diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
index 32c05266049c20bc6ee50084ae3ecb50d830124f..3a68212554c44fdb124cfe2eff7583e94d86fb30 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
@@ -66,7 +66,6 @@ AtmosphericCorrectionParameters
 }
 
 
-
 /**PrintSelf method */
 void
 AtmosphericCorrectionParameters
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index 792b681e094372511acd005dfd2cdd7c4b2f999c..fe1ba2517edc5da921ec8ed73df7a52d62756c5e 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -128,7 +128,7 @@ public:
   void UpdateAeronetData(const std::string& file, int year, int hour, int minute)
   {
     this->UpdateAeronetData(file, year, m_Month, m_Day, hour, minute, 0.4);
-  }*/ 
+  }*/
 
   /** Constructor */
   AtmosphericCorrectionParameters();
diff --git a/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx b/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx
index 30a79df1855811ef0de7c67a9b6e6ae985062584..4f6cbcf016252834401255f7a4f8223c4d4e99ac 100644
--- a/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx
+++ b/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx
@@ -45,7 +45,6 @@ ImageMetadataCorrectionParameters
 }
 
 
-
 /** Get data from filter function file*/
 void
 ImageMetadataCorrectionParameters
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
index b880a23950323a908117cc094a5b9e87cf2cf549..f89c940715fb65d1325495de9ee8a771a894e44b 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -25,7 +25,7 @@
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
-#include "otbAtmosphericCorrectionParameters.h" 
+#include "otbAtmosphericCorrectionParameters.h"
 #include "otbImageMetadataCorrectionParameters.h"
 #include "otbAtmosphericRadiativeTerms.h"
 
@@ -119,8 +119,8 @@ private:
  * \ingroup AtmosphericRadiativeTerms
  * \ingroup AtmosphericCorrectionParameters
  * \ingroup LuminanceToReflectanceImageFilter
- * \ingroup ImageToReflectanceImageFilter 
- * \ingroup ImageMetadataCorrectionParameters  
+ * \ingroup ImageToReflectanceImageFilter
+ * \ingroup ImageMetadataCorrectionParameters
  * \ingroup otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms
  * \ingroup Radiometry
  *
@@ -190,30 +190,30 @@ public:
   typedef itk::MetaDataDictionary MetaDataDictionaryType;
 
   /** Get/Set Atmospheric Radiative Terms. */
-  void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) 
+  void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms)
   {
     m_AtmosphericRadiativeTerms = atmoRadTerms;
-    this->SetNthInput(1, m_AtmosphericRadiativeTerms); 
+    this->SetNthInput(1, m_AtmosphericRadiativeTerms);
     m_IsSetAtmosphericRadiativeTerms = true;
     this->Modified();
   }
   itkGetObjectMacro(AtmosphericRadiativeTerms, AtmosphericRadiativeTermsType);
 
   /** Get/Set Atmospheric Correction Parameters. */
-  void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) 
+  void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms)
   {
     m_AtmoCorrectionParameters = atmoCorrTerms;
-    this->SetNthInput(2, m_AtmoCorrectionParameters); 
-    m_IsSetAtmoCorrectionParameters = true; 
+    this->SetNthInput(2, m_AtmoCorrectionParameters);
+    m_IsSetAtmoCorrectionParameters = true;
     this->Modified();
   }
   itkGetObjectMacro(AtmoCorrectionParameters, AtmoCorrectionParametersType);
 
   /** Get/Set Acquisition Correction Parameters. */
-  void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) 
+  void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms)
   {
     m_AcquiCorrectionParameters = acquiCorrTerms;
-    this->SetNthInput(3, m_AcquiCorrectionParameters); 
+    this->SetNthInput(3, m_AcquiCorrectionParameters);
     m_IsSetAcquiCorrectionParameters = true;
     this->Modified();
   }
@@ -242,7 +242,7 @@ protected:
 
   /** Initialize the parameters of the functor before the threads run. */
   virtual void BeforeThreadedGenerateData();
