let count++
local arguments=" -i ${partial} ${arguments}"
done
-${rootMerger} ${arguments} > /dev/null || warning "error while calling ${rootMerger}"
+${rootMerger} ${arguments} > /dev/null || error "error while calling ${rootMerger}"
echo " ${indent}merged ${count} files"
}
echo " ${indent}merged ${count} files"
}
+doseMerger="mergeDosePerEnegryFile.sh"
+test -x "./mergeDosePerEnergyFile.sh" && doseMerger="./mergeDosePerEnergyFile.sh"
+
+function merge_dose {
+local merged="$1"
+shift
+echo " ${indent}entering dose merger"
+echo " ${indent}merger is ${doseMerger}"
+echo " ${indent}creating ${merged}"
+local count=0
+start_bar $#
+while test $# -gt 0
+do
+ local partial="$1"
+ shift
+ let count++
+
+ if test ! -f "${merged}"
+ then
+ update_bar ${count} "copying first partial result ${partial}"
+ cp "${partial}" "${merged}"
+ continue
+ fi
+
+ update_bar ${count} "adding ${partial}"
+ ${doseMerger} -i "${merged}" -j "${partial}" -o "${merged}" 2> /dev/null > /dev/null || warning "error while calling ${doseMerger}"
+done
+end_bar
+echo " ${indent}merged ${count} files"
+}
+
txtImageMerger="clitkMergeAsciiDoseActor"
test -f "./clitkMergeAsciiDoseActor" && txtImageMerger="./clitkMergeAsciiDoseActor"
local outputfile="${1:?"provide output filename"}"
echo "merging ${outputfile}"
- local partialoutputfiles="$(find "${rundir}" -type f -name "${outputfile}")"
+ local partialoutputfiles="$(find "${rundir}" -mindepth 2 -type f -name "${outputfile}")"
local nboutputfiles="$(echo "${partialoutputfiles}" | wc -l)"
if test ${nboutputdirs} -ne ${nboutputfiles}
then
return
fi
+ if test "${firstpartialoutputextension}" == "txt" && grep -qs 'energydose' "${firstpartialoutputfile}"
+ then
+ echo "${indent}this is a dose file"
+ local mergedfile="${outputdir}/$(basename "${firstpartialoutputfile}")"
+ merge_dose "${mergedfile}" ${partialoutputfiles} || error "error while merging"
+ return
+ fi
+
+
+
if test "${firstpartialoutputextension}" == "txt" && grep -qs 'Resol' "${firstpartialoutputfile}"
then
local resol="$(sed -nr '/Resol/s/^.*=\s+\((.+)\)\s*$/\1/p' "${firstpartialoutputfile}")"
error "unknown file type"
}
-echo "!!!! this is $0 v0.3j !!!!"
+echo "!!!! this is $0 v0.3k !!!!"
rundir="${1?"provide run dir"}"
rundir="$(echo "${rundir}" | sed 's|/*$||')"