Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --git a/cluster_tools/gate_power_merge.sh b/cluster_tools/gate_power_merge.sh
index ab9ac976a06c3a392cb34ac35702cdb5600953a6..e35a683fb2bcf3694eed7f10519995efe4333d58 100755 (executable)
--- a/cluster_tools/gate_power_merge.sh
+++ b/cluster_tools/gate_power_merge.sh
@@ -343,7 +343,7 @@ function merge_dispatcher {
         return
     fi
 
-    if test "${firstpartialoutputextension}" == "mhd"
+    if test "${firstpartialoutputextension}" == "mhd" || test "${firstpartialoutputextension}" == "mha"
     then
         echo "${indent}this is a mhd image"
         local mergedfile="${outputdir}/$(basename "${firstpartialoutputfile}")"
@@ -503,7 +503,7 @@ echo "output dir is ${outputdir}"
 test -d "${outputdir}" && rm -r "${outputdir}"
 mkdir "${outputdir}"
 
-for outputfile in $(find "${rundir}" -regextype 'posix-extended' -type f -regex "${rundir}/output.*\.(hdr|mhd|root|txt)" | awk -F '/' '{ print $NF; }' | sort | uniq)
+for outputfile in $(find "${rundir}" -regextype 'posix-extended' -type f -regex "${rundir}/output.*\.(hdr|mhd|mha|root|txt)" | awk -F '/' '{ print $NF; }' | sort | uniq)
 do
     merge_dispatcher "${outputfile}"
 done