-  /** Fill AtmosphericRadiativeTerms using image metadata*/ 
+  /** Fill AtmosphericRadiativeTerms using image metadata*/
   void UpdateAtmosphericRadiativeTerms();
   /** Update Functors parameters */
   void UpdateFunctors();
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
index ff777e6fc7ccb9c6abc10fef0ef55f2006657a68..24711e2967e3e0bc6fd6c90284eeed4041b41722 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -80,7 +80,6 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
  }
 
 
-
 template <class TInputImage, class TOutputImage>
 void
 ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
@@ -135,7 +134,7 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
           {
             if (imageMetadataInterface->GetSpectralSensitivity()->Capacity() > 0)
                   {
-                      m_AcquiCorrectionParameters->SetWavelengthSpectralBand(imageMetadataInterface->GetSpectralSensitivity());  
+                      m_AcquiCorrectionParameters->SetWavelengthSpectralBand(imageMetadataInterface->GetSpectralSensitivity());
                   }
             else
                   {
@@ -153,7 +152,6 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
       }
 
 
-
   m_AtmosphericRadiativeTerms = CorrectionParametersToRadiativeTermsType::Compute(m_AtmoCorrectionParameters,m_AcquiCorrectionParameters);
 
  }
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index 4eca8b6b694d8797cc46f8926185c05169978bf9..a8352b3e7ea360809376abb2881d548e6d00e91d 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -219,42 +219,41 @@ public:
   itkSetMacro(PixelSpacingInKilometers, double);
   itkGetMacro(PixelSpacingInKilometers, double);
   /** Set/Get the viewing angle */
-  itkSetMacro(ZenithalViewingAngle, double); 
+  itkSetMacro(ZenithalViewingAngle, double);
   itkGetMacro(ZenithalViewingAngle, double);
 
 
   /** Get/Set Atmospheric Radiative Terms. */
-  void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) 
+  void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms)
   {
     m_AtmosphericRadiativeTerms = atmoRadTerms;
-    this->SetNthInput(1, m_AtmosphericRadiativeTerms); 
+    this->SetNthInput(1, m_AtmosphericRadiativeTerms);
     m_IsSetAtmosphericRadiativeTerms = true;
     this->Modified();
   }
   itkGetObjectMacro(AtmosphericRadiativeTerms, AtmosphericRadiativeTermsType);
 
   /** Get/Set Atmospheric Correction Parameters. */
-  void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) 
+  void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms)
   {
     m_AtmoCorrectionParameters = atmoCorrTerms;
-    this->SetNthInput(2, m_AtmoCorrectionParameters); 
-    m_IsSetAtmoCorrectionParameters = true; 
+    this->SetNthInput(2, m_AtmoCorrectionParameters);
+    m_IsSetAtmoCorrectionParameters = true;
     this->Modified();
   }
   itkGetObjectMacro(AtmoCorrectionParameters, AtmoCorrectionParametersType);
 
   /** Get/Set Acquisition Correction Parameters. */
-  void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) 
+  void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms)
   {
     m_AcquiCorrectionParameters = acquiCorrTerms;
-    this->SetNthInput(3, m_AcquiCorrectionParameters); 
+    this->SetNthInput(3, m_AcquiCorrectionParameters);
     m_IsSetAcquiCorrectionParameters = true;
     this->Modified();
   }
   itkGetObjectMacro(AcquiCorrectionParameters, AcquiCorrectionParametersType);
 
 
-
   /** Compute radiative terms if necessary and then update functors attibuts. */
   void GenerateParameters();
 
diff --git a/Code/Simulation/otbAtmosphericEffects.h b/Code/Simulation/otbAtmosphericEffects.h
index 1807d60e5bee5f574204de4f8c046b5baf9c2351..60ce6cfb87387307121adf7566d10789ca967075 100644
--- a/Code/Simulation/otbAtmosphericEffects.h
+++ b/Code/Simulation/otbAtmosphericEffects.h
@@ -72,7 +72,7 @@ class AtmosphericEffects
            itkSetObjectMacro(InputSpectralResponse, InputSpectralResponseType);
 
             /** Get/Set Atmospheric Radiative Terms. */
