1808: Add a test on the solar distance input of optical calibration application

Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt

@@ -30,6 +30,17 @@ otb_test_application(NAME apTvRaOpticalCalibration_QuickbirdXS
                              ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
                              ${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif )
 
+otb_test_application(NAME apTvRaOpticalCalibration_SolarDistance
+                     APP  OpticalCalibration
+                     OPTIONS -in ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
+                             -level toa
+                             -clamp false
+                             -acqui.solardistance 0.9987593
+                             -out ${TEMP}/apTvRaOpticalCalibration_SolarDistance.tif
+                     VALID   --compare-image ${EPSILON_7}
+                             ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
+                             ${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif )
+
 otb_test_application(NAME apTvRaOpticalCalibration_WV2PAN
                      APP  OpticalCalibration
                      OPTIONS -in ${INPUTDATA}/WV2_PAN_ROI_1000_100.tif

Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilter.cxx

@@ -35,12 +35,14 @@ int otbImageToReflectanceImageFilter(int itkNotUsed(argc), char * argv[])
   int          day = 1;
   int          month = 1;
   double solarDistance = 1.;
+  char fluxMode[] = "0";
+  char solarDistMode[] = "1";
 
-  if (atoi(argv[16]) == 0)
+  if (strcmp(argv[16], fluxMode) == 0)
     {
     flux = static_cast<double>(atof(argv[17]));
     }
-  else if (atoi(argv[16]) == 1)
+  else if (strcmp(argv[16], solarDistMode) == 0)
     {
     solarDistance = static_cast<double>(atof(argv[17]));
     }
@@ -90,11 +92,11 @@ int otbImageToReflectanceImageFilter(int itkNotUsed(argc), char * argv[])
   filter->SetSolarIllumination(solarIllumination);
   filter->SetUseClamp(false);
   
-  if (atoi(argv[16]) == 0)
+  if (strcmp(argv[16], fluxMode) == 0)
     {
     filter->SetFluxNormalizationCoefficient(flux);
     }
-  else if (atoi(argv[16]) == 1)
+  else if (strcmp(argv[16], solarDistMode) == 0)
     {
     filter->SetSolarDistance(solarDistance);
     }

Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilter.cxx

@@ -35,12 +35,14 @@ int otbRadianceToReflectanceImageFilter(int itkNotUsed(argc), char * argv[])
   int          day = 1;
   int          month = 1;
   double       solarDistance = 1.;
+  char fluxMode[] = "0";
+  char solarDistMode[] = "1";
   
-  if (atoi(argv[8]) == 0)
+  if (strcmp(argv[8], fluxMode) == 0)
     {
     flux = static_cast<double>(atof(argv[9]));
     }
-  else if (atoi(argv[8]) == 1)
+  else if (strcmp(argv[8], solarDistMode) == 0)
     {
     solarDistance = static_cast<double>(atof(argv[9]));
     }
@@ -80,11 +82,11 @@ int otbRadianceToReflectanceImageFilter(int itkNotUsed(argc), char * argv[])
   filter->SetZenithalSolarAngle(angle);
   filter->SetSolarIllumination(solarIllumination);
   filter->SetUseClamp(false);
-  if (atoi(argv[8]) == 0)
+  if (strcmp(argv[8], fluxMode) == 0)
     {
     filter->SetFluxNormalizationCoefficient(flux);
     }
-  else if (atoi(argv[8]) == 1)
+  else if (strcmp(argv[8], solarDistMode) == 0)
     {
     filter->SetSolarDistance(solarDistance);
     }

Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx

@@ -39,12 +39,14 @@ int otbReflectanceToImageImageFilter(int itkNotUsed(argc), char * argv[])
   int          day = 1;
   int          month = 1;
   double       solarDistance = 1.0;
+  char fluxMode[] = "0";
+  char solarDistMode[] = "1";
 
-  if (atoi(argv[16]) == 0)
+  if (strcmp(argv[16], fluxMode) == 0)
     {
     flux = static_cast<double>(atof(argv[17]));
     }
-  else if (atoi(argv[16]) == 1)
+  else if (strcmp(argv[16], solarDistMode) == 0)
     {
     solarDistance = static_cast<double>(atof(argv[17]));
     }
@@ -93,11 +95,11 @@ int otbReflectanceToImageImageFilter(int itkNotUsed(argc), char * argv[])
   filter->SetZenithalSolarAngle(angle);
   filter->SetSolarIllumination(solarIllumination);
 
-  if (atoi(argv[16]) == 0)
+  if (strcmp(argv[16], fluxMode) == 0)
     {
     filter->SetFluxNormalizationCoefficient(flux);
     }
-  else if (atoi(argv[16]) == 1)
+  else if (strcmp(argv[16], solarDistMode) == 0)
     {
     filter->SetSolarDistance(solarDistance);
     }

Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilter.cxx

@@ -34,12 +34,14 @@ int otbReflectanceToRadianceImageFilter(int itkNotUsed(argc), char * argv[])
   int          day = 1;
   int          month = 1;
   double       solarDistance = 1.;
+  char fluxMode[] = "0";
+  char solarDistMode[] = "1";
 
-  if (atoi(argv[8]) == 0)
+  if (strcmp(argv[8], fluxMode) == 0)
     {
     flux = static_cast<double>(atof(argv[9]));
     }
-  else if (atoi(argv[8]) == 1)
+  else if (strcmp(argv[8], solarDistMode) == 0)
     {
     solarDistance = static_cast<double>(atof(argv[9]));
     }
@@ -79,11 +81,11 @@ int otbReflectanceToRadianceImageFilter(int itkNotUsed(argc), char * argv[])
   filter->SetZenithalSolarAngle(angle);
   filter->SetSolarIllumination(solarIllumination);
   filter->SetUseClamp(false);
-  if (atoi(argv[8]) == 0)
+  if (strcmp(argv[8], fluxMode) == 0)
     {
     filter->SetFluxNormalizationCoefficient(flux);
     }
-  else if (atoi(argv[8]) == 1)
+  else if (strcmp(argv[8], solarDistMode) == 0)
     {
     filter->SetSolarDistance(solarDistance);
     }