Modify mergeDoseByRegion

[clitk.git] / cluster_tools / gate_power_merge.sh

diff --git a/cluster_tools/gate_power_merge.sh b/cluster_tools/gate_power_merge.sh
index 767fb2f6d2d70e063d4e0d8b0539f29ff1a66be4..bc3b3e033450749631b4fe60401c04a86b6d6a2f 100755 (executable)
--- a/cluster_tools/gate_power_merge.sh
+++ b/cluster_tools/gate_power_merge.sh
@@ -207,6 +207,7 @@ function merge_doseByRegions {
     echo "  ${indent}creating ${merged}"
     local count=0
     start_bar $#
+    source ${doseMerger}
     while test $# -gt 0
     do
         local partial="$1"
@@ -216,13 +217,14 @@ function merge_doseByRegions {
         if test ! -f "${merged}"
         then
             update_bar ${count} "copying first partial result ${partial}"
-            cp "${partial}" "${merged}"
+            addWithoutPartialResult -i "${partial}" -o "${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}"
+        addToPartialResult -i "${merged}" -j "${partial}" -o "${merged}" 2> /dev/null > /dev/null || warning "error while calling ${doseMerger}"
     done
+    divideUncertaintyResult -i "${merged}" -j "${count}" -o "${merged}"
     end_bar
     echo "  ${indent}merged ${count} files"
 }
@@ -595,6 +597,11 @@ do
     merge_dispatcher_uncertainty "${outputfile}" "${force}"
 done
 
+echo "compute job statistics"
+python computeEnlapsedTime.py ${rundir} gate
+mv "statJobs.txt" "${outputdir}/statJobs.txt"
+
+
 if [ -f "${rundir}/params.txt" ]
 then
     echo "copying params file"