-            void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) 
+            void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms)
             {
               m_AtmosphericRadiativeTerms = atmoRadTerms;
               this->Modified();
diff --git a/Code/Simulation/otbAtmosphericEffects.txx b/Code/Simulation/otbAtmosphericEffects.txx
index da8ea20279c232a344febedbef3a32b06377000d..e31a692ca505ce74c566cb405f227e36bb59d52b 100644
--- a/Code/Simulation/otbAtmosphericEffects.txx
+++ b/Code/Simulation/otbAtmosphericEffects.txx
@@ -108,7 +108,7 @@ AtmosphericEffects<TSpectralResponse , TRSR>
   filterSRToR->Update();
 
 
-  this->m_CorrectedSpectralResponse->SetFromImage( filterSRToR->GetOutput() );*/
+  this->m_CorrectedSpectralResponse->SetFromImage( filterSRToR->GetOutput() ); */
 
   /*if (m_IsSetAtmosphericRadiativeTerms)
   {*/
@@ -127,7 +127,7 @@ AtmosphericEffects<TSpectralResponse , TRSR>
     this->m_CorrectedSpectralResponse->SetFromImage( filterSRToR->GetOutput() );
   /*}
   else
-    itkExceptionMacro(<< "Atmospheric radiative terms must be provided before updating the CSR (Corrected Spectral Response)");*/
+    itkExceptionMacro(<< "Atmospheric radiative terms must be provided before updating the CSR (Corrected Spectral Response)"); */
 
 }
 } // end namespace otb
diff --git a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
index 6c8ea24aac9a71d3eee0cc1a634fc739c70badfe..2b9604b78f3b27bfcac76c86dffb2b90e69a85bc 100644
--- a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
@@ -26,7 +26,7 @@
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 
 #include "otbAtmosphericRadiativeTerms.h"
-#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h" 
+#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbImageMetadataCorrectionParameters.h"
 #include "itkMetaDataDictionary.h"
 // #include "itkFactory.h"
@@ -216,30 +216,30 @@ public:
 
 
   /** Get/Set Atmospheric Radiative Terms. */
-  void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) 
+  void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms)
   {
     m_AtmosphericRadiativeTerms = atmoRadTerms;
-    this->SetNthInput(1, m_AtmosphericRadiativeTerms); 
+    this->SetNthInput(1, m_AtmosphericRadiativeTerms);
     m_IsSetAtmosphericRadiativeTerms = true;
     this->Modified();
   }
   itkGetObjectMacro(AtmosphericRadiativeTerms, AtmosphericRadiativeTermsType);
 
   /** Get/Set Atmospheric Correction Parameters. */
-  void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) 
+  void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms)
   {
     m_AtmoCorrectionParameters = atmoCorrTerms;
-    this->SetNthInput(2, m_AtmoCorrectionParameters); 
-    m_IsSetAtmoCorrectionParameters = true; 
+    this->SetNthInput(2, m_AtmoCorrectionParameters);
+    m_IsSetAtmoCorrectionParameters = true;
     this->Modified();
   }
   itkGetObjectMacro(AtmoCorrectionParameters, AtmoCorrectionParametersType);
 
   /** Get/Set Acquisition Correction Parameters. */
-  void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) 
+  void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms)
   {
     m_AcquiCorrectionParameters = acquiCorrTerms;
-    this->SetNthInput(3, m_AcquiCorrectionParameters); 
+    this->SetNthInput(3, m_AcquiCorrectionParameters);
     m_IsSetAcquiCorrectionParameters = true;
     this->Modified();
   }
