X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2Fgate_power_merge.sh;h=8949b35b0be6afd05f474c5ea107419531868976;hb=e7f6ef589423355d3577da5c40e23d054f232aec;hp=9878fff61fbd40c3c483a4bd9f57fabe717f9cfd;hpb=82fdf42ca0636551f03d1f8d017b39e94f79c246;p=clitk.git

diff --git a/cluster_tools/gate_power_merge.sh b/cluster_tools/gate_power_merge.sh
index 9878fff..8949b35 100755
--- a/cluster_tools/gate_power_merge.sh
+++ b/cluster_tools/gate_power_merge.sh
@@ -168,7 +168,7 @@ test -x "./clitkImageArithm" && mhdImageMerger="./clitkImageArithm"
 
 function merge_mhd_image {
 local merged="$1"
-local merged_bin="${merged%.*}.img"
+local merged_bin="${merged%.*}.raw"
 shift
 echo "  ${indent}entering mhd image merger"
 echo "  ${indent}merger is ${mhdImageMerger}"
@@ -272,15 +272,24 @@ function merge_dispatcher {
     then
         echo "${indent}this is a non specific txt output"
         local mergedfile="${outputdir}/$(basename "${firstpartialoutputfile}")"
-        echo "  ${indent}catting ${mergedfile}"
-        cat ${partialoutputfiles} > "${mergedfile}" || error "error while merging"
-        return
+        local nbdifferent="$(md5sum ${partialoutputfiles} | awk '{ print $1; }' | sort | uniq | wc -l)"
+        echo "  ${indent}${nbdifferent} different files"
+        if test ${nbdifferent} -gt 1
+        then
+            echo "  ${indent}catting to ${mergedfile}"
+            cat ${partialoutputfiles} > "${mergedfile}" || error "error while merging"
+            return
+        else
+            echo "  ${indent}moving to ${mergedfile}"
+            cp "${firstpartialoutputfile}" "${mergedfile}" || error "error while merging"
+            return
+        fi
     fi
 
-    warning "unknown file type"
+    error "unknown file type"
 }
 
-echo "!!!! this is $0 v0.3h !!!!"
+echo "!!!! this is $0 v0.3i !!!!"
 
 rundir="${1?"provide run dir"}"
 rundir="$(echo "${rundir}" | sed 's|/*$||')"