Merge pull request #1829 from ANTsX/DEFAULTS

ENH: Change radius and gradient step defaults.
ANTsX · Jan 23, 2025 · 0cff6f2 · 0cff6f2
2 parents 9c98082 + c42cccd
commit 0cff6f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Scripts/antsRegistrationSyN.sh b/Scripts/antsRegistrationSyN.sh
@@ -230,6 +230,7 @@ function reportMappingParameters {
  Initial transforms:       ${INITIALTRANSFORMS[@]}
  Number of threads:        $NUMBEROFTHREADS
  Spline distance:          $SPLINEDISTANCE
+ Linear gradient step:     $LINEARGRADIENTSTEP
  SyN gradient step:        $SYNGRADIENTSTEP
  Transform type:           $TRANSFORMTYPE
  CC radius:                $CCRADIUS
@@ -283,10 +284,11 @@ INITIALTRANSFORMS=()
 OUTPUTNAME=output
 NUMBEROFTHREADS=0
 SPLINEDISTANCE=26
-SYNGRADIENTSTEP=0.1
+LINEARGRADIENTSTEP=0.1
+SYNGRADIENTSTEP=0.2
 TRANSFORMTYPE='s'
 PRECISIONTYPE='d'
-CCRADIUS=4
+CCRADIUS=2
 MASKIMAGES=()
 USEHISTOGRAMMATCHING=0
 COLLAPSEOUTPUTTRANSFORMS=1
@@ -537,13 +539,13 @@ if [[ $TRANSFORMTYPE == 't' ]] ; then
   tx=Translation
 fi
 
-RIGIDSTAGE="--transform ${tx}[ 0.1 ] \
+RIGIDSTAGE="--transform ${tx}[ ${LINEARGRADIENTSTEP} ] \
             --metric ${LINEARMETRIC}[ ${FIXEDIMAGES[0]},${MOVINGIMAGES[0]},1,${LINEARMETRICPARAMETER},Regular,0.25 ] \
             --convergence $RIGIDCONVERGENCE \
             --shrink-factors $RIGIDSHRINKFACTORS \
             --smoothing-sigmas $RIGIDSMOOTHINGSIGMAS"
 
-AFFINESTAGE="--transform Affine[ 0.1 ] \
+AFFINESTAGE="--transform Affine[ ${LINEARGRADIENTSTEP} ] \
              --metric ${LINEARMETRIC}[ ${FIXEDIMAGES[0]},${MOVINGIMAGES[0]},1,${LINEARMETRICPARAMETER},Regular,0.25 ] \
              --convergence $AFFINECONVERGENCE \
              --shrink-factors $AFFINESHRINKFACTORS \

diff --git a/Scripts/antsRegistrationSyNQuick.sh b/Scripts/antsRegistrationSyNQuick.sh
@@ -233,6 +233,7 @@ function reportMappingParameters {
  Initial transforms:       ${INITIALTRANSFORMS[@]}
  Number of threads:        $NUMBEROFTHREADS
  Spline distance:          $SPLINEDISTANCE
+ Linear gradient step:     $LINEARGRADIENTSTEP
  SyN gradient step:        $SYNGRADIENTSTEP
  Transform type:           $TRANSFORMTYPE
  MI histogram bins:        $NUMBEROFBINS
@@ -286,7 +287,8 @@ INITIALTRANSFORMS=()
 OUTPUTNAME=output
 NUMBEROFTHREADS=0
 SPLINEDISTANCE=26
-SYNGRADIENTSTEP=0.1
+LINEARGRADIENTSTEP=0.1
+SYNGRADIENTSTEP=0.2
 TRANSFORMTYPE='s'
 PRECISIONTYPE='d'
 NUMBEROFBINS=32
@@ -541,13 +543,13 @@ if [[ $TRANSFORMTYPE == 't' ]] ; then
   tx=Translation
 fi
 
-RIGIDSTAGE="--transform ${tx}[ 0.1 ] \
+RIGIDSTAGE="--transform ${tx}[ ${LINEARGRADIENTSTEP} ] \
             --metric ${LINEARMETRIC}[ ${FIXEDIMAGES[0]},${MOVINGIMAGES[0]},1,${LINEARMETRICPARAMETER},Regular,0.25 ] \
             --convergence $RIGIDCONVERGENCE \
             --shrink-factors $RIGIDSHRINKFACTORS \
             --smoothing-sigmas $RIGIDSMOOTHINGSIGMAS"
 
-AFFINESTAGE="--transform Affine[ 0.1 ] \
+AFFINESTAGE="--transform Affine[ ${LINEARGRADIENTSTEP} ] \
              --metric ${LINEARMETRIC}[ ${FIXEDIMAGES[0]},${MOVINGIMAGES[0]},1,${LINEARMETRICPARAMETER},Regular,0.25 ] \
              --convergence $AFFINECONVERGENCE \
              --shrink-factors $AFFINESHRINKFACTORS \