...

diff --combined appli/CTBronchi/Process.sh
index 47954b752fac95797956d3c0e1313a180255f1a1,009829ff50919388a015dd030f4b4c9bc8f09e7e..a6cb49bab4e08026992a7d52083813e61fc83977
--- 1/appli/CTBronchi/Process.sh
--- 2/appli/CTBronchi/Process.sh
+++ b/appli/CTBronchi/Process.sh
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/bash
  
  ## -- Command line options
- exec_dir=`dirname $0`
+ curr_dir=`dirname $0`
  vesselness_sigma="0.5"
  vesselness_alpha1="0.5"
  vesselness_alpha2="2"
@@@ -12,8 -12,8 +12,8 @@@ mori_signal_influence="0.5
  mori_lower="-1024"
  mori_upper="0"
  mori_delta="1"
- slicebyslice_vesselness_thr="5"
- fast_vesselness_thr="95"
+ slice_by_slice_vesselness_thr="5"
+ labels_vesselness_thr="65"
  labels_upper_thr="-400"
  beta="2.5"
  epsilon="1e-5"
@@@ -67,14 -67,14 +67,18 @@@ while [[ "$#" -gt 0 ]]; d
          mori_delta="$2"
          shift
          ;;
 -        -labels_vesselness_thr)
 -        labels_vesselness_thr="$2"
 +        -slicebyslice_vesselness_thr)
 +        slicebyslice_vesselness_thr="$2"
 +        shift
 +        ;;
 +        -fast_vesselness_thr)
 +        fast_vesselness_thr="$2"
          shift
          ;;
+         -slice_by_slice_vesselness_thr)
+         slice_by_slice_vesselness_thr="$2"
+         shift
+         ;;
          -labels_upper_thr)
          labels_upper_thr="$2"
          shift
@@@ -120,13 -120,13 +124,13 @@@ echo "*********************************
  (>&2 echo "Processing $input... ")
  echo "Processing $input..."
  if [ ! -f $vesselness ] || [ -n "$force" ] ; then
-     $exec_dir/fpa_CTBronchi_Vesselness \
+     $curr_dir/fpa_CTBronchi_Vesselness \
          -i $input -o $vesselness \
          -s $vesselness_sigma -a $vesselness_alpha1 -b $vesselness_alpha2
  fi
  
  if [ ! -f $mori ] || [ -n "$force" ] ; then
-     $exec_dir/fpa_CTBronchi_MoriSegmentation \
+     $curr_dir/fpa_CTBronchi_MoriSegmentation \
          -i $input \
          -o $mori \
          -s $mori_signal \
@@@ -141,17 -141,17 +145,17 @@@
  fi
  
  if [ ! -f $labels ] || [ -n "$force" ] ; then
-     $exec_dir/fpa_CTBronchi_MoriLabelling \
+     $curr_dir/fpa_CTBronchi_MoriLabelling \
          -i $input \
          -l $mori \
          -v $vesselness \
          -o $labels \
 -        -a $labels_vesselness_thr \
 +        -a $fast_vesselness_thr \
          -u $labels_upper_thr
  fi
  
  if [ ! -f $fastrw ] || [ -n "$force" ] ; then
-     $exec_dir/fpa_CTBronchi_FastRandomWalker \
+     $curr_dir/fpa_CTBronchi_FastRandomWalker \
          -i $input \
          -l $labels \
          -o $fastrw \
@@@ -160,12 -160,12 +164,12 @@@
  fi
  
  if [ ! -f $slicerw ] || [ -n "$force" ] ; then
-     $exec_dir/fpa_CTBronchi_SliceBySliceRandomWalker \
+     $curr_dir/fpa_CTBronchi_SliceBySliceRandomWalker \
          -i $input \
          -l $mori \
          -v $vesselness \
          -o $slicerw \
-         -t $slicebyslice_vesselness_thr \
+         -t $slice_by_slice_vesselness_thr \
          -b $beta \
          -e $epsilon
  fi