diff --git a/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx b/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx
index 56d7a855027da55049f005577796039cfce295d1..35f7b0eed68eb944f4b69dfdca168861d86c4399 100644
--- a/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx
+++ b/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx
@@ -177,7 +177,7 @@ int main(int argc, char* argv[])
         }*/
       std::string strarg (argv[i]);
       std::cout << strarg << std::endl;
-      vexp.push_back(strarg); 
+      vexp.push_back(strarg);
       }
     }
   //  std::cerr << exp << ":\n";
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index fe7d08fd8c7832d0ba850fb0003856af0ab63e73..cc85fb6e58ff786460f50bd58b85b0dfa4199fe3 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -95,7 +95,7 @@ void CommandLineLauncher::DeleteWatcherList()
 bool CommandLineLauncher::Load(const std::string & exp)
 {
   /*m_Expression = exp;
-  return this->Load();*/
+  return this->Load(); */
   return false;
 }
 
@@ -884,7 +884,7 @@ bool CommandLineLauncher::CheckUnicity()
 bool CommandLineLauncher::CheckParametersPrefix()
 {
   // Check if the chain " --" appears in the args, could be a common mistake
-  for (std::vector<std::string>::iterator it = m_VExpression.begin() ; it != m_VExpression.end(); ++it)
+  for (std::vector<std::string>::iterator it = m_VExpression.begin(); it != m_VExpression.end(); ++it)
     {
     if (it->find("--") != std::string::npos )
       {
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
index e76b2974c6c959d59661af0e8ff263fdc4c355f1..df4c449446f6769a1c6f3ad0b7f894005bae6628 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
@@ -164,7 +164,7 @@ CommandLineParser::GetPaths( std::vector<std::string> & paths, const std::string
   return OK;
 }
 
-CommandLineParser::ParseResultType 
+CommandLineParser::ParseResultType
 CommandLineParser::GetModuleName( std::string & modName, std::vector<std::string> & exp )
 {
   itksys::RegularExpression reg;
@@ -260,15 +260,15 @@ CommandLineParser::GetAttribut( const std::string & key, std::vector<std::string
    
    if (it->find(key) != std::string::npos)
      { foundKey=true;
-   std::cout << "foundkey true" << std::endl; 
+   std::cout << "foundkey true" << std::endl;
    }
    else
    {
-   std::cout << "foundkey false" << std::endl; 
+   std::cout << "foundkey false" << std::endl;
    }
    ++it;
    }
- return res;  
+ return res;
 }
 
 std::vector<std::string>
@@ -361,7 +361,7 @@ CommandLineParser::GetAttribut( const std::string & key, const std::string & exp
   return res;
 }
 
-std::string 
+std::string
 CommandLineParser::GetAttributAsString( const std::string & key, std::vector<std::string> & exp )
 {
   std::string res("");
@@ -437,7 +437,7 @@ CommandLineParser::IsAttributExists( const std::string key, const std::string &
 bool
 CommandLineParser::IsAttributExists( const std::string key, std::vector<std::string> & exp  )
 {
-  for (std::vector<std::string>::iterator it = exp.begin() ; it != exp.end(); ++it)
+  for (std::vector<std::string>::iterator it = exp.begin(); it != exp.end(); ++it)
   {
     if (it->find(key) != std::string::npos)
       return true;
@@ -449,7 +449,7 @@ std::vector<std::string>
 CommandLineParser::GetKeyList(  std::vector<std::string> & exp  )
 {
    std::vector<std::string> keyList;
-   for (std::vector<std::string>::iterator it = exp.begin() ; it != exp.end(); ++it)
+   for (std::vector<std::string>::iterator it = exp.begin(); it != exp.end(); ++it)
     {
       if (it->find("-") == 0 && this->IsAValidKey(*it))
       {
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index 535875b228aea7fac07f5644d826b90ef38df0ef..33ce4496f45e6e02328c56e8ccf8f107bdd64922 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -130,7 +130,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
 
   AtmosphericCorrectionParametersType::Pointer dataAtmosphericCorrectionParameters =
     AtmosphericCorrectionParametersType::New();
-  AtmosphericRadiativeTermsType::Pointer dataAtmosphericRadiativeTerms = AtmosphericRadiativeTermsType::New();*/
+  AtmosphericRadiativeTermsType::Pointer dataAtmosphericRadiativeTerms = AtmosphericRadiativeTermsType::New(); */
 
   typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms     CorrectionParametersToRadiativeTermsType;
 
@@ -210,7 +210,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
     filterAtmosphericCorrectionParametersTo6SRadiativeTerms =
     RadiometryCorrectionParametersToRadiativeTermsType::New();
   filterAtmosphericCorrectionParametersTo6SRadiativeTerms->SetInput(dataAtmosphericCorrectionParameters);
-  filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update();*/
+  filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update(); */
 
   paramAcqui->SetSolarZenithalAngle(filterLuminanceToReflectance->GetZenithalSolarAngle());
   paramAcqui->SetSolarAzimutalAngle(static_cast<double>(atof(argv[8])));
diff --git a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
index ff2e43ef564bd1ab1961311d01be53833a878eab..1ad9654e4d018bd1aa16a6c04948bfe195f693c1 100644
--- a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
+++ b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
@@ -17,7 +17,7 @@
 =========================================================================*/
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
-#include "otbAtmosphericCorrectionParameters.h" 
+#include "otbAtmosphericCorrectionParameters.h"
 #include "otbImageMetadataCorrectionParameters.h"
 #include "otbAtmosphericRadiativeTerms.h"
 #include <vector>
@@ -100,10 +100,10 @@ int otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms(int argc, char
   functionValues->SetMinSpectralValue(minSpectralValue);
   functionValues->SetMaxSpectralValue(maxSpectralValue);
   functionValues->SetUserStep(val);
-  paramAcqui->SetWavelengthSpectralBandWithIndex(0, functionValues); 
+  paramAcqui->SetWavelengthSpectralBandWithIndex(0, functionValues);
 
   // Set parameters
-  paramAcqui->SetSolarZenithalAngle(static_cast<double>(solarZenithalAngle)); 
+  paramAcqui->SetSolarZenithalAngle(static_cast<double>(solarZenithalAngle));
   paramAcqui->SetSolarAzimutalAngle(static_cast<double>(solarAzimutalAngle));
   paramAcqui->SetViewingZenithalAngle(static_cast<double>(viewingZenithalAngle));
   paramAcqui->SetViewingAzimutalAngle(static_cast<double>(viewingAzimutalAngle));
diff --git a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
index 68d5ed57969ab41111f8cc638088a0c3d2a07087..52b304b55919bd2ef930e2aed9489a447a35da3b 100644
--- a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
@@ -25,7 +25,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbAtmosphericRadiativeTerms.h"
-#include "otbAtmosphericCorrectionParameters.h" 
+#include "otbAtmosphericCorrectionParameters.h"
 
 #include "itkMetaDataDictionary.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
@@ -107,12 +107,12 @@ int otbReflectanceToSurfaceReflectanceImageFilterTest(int itkNotUsed(argc), char
   writer->Update();
 
   return EXIT_SUCCESS;
-}  
+}
 
 //Check the correct generation of the atmospheric parameters
 int otbReflectanceToSurfaceReflectanceImageFilterTest2(int itkNotUsed(argc), char * argv[])
 {
-  const char * inputFileName  = argv[1]; 
+  const char * inputFileName  = argv[1];
   const char * outputFileName = argv[2];
 
   const unsigned int Dimension = 2;
@@ -158,7 +158,7 @@ int otbReflectanceToSurfaceReflectanceImageFilterTest2(int itkNotUsed(argc), cha
 
   std::ofstream fout (outputFileName);
   fout << terms;
-  fout.close();*/
+  fout.close(); */
 
   return EXIT_SUCCESS;
 }
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
index 4fbbbd41510e6362b2e144b011b611e71dbd1d0d..37e22343b2ae0e27ac1a919d2b0d0afcf8c7732c 100644
--- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
@@ -52,7 +52,7 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int itkNotUsed(a
   typedef otb::FilterFunctionValues                            FilterFunctionValuesType;
   typedef CorrectionParametersType::AerosolModelType           AerosolModelType;
   typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType;
-  typedef FilterFunctionValuesType::ValuesVectorType           ValuesVectorType;*/
+  typedef FilterFunctionValuesType::ValuesVectorType           ValuesVectorType; */
 
   typedef otb::AtmosphericCorrectionParameters                              AtmoCorrectionParametersType;
   typedef AtmoCorrectionParametersType::Pointer                    AtmoCorrectionParametersPointerType;
@@ -134,7 +134,7 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int itkNotUsed(a
   param->SetWaterVaporAmount(static_cast<double>(waterVaporAmount));
   param->SetOzoneAmount(static_cast<double>(ozoneAmount));
   param->SetAerosolModel(aerosolModel);
-  param->SetAerosolOptical(static_cast<double>(aerosolOptical));*/
+  param->SetAerosolOptical(static_cast<double>(aerosolOptical)); */
 
   paramAcqui->SetSolarZenithalAngle(solarZenithalAngle);
   paramAcqui->SetSolarAzimutalAngle(solarAzimutalAngle);
diff --git a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
index 11c1416099919dcd1e02ef277ff16e2c1d55847d..e1699c2ffd340d6779129407c576b59cc106da51 100644
--- a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
@@ -47,7 +47,7 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[])
 
   /*typedef AtmosphericEffectsType::AtmosphericCorrectionParametersType AtmosphericCorrectionParametersType; chris
   typedef AtmosphericCorrectionParametersType::AerosolModelType AerosolModelType;
-  typedef AtmosphericCorrectionParametersType::AerosolModelType AerosolModelType;*/
+  typedef AtmosphericCorrectionParametersType::AerosolModelType AerosolModelType; */
 
 
   typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms     CorrectionParametersToRadiativeTermsType;
@@ -125,7 +125,7 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[])
 
   //Instantiation
   /*AtmosphericCorrectionParametersType::Pointer chris
-    dataAtmosphericCorrectionParameters = AtmosphericCorrectionParametersType::New();*/
+    dataAtmosphericCorrectionParameters = AtmosphericCorrectionParametersType::New(); */
 
   AcquiCorrectionParametersPointerType paramAcqui = AcquiCorrectionParametersType::New();
   AtmoCorrectionParametersPointerType  paramAtmo = AtmoCorrectionParametersType::New();
@@ -148,7 +148,7 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[])
 
   AerosolModelType aerosolModel = static_cast<AerosolModelType> (aerosolModelValue);
   dataAtmosphericCorrectionParameters->SetAerosolModel(aerosolModel);
-  dataAtmosphericCorrectionParameters->SetAerosolOptical(aerosolOptical);*/
+  dataAtmosphericCorrectionParameters->SetAerosolOptical(aerosolOptical); */
 
   paramAcqui->SetSolarZenithalAngle(zenithSolarAngle);
   paramAcqui->SetSolarAzimutalAngle(azimutSolarAngle);
diff --git a/Testing/Code/Simulation/otbAtmosphericEffects.cxx b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
index 5c2507c92a9131dca7ce3c27db8fc10be3109e9c..1f45adb92edf45fdb58c8c01cab9b1a26e31a023 100644
--- a/Testing/Code/Simulation/otbAtmosphericEffects.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
@@ -23,7 +23,7 @@
 #include "otbAtmosphericEffects.h"
 #include "otbReduceSpectralResponse.h"
 
-#include "otbAtmosphericCorrectionParameters.h" 
+#include "otbAtmosphericCorrectionParameters.h"
 #include "otbImageMetadataCorrectionParameters.h"
 #include "otbAtmosphericRadiativeTerms.h"