X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2Fgate_power_merge.sh;h=43d90d02c496d6dba5c3f696a88b195c4b535f0c;hb=HEAD;hp=7717c578fe355975af3d6aeeea5d2969ab5feeae;hpb=41e17601d6204e6036fa27a3db4c8d1e6bd175a7;p=clitk.git

diff --git a/cluster_tools/gate_power_merge.sh b/cluster_tools/gate_power_merge.sh
index 7717c57..43d90d0 100755
--- a/cluster_tools/gate_power_merge.sh
+++ b/cluster_tools/gate_power_merge.sh
@@ -165,7 +165,7 @@ function merge_stat {
     echo "  ${indent}merged ${count} files"
 }
 
-doseMerger="mergeDosePerEnegryFile.sh"
+doseMerger="mergeDosePerEnergyFile.sh"
 test -x "./mergeDosePerEnergyFile.sh" && doseMerger="./mergeDosePerEnergyFile.sh"
 
 function merge_dose {
@@ -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"
@@ -217,12 +218,14 @@ function merge_doseByRegions {
         then
             update_bar ${count} "copying first partial result ${partial}"
             cp "${partial}" "${merged}"
+            copyFirstPartialResult -i "${merged}" -o "${merged}" 2> /dev/null > /dev/null || warning "error while calling ${doseMerger}"
             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}" -o "${merged}" 2> /dev/null > /dev/null || warning "error while calling ${doseMerger}"
     end_bar
     echo "  ${indent}merged ${count} files"
 }
@@ -595,6 +598,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"