Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e552d978311bade44b56c8c6f96d04d012fb6e41..fd3ea26bc9571c0e971224ea779a229663d5ad5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,8 +124,6 @@ SET(SCRIPTS
   scripts/create_midP_masks-2.0.sh  
   scripts/pts_to_landmarks.sh
   scripts/create_mhd_3D.sh
-  scripts/create_sequence.sh
-  scripts/dcm_sort_by_field.sh
   scripts/dicom_info.sh
 )
 

diff --git a/registration/clitkGenericOptimizer.h b/registration/clitkGenericOptimizer.h
index ca8cace7593ef6451096eb0138183d22a7c14fed..04b849d0d7280b325a5d5b30a785069080c33b99 100644 (file)
--- a/registration/clitkGenericOptimizer.h
+++ b/registration/clitkGenericOptimizer.h
@@ -323,7 +323,7 @@ public:
       std::cout<<std::setprecision(6);
       if (m_OutputIteration)  std::cout<<"Iteration: "<< o->GetCurrentIteration()<<std::endl;
       if (m_OutputPosition)  std::cout<<"Position: "<< o->GetCurrentPosition()<<std::endl;
-      if (m_OutputPosition)  std::cout<<"Step length: "<< o->GetCurrentStepLength()<<std::endl;
+      if (m_OutputValue)  std::cout<<"Step length: "<< o->GetCurrentStepLength()<<std::endl;
       if (m_OutputValue)  std::cout<<"Value: "<< o->GetValue()<<std::endl;
       if (m_OutputGradient)  std::cout<<"Gradient: "<< o->GetGradient()<<std::endl;
       std::cout<<std::endl;