diff --git a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
index a0656056d40be1dea298da8fd4ed14f5b72e7405..9fa1862ed227a563c131ae46d90d981cfe5424c9 100644
--- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -38,8 +38,8 @@
// an optical multispectral image similar to Pleiades.
// These corrections are made in four steps :
// \begin{itemize}
-// \item digital number to luminance correction;
-// \item luminance to refletance image conversion;
+// \item digital number to radiance correction;
+// \item radiance to refletance image conversion;
// \item atmospheric correction for TOA (top of atmosphere) to TOC (top of canopy)
// reflectance estimation;
// \item correction of the adjacency effects taking into account the neighborhood contribution.
@@ -61,15 +61,15 @@
// Let's look at the minimal code required to use this
// algorithm. First, the following header defining the
// \doxygen{otb}{AtmosphericCorrectionSequencement} class must be
-// included. For the numerical to luminance image, luminance to
+// included. For the numerical to radiance image, radiance to
// refletance image, and reflectance to atmospheric correction image
// corrections and the neighborhood correction, four header files are
// required.
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
-#include "otbImageToLuminanceImageFilter.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
// Software Guide : EndCodeSnippet
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
//-------------------------------
// Software Guide : BeginLatex
//
- // The \doxygen{otb}{ImageToLuminanceImageFilter}
+ // The \doxygen{otb}{ImageToRadianceImageFilter}
// type is defined and instancied. This class uses a functor applied
// to each component of each pixel ($\mathbf{X^{k}}$) whose formula is:
//
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
//
// Where :
// \begin{itemize}
- // \item $\mathbf{L_{TOA}^{k}}$ is the incident luminance (in
+ // \item $\mathbf{L_{TOA}^{k}}$ is the incident radiance (in
// $W.m^{-2}.sr^{-1}.\mu m^{-1}$);
// \item $\mathbf{X^{k}}$ is the measured digital number (ie. the input image pixel component);
// \item $\alpha_{k}$ is the absolute calibration gain for the channel k;
@@ -198,13 +198,13 @@ int main(int argc, char *argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- typedef otb::ImageToLuminanceImageFilter<ImageType, ImageType>
- ImageToLuminanceImageFilterType;
+ typedef otb::ImageToRadianceImageFilter<ImageType, ImageType>
+ ImageToRadianceImageFilterType;
- ImageToLuminanceImageFilterType::Pointer filterImageToLuminance
- = ImageToLuminanceImageFilterType::New();
+ ImageToRadianceImageFilterType::Pointer filterImageToRadiance
+ = ImageToRadianceImageFilterType::New();
// Software Guide : EndCodeSnippet
- typedef ImageToLuminanceImageFilterType::VectorType VectorType;
+ typedef ImageToRadianceImageFilterType::VectorType VectorType;
VectorType alpha(nbOfComponent);
VectorType beta(nbOfComponent);
alpha.Fill(0);
@@ -227,17 +227,17 @@ int main(int argc, char *argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- filterImageToLuminance->SetAlpha(alpha);
- filterImageToLuminance->SetBeta(beta);
+ filterImageToRadiance->SetAlpha(alpha);
+ filterImageToRadiance->SetBeta(beta);
// Software Guide : EndCodeSnippet
//-------------------------------
// Software Guide : BeginLatex
//
- // The \doxygen{otb}{LuminanceToReflectanceImageFilter}
+ // The \doxygen{otb}{RadianceToReflectanceImageFilter}
// type is defined and instancied.
// This class used a functor applied to each component of each pixel
- // of the luminance filter output ($\mathbf{L_{TOA}^{k}}$):
+ // of the radiance filter output ($\mathbf{L_{TOA}^{k}}$):
//
// \begin{equation}
// \rho_{TOA}^{k} = \frac{ \pi.\mathbf{L_{TOA}^{k}} } { E_{S}^{k}.cos(\theta_{S}).d/d_{0} }.
@@ -259,13 +259,13 @@ int main(int argc, char *argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- typedef otb::LuminanceToReflectanceImageFilter<ImageType, ImageType>
- LuminanceToReflectanceImageFilterType;
- LuminanceToReflectanceImageFilterType::Pointer filterLuminanceToReflectance
- = LuminanceToReflectanceImageFilterType::New();
+ typedef otb::RadianceToReflectanceImageFilter<ImageType, ImageType>
+ RadianceToReflectanceImageFilterType;
+ RadianceToReflectanceImageFilterType::Pointer filterRadianceToReflectance
+ = RadianceToReflectanceImageFilterType::New();
// Software Guide : EndCodeSnippet
- typedef LuminanceToReflectanceImageFilterType::VectorType VectorType;
+ typedef RadianceToReflectanceImageFilterType::VectorType VectorType;
VectorType solarIllumination(nbOfComponent);
solarIllumination.Fill(0);
@@ -287,11 +287,11 @@ int main(int argc, char *argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- filterLuminanceToReflectance->SetZenithalSolarAngle(
+ filterRadianceToReflectance->SetZenithalSolarAngle(
static_cast<double>(atof(argv[6])));
- filterLuminanceToReflectance->SetDay(atoi(argv[7]));
- filterLuminanceToReflectance->SetMonth(atoi(argv[8]));
- filterLuminanceToReflectance->SetSolarIllumination(solarIllumination);
+ filterRadianceToReflectance->SetDay(atoi(argv[7]));
+ filterRadianceToReflectance->SetMonth(atoi(argv[8]));
+ filterRadianceToReflectance->SetSolarIllumination(solarIllumination);
// Software Guide : EndCodeSnippet
//-------------------------------
@@ -635,10 +635,10 @@ int main(int argc, char *argv[])
// Software Guide : BeginCodeSnippet
writer->SetFileName(argv[2]);
- filterImageToLuminance->SetInput(reader->GetOutput());
- filterLuminanceToReflectance->SetInput(filterImageToLuminance->GetOutput());
+ filterImageToRadiance->SetInput(reader->GetOutput());
+ filterRadianceToReflectance->SetInput(filterImageToRadiance->GetOutput());
filterReflectanceToSurfaceReflectanceImageFilter->SetInput(
- filterLuminanceToReflectance->GetOutput());
+ filterRadianceToReflectance->GetOutput());
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetInput(
filterReflectanceToSurfaceReflectanceImageFilter->GetOutput());
diff --git a/Examples/Radiometry/test/CMakeLists.txt b/Examples/Radiometry/test/CMakeLists.txt
index 67e6f396bbf2c1eb68104d7ab70717ade2a4f4da..43c5edcffc2988d6bb2a30135536085e731f78c8 100644
--- a/Examples/Radiometry/test/CMakeLists.txt
+++ b/Examples/Radiometry/test/CMakeLists.txt
@@ -84,8 +84,8 @@ otb_add_test(NAME raTeAtmosphericCorrectionSequencementTest COMMAND ${OTB_TEST_D
${INPUTDATA}/atmosphericCorrectionSequencement_solar_illumination.txt
${INPUTDATA}/atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt
- # ImageToLuminance parameters
- # LuminanceToReflectance parameters
+ # ImageToRadiance parameters
+ # RadianceToReflectance parameters
27.3 #solar azimuthal elevation
4 #day
12 #month
diff --git a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
index b4253f066542b5eb1cb0186d2f1dd1d94fb6c124..7707ead17102762c4c8a23ceb60833d2e61549d8 100644
--- a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
+++ b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
@@ -23,10 +23,10 @@
#include "otbWrapperApplication.h"
#include "otbWrapperApplicationFactory.h"
-#include "otbImageToLuminanceImageFilter.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
-#include "otbLuminanceToImageImageFilter.h"
-#include "otbReflectanceToLuminanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
+#include "otbRadianceToImageImageFilter.h"
+#include "otbReflectanceToRadianceImageFilter.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "itkMultiplyImageFilter.h"
#include "otbClampVectorImageFilter.h"
@@ -78,17 +78,17 @@ public:
itkTypeMacro(OpticalCalibration, Application);
- typedef ImageToLuminanceImageFilter<FloatVectorImageType,
- DoubleVectorImageType> ImageToLuminanceImageFilterType;
+ typedef ImageToRadianceImageFilter<FloatVectorImageType,
+ DoubleVectorImageType> ImageToRadianceImageFilterType;
- typedef LuminanceToReflectanceImageFilter<DoubleVectorImageType,
- DoubleVectorImageType> LuminanceToReflectanceImageFilterType;
+ typedef RadianceToReflectanceImageFilter<DoubleVectorImageType,
+ DoubleVectorImageType> RadianceToReflectanceImageFilterType;
- typedef LuminanceToImageImageFilter<DoubleVectorImageType,
- DoubleVectorImageType> LuminanceToImageImageFilterType;
+ typedef RadianceToImageImageFilter<DoubleVectorImageType,
+ DoubleVectorImageType> RadianceToImageImageFilterType;
- typedef ReflectanceToLuminanceImageFilter<FloatVectorImageType,
- DoubleVectorImageType> ReflectanceToLuminanceImageFilterType;
+ typedef ReflectanceToRadianceImageFilter<FloatVectorImageType,
+ DoubleVectorImageType> ReflectanceToRadianceImageFilterType;
typedef itk::MultiplyImageFilter<DoubleVectorImageType,DoubleImageType,DoubleVectorImageType> ScaleFilterOutDoubleType;
@@ -381,7 +381,7 @@ private:
{
ossOutput << std::endl << "File: " << m_inImageName << std::endl;
- //Check if valid metadata information are available to compute ImageToLuminance and LuminanceToReflectance
+ //Check if valid metadata information are available to compute ImageToRadiance and RadianceToReflectance
FloatVectorImageType::Pointer inImage = GetParameterFloatVectorImage("in");
itk::MetaDataDictionary dict = inImage->GetMetaDataDictionary();
OpticalImageMetadataInterface::Pointer lImageMetadataInterface = OpticalImageMetadataInterfaceFactory::CreateIMI(dict);
@@ -566,11 +566,11 @@ private:
void DoExecute() ITK_OVERRIDE
{
//Main filters instantiations
- m_ImageToLuminanceFilter = ImageToLuminanceImageFilterType::New();
- m_LuminanceToReflectanceFilter = LuminanceToReflectanceImageFilterType::New();
+ m_ImageToRadianceFilter = ImageToRadianceImageFilterType::New();
+ m_RadianceToReflectanceFilter = RadianceToReflectanceImageFilterType::New();
m_ReflectanceToSurfaceReflectanceFilter = ReflectanceToSurfaceReflectanceImageFilterType::New();
- m_ReflectanceToLuminanceFilter = ReflectanceToLuminanceImageFilterType::New();
- m_LuminanceToImageFilter = LuminanceToImageImageFilterType::New();
+ m_ReflectanceToRadianceFilter = ReflectanceToRadianceImageFilterType::New();
+ m_RadianceToImageFilter = RadianceToImageImageFilterType::New();
//Other instantiations
m_ScaleFilter = ScaleFilterOutDoubleType::New();
@@ -590,22 +590,22 @@ private:
// Set (Date and Day) OR FluxNormalizationCoef to corresponding filters
if ( !IsParameterEnabled("acqui.fluxnormcoeff") )
{
- m_LuminanceToReflectanceFilter->SetDay(GetParameterInt("acqui.day"));
- m_LuminanceToReflectanceFilter->SetMonth(GetParameterInt("acqui.month"));
+ m_RadianceToReflectanceFilter->SetDay(GetParameterInt("acqui.day"));
+ m_RadianceToReflectanceFilter->SetMonth(GetParameterInt("acqui.month"));
- m_ReflectanceToLuminanceFilter->SetDay(GetParameterInt("acqui.day"));
- m_ReflectanceToLuminanceFilter->SetMonth(GetParameterInt("acqui.month"));
+ m_ReflectanceToRadianceFilter->SetDay(GetParameterInt("acqui.day"));
+ m_ReflectanceToRadianceFilter->SetMonth(GetParameterInt("acqui.month"));
}
else
{
- m_LuminanceToReflectanceFilter->SetFluxNormalizationCoefficient(GetParameterFloat("acqui.fluxnormcoeff"));
+ m_RadianceToReflectanceFilter->SetFluxNormalizationCoefficient(GetParameterFloat("acqui.fluxnormcoeff"));
- m_ReflectanceToLuminanceFilter->SetFluxNormalizationCoefficient(GetParameterFloat("acqui.fluxnormcoeff"));
+ m_ReflectanceToRadianceFilter->SetFluxNormalizationCoefficient(GetParameterFloat("acqui.fluxnormcoeff"));
}
// Set Sun Elevation Angle to corresponding filters
- m_LuminanceToReflectanceFilter->SetElevationSolarAngle(GetParameterFloat("acqui.sun.elev"));
- m_ReflectanceToLuminanceFilter->SetElevationSolarAngle(GetParameterFloat("acqui.sun.elev"));
+ m_RadianceToReflectanceFilter->SetElevationSolarAngle(GetParameterFloat("acqui.sun.elev"));
+ m_ReflectanceToRadianceFilter->SetElevationSolarAngle(GetParameterFloat("acqui.sun.elev"));
// Set Gain and Bias to corresponding filters
if (IsParameterEnabled("acqui.gainbias") && HasValue("acqui.gainbias"))
@@ -644,14 +644,14 @@ private:
switch (numLine)
{
case 1 :
- m_ImageToLuminanceFilter->SetAlpha(vlvector);
- m_LuminanceToImageFilter->SetAlpha(vlvector);
+ m_ImageToRadianceFilter->SetAlpha(vlvector);
+ m_RadianceToImageFilter->SetAlpha(vlvector);
GetLogger()->Info("Trying to get gains/biases information... OK (1/2)\n");
break;
case 2 :
- m_ImageToLuminanceFilter->SetBeta(vlvector);
- m_LuminanceToImageFilter->SetBeta(vlvector);
+ m_ImageToRadianceFilter->SetBeta(vlvector);
+ m_RadianceToImageFilter->SetBeta(vlvector);
GetLogger()->Info("Trying to get gains/biases information... OK (2/2)\n");
break;
@@ -669,11 +669,11 @@ private:
//Try to retrieve information from image metadata
if (IMIName != IMIOptDfltName)
{
- m_ImageToLuminanceFilter->SetAlpha(lImageMetadataInterface->GetPhysicalGain());
- m_LuminanceToImageFilter->SetAlpha(lImageMetadataInterface->GetPhysicalGain());
+ m_ImageToRadianceFilter->SetAlpha(lImageMetadataInterface->GetPhysicalGain());
+ m_RadianceToImageFilter->SetAlpha(lImageMetadataInterface->GetPhysicalGain());
- m_ImageToLuminanceFilter->SetBeta(lImageMetadataInterface->GetPhysicalBias());
- m_LuminanceToImageFilter->SetBeta(lImageMetadataInterface->GetPhysicalBias());
+ m_ImageToRadianceFilter->SetBeta(lImageMetadataInterface->GetPhysicalBias());
+ m_RadianceToImageFilter->SetBeta(lImageMetadataInterface->GetPhysicalBias());
}
else
itkExceptionMacro(<< "Please, provide a type of sensor supported by OTB for automatic metadata extraction! ");
@@ -711,8 +711,8 @@ private:
itk::VariableLengthVector<double> vlvector;
vlvector.SetData(values.data(),values.size(),false);
- m_LuminanceToReflectanceFilter->SetSolarIllumination(vlvector);
- m_ReflectanceToLuminanceFilter->SetSolarIllumination(vlvector);
+ m_RadianceToReflectanceFilter->SetSolarIllumination(vlvector);
+ m_ReflectanceToRadianceFilter->SetSolarIllumination(vlvector);
}
}
file.close();
@@ -725,8 +725,8 @@ private:
//Try to retrieve information from image metadata
if (IMIName != IMIOptDfltName)
{
- m_LuminanceToReflectanceFilter->SetSolarIllumination(lImageMetadataInterface->GetSolarIrradiance());
- m_ReflectanceToLuminanceFilter->SetSolarIllumination(lImageMetadataInterface->GetSolarIrradiance());
+ m_RadianceToReflectanceFilter->SetSolarIllumination(lImageMetadataInterface->GetSolarIrradiance());
+ m_ReflectanceToRadianceFilter->SetSolarIllumination(lImageMetadataInterface->GetSolarIrradiance());
}
else
itkExceptionMacro(<< "Please, provide a type of sensor supported by OTB for automatic metadata extraction! ");
@@ -748,17 +748,17 @@ private:
GetLogger()->Info("Compute Top of Atmosphere reflectance\n");
//Pipeline
- m_ImageToLuminanceFilter->SetInput(inImage);
- m_LuminanceToReflectanceFilter->SetInput(m_ImageToLuminanceFilter->GetOutput());
+ m_ImageToRadianceFilter->SetInput(inImage);
+ m_RadianceToReflectanceFilter->SetInput(m_ImageToRadianceFilter->GetOutput());
if (IsParameterEnabled("clamp"))
{
GetLogger()->Info("Clamp values between [0, 100]\n");
}
- m_LuminanceToReflectanceFilter->SetUseClamp(IsParameterEnabled("clamp"));
- m_LuminanceToReflectanceFilter->UpdateOutputInformation();
- m_ScaleFilter->SetInput(m_LuminanceToReflectanceFilter->GetOutput());
+ m_RadianceToReflectanceFilter->SetUseClamp(IsParameterEnabled("clamp"));
+ m_RadianceToReflectanceFilter->UpdateOutputInformation();
+ m_ScaleFilter->SetInput(m_RadianceToReflectanceFilter->GetOutput());
}
break;
case Level_TOA_IM:
@@ -766,10 +766,10 @@ private:
GetLogger()->Info("Convert Top of Atmosphere reflectance to image DN\n");
//Pipeline
- m_ReflectanceToLuminanceFilter->SetInput(inImage);
- m_LuminanceToImageFilter->SetInput(m_ReflectanceToLuminanceFilter->GetOutput());
- m_LuminanceToImageFilter->UpdateOutputInformation();
- m_ScaleFilter->SetInput(m_LuminanceToImageFilter->GetOutput());
+ m_ReflectanceToRadianceFilter->SetInput(inImage);
+ m_RadianceToImageFilter->SetInput(m_ReflectanceToRadianceFilter->GetOutput());
+ m_RadianceToImageFilter->UpdateOutputInformation();
+ m_ScaleFilter->SetInput(m_RadianceToImageFilter->GetOutput());
}
break;
case Level_TOC:
@@ -777,9 +777,9 @@ private:
GetLogger()->Info("Compute Top of Canopy reflectance\n");
//Pipeline
- m_ImageToLuminanceFilter->SetInput(inImage);
- m_LuminanceToReflectanceFilter->SetInput(m_ImageToLuminanceFilter->GetOutput());
- m_ReflectanceToSurfaceReflectanceFilter->SetInput(m_LuminanceToReflectanceFilter->GetOutput());
+ m_ImageToRadianceFilter->SetInput(inImage);
+ m_RadianceToReflectanceFilter->SetInput(m_ImageToRadianceFilter->GetOutput());
+ m_ReflectanceToSurfaceReflectanceFilter->SetInput(m_RadianceToReflectanceFilter->GetOutput());
m_ReflectanceToSurfaceReflectanceFilter->SetAcquiCorrectionParameters(m_paramAcqui);
m_ReflectanceToSurfaceReflectanceFilter->SetAtmoCorrectionParameters(m_paramAtmo);
@@ -934,10 +934,10 @@ private:
}
//Keep object references as a members of the class, else the pipeline will be broken after exiting DoExecute().
- ImageToLuminanceImageFilterType ::Pointer m_ImageToLuminanceFilter;
- LuminanceToReflectanceImageFilterType::Pointer m_LuminanceToReflectanceFilter;
- ReflectanceToLuminanceImageFilterType::Pointer m_ReflectanceToLuminanceFilter;
- LuminanceToImageImageFilterType::Pointer m_LuminanceToImageFilter;
+ ImageToRadianceImageFilterType ::Pointer m_ImageToRadianceFilter;
+ RadianceToReflectanceImageFilterType::Pointer m_RadianceToReflectanceFilter;
+ ReflectanceToRadianceImageFilterType::Pointer m_ReflectanceToRadianceFilter;
+ RadianceToImageImageFilterType::Pointer m_RadianceToImageFilter;
ReflectanceToSurfaceReflectanceImageFilterType::Pointer m_ReflectanceToSurfaceReflectanceFilter;
ScaleFilterOutDoubleType::Pointer m_ScaleFilter;
AtmoCorrectionParametersPointerType m_paramAtmo;
diff --git a/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt b/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt
index b5df61f0596399e35679cb52af0698130a3ad7e7..a3068e1a64d109373ccb799f839f62a9c74c03b1 100644
--- a/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt
+++ b/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt
@@ -27,7 +27,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_QuickbirdXS
-clamp false
-out ${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif )
otb_test_application(NAME apTvRaOpticalCalibration_WV2PAN
@@ -36,7 +36,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_WV2PAN
-level toa
-out ${TEMP}/apTvRaOpticalCalibration_WV2PAN.tif
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2PAN.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoWV2PAN.tif
${TEMP}/apTvRaOpticalCalibration_WV2PAN.tif )
otb_test_application(NAME apTvRaOpticalCalibration_WV2Multi
@@ -45,7 +45,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_WV2Multi
-level toa
-out ${TEMP}/apTvRaOpticalCalibration_WV2Multi.tif
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2Multi.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoWV2Multi.tif
${TEMP}/apTvRaOpticalCalibration_WV2Multi.tif )
otb_test_application(NAME apTvRaOpticalCalibration_Formosat
@@ -54,7 +54,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_Formosat
-level toa
-out ${TEMP}/apTvRaOpticalCalibration_Formosat.img
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoFormosat.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoFormosat.tif
${TEMP}/apTvRaOpticalCalibration_Formosat.img )
otb_test_application(NAME apTvRaOpticalCalibration_QuickbirdPAN
@@ -63,7 +63,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_QuickbirdPAN
-level toa
-out ${TEMP}/apTvRaOpticalCalibration_QuickbirdPAN.tif
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN.tif
${TEMP}/apTvRaOpticalCalibration_QuickbirdPAN.tif )
otb_test_application(NAME apTvRaOpticalCalibration_Spot5
@@ -72,7 +72,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_Spot5
-level toa
-out ${TEMP}/apTvRaOpticalCalibration_Spot5.img
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoSpot5.tif
${TEMP}/apTvRaOpticalCalibration_Spot5.img )
otb_test_application(NAME apTvRaOpticalCalibration_UnknownSensor
@@ -106,7 +106,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_UnknownSensor
otb_test_application(NAME apTvRaOpticalCalibration_Reverse_UnknownSensor
APP OpticalCalibration
OPTIONS
- -in ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif
+ -in ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
-out ${TEMP}/apTvRaOpticalCalibration_Rev_QB-XS_UnknownSensor_test.tif
-level toatoim
-acqui.gainbias ${INPUTDATA}/apTvRaOpticalCalibrationUnknownSensorGainsBiases.txt
@@ -126,6 +126,6 @@ otb_test_application(NAME apTvRaOpticalCalibration_Ikonos
-level toa
-out ${TEMP}/apTvRaOpticalCalibration_Ikonos.tif
VALID --compare-image ${EPSILON_7}
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoIkonos.tif
${TEMP}/apTvRaOpticalCalibration_Ikonos.tif )
diff --git a/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
index 1219f24c1a9876a30ba77a55277442247a43e26b..dee453835a8e034816bb943bce9b55e78bdad085 100644
--- a/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
@@ -84,8 +84,8 @@ private:
" may be innacurate and that techniques such as color space transform or image"
" normalisation could be applied before using this application. Also"
" note that most satellite images noise model is not gaussian, since"
- " noise variance linearly depends on luminance (the higher the"
- " luminance, the higher the noise variance). To account for such noise"
+ " noise variance linearly depends on radiance (the higher the"
+ " radiance, the higher the noise variance). To account for such noise"
" model, the application provides the range radius ramp option"
" (rangeramp), which will vary the range radius linearly with the"
" central pixel intensity. Default value is 1. (no ramp).\n\n"
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.txx b/Modules/IO/ImageIO/include/otbImageFileReader.txx
index f701d882571bd7c17dbd6dd90e162b19f450e21b..966fe434b9ebf1ab7fd58711e55f9e171d7575f3 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.txx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.txx
@@ -734,7 +734,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
// TODO:
// Pass down the PixelType (RGB, VECTOR, etc.) so that any vector to
// scalar conversion be type specific. i.e. RGB to scalar would use
- // a formula to convert to luminance, VECTOR to scalar would use
+ // a formula to convert to radiance, VECTOR to scalar would use
// vector magnitude.
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h
similarity index 84%
rename from Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h
index d451f59441923a2b09a36bf81cacc16be99b7c38..fc8b7c3bbde428c1907ead63b869c77bd6707a78 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToRadianceImageFilter.h
@@ -19,8 +19,8 @@
* limitations under the License.
*/
-#ifndef otbImageToLuminanceImageFilter_h
-#define otbImageToLuminanceImageFilter_h
+#ifndef otbImageToRadianceImageFilter_h
+#define otbImageToRadianceImageFilter_h
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
#include "itkNumericTraits.h"
@@ -34,10 +34,10 @@ namespace otb
namespace Functor
{
/**
- * \class ImageToLuminanceImageFunctor
+ * \class ImageToRadianceImageFunctor
* \brief Add beta to the quotient Input over alpha.
*
- * \sa ImageToLuminanceImageFilter
+ * \sa ImageToRadianceImageFilter
* \ingroup Functor
* \ingroup Radiometry
*
@@ -45,15 +45,15 @@ namespace Functor
*/
template <class TInput, class TOutput>
-class ImageToLuminanceImageFunctor
+class ImageToRadianceImageFunctor
{
public:
- ImageToLuminanceImageFunctor() :
+ ImageToRadianceImageFunctor() :
m_Alpha(1.),
m_Beta(0.)
{}
- virtual ~ImageToLuminanceImageFunctor() {}
+ virtual ~ImageToRadianceImageFunctor() {}
void SetAlpha(double alpha)
{
@@ -87,17 +87,17 @@ private:
};
}
-/** \class ImageToLuminanceImageFilter
- * \brief Convert a raw value into a luminance value
+/** \class ImageToRadianceImageFilter
+ * \brief Convert a raw value into a radiance value
*
- * Transform a classical image into the luminance image. For this it
- * uses the functor ImageToLuminanceImageFunctor calling for each component of each pixel.
+ * Transform a classical image into the radiance image. For this it
+ * uses the functor ImageToRadianceImageFunctor calling for each component of each pixel.
*
*
* For Spot image in the dimap format, the correction parameters are
* retrieved automatically from the metadata
*
- * \ingroup ImageToLuminanceImageFunctor
+ * \ingroup ImageToRadianceImageFunctor
* \ingroup Radiometry
*
* \example Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -105,10 +105,10 @@ private:
* \ingroup OTBOpticalCalibration
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT ImageToLuminanceImageFilter :
+class ITK_EXPORT ImageToRadianceImageFilter :
public UnaryImageFunctorWithVectorImageFilter<TInputImage,
TOutputImage,
- typename Functor::ImageToLuminanceImageFunctor<typename
+ typename Functor::ImageToRadianceImageFunctor<typename
TInputImage::
InternalPixelType,
typename
@@ -123,11 +123,11 @@ public:
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename Functor::ImageToLuminanceImageFunctor<typename InputImageType::InternalPixelType,
+ typedef typename Functor::ImageToRadianceImageFunctor<typename InputImageType::InternalPixelType,
typename OutputImageType::InternalPixelType> FunctorType;
/** "typedef" for standard classes. */
- typedef ImageToLuminanceImageFilter Self;
+ typedef ImageToRadianceImageFilter Self;
typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -136,7 +136,7 @@ public:
itkNewMacro(Self);
/** return class name. */
- itkTypeMacro(ImageToLuminanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
+ itkTypeMacro(ImageToRadianceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
typedef typename InputImageType::PixelType InputPixelType;
@@ -164,14 +164,14 @@ public:
protected:
/** Constructor */
- ImageToLuminanceImageFilter()
+ ImageToRadianceImageFilter()
{
m_Alpha.SetSize(0);
m_Beta.SetSize(0);
};
/** Destructor */
- ~ImageToLuminanceImageFilter() ITK_OVERRIDE {}
+ ~ImageToRadianceImageFilter() ITK_OVERRIDE {}
/** Update the functor list and input parameters */
void BeforeThreadedGenerateData(void) ITK_OVERRIDE
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
index 024a72343815e62413aebee0a2a6b6c5725e40d9..6dbc688a7f1e0861f4624e0a14d2fab256a49293 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
@@ -22,22 +22,22 @@
#ifndef otbImageToReflectanceImageFilter_h
#define otbImageToReflectanceImageFilter_h
-#include "otbImageToLuminanceImageFilter.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
namespace otb
{
namespace Functor
{
/** \class ImageToReflectanceImageFunctor
- * \brief Call the ImageToLuminanceFunctor over the input and the LuminanceToReflectanceFunctor to this result.
+ * \brief Call the ImageToRadianceFunctor over the input and the RadianceToReflectanceFunctor to this result.
*
*
* \sa ImageToReflectanceImageFilter
*
* \ingroup Functor
- * \ingroup ImageToLuminanceFunctor
- * \ingroup LuminanceToReflectanceFunctor
+ * \ingroup ImageToRadianceFunctor
+ * \ingroup RadianceToReflectanceFunctor
* \ingroup Radiometry
*
* \ingroup OTBOpticalCalibration
@@ -49,8 +49,8 @@ public:
ImageToReflectanceImageFunctor() {}
virtual ~ImageToReflectanceImageFunctor() {}
- typedef Functor::ImageToLuminanceImageFunctor<TInput, TOutput> ImToLumFunctorType;
- typedef Functor::LuminanceToReflectanceImageFunctor<TInput, TOutput> LumToReflecFunctorType;
+ typedef Functor::ImageToRadianceImageFunctor<TInput, TOutput> ImToLumFunctorType;
+ typedef Functor::RadianceToReflectanceImageFunctor<TInput, TOutput> LumToReflecFunctorType;
void SetAlpha(double alpha)
{
@@ -124,8 +124,8 @@ private:
* retrieved automatically from the metadata
*
* \ingroup ImageToReflectanceImageFunctor
- * \ingroup ImageToLuminanceImageFilter
- * \ingroup ReflectanceToLuminanceImageFilter
+ * \ingroup ImageToRadianceImageFilter
+ * \ingroup ReflectanceToRadianceImageFilter
* \ingroup Radiometry
*
* \ingroup OTBOpticalCalibration
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h
similarity index 84%
rename from Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h
index c28fd72970594c3a28c844eeb596b9005ce7756d..dc135e3db45c436617f2afd8eed4da1e3193132f 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToImageImageFilter.h
@@ -19,8 +19,8 @@
* limitations under the License.
*/
-#ifndef otbLuminanceToImageImageFilter_h
-#define otbLuminanceToImageImageFilter_h
+#ifndef otbRadianceToImageImageFilter_h
+#define otbRadianceToImageImageFilter_h
#include "otb_6S.h"
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
@@ -35,10 +35,10 @@ namespace otb
namespace Functor
{
/**
- * \class LuminanceToImageImageFunctor
+ * \class RadianceToImageImageFunctor
* \brief Subtract beta to the Input and multiply by alpha.
*
- * \sa LuminanceToImageImageFilter
+ * \sa RadianceToImageImageFilter
* \ingroup Functor
* \ingroup Radiometry
*
@@ -46,15 +46,15 @@ namespace Functor
*/
template <class TInput, class TOutput>
-class LuminanceToImageImageFunctor
+class RadianceToImageImageFunctor
{
public:
- LuminanceToImageImageFunctor() :
+ RadianceToImageImageFunctor() :
m_Alpha(1.),
m_Beta(0.)
{}
- virtual ~LuminanceToImageImageFunctor() {}
+ virtual ~RadianceToImageImageFunctor() {}
void SetAlpha(double alpha)
{
@@ -88,17 +88,17 @@ private:
};
}
-/** \class LuminanceToImageImageFilter
- * \brief Convert a raw value into a luminance value
+/** \class RadianceToImageImageFilter
+ * \brief Convert a raw value into a radiance value
*
- * Transform a luminance image into a classical image. For this it
- * uses the functor LuminanceToImageImageFunctor calling for each component of each pixel.
+ * Transform a radiance image into a classical image. For this it
+ * uses the functor RadianceToImageImageFunctor calling for each component of each pixel.
*
*
* For Spot image in the dimap format, the correction parameters are
* retrieved automatically from the metadata
*
- * \ingroup LuminanceToImageImageFunctor
+ * \ingroup RadianceToImageImageFunctor
* \ingroup Radiometry
*
* \example Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -106,10 +106,10 @@ private:
* \ingroup OTBOpticalCalibration
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT LuminanceToImageImageFilter :
+class ITK_EXPORT RadianceToImageImageFilter :
public UnaryImageFunctorWithVectorImageFilter<TInputImage,
TOutputImage,
- typename Functor::LuminanceToImageImageFunctor<typename
+ typename Functor::RadianceToImageImageFunctor<typename
TInputImage::
InternalPixelType,
typename
@@ -124,11 +124,11 @@ public:
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename Functor::LuminanceToImageImageFunctor<typename InputImageType::InternalPixelType,
+ typedef typename Functor::RadianceToImageImageFunctor<typename InputImageType::InternalPixelType,
typename OutputImageType::InternalPixelType> FunctorType;
/** "typedef" for standard classes. */
- typedef LuminanceToImageImageFilter Self;
+ typedef RadianceToImageImageFilter Self;
typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -137,7 +137,7 @@ public:
itkNewMacro(Self);
/** return class name. */
- itkTypeMacro(LuminanceToImageImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
+ itkTypeMacro(RadianceToImageImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
typedef typename InputImageType::PixelType InputPixelType;
@@ -165,14 +165,14 @@ public:
protected:
/** Constructor */
- LuminanceToImageImageFilter()
+ RadianceToImageImageFilter()
{
m_Alpha.SetSize(0);
m_Beta.SetSize(0);
};
/** Destructor */
- ~LuminanceToImageImageFilter() ITK_OVERRIDE {}
+ ~RadianceToImageImageFilter() ITK_OVERRIDE {}
/** Update the functor list and input parameters */
void BeforeThreadedGenerateData(void) ITK_OVERRIDE
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
similarity index 88%
rename from Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
index 1d126c854ca068152e206f732065a1ce642e5960..9e4d667b5edaa63752e2ff746b7fad97e2e4c3bf 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
@@ -19,8 +19,8 @@
* limitations under the License.
*/
-#ifndef otbLuminanceToReflectanceImageFilter_h
-#define otbLuminanceToReflectanceImageFilter_h
+#ifndef otbRadianceToReflectanceImageFilter_h
+#define otbRadianceToReflectanceImageFilter_h
#include "otbVarSol.h"
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
@@ -33,14 +33,14 @@ namespace otb
namespace Functor
{
/**
- * \class LuminanceToReflectanceImageFunctor
- * \brief Compupute reflectance from the luminance value
+ * \class RadianceToReflectanceImageFunctor
+ * \brief Compute reflectance from the radiance value
*
* Multiply by Pi and by an illumination correction coefficient the
* quotient between the input and the given solar illumination.
*
*
- * \sa LuminanceToReflectanceImageFilter
+ * \sa RadianceToReflectanceImageFilter
*
* \ingroup Functor
* \ingroup Radiometry
@@ -49,16 +49,16 @@ namespace Functor
* \ingroup OTBOpticalCalibration
*/
template <class TInput, class TOutput>
-class LuminanceToReflectanceImageFunctor
+class RadianceToReflectanceImageFunctor
{
public:
- LuminanceToReflectanceImageFunctor() :
+ RadianceToReflectanceImageFunctor() :
m_SolarIllumination(1.0),
m_IlluminationCorrectionCoefficient(1.0),
m_UseClamp(true)
{}
- virtual ~LuminanceToReflectanceImageFunctor() {}
+ virtual ~RadianceToReflectanceImageFunctor() {}
void SetSolarIllumination(double solarIllumination)
{
@@ -112,17 +112,17 @@ private:
};
}
-/** \class LuminanceToReflectanceImageFilter
- * \brief Convert luminance value into reflectance value
+/** \class RadianceToReflectanceImageFilter
+ * \brief Convert radiance value into reflectance value
*
- * Transform a luminance image into the reflectance. For this it uses the
- * functor LuminanceToReflectanceImageFunctor calling for each component of each pixel.
+ * Transform a radiance image into the reflectance. For this it uses the
+ * functor RadianceToReflectanceImageFunctor calling for each component of each pixel.
*
*
* For Spot image in the dimap format, the correction parameters are
* retrieved automatically from the metadata
*
- * \ingroup ImageToLuminanceImageFunctor
+ * \ingroup ImageToRadianceImageFunctor
* \ingroup Radiometry
*
* \example Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -130,10 +130,10 @@ private:
* \ingroup OTBOpticalCalibration
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT LuminanceToReflectanceImageFilter :
+class ITK_EXPORT RadianceToReflectanceImageFilter :
public UnaryImageFunctorWithVectorImageFilter<TInputImage,
TOutputImage,
- typename Functor::LuminanceToReflectanceImageFunctor<typename
+ typename Functor::RadianceToReflectanceImageFunctor<typename
TInputImage::
InternalPixelType,
typename
@@ -148,12 +148,12 @@ public:
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename Functor::LuminanceToReflectanceImageFunctor<typename InputImageType::InternalPixelType,
+ typedef typename Functor::RadianceToReflectanceImageFunctor<typename InputImageType::InternalPixelType,
typename OutputImageType::InternalPixelType>
FunctorType;
/** "typedef" for standard classes. */
- typedef LuminanceToReflectanceImageFilter Self;
+ typedef RadianceToReflectanceImageFilter Self;
typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -162,7 +162,7 @@ public:
itkNewMacro(Self);
/** return class name. */
- itkTypeMacro(LuminanceToReflectanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
+ itkTypeMacro(RadianceToReflectanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
typedef typename InputImageType::PixelType InputPixelType;
@@ -235,7 +235,7 @@ public:
protected:
/** Constructor */
- LuminanceToReflectanceImageFilter() :
+ RadianceToReflectanceImageFilter() :
m_ZenithalSolarAngle(120.0), //invalid value which will lead to negative radiometry
m_FluxNormalizationCoefficient(1.),
m_Day(0),
@@ -247,7 +247,7 @@ protected:
};
/** Destructor */
- ~LuminanceToReflectanceImageFilter() ITK_OVERRIDE {}
+ ~RadianceToReflectanceImageFilter() ITK_OVERRIDE {}
/** Update the functor list and input parameters */
void BeforeThreadedGenerateData(void) ITK_OVERRIDE
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
index 23fa33c2d069fb92686495f054858a716feadd15..6050d66777077a99b24d82a1baf04496947a2f1b 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
@@ -22,22 +22,22 @@
#ifndef otbReflectanceToImageImageFilter_h
#define otbReflectanceToImageImageFilter_h
-#include "otbLuminanceToImageImageFilter.h"
-#include "otbReflectanceToLuminanceImageFilter.h"
+#include "otbRadianceToImageImageFilter.h"
+#include "otbReflectanceToRadianceImageFilter.h"
namespace otb
{
namespace Functor
{
/** \class ReflectanceToImageImageFunctor
- * \brief Call the ReflectanceToLuminanceFunctor over the input and the LuminanceToImageFunctor to this result.
+ * \brief Call the ReflectanceToRadianceFunctor over the input and the RadianceToImageFunctor to this result.
*
*
* \sa ReflectanceToImageImageFilter
*
* \ingroup Functor
- * \ingroup LuminanceToImageFunctor
- * \ingroup ReflectanceToLuminanceFunctor
+ * \ingroup RadianceToImageFunctor
+ * \ingroup ReflectanceToRadianceFunctor
* \ingroup Radiometry
*
* \ingroup OTBOpticalCalibration
@@ -49,8 +49,8 @@ public:
ReflectanceToImageImageFunctor() {}
virtual ~ReflectanceToImageImageFunctor() {}
- typedef Functor::LuminanceToImageImageFunctor<TInput, TOutput> LumToImFunctorType;
- typedef Functor::ReflectanceToLuminanceImageFunctor<TInput, TOutput> ReflecToLumFunctorType;
+ typedef Functor::RadianceToImageImageFunctor<TInput, TOutput> LumToImFunctorType;
+ typedef Functor::ReflectanceToRadianceImageFunctor<TInput, TOutput> ReflecToLumFunctorType;
void SetAlpha(double alpha)
{
@@ -116,8 +116,8 @@ private:
* retrieved automatically from the metadata
*
* \ingroup ReflectanceToImageImageFunctor
- * \ingroup LuminanceToImageImageFilter
- * \ingroup ReflectanceToLuminanceImageFilter
+ * \ingroup RadianceToImageImageFilter
+ * \ingroup ReflectanceToRadianceImageFilter
* \ingroup Radiometry
*
* \ingroup OTBOpticalCalibration
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
similarity index 88%
rename from Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
index be524148c3155e0dab067dc0b8fc35e60fc87be7..69352382feae6b50c9679f93586b71cedb6366d0 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
@@ -19,8 +19,8 @@
* limitations under the License.
*/
-#ifndef otbReflectanceToLuminanceImageFilter_h
-#define otbReflectanceToLuminanceImageFilter_h
+#ifndef otbReflectanceToRadianceImageFilter_h
+#define otbReflectanceToRadianceImageFilter_h
#include "otbVarSol.h"
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
@@ -34,14 +34,14 @@ namespace otb
namespace Functor
{
/**
- * \class ReflectanceToLuminanceImageFunctor
- * \brief Compupute luminance from the reflectance value
+ * \class ReflectanceToRadianceImageFunctor
+ * \brief Compute radiance from the reflectance value
*
* Divide by Pi and multiply by an illumination correction coefficient
* and the given solar illumination.
*
*
- * \sa ReflectanceToLuminanceImageFilter
+ * \sa ReflectanceToRadianceImageFilter
*
* \ingroup Functor
* \ingroup Radiometry
@@ -50,15 +50,15 @@ namespace Functor
* \ingroup OTBOpticalCalibration
*/
template <class TInput, class TOutput>
-class ReflectanceToLuminanceImageFunctor
+class ReflectanceToRadianceImageFunctor
{
public:
- ReflectanceToLuminanceImageFunctor() :
+ ReflectanceToRadianceImageFunctor() :
m_SolarIllumination(1.0),
m_IlluminationCorrectionCoefficient(1.0)
{}
- virtual ~ReflectanceToLuminanceImageFunctor() {}
+ virtual ~ReflectanceToRadianceImageFunctor() {}
void SetSolarIllumination(double solarIllumination)
{
@@ -97,17 +97,17 @@ private:
};
}
-/** \class ReflectanceToLuminanceImageFilter
- * \brief Convert reflectance value into luminance value
+/** \class ReflectanceToRadianceImageFilter
+ * \brief Convert reflectance value into radiance value
*
- * Transform a reflectance image into the luminance. For this it uses the
- * functor ReflectanceToLuminanceImageFunctor calling for each component of each pixel.
+ * Transform a reflectance image into the radiance. For this it uses the
+ * functor ReflectanceToRadianceImageFunctor calling for each component of each pixel.
*
*
* For Spot image in the dimap format, the correction parameters are
* retrieved automatically from the metadata
*
- * \ingroup ImageToLuminanceImageFunctor
+ * \ingroup ImageToRadianceImageFunctor
* \ingroup Radiometry
*
* \example Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -115,10 +115,10 @@ private:
* \ingroup OTBOpticalCalibration
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT ReflectanceToLuminanceImageFilter :
+class ITK_EXPORT ReflectanceToRadianceImageFilter :
public UnaryImageFunctorWithVectorImageFilter<TInputImage,
TOutputImage,
- typename Functor::ReflectanceToLuminanceImageFunctor<typename
+ typename Functor::ReflectanceToRadianceImageFunctor<typename
TInputImage::
InternalPixelType,
typename
@@ -133,12 +133,12 @@ public:
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename Functor::ReflectanceToLuminanceImageFunctor<typename InputImageType::InternalPixelType,
+ typedef typename Functor::ReflectanceToRadianceImageFunctor<typename InputImageType::InternalPixelType,
typename OutputImageType::InternalPixelType>
FunctorType;
/** "typedef" for standard classes. */
- typedef ReflectanceToLuminanceImageFilter Self;
+ typedef ReflectanceToRadianceImageFilter Self;
typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -147,7 +147,7 @@ public:
itkNewMacro(Self);
/** return class name. */
- itkTypeMacro(ReflectanceToLuminanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
+ itkTypeMacro(ReflectanceToRadianceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
typedef typename InputImageType::PixelType InputPixelType;
@@ -220,7 +220,7 @@ public:
protected:
/** Constructor */
- ReflectanceToLuminanceImageFilter() :
+ ReflectanceToRadianceImageFilter() :
m_ZenithalSolarAngle(120.0), //invalid value which will lead to negative radiometry
m_FluxNormalizationCoefficient(1.),
m_Day(0),
@@ -231,7 +231,7 @@ protected:
};
/** Destructor */
- ~ReflectanceToLuminanceImageFilter() ITK_OVERRIDE {}
+ ~ReflectanceToRadianceImageFilter() ITK_OVERRIDE {}
/** Update the functor list and input parameters */
void BeforeThreadedGenerateData(void) ITK_OVERRIDE
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
index bf354881adb00d955b719c4ada42bf48f172d274..7fc9c223503f3d4f51da64949e15efb3f3297740 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -119,7 +119,7 @@ private:
*
* \ingroup AtmosphericRadiativeTerms
* \ingroup AtmosphericCorrectionParameters
- * \ingroup LuminanceToReflectanceImageFilter
+ * \ingroup RadianceToReflectanceImageFilter
* \ingroup ImageToReflectanceImageFilter
* \ingroup ImageMetadataCorrectionParameters
* \ingroup otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms
diff --git a/Modules/Radiometry/OpticalCalibration/otb-module.cmake b/Modules/Radiometry/OpticalCalibration/otb-module.cmake
index 0df5e31decf78485c15018253a9ebd89015385a2..104d2b013b27cc66de92d43cb596f07629804ce7 100644
--- a/Modules/Radiometry/OpticalCalibration/otb-module.cmake
+++ b/Modules/Radiometry/OpticalCalibration/otb-module.cmake
@@ -18,7 +18,7 @@
# limitations under the License.
#
-set(DOCUMENTATION "Digital number to luminance correction. luminance to
+set(DOCUMENTATION "Digital number to radiance correction. radiance to
refletance image conversion. atmospheric correction for TOA (top of atmosphere) to TOC
(top of canopy) reflectance estimation. correction of the adjacency effects taking
into account the neighborhood contribution.")
diff --git a/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt b/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt
index dc0a87b1ec54d0fbce0e2e5e1b706cd73273f6dc..a835c8048cd531fa177fcb8b85743a1580e2bd1b 100644
--- a/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt
+++ b/Modules/Radiometry/OpticalCalibration/test/CMakeLists.txt
@@ -24,14 +24,14 @@ set(OTBOpticalCalibrationTests
otbOpticalCalibrationTestDriver.cxx
otbSpectralSensitivityReaderTest.cxx
otbReflectanceToImageImageFilter.cxx
-otbReflectanceToLuminanceImageFilterNew.cxx
-otbLuminanceToReflectanceImageFilterNew.cxx
-otbLuminanceToReflectanceImageFilterAuto.cxx
-otbImageToLuminanceImageFilterNew.cxx
+otbReflectanceToRadianceImageFilterNew.cxx
+otbRadianceToReflectanceImageFilterNew.cxx
+otbRadianceToReflectanceImageFilterAuto.cxx
+otbImageToRadianceImageFilterNew.cxx
otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
-otbLuminanceToImageImageFilterAuto.cxx
-otbLuminanceToImageImageFilterNew.cxx
-otbReflectanceToLuminanceImageFilterAuto.cxx
+otbRadianceToImageImageFilterAuto.cxx
+otbRadianceToImageImageFilterNew.cxx
+otbReflectanceToRadianceImageFilterAuto.cxx
otbAeronetExtractDataBadData.cxx
otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
@@ -42,21 +42,21 @@ otbImageToReflectanceImageFilterNew.cxx
otbWavelengthSpectralBandsTest.cxx
otbAtmosphericRadiativeTermsTest.cxx
otbImageToReflectanceImageFilter.cxx
-otbLuminanceToReflectanceImageFilter.cxx
+otbRadianceToReflectanceImageFilter.cxx
otbReflectanceToImageImageFilterAuto.cxx
otbAeronetNew.cxx
otbAeronetExtractData.cxx
otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
otbImageMetadataCorrectionParametersNew.cxx
-otbImageToLuminanceImageFilterAuto.cxx
+otbImageToRadianceImageFilterAuto.cxx
otbAtmosphericCorrectionSequencement.cxx
otbSIXSTraitsTest.cxx
otbSIXSTraitsComputeAtmosphericParameters.cxx
otbReflectanceToImageImageFilterNew.cxx
otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
-otbLuminanceToImageImageFilter.cxx
-otbReflectanceToLuminanceImageFilter.cxx
-otbImageToLuminanceImageFilter.cxx
+otbRadianceToImageImageFilter.cxx
+otbReflectanceToRadianceImageFilter.cxx
+otbImageToRadianceImageFilter.cxx
)
add_executable(otbOpticalCalibrationTestDriver ${OTBOpticalCalibrationTests})
@@ -170,80 +170,80 @@ otb_add_test(NAME raTvRomaniaReflectanceToImage COMMAND otbOpticalCalibrationTes
0.9889145564708814 #= sqrt(0.977952) d/d0 corresponding to the date 03/05
)
-otb_add_test(NAME raTuReflectanceToLuminanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbReflectanceToLuminanceImageFilterNew
+otb_add_test(NAME raTuReflectanceToRadianceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
+ otbReflectanceToRadianceImageFilterNew
)
-otb_add_test(NAME raTuLuminanceToReflectanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbLuminanceToReflectanceImageFilterNew
+otb_add_test(NAME raTuRadianceToReflectanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
+ otbRadianceToReflectanceImageFilterNew
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN.tif
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN.tif
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN.tif
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2PAN.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoWV2PAN.tif
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoWV2PAN.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoWV2PAN.tif
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_PAN/09DEC10103019-P2AS-052298844010_01_P001.TIF}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoWV2PAN.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoWV2PAN.tif
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoSpot5.img
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoSpot5.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoSpot5.img
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{SPOT5/TEHERAN/IMAGERY.TIF}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoSpot5.img
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoSpot5.img
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoIkonos.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoIkonos.tif
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoIkonos.tif
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2Multi.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoWV2Multi.tif
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoWV2Multi.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoWV2Multi.tif
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_MUL/09DEC10103019-M2AS-052298844010_01_P001.TIF}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoWV2Multi.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoWV2Multi.tif
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoFormosat.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoFormosat.img
- otbLuminanceToReflectanceImageFilterAuto
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterAutoFormosat.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoFormosat.img
+ otbRadianceToReflectanceImageFilterAuto
LARGEINPUT{FORMOSAT/Sudouest_20071013_MS_fmsat/IMAGERY.TIF}
- ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoFormosat.img
+ ${TEMP}/raTvRadianceToReflectanceImageFilterAutoFormosat.img
)
-otb_add_test(NAME raTuImageToLuminanceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbImageToLuminanceImageFilterNew
+otb_add_test(NAME raTuImageToRadianceImageFilterNew COMMAND otbOpticalCalibrationTestDriver
+ otbImageToRadianceImageFilterNew
)
otb_add_test(NAME raTuRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew COMMAND otbOpticalCalibrationTestDriver
otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew)
-otb_add_test(NAME raTuLuminanceToImageImageFilterNew COMMAND otbOpticalCalibrationTestDriver
- otbLuminanceToImageImageFilterNew
+otb_add_test(NAME raTuRadianceToImageImageFilterNew COMMAND otbOpticalCalibrationTestDriver
+ otbRadianceToImageImageFilterNew
)
#FIXME Those tests have performing local copies of header, baselines...They were migrate "as it" for now in version 5.0 but
@@ -256,16 +256,16 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${TOULOUSEQBDIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoQuickbirdPAN.tif ${TOULOUSEQBDIR}/02APR01105228-P1BS-000000128955_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoQuickbirdPAN.tif ${TOULOUSEQBDIR}/02APR01105228-P1BS-000000128955_01_P001.TIF)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${TOULOUSEQBDIR}/raTvSMALLTOULOUSELuminanceToImageImageFilterAutoQuickbirdPAN.tif
- ${TOULOUSEQBDIR}/raTvLuminanceToImageImageFilterAutoQuickbirdPAN.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${TOULOUSEQBDIR}/raTvSMALLTOULOUSERadianceToImageImageFilterAutoQuickbirdPAN.tif
+ ${TOULOUSEQBDIR}/raTvRadianceToImageImageFilterAutoQuickbirdPAN.tif
+ otbRadianceToImageImageFilterAuto
${TOULOUSEQBDIR}/02APR01105228-P1BS-000000128955_01_P001.TIF
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
- ${TOULOUSEQBDIR}/raTvLuminanceToImageImageFilterAutoQuickbirdPAN.tif
- ${TOULOUSEQBDIR}/raTvSMALLTOULOUSELuminanceToImageImageFilterAutoQuickbirdPAN.tif
+ ${TOULOUSEQBDIR}/raTvRadianceToImageImageFilterAutoQuickbirdPAN.tif
+ ${TOULOUSEQBDIR}/raTvSMALLTOULOUSERadianceToImageImageFilterAutoQuickbirdPAN.tif
)
@@ -274,16 +274,16 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${TOULOUSEQBDIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoQuickbirdXS.tif ${TOULOUSEQBDIR}/02APR01105228-M1BS-000000128955_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoQuickbirdXS.tif ${TOULOUSEQBDIR}/02APR01105228-M1BS-000000128955_01_P001.TIF)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${TOULOUSEQBDIR}/raTvSMALLTOULOUSELuminanceToImageImageFilterAutoQuickbirdXS.tif
- ${TOULOUSEQBDIR}/raTvLuminanceToImageImageFilterAutoQuickbirdXS.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${TOULOUSEQBDIR}/raTvSMALLTOULOUSERadianceToImageImageFilterAutoQuickbirdXS.tif
+ ${TOULOUSEQBDIR}/raTvRadianceToImageImageFilterAutoQuickbirdXS.tif
+ otbRadianceToImageImageFilterAuto
${TOULOUSEQBDIR}/02APR01105228-M1BS-000000128955_01_P001.TIF
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF}
- ${TOULOUSEQBDIR}/raTvLuminanceToImageImageFilterAutoQuickbirdXS.tif
- ${TOULOUSEQBDIR}/raTvSMALLTOULOUSELuminanceToImageImageFilterAutoQuickbirdXS.tif
+ ${TOULOUSEQBDIR}/raTvRadianceToImageImageFilterAutoQuickbirdXS.tif
+ ${TOULOUSEQBDIR}/raTvSMALLTOULOUSERadianceToImageImageFilterAutoQuickbirdXS.tif
)
set(ROMEWV2DIR ${TEMP}/OpticalCalibLumToImWv2MULTI)
@@ -291,48 +291,48 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_MUL)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${ROMEWV2DIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoWV2Multi.tif ${ROMEWV2DIR}/09DEC10103019-M2AS-052298844010_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoWV2Multi.tif ${ROMEWV2DIR}/09DEC10103019-M2AS-052298844010_01_P001.TIF)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${ROMEWV2DIR}/raTvSMALLROMELuminanceToImageImageFilterAutoWV2Multi.tif
- ${ROMEWV2DIR}/raTvLuminanceToImageImageFilterAutoWV2Multi.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${ROMEWV2DIR}/raTvSMALLROMERadianceToImageImageFilterAutoWV2Multi.tif
+ ${ROMEWV2DIR}/raTvRadianceToImageImageFilterAutoWV2Multi.tif
+ otbRadianceToImageImageFilterAuto
${ROMEWV2DIR}/09DEC10103019-M2AS-052298844010_01_P001.TIF
LARGEINPUT{WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_MUL/09DEC10103019-M2AS-052298844010_01_P001.TIF}
- ${ROMEWV2DIR}/raTvLuminanceToImageImageFilterAutoWV2Multi.tif
- ${ROMEWV2DIR}/raTvSMALLROMELuminanceToImageImageFilterAutoWV2Multi.tif
+ ${ROMEWV2DIR}/raTvRadianceToImageImageFilterAutoWV2Multi.tif
+ ${ROMEWV2DIR}/raTvSMALLROMERadianceToImageImageFilterAutoWV2Multi.tif
)
set(BLOSSEVILLEIKONOSDIR ${TEMP}/OpticalCalibLumToImIkonos)
file(MAKE_DIRECTORY ${BLOSSEVILLEIKONOSDIR})
file(GLOB MTDATA ${OTB_DATA_LARGEINPUT_ROOT}/IKONOS/BLOSSEVILLE/*metadata.txt ${OTB_DATA_LARGEINPUT_ROOT}/IKONOS/BLOSSEVILLE/*pan*)
file(COPY ${MTDATA} DESTINATION ${BLOSSEVILLEIKONOSDIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoIkonos.tif ${BLOSSEVILLEIKONOSDIR}/po_2619900_pan_0000000.tif)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoIkonos.tif ${BLOSSEVILLEIKONOSDIR}/po_2619900_pan_0000000.tif)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BLOSSEVILLEIKONOSDIR}/raTvSMALLBLOSSEVILLELuminanceToImageImageFilterAutoIkonos.tif
- ${BLOSSEVILLEIKONOSDIR}/raTvLuminanceToImageImageFilterAutoIkonos.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BLOSSEVILLEIKONOSDIR}/raTvSMALLBLOSSEVILLERadianceToImageImageFilterAutoIkonos.tif
+ ${BLOSSEVILLEIKONOSDIR}/raTvRadianceToImageImageFilterAutoIkonos.tif
+ otbRadianceToImageImageFilterAuto
${BLOSSEVILLEIKONOSDIR}/po_2619900_pan_0000000.tif
LARGEINPUT{IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif}
- ${BLOSSEVILLEIKONOSDIR}/raTvLuminanceToImageImageFilterAutoIkonos.tif
- ${BLOSSEVILLEIKONOSDIR}/raTvSMALLBLOSSEVILLELuminanceToImageImageFilterAutoIkonos.tif
+ ${BLOSSEVILLEIKONOSDIR}/raTvRadianceToImageImageFilterAutoIkonos.tif
+ ${BLOSSEVILLEIKONOSDIR}/raTvSMALLBLOSSEVILLERadianceToImageImageFilterAutoIkonos.tif
)
set(TEHERANSPOT5DIR ${TEMP}/OpticalCalibLumToImSPOT5)
file(MAKE_DIRECTORY ${TEHERANSPOT5DIR})
file(GLOB MTDATA ${OTB_DATA_LARGEINPUT_ROOT}/SPOT5/TEHERAN/*.DIM)
file(COPY ${MTDATA} DESTINATION ${TEHERANSPOT5DIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoSpot5.tif ${TEHERANSPOT5DIR}/IMAGERY.TIF)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoSpot5.tif ${TEHERANSPOT5DIR}/IMAGERY.TIF)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${TEHERANSPOT5DIR}/raTvSMALLTEHERANLuminanceToImageImageFilterAutoSpot5.img
- ${TEHERANSPOT5DIR}/raTvLuminanceToImageImageFilterAutoSpot5.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${TEHERANSPOT5DIR}/raTvSMALLTEHERANRadianceToImageImageFilterAutoSpot5.img
+ ${TEHERANSPOT5DIR}/raTvRadianceToImageImageFilterAutoSpot5.tif
+ otbRadianceToImageImageFilterAuto
${TEHERANSPOT5DIR}/IMAGERY.TIF
LARGEINPUT{SPOT5/TEHERAN/IMAGERY.TIF}
- ${TEHERANSPOT5DIR}/raTvLuminanceToImageImageFilterAutoSpot5.tif
- ${TEHERANSPOT5DIR}/raTvSMALLTEHERANLuminanceToImageImageFilterAutoSpot5.img
+ ${TEHERANSPOT5DIR}/raTvRadianceToImageImageFilterAutoSpot5.tif
+ ${TEHERANSPOT5DIR}/raTvSMALLTEHERANRadianceToImageImageFilterAutoSpot5.img
)
set(ROMEWV2DIR ${TEMP}/OpticalCalibLumToImWv2PAN)
@@ -340,16 +340,16 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_PAN)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${ROMEWV2DIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoWV2PAN.tif ${ROMEWV2DIR}/09DEC10103019-P2AS-052298844010_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoWV2PAN.tif ${ROMEWV2DIR}/09DEC10103019-P2AS-052298844010_01_P001.TIF)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${ROMEWV2DIR}/raTvSMALLROMELuminanceToImageImageFilterAutoWV2PAN.tif
- ${ROMEWV2DIR}/raTvLuminanceToImageImageFilterAutoWV2PAN.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${ROMEWV2DIR}/raTvSMALLROMERadianceToImageImageFilterAutoWV2PAN.tif
+ ${ROMEWV2DIR}/raTvRadianceToImageImageFilterAutoWV2PAN.tif
+ otbRadianceToImageImageFilterAuto
${ROMEWV2DIR}/09DEC10103019-P2AS-052298844010_01_P001.TIF
LARGEINPUT{WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_PAN/09DEC10103019-P2AS-052298844010_01_P001.TIF}
- ${ROMEWV2DIR}/raTvLuminanceToImageImageFilterAutoWV2PAN.tif
- ${ROMEWV2DIR}/raTvSMALLROMELuminanceToImageImageFilterAutoWV2PAN.tif
+ ${ROMEWV2DIR}/raTvRadianceToImageImageFilterAutoWV2PAN.tif
+ ${ROMEWV2DIR}/raTvSMALLROMERadianceToImageImageFilterAutoWV2PAN.tif
)
set(SUDOUESTFORMOSATDIR ${TEMP}/OpticalCalibLumToImFormosat)
@@ -357,16 +357,16 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/FORMOSAT/Sudouest_20071013_MS_fmsat)
file(GLOB MTDATA ${MTDATADIR}/*.DIM)
file(COPY ${MTDATA} DESTINATION ${SUDOUESTFORMOSATDIR})
- otb_copy_rename(${BASELINE}/raTvImageToLuminanceImageFilterAutoFormosat.tif ${SUDOUESTFORMOSATDIR}/IMAGERY.TIF)
+ otb_copy_rename(${BASELINE}/raTvImageToRadianceImageFilterAutoFormosat.tif ${SUDOUESTFORMOSATDIR}/IMAGERY.TIF)
- otb_add_test(NAME raTvLuminanceToImageImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${SUDOUESTFORMOSATDIR}/raTvSMALLSOLuminanceToImageImageFilterAutoFormosat.img
- ${SUDOUESTFORMOSATDIR}/raTvLuminanceToImageImageFilterAutoFormosat.tif
- otbLuminanceToImageImageFilterAuto
+ otb_add_test(NAME raTvRadianceToImageImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${SUDOUESTFORMOSATDIR}/raTvSMALLSORadianceToImageImageFilterAutoFormosat.img
+ ${SUDOUESTFORMOSATDIR}/raTvRadianceToImageImageFilterAutoFormosat.tif
+ otbRadianceToImageImageFilterAuto
${SUDOUESTFORMOSATDIR}/IMAGERY.TIF
LARGEINPUT{FORMOSAT/Sudouest_20071013_MS_fmsat/IMAGERY.TIF}
- ${SUDOUESTFORMOSATDIR}/raTvLuminanceToImageImageFilterAutoFormosat.tif
- ${SUDOUESTFORMOSATDIR}/raTvSMALLSOLuminanceToImageImageFilterAutoFormosat.img
+ ${SUDOUESTFORMOSATDIR}/raTvRadianceToImageImageFilterAutoFormosat.tif
+ ${SUDOUESTFORMOSATDIR}/raTvSMALLSORadianceToImageImageFilterAutoFormosat.img
)
set(TOULOUSEQBDIR ${TEMP}/OpticalCalibRefToLumQBPAN)
@@ -374,14 +374,14 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${TOULOUSEQBDIR})
- otb_copy_rename(${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN.tif ${TOULOUSEQBDIR}/02APR01105228-P1BS-000000128955_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdPAN.tif ${TOULOUSEQBDIR}/02APR01105228-P1BS-000000128955_01_P001.TIF)
- otb_add_test(NAME raTvReflectanceToLuminanceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoQuickbirdPAN.tif
- ${TOULOUSEQBDIR}/raTvReflectanceToLuminanceImageFilterAutoQuickbirdPAN.tif
- otbReflectanceToLuminanceImageFilterAuto
+ otb_add_test(NAME raTvReflectanceToRadianceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoQuickbirdPAN.tif
+ ${TOULOUSEQBDIR}/raTvReflectanceToRadianceImageFilterAutoQuickbirdPAN.tif
+ otbReflectanceToRadianceImageFilterAuto
${TOULOUSEQBDIR}/02APR01105228-P1BS-000000128955_01_P001.TIF
- ${TOULOUSEQBDIR}/raTvReflectanceToLuminanceImageFilterAutoQuickbirdPAN.tif
+ ${TOULOUSEQBDIR}/raTvReflectanceToRadianceImageFilterAutoQuickbirdPAN.tif
)
set(ROMEWV2DIR ${TEMP}/OpticalCalibRefToLumWv2PAN)
@@ -389,42 +389,42 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_PAN)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${ROMEWV2DIR})
- otb_copy_rename(${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2PAN.tif ${ROMEWV2DIR}/09DEC10103019-P2AS-052298844010_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvRadianceToReflectanceImageFilterAutoWV2PAN.tif ${ROMEWV2DIR}/09DEC10103019-P2AS-052298844010_01_P001.TIF)
- otb_add_test(NAME raTvReflectanceToLuminanceImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoWV2PAN.tif
- ${ROMEWV2DIR}/raTvReflectanceToLuminanceImageFilterAutoWV2PAN.tif
- otbReflectanceToLuminanceImageFilterAuto
+ otb_add_test(NAME raTvReflectanceToRadianceImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoWV2PAN.tif
+ ${ROMEWV2DIR}/raTvReflectanceToRadianceImageFilterAutoWV2PAN.tif
+ otbReflectanceToRadianceImageFilterAuto
${ROMEWV2DIR}/09DEC10103019-P2AS-052298844010_01_P001.TIF
- ${ROMEWV2DIR}/raTvReflectanceToLuminanceImageFilterAutoWV2PAN.tif
+ ${ROMEWV2DIR}/raTvReflectanceToRadianceImageFilterAutoWV2PAN.tif
)
set(TEHERANSPOT5DIR ${TEMP}/OpticalCalibRefToLumSPOT5)
file(MAKE_DIRECTORY ${TEHERANSPOT5DIR})
file(GLOB MTDATA ${OTB_DATA_LARGEINPUT_ROOT}/SPOT5/TEHERAN/*.DIM)
file(COPY ${MTDATA} DESTINATION ${TEHERANSPOT5DIR})
- otb_copy_rename(${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif ${TEHERANSPOT5DIR}/IMAGERY.TIF)
+ otb_copy_rename(${BASELINE}/raTvRadianceToReflectanceImageFilterAutoSpot5.tif ${TEHERANSPOT5DIR}/IMAGERY.TIF)
- otb_add_test(NAME raTvReflectanceToLuminanceImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoSpot5.tif
- ${TEHERANSPOT5DIR}/raTvReflectanceToLuminanceImageFilterAutoSpot5.img
- otbReflectanceToLuminanceImageFilterAuto
+ otb_add_test(NAME raTvReflectanceToRadianceImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoSpot5.tif
+ ${TEHERANSPOT5DIR}/raTvReflectanceToRadianceImageFilterAutoSpot5.img
+ otbReflectanceToRadianceImageFilterAuto
${TEHERANSPOT5DIR}/IMAGERY.TIF
- ${TEHERANSPOT5DIR}/raTvReflectanceToLuminanceImageFilterAutoSpot5.img
+ ${TEHERANSPOT5DIR}/raTvReflectanceToRadianceImageFilterAutoSpot5.img
)
set(BLOSSEVILLEIKONOSDIR ${TEMP}/OpticalCalibRefToLumIkonos)
file(MAKE_DIRECTORY ${BLOSSEVILLEIKONOSDIR})
file(GLOB MTDATA ${OTB_DATA_LARGEINPUT_ROOT}/IKONOS/BLOSSEVILLE/*metadata.txt ${OTB_DATA_LARGEINPUT_ROOT}/IKONOS/BLOSSEVILLE/*pan*)
file(COPY ${MTDATA} DESTINATION ${BLOSSEVILLEIKONOSDIR})
- otb_copy_rename(${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif ${BLOSSEVILLEIKONOSDIR}/po_2619900_pan_0000000.tif)
+ otb_copy_rename(${BASELINE}/raTvRadianceToReflectanceImageFilterAutoIkonos.tif ${BLOSSEVILLEIKONOSDIR}/po_2619900_pan_0000000.tif)
- otb_add_test(NAME raTvReflectanceToLuminanceImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoIkonos.tif
- ${BLOSSEVILLEIKONOSDIR}/raTvReflectanceToLuminanceImageFilterAutoIkonos.tif
- otbReflectanceToLuminanceImageFilterAuto
+ otb_add_test(NAME raTvReflectanceToRadianceImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoIkonos.tif
+ ${BLOSSEVILLEIKONOSDIR}/raTvReflectanceToRadianceImageFilterAutoIkonos.tif
+ otbReflectanceToRadianceImageFilterAuto
${BLOSSEVILLEIKONOSDIR}/po_2619900_pan_0000000.tif
- ${BLOSSEVILLEIKONOSDIR}/raTvReflectanceToLuminanceImageFilterAutoIkonos.tif
+ ${BLOSSEVILLEIKONOSDIR}/raTvReflectanceToRadianceImageFilterAutoIkonos.tif
)
set(TOULOUSEQBDIR ${TEMP}/OpticalCalibRefToLumQBXS)
@@ -432,14 +432,14 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${TOULOUSEQBDIR})
- otb_copy_rename(${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif ${TOULOUSEQBDIR}/02APR01105228-M1BS-000000128955_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvRadianceToReflectanceImageFilterAutoQuickbirdXS.tif ${TOULOUSEQBDIR}/02APR01105228-M1BS-000000128955_01_P001.TIF)
- otb_add_test(NAME raTvReflectanceToLuminanceImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoQuickbirdXS.tif
- ${TOULOUSEQBDIR}/raTvReflectanceToLuminanceImageFilterAutoQuickbirdXS.tif
- otbReflectanceToLuminanceImageFilterAuto
+ otb_add_test(NAME raTvReflectanceToRadianceImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoQuickbirdXS.tif
+ ${TOULOUSEQBDIR}/raTvReflectanceToRadianceImageFilterAutoQuickbirdXS.tif
+ otbReflectanceToRadianceImageFilterAuto
${TOULOUSEQBDIR}/02APR01105228-M1BS-000000128955_01_P001.TIF
- ${TOULOUSEQBDIR}/raTvReflectanceToLuminanceImageFilterAutoQuickbirdXS.tif
+ ${TOULOUSEQBDIR}/raTvReflectanceToRadianceImageFilterAutoQuickbirdXS.tif
)
set(ROMEWV2DIR ${TEMP}/OpticalCalibRefToLumWv2MULTI)
@@ -447,14 +447,14 @@ if(OTB_DATA_USE_LARGEINPUT AND OTB_DATA_ROOT)
set(MTDATADIR ${OTB_DATA_LARGEINPUT_ROOT}/WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_MUL)
file(GLOB MTDATA ${MTDATADIR}/*TIL ${MTDATADIR}/*RPB ${MTDATADIR}/*XML ${MTDATADIR}/*IMD)
file(COPY ${MTDATA} DESTINATION ${ROMEWV2DIR})
- otb_copy_rename(${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2Multi.tif ${ROMEWV2DIR}/09DEC10103019-M2AS-052298844010_01_P001.TIF)
+ otb_copy_rename(${BASELINE}/raTvRadianceToReflectanceImageFilterAutoWV2Multi.tif ${ROMEWV2DIR}/09DEC10103019-M2AS-052298844010_01_P001.TIF)
- otb_add_test(NAME raTvReflectanceToLuminanceImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoWV2Multi.tif
- ${ROMEWV2DIR}/raTvReflectanceToLuminanceImageFilterAutoWV2Multi.tif
- otbReflectanceToLuminanceImageFilterAuto
+ otb_add_test(NAME raTvReflectanceToRadianceImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoWV2Multi.tif
+ ${ROMEWV2DIR}/raTvReflectanceToRadianceImageFilterAutoWV2Multi.tif
+ otbReflectanceToRadianceImageFilterAuto
${ROMEWV2DIR}/09DEC10103019-M2AS-052298844010_01_P001.TIF
- ${ROMEWV2DIR}/raTvReflectanceToLuminanceImageFilterAutoWV2Multi.tif
+ ${ROMEWV2DIR}/raTvReflectanceToRadianceImageFilterAutoWV2Multi.tif
)
endif()
@@ -621,12 +621,12 @@ otb_add_test(NAME raTvRomaniaImageToReflectance COMMAND otbOpticalCalibrationTes
0.9889145564708814 #= sqrt(0.977952) d/d0 corresponding to the date 03/05
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilterDayMonth COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilter.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterDayMonth.tif
- otbLuminanceToReflectanceImageFilter
+otb_add_test(NAME raTvRadianceToReflectanceImageFilterDayMonth COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilter.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterDayMonth.tif
+ otbRadianceToReflectanceImageFilter
${INPUTDATA}/verySmallFSATSW.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterDayMonth.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterDayMonth.tif
0.2 #radius
10 #channel 1 illumination
20 #channel 2 illumination
@@ -636,12 +636,12 @@ otb_add_test(NAME raTvLuminanceToReflectanceImageFilterDayMonth COMMAND otbOptic
5 #month
)
-otb_add_test(NAME raTvLuminanceToReflectanceImageFilter COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvLuminanceToReflectanceImageFilterDsol.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterDsol.tif
- otbLuminanceToReflectanceImageFilter
+otb_add_test(NAME raTvRadianceToReflectanceImageFilter COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvRadianceToReflectanceImageFilterDsol.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterDsol.tif
+ otbRadianceToReflectanceImageFilter
${INPUTDATA}/verySmallFSATSW.tif
- ${TEMP}/raTvLuminanceToReflectanceImageFilterDsol.tif
+ ${TEMP}/raTvRadianceToReflectanceImageFilterDsol.tif
0.2 #radius
10 #channel 1 illumination
20 #channel 2 illumination
@@ -748,60 +748,60 @@ otb_add_test(NAME raTuImageMetadataCorrectionParametersNew COMMAND otbOpticalCal
otbImageMetadataCorrectionParametersNew
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoFormosat.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoFormosat.img
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoFORMOSAT COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoFormosat.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoFormosat.img
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{FORMOSAT/Sudouest_20071013_MS_fmsat/IMAGERY.TIF}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoFormosat.img
+ ${TEMP}/raTvImageToRadianceImageFilterAutoFormosat.img
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoIkonos.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoIkonos.tif
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoIkonos COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoIkonos.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoIkonos.tif
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoIkonos.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoIkonos.tif
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoQuickbirdXS.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoQuickbirdXS.tif
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoQuickbirdXS COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoQuickbirdXS.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoQuickbirdXS.tif
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoQuickbirdXS.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoQuickbirdXS.tif
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoQuickbirdPAN.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoQuickbirdPAN.tif
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoQuickbirdPAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoQuickbirdPAN.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoQuickbirdPAN.tif
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoQuickbirdPAN.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoQuickbirdPAN.tif
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoWV2Multi.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoWV2Multi.tif
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoWV2MULTI COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoWV2Multi.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoWV2Multi.tif
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_MUL/09DEC10103019-M2AS-052298844010_01_P001.TIF}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoWV2Multi.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoWV2Multi.tif
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoSpot5.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoSpot5.img
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoSpot5 COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoSpot5.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoSpot5.img
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{SPOT5/TEHERAN/IMAGERY.TIF}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoSpot5.img
+ ${TEMP}/raTvImageToRadianceImageFilterAutoSpot5.img
)
-otb_add_test(NAME raTvImageToLuminanceImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilterAutoWV2PAN.tif
- ${TEMP}/raTvImageToLuminanceImageFilterAutoWV2PAN.tif
- otbImageToLuminanceImageFilterAuto
+otb_add_test(NAME raTvImageToRadianceImageFilterAutoWV2PAN COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilterAutoWV2PAN.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoWV2PAN.tif
+ otbImageToRadianceImageFilterAuto
LARGEINPUT{WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_PAN/09DEC10103019-P2AS-052298844010_01_P001.TIF}
- ${TEMP}/raTvImageToLuminanceImageFilterAutoWV2PAN.tif
+ ${TEMP}/raTvImageToRadianceImageFilterAutoWV2PAN.tif
)
otb_add_test(NAME raTvAtmosphericCorrectionSequencementTest COMMAND otbOpticalCalibrationTestDriver
@@ -860,11 +860,11 @@ otb_add_test(NAME raTvSurfaceAdjacencyEffectCorrectionSchemeFilter COMMAND otbOp
${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
)
-otb_add_test(NAME raTvLuminanceToImageImageFilter COMMAND otbOpticalCalibrationTestDriver
+otb_add_test(NAME raTvRadianceToImageImageFilter COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${INPUTDATA}/verySmallFSATSW.tif
${TEMP}/raTvverySmallFSATSWImageFilter.tif
- otbLuminanceToImageImageFilter
- ${BASELINE}/raTvImageToLuminanceImageFilter.tif
+ otbRadianceToImageImageFilter
+ ${BASELINE}/raTvImageToRadianceImageFilter.tif
${TEMP}/raTvverySmallFSATSWImageFilter.tif
10 #channel 1 alpha
20 #channel 2 alpha
@@ -876,11 +876,11 @@ otb_add_test(NAME raTvLuminanceToImageImageFilter COMMAND otbOpticalCalibrationT
4 #channel 4 beta
)
-otb_add_test(NAME raTvReflectanceToLuminanceImageFilter COMMAND otbOpticalCalibrationTestDriver
+otb_add_test(NAME raTvReflectanceToRadianceImageFilter COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${INPUTDATA}/verySmallFSATSW.tif
${TEMP}/raTvverySmallFSATSWImageFilterDsol.tif
- otbReflectanceToLuminanceImageFilter
- ${BASELINE}/raTvLuminanceToReflectanceImageFilterDsol.tif
+ otbReflectanceToRadianceImageFilter
+ ${BASELINE}/raTvRadianceToReflectanceImageFilterDsol.tif
${TEMP}/raTvverySmallFSATSWImageFilterDsol.tif
0.2 #radius
10 #channel 1 illumination
@@ -890,11 +890,11 @@ otb_add_test(NAME raTvReflectanceToLuminanceImageFilter COMMAND otbOpticalCalibr
0.9923885328
)
-otb_add_test(NAME raTvReflectanceToLuminanceImageFilterDayMonth COMMAND otbOpticalCalibrationTestDriver
+otb_add_test(NAME raTvReflectanceToRadianceImageFilterDayMonth COMMAND otbOpticalCalibrationTestDriver
--compare-image ${EPSILON_12} ${INPUTDATA}/verySmallFSATSW.tif
${TEMP}/raTvverySmallFSATSWImageFilterDayMonth.tif
- otbReflectanceToLuminanceImageFilter
- ${BASELINE}/raTvLuminanceToReflectanceImageFilter.tif
+ otbReflectanceToRadianceImageFilter
+ ${BASELINE}/raTvRadianceToReflectanceImageFilter.tif
${TEMP}/raTvverySmallFSATSWImageFilterDayMonth.tif
0.2 #radius
10 #channel 1 illumination
@@ -905,12 +905,12 @@ otb_add_test(NAME raTvReflectanceToLuminanceImageFilterDayMonth COMMAND otbOptic
5 #month
)
-otb_add_test(NAME raTvImageToLuminanceImageFilter COMMAND otbOpticalCalibrationTestDriver
- --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToLuminanceImageFilter.tif
- ${TEMP}/raTvImageToLuminanceImageFilter.tif
- otbImageToLuminanceImageFilter
+otb_add_test(NAME raTvImageToRadianceImageFilter COMMAND otbOpticalCalibrationTestDriver
+ --compare-image ${EPSILON_12} ${BASELINE}/raTvImageToRadianceImageFilter.tif
+ ${TEMP}/raTvImageToRadianceImageFilter.tif
+ otbImageToRadianceImageFilter
${INPUTDATA}/verySmallFSATSW.tif
- ${TEMP}/raTvImageToLuminanceImageFilter.tif
+ ${TEMP}/raTvImageToRadianceImageFilter.tif
10 #channel 1 alpha
20 #channel 2 alpha
30 #channel 3 alpha
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionSequencement.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionSequencement.cxx
index 5603540ec5174a4f2c39ae927ecf1978ab30816a..0e1d8a94c3b8e30b856ff83f71531985bdb13dbf 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionSequencement.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionSequencement.cxx
@@ -20,8 +20,8 @@
-#include "otbImageToLuminanceImageFilter.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
@@ -63,9 +63,9 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
//-------------------------------
- typedef otb::ImageToLuminanceImageFilter<ImageType, ImageType>
- ImageToLuminanceImageFilterType;
- typedef ImageToLuminanceImageFilterType::VectorType VectorType;
+ typedef otb::ImageToRadianceImageFilter<ImageType, ImageType>
+ ImageToRadianceImageFilterType;
+ typedef ImageToRadianceImageFilterType::VectorType VectorType;
VectorType alpha(nbOfComponent);
VectorType beta(nbOfComponent);
@@ -84,16 +84,16 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
}
fin.close();
- ImageToLuminanceImageFilterType::Pointer filterImageToLuminance = ImageToLuminanceImageFilterType::New();
- filterImageToLuminance->SetAlpha(alpha);
- filterImageToLuminance->SetBeta(beta);
- filterImageToLuminance->SetInput(reader->GetOutput());
+ ImageToRadianceImageFilterType::Pointer filterImageToRadiance = ImageToRadianceImageFilterType::New();
+ filterImageToRadiance->SetAlpha(alpha);
+ filterImageToRadiance->SetBeta(beta);
+ filterImageToRadiance->SetInput(reader->GetOutput());
//-------------------------------
- typedef otb::LuminanceToReflectanceImageFilter<ImageType, ImageType>
- LuminanceToReflectanceImageFilterType;
+ typedef otb::RadianceToReflectanceImageFilter<ImageType, ImageType>
+ RadianceToReflectanceImageFilterType;
- typedef LuminanceToReflectanceImageFilterType::VectorType VectorType;
+ typedef RadianceToReflectanceImageFilterType::VectorType VectorType;
VectorType solarIllumination(nbOfComponent);
solarIllumination.Fill(0);
@@ -107,16 +107,16 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
}
fin.close();
- LuminanceToReflectanceImageFilterType::Pointer filterLuminanceToReflectance =
- LuminanceToReflectanceImageFilterType::New();
+ RadianceToReflectanceImageFilterType::Pointer filterRadianceToReflectance =
+ RadianceToReflectanceImageFilterType::New();
const int day(atoi(argv[5]));
const int month(atoi(argv[6]));
- filterLuminanceToReflectance->SetZenithalSolarAngle(static_cast<double>(atof(argv[4])));
- filterLuminanceToReflectance->SetDay(day);
- filterLuminanceToReflectance->SetMonth(month);
- filterLuminanceToReflectance->SetSolarIllumination(solarIllumination);
- filterLuminanceToReflectance->SetInput(filterImageToLuminance->GetOutput());
+ filterRadianceToReflectance->SetZenithalSolarAngle(static_cast<double>(atof(argv[4])));
+ filterRadianceToReflectance->SetDay(day);
+ filterRadianceToReflectance->SetMonth(month);
+ filterRadianceToReflectance->SetSolarIllumination(solarIllumination);
+ filterRadianceToReflectance->SetInput(filterImageToRadiance->GetOutput());
//-------------------------------
/*typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms RadiometryCorrectionParametersToRadiativeTermsType;
@@ -189,7 +189,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
fin.close();
// Set parameters
- /*dataAtmosphericCorrectionParameters->SetSolarZenithalAngle(filterLuminanceToReflectance->GetZenithalSolarAngle());
+ /*dataAtmosphericCorrectionParameters->SetSolarZenithalAngle(filterRadianceToReflectance->GetZenithalSolarAngle());
dataAtmosphericCorrectionParameters->SetSolarAzimutalAngle(static_cast<double>(atof(argv[8])));
dataAtmosphericCorrectionParameters->SetViewingZenithalAngle(static_cast<double>(atof(argv[9])));
dataAtmosphericCorrectionParameters->SetViewingAzimutalAngle(static_cast<double>(atof(argv[10])));
@@ -208,7 +208,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->SetInput(dataAtmosphericCorrectionParameters);
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update(); */
- paramAcqui->SetSolarZenithalAngle(filterLuminanceToReflectance->GetZenithalSolarAngle());
+ paramAcqui->SetSolarZenithalAngle(filterRadianceToReflectance->GetZenithalSolarAngle());
paramAcqui->SetSolarAzimutalAngle(static_cast<double>(atof(argv[8])));
paramAcqui->SetViewingZenithalAngle(static_cast<double>(atof(argv[9])));
paramAcqui->SetViewingAzimutalAngle(static_cast<double>(atof(argv[10])));
@@ -231,7 +231,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
ReflectanceToSurfaceReflectanceImageFilterType::New();
filterReflectanceToSurfaceReflectanceImageFilter->SetAtmosphericRadiativeTerms(radiative);
- filterReflectanceToSurfaceReflectanceImageFilter->SetInput(filterLuminanceToReflectance->GetOutput());
+ filterReflectanceToSurfaceReflectanceImageFilter->SetInput(filterRadianceToReflectance->GetOutput());
//-------------------------------
typedef otb::SurfaceAdjacencyEffectCorrectionSchemeFilter<ImageType,
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilter.cxx
similarity index 84%
rename from Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilter.cxx
index ff31be6ee0bede01f03e50e013a5971ee25f157a..130e08b2af3bae75ef839a0fa0827bfb700616fd 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilter.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilter.cxx
@@ -20,11 +20,11 @@
#include "itkMacro.h"
-#include "otbImageToLuminanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-int otbImageToLuminanceImageFilter(int itkNotUsed(argc), char * argv[])
+int otbImageToRadianceImageFilter(int itkNotUsed(argc), char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
@@ -35,8 +35,8 @@ int otbImageToLuminanceImageFilter(int itkNotUsed(argc), char * argv[])
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::ImageToLuminanceImageFilter<InputImageType, OutputImageType> ImageToLuminanceImageFilterType;
- typedef ImageToLuminanceImageFilterType::VectorType VectorType;
+ typedef otb::ImageToRadianceImageFilter<InputImageType, OutputImageType> ImageToRadianceImageFilterType;
+ typedef ImageToRadianceImageFilterType::VectorType VectorType;
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
@@ -58,7 +58,7 @@ int otbImageToLuminanceImageFilter(int itkNotUsed(argc), char * argv[])
}
// Instantiating object
- ImageToLuminanceImageFilterType::Pointer filter = ImageToLuminanceImageFilterType::New();
+ ImageToRadianceImageFilterType::Pointer filter = ImageToRadianceImageFilterType::New();
filter->SetAlpha(alpha);
filter->SetBeta(beta);
filter->SetInput(reader->GetOutput());
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterAuto.cxx
similarity index 86%
rename from Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterAuto.cxx
index fccdd66e52d30d250bc835bd6aa07d59a611fb82..a5225ac94c108809cac4f8166e37f9778957fddf 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterAuto.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterAuto.cxx
@@ -19,13 +19,13 @@
*/
-#include "otbImageToLuminanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbMultiChannelExtractROI.h"
//Test the retrieval of parameters from the image metadata
-int otbImageToLuminanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
+int otbImageToRadianceImageFilterAuto(int itkNotUsed(argc), char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
@@ -36,7 +36,7 @@ int otbImageToLuminanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::ImageToLuminanceImageFilter<InputImageType, OutputImageType> ImageToLuminanceImageFilterType;
+ typedef otb::ImageToRadianceImageFilter<InputImageType, OutputImageType> ImageToRadianceImageFilterType;
typedef otb::MultiChannelExtractROI<PixelType, PixelType> RoiFilterType;
ReaderType::Pointer reader = ReaderType::New();
@@ -46,7 +46,7 @@ int otbImageToLuminanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
reader->UpdateOutputInformation();
// Instantiating object
- ImageToLuminanceImageFilterType::Pointer filter = ImageToLuminanceImageFilterType::New();
+ ImageToRadianceImageFilterType::Pointer filter = ImageToRadianceImageFilterType::New();
filter->SetInput(reader->GetOutput());
RoiFilterType::Pointer roiFilter = RoiFilterType::New();
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterNew.cxx
similarity index 75%
rename from Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterNew.cxx
index ebc20d764e3e10c54cb42ec27cf845d335c367de..83086a2c3c69fcb25c04d367a35208cd0c810035 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterNew.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbImageToRadianceImageFilterNew.cxx
@@ -20,18 +20,18 @@
#include "itkMacro.h"
-#include "otbImageToLuminanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
-int otbImageToLuminanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
+int otbImageToRadianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
{
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::ImageToLuminanceImageFilter<InputImageType, InputImageType> ImageToLuminanceImageFilterType;
+ typedef otb::ImageToRadianceImageFilter<InputImageType, InputImageType> ImageToRadianceImageFilterType;
// Instantiating object
- ImageToLuminanceImageFilterType::Pointer filter = ImageToLuminanceImageFilterType::New();
+ ImageToRadianceImageFilterType::Pointer filter = ImageToRadianceImageFilterType::New();
std::cout << filter << std::endl;
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx b/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx
index 244ebdc5c71e0199f4da97eeb262ce58cd69c877..d9d6d93a700f8d18e3bc0393602c9bac1432f456 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbOpticalCalibrationTestDriver.cxx
@@ -26,14 +26,14 @@ void RegisterTests()
REGISTER_TEST(otbSpectralSensitivityReaderTest);
REGISTER_TEST(otbSpectralSensitivityReaderGenericTest);
REGISTER_TEST(otbReflectanceToImageImageFilter);
- REGISTER_TEST(otbReflectanceToLuminanceImageFilterNew);
- REGISTER_TEST(otbLuminanceToReflectanceImageFilterNew);
- REGISTER_TEST(otbLuminanceToReflectanceImageFilterAuto);
- REGISTER_TEST(otbImageToLuminanceImageFilterNew);
+ REGISTER_TEST(otbReflectanceToRadianceImageFilterNew);
+ REGISTER_TEST(otbRadianceToReflectanceImageFilterNew);
+ REGISTER_TEST(otbRadianceToReflectanceImageFilterAuto);
+ REGISTER_TEST(otbImageToRadianceImageFilterNew);
REGISTER_TEST(otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew);
- REGISTER_TEST(otbLuminanceToImageImageFilterAuto);
- REGISTER_TEST(otbLuminanceToImageImageFilterNew);
- REGISTER_TEST(otbReflectanceToLuminanceImageFilterAuto);
+ REGISTER_TEST(otbRadianceToImageImageFilterAuto);
+ REGISTER_TEST(otbRadianceToImageImageFilterNew);
+ REGISTER_TEST(otbReflectanceToRadianceImageFilterAuto);
REGISTER_TEST(otbAeronetExtractDataBadData);
REGISTER_TEST(otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter);
REGISTER_TEST(otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms);
@@ -47,7 +47,7 @@ void RegisterTests()
REGISTER_TEST(otbAtmosphericRadiativeTermsSingleChannelNew);
REGISTER_TEST(otbAtmosphericRadiativeTermsTest);
REGISTER_TEST(otbImageToReflectanceImageFilter);
- REGISTER_TEST(otbLuminanceToReflectanceImageFilter);
+ REGISTER_TEST(otbRadianceToReflectanceImageFilter);
REGISTER_TEST(otbReflectanceToImageImageFilterAuto);
REGISTER_TEST(otbAeronetNew);
REGISTER_TEST(otbAeronetExtractData);
@@ -55,13 +55,13 @@ void RegisterTests()
REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilterTest);
REGISTER_TEST(otbReflectanceToSurfaceReflectanceImageFilterTest2);
REGISTER_TEST(otbImageMetadataCorrectionParametersNew);
- REGISTER_TEST(otbImageToLuminanceImageFilterAuto);
+ REGISTER_TEST(otbImageToRadianceImageFilterAuto);
REGISTER_TEST(otbAtmosphericCorrectionSequencementTest);
REGISTER_TEST(otbSIXSTraitsTest);
REGISTER_TEST(otbSIXSTraitsComputeAtmosphericParametersTest);
REGISTER_TEST(otbReflectanceToImageImageFilterNew);
REGISTER_TEST(otbSurfaceAdjacencyEffectCorrectionSchemeFilter);
- REGISTER_TEST(otbLuminanceToImageImageFilter);
- REGISTER_TEST(otbReflectanceToLuminanceImageFilter);
- REGISTER_TEST(otbImageToLuminanceImageFilter);
+ REGISTER_TEST(otbRadianceToImageImageFilter);
+ REGISTER_TEST(otbReflectanceToRadianceImageFilter);
+ REGISTER_TEST(otbImageToRadianceImageFilter);
}
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilter.cxx
similarity index 84%
rename from Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilter.cxx
index 1b75114f867aced692181352347a76525e8e1926..3753231f96dd13597a2fefe1abbe94a29deec28d 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilter.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilter.cxx
@@ -20,13 +20,13 @@
#include "itkMacro.h"
-#include "otbLuminanceToImageImageFilter.h"
+#include "otbRadianceToImageImageFilter.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "itkVariableLengthVector.h"
-int otbLuminanceToImageImageFilter(int itkNotUsed(argc), char * argv[])
+int otbRadianceToImageImageFilter(int itkNotUsed(argc), char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
@@ -37,8 +37,8 @@ int otbLuminanceToImageImageFilter(int itkNotUsed(argc), char * argv[])
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::LuminanceToImageImageFilter<InputImageType, OutputImageType> LuminanceToImageImageFilterType;
- typedef LuminanceToImageImageFilterType::VectorType VectorType;
+ typedef otb::RadianceToImageImageFilter<InputImageType, OutputImageType> RadianceToImageImageFilterType;
+ typedef RadianceToImageImageFilterType::VectorType VectorType;
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
@@ -60,7 +60,7 @@ int otbLuminanceToImageImageFilter(int itkNotUsed(argc), char * argv[])
}
// Instantiating object
- LuminanceToImageImageFilterType::Pointer filter = LuminanceToImageImageFilterType::New();
+ RadianceToImageImageFilterType::Pointer filter = RadianceToImageImageFilterType::New();
filter->SetAlpha(alpha);
filter->SetBeta(beta);
filter->SetInput(reader->GetOutput());
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterAuto.cxx
similarity index 88%
rename from Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterAuto.cxx
index a7d7c2fde19531672ffbfe767869e0f1db93750d..55dfb6d0266d80e861bb998e4dc5e88bd8b6d419 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterAuto.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterAuto.cxx
@@ -19,13 +19,13 @@
*/
-#include "otbLuminanceToImageImageFilter.h"
+#include "otbRadianceToImageImageFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbMultiChannelExtractROI.h"
//Test the retrieval of parameters from the image metadata
-int otbLuminanceToImageImageFilterAuto(int itkNotUsed(argc), char * argv[])
+int otbRadianceToImageImageFilterAuto(int itkNotUsed(argc), char * argv[])
{
const char * inputFileName = argv[1];
const char * inputFileName2 = argv[2];
@@ -38,7 +38,7 @@ int otbLuminanceToImageImageFilterAuto(int itkNotUsed(argc), char * argv[])
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::LuminanceToImageImageFilter<InputImageType, OutputImageType> LuminanceToImageImageFilterType;
+ typedef otb::RadianceToImageImageFilter<InputImageType, OutputImageType> RadianceToImageImageFilterType;
typedef otb::MultiChannelExtractROI<PixelType, PixelType> RoiFilterType;
ReaderType::Pointer reader = ReaderType::New();
@@ -54,7 +54,7 @@ int otbLuminanceToImageImageFilterAuto(int itkNotUsed(argc), char * argv[])
reader2->UpdateOutputInformation();
// Instantiating object
- LuminanceToImageImageFilterType::Pointer filter = LuminanceToImageImageFilterType::New();
+ RadianceToImageImageFilterType::Pointer filter = RadianceToImageImageFilterType::New();
filter->SetInput(reader->GetOutput());
writer->SetInput(filter->GetOutput());
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterNew.cxx
similarity index 75%
rename from Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterNew.cxx
index b33f89f7bf5ffb8ecfdaeed872d1996cd1c24a39..ca4a7be9fa5fb7865a0f1d56f671b0025b6b1e98 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterNew.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToImageImageFilterNew.cxx
@@ -20,19 +20,19 @@
#include "itkMacro.h"
-#include "otbLuminanceToImageImageFilter.h"
+#include "otbRadianceToImageImageFilter.h"
#include "otbVectorImage.h"
-int otbLuminanceToImageImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
+int otbRadianceToImageImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
{
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::LuminanceToImageImageFilter<InputImageType, InputImageType> LuminanceToImageImageFilterType;
+ typedef otb::RadianceToImageImageFilter<InputImageType, InputImageType> RadianceToImageImageFilterType;
// Instantiating object
- LuminanceToImageImageFilterType::Pointer filter = LuminanceToImageImageFilterType::New();
+ RadianceToImageImageFilterType::Pointer filter = RadianceToImageImageFilterType::New();
std::cout << filter << std::endl;
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilter.cxx
similarity index 86%
rename from Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilter.cxx
index 111a0c6f9aa435112445569eaa23fb17d5611c60..144781ca743e7c7e6e2f811fa1182ff0ec6d0d44 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilter.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilter.cxx
@@ -20,12 +20,12 @@
#include "itkMacro.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-int otbLuminanceToReflectanceImageFilter(int argc, char * argv[])
+int otbRadianceToReflectanceImageFilter(int argc, char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
@@ -50,8 +50,8 @@ int otbLuminanceToReflectanceImageFilter(int argc, char * argv[])
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::LuminanceToReflectanceImageFilter<InputImageType, OutputImageType> LuminanceToReflectanceImageFilterType;
- typedef LuminanceToReflectanceImageFilterType::VectorType VectorType;
+ typedef otb::RadianceToReflectanceImageFilter<InputImageType, OutputImageType> RadianceToReflectanceImageFilterType;
+ typedef RadianceToReflectanceImageFilterType::VectorType VectorType;
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
@@ -69,7 +69,7 @@ int otbLuminanceToReflectanceImageFilter(int argc, char * argv[])
solarIllumination[3] = static_cast<double>(atof(argv[7]));
// Instantiating object
- LuminanceToReflectanceImageFilterType::Pointer filter = LuminanceToReflectanceImageFilterType::New();
+ RadianceToReflectanceImageFilterType::Pointer filter = RadianceToReflectanceImageFilterType::New();
filter->SetZenithalSolarAngle(angle);
filter->SetSolarIllumination(solarIllumination);
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterAuto.cxx
similarity index 73%
rename from Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterAuto.cxx
index fda44a1edb5cd2bc2d76240e2c9256d600fd4f44..511b4d658a52f29a549d909e97ba5f9a1090ee08 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterAuto.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterAuto.cxx
@@ -19,13 +19,13 @@
*/
-#include "otbImageToLuminanceImageFilter.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
+#include "otbImageToRadianceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbMultiChannelExtractROI.h"
-int otbLuminanceToReflectanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
+int otbRadianceToReflectanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
@@ -36,9 +36,9 @@ int otbLuminanceToReflectanceImageFilterAuto(int itkNotUsed(argc), char * argv[]
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::ImageToLuminanceImageFilter<InputImageType, OutputImageType> ImageToLuminanceImageFilterType;
- typedef otb::LuminanceToReflectanceImageFilter<OutputImageType,
- OutputImageType> LuminanceToReflectanceImageFilterType;
+ typedef otb::ImageToRadianceImageFilter<InputImageType, OutputImageType> ImageToRadianceImageFilterType;
+ typedef otb::RadianceToReflectanceImageFilter<OutputImageType,
+ OutputImageType> RadianceToReflectanceImageFilterType;
typedef otb::MultiChannelExtractROI<PixelType, PixelType> RoiFilterType;
ReaderType::Pointer reader = ReaderType::New();
@@ -48,11 +48,11 @@ int otbLuminanceToReflectanceImageFilterAuto(int itkNotUsed(argc), char * argv[]
reader->UpdateOutputInformation();
// Instantiating object
- ImageToLuminanceImageFilterType::Pointer filterToLuminance = ImageToLuminanceImageFilterType::New();
- filterToLuminance->SetInput(reader->GetOutput());
+ ImageToRadianceImageFilterType::Pointer filterToRadiance = ImageToRadianceImageFilterType::New();
+ filterToRadiance->SetInput(reader->GetOutput());
- LuminanceToReflectanceImageFilterType::Pointer filterToReflectance = LuminanceToReflectanceImageFilterType::New();
- filterToReflectance->SetInput(filterToLuminance->GetOutput());
+ RadianceToReflectanceImageFilterType::Pointer filterToReflectance = RadianceToReflectanceImageFilterType::New();
+ filterToReflectance->SetInput(filterToRadiance->GetOutput());
filterToReflectance->SetUseClamp(false);
RoiFilterType::Pointer roiFilter = RoiFilterType::New();
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterNew.cxx
similarity index 73%
rename from Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterNew.cxx
index 12b467122bc0ed7ce90d617671c942609151a001..2d208d12717ff0ebdd74bd903b28e1247552b95d 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterNew.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbRadianceToReflectanceImageFilterNew.cxx
@@ -20,19 +20,19 @@
#include "itkMacro.h"
-#include "otbLuminanceToReflectanceImageFilter.h"
+#include "otbRadianceToReflectanceImageFilter.h"
#include "otbVectorImage.h"
-int otbLuminanceToReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
+int otbRadianceToReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
{
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::LuminanceToReflectanceImageFilter<InputImageType, InputImageType> LuminanceToReflectanceImageFilterType;
+ typedef otb::RadianceToReflectanceImageFilter<InputImageType, InputImageType> RadianceToReflectanceImageFilterType;
// Instantiating object
- LuminanceToReflectanceImageFilterType::Pointer filter = LuminanceToReflectanceImageFilterType::New();
+ RadianceToReflectanceImageFilterType::Pointer filter = RadianceToReflectanceImageFilterType::New();
std::cout << filter << std::endl;
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx
index a61ae86a8256144feb3676d964eeb70eddb7cdd9..c52c21e17a04618244b3d487ea728e040d7be932 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx
@@ -22,8 +22,8 @@
#include "otbReflectanceToImageImageFilter.h"
-//#include "otbReflectanceToLuminanceImageFilter.h"
-//#include "otbLuminanceToImageImageFilter.h"
+//#include "otbReflectanceToRadianceImageFilter.h"
+//#include "otbRadianceToImageImageFilter.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
@@ -129,10 +129,10 @@ int otbReflectanceToImageImageFilter(int argc, char * argv[])
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
-typedef otb::ReflectanceToLuminanceImageFilter<InputImageType, InputImageType> ReflectanceToLuminanceImageFilterType;
-typedef otb::LuminanceToImageImageFilter<InputImageType, OutputImageType> LuminanceToImageImageFilterType;
+typedef otb::ReflectanceToRadianceImageFilter<InputImageType, InputImageType> ReflectanceToRadianceImageFilterType;
+typedef otb::RadianceToImageImageFilter<InputImageType, OutputImageType> RadianceToImageImageFilterType;
- typedef ReflectanceToLuminanceImageFilterType::VectorType VectorType;
+ typedef ReflectanceToRadianceImageFilterType::VectorType VectorType;
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
@@ -158,8 +158,8 @@ typedef otb::LuminanceToImageImageFilter<InputImageType, OutputImageType> Lumina
// Instantiating object
-ReflectanceToLuminanceImageFilterType::Pointer filter = ReflectanceToLuminanceImageFilterType::New();
-LuminanceToImageImageFilterType::Pointer filter2 = LuminanceToImageImageFilterType::New();
+ReflectanceToRadianceImageFilterType::Pointer filter = ReflectanceToRadianceImageFilterType::New();
+RadianceToImageImageFilterType::Pointer filter2 = RadianceToImageImageFilterType::New();
filter2->SetAlpha(alpha);
filter2->SetBeta(beta);
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilter.cxx
similarity index 86%
rename from Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilter.cxx
index b7fcc26964ba68d487b139819fbce7d521bf207a..3bd797486075bfac16f06cc21c7e9d94787e866a 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilter.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilter.cxx
@@ -20,11 +20,11 @@
#include "itkMacro.h"
-#include "otbReflectanceToLuminanceImageFilter.h"
+#include "otbReflectanceToRadianceImageFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
-int otbReflectanceToLuminanceImageFilter(int argc, char * argv[])
+int otbReflectanceToRadianceImageFilter(int argc, char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
@@ -49,8 +49,8 @@ int otbReflectanceToLuminanceImageFilter(int argc, char * argv[])
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::ReflectanceToLuminanceImageFilter<InputImageType, OutputImageType> ReflectanceToLuminanceImageFilterType;
- typedef ReflectanceToLuminanceImageFilterType::VectorType VectorType;
+ typedef otb::ReflectanceToRadianceImageFilter<InputImageType, OutputImageType> ReflectanceToRadianceImageFilterType;
+ typedef ReflectanceToRadianceImageFilterType::VectorType VectorType;
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
@@ -68,7 +68,7 @@ int otbReflectanceToLuminanceImageFilter(int argc, char * argv[])
solarIllumination[3] = static_cast<double>(atof(argv[7]));
// Instantiating object
- ReflectanceToLuminanceImageFilterType::Pointer filter = ReflectanceToLuminanceImageFilterType::New();
+ ReflectanceToRadianceImageFilterType::Pointer filter = ReflectanceToRadianceImageFilterType::New();
filter->SetZenithalSolarAngle(angle);
filter->SetSolarIllumination(solarIllumination);
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterAuto.cxx
similarity index 77%
rename from Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterAuto.cxx
index 08d6ba55fea34eb0c180102e314e1a13ca4a224c..034a714a39f54485661c3beee2788c6da27b27b7 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterAuto.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterAuto.cxx
@@ -19,12 +19,12 @@
*/
-#include "otbReflectanceToLuminanceImageFilter.h"
+#include "otbReflectanceToRadianceImageFilter.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
#include "otbMultiChannelExtractROI.h"
-int otbReflectanceToLuminanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
+int otbReflectanceToRadianceImageFilterAuto(int itkNotUsed(argc), char * argv[])
{
const char * inputFileName = argv[1];
@@ -36,8 +36,8 @@ const char * inputFileName = argv[1];
typedef otb::VectorImage<PixelType, Dimension> OutputImageType;
typedef otb::ImageFileReader<InputImageType> ReaderType;
typedef otb::ImageFileWriter<OutputImageType> WriterType;
- typedef otb::ReflectanceToLuminanceImageFilter<OutputImageType,
- OutputImageType> ReflectanceToLuminanceImageFilterType;
+ typedef otb::ReflectanceToRadianceImageFilter<OutputImageType,
+ OutputImageType> ReflectanceToRadianceImageFilterType;
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
@@ -46,10 +46,10 @@ const char * inputFileName = argv[1];
reader->UpdateOutputInformation();
// Instantiating object
- ReflectanceToLuminanceImageFilterType::Pointer filterToLuminance = ReflectanceToLuminanceImageFilterType::New();
+ ReflectanceToRadianceImageFilterType::Pointer filterToRadiance = ReflectanceToRadianceImageFilterType::New();
- filterToLuminance->SetInput(reader->GetOutput());
- writer->SetInput(filterToLuminance->GetOutput());
+ filterToRadiance->SetInput(reader->GetOutput());
+ writer->SetInput(filterToRadiance->GetOutput());
writer->Update();
return EXIT_SUCCESS;
diff --git a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterNew.cxx
similarity index 73%
rename from Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterNew.cxx
index 072248351ca021ebd497b7500fa29a9c48a197f4..c6eb5895ad04fd0de8749e454180a21e294f4841 100644
--- a/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterNew.cxx
+++ b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToRadianceImageFilterNew.cxx
@@ -20,18 +20,18 @@
#include "itkMacro.h"
-#include "otbReflectanceToLuminanceImageFilter.h"
+#include "otbReflectanceToRadianceImageFilter.h"
-int otbReflectanceToLuminanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
+int otbReflectanceToRadianceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
{
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::VectorImage<PixelType, Dimension> InputImageType;
- typedef otb::ReflectanceToLuminanceImageFilter<InputImageType, InputImageType> ReflectanceToLuminanceImageFilterType;
+ typedef otb::ReflectanceToRadianceImageFilter<InputImageType, InputImageType> ReflectanceToRadianceImageFilterType;
// Instantiating object
- ReflectanceToLuminanceImageFilterType::Pointer filter = ReflectanceToLuminanceImageFilterType::New();
+ ReflectanceToRadianceImageFilterType::Pointer filter = ReflectanceToRadianceImageFilterType::New();
std::cout << filter << std::endl;
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
index dd3a116b26c54fd287f895a3c8567584780adb3f..d9a944bf7d1c9f639b718d6aeee7e030f2fd8646 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
@@ -39,7 +39,7 @@ namespace otb
* compute the satellite spectral bands.
*
* There are 2 operating modes:
- * - luminance mode (default): integrates the spectral response over each band
+ * - radiance mode (default): integrates the spectral response over each band
* - reflectance mode (needs to call SetReflectanceMode(true)): takes into account
* the solar irradiance in the integration
*
@@ -154,7 +154,7 @@ private:
/** the computed response */
InputSpectralResponsePointerType m_ReduceResponse;
- /** Choose between reflectance or luminance mode */
+ /** Choose between reflectance or radiance mode */
bool m_ReflectanceMode;
};
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
index e14cfb9f34e67ade7b301b87279119ff117cb692..2c7af98309f7d1bf1dbdb08042dcd8bb1cd689e8 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
@@ -109,7 +109,7 @@ ReduceSpectralResponse<TSpectralResponse , TRSR>
/*
In order to simplify the computation for the reflectance mode,
we introduce the solar irradiance in the general formula with
- a value of 1.0 for the luminance case.
+ a value of 1.0 for the radiance case.
In this way the formula is the same if we weight the RSR by
the solar irradiance before the integration.
@@ -197,7 +197,7 @@ ReduceSpectralResponse<TSpectralResponse , TRSR>
os <<indent << "[Center Wavelength (micrometers), Reflectance (percent)]" << std::endl;
}
else{
- os <<indent << "[Center Wavelength (micrometers), Luminance (percent)]" << std::endl;
+ os <<indent << "[Center Wavelength (micrometers), Radiance (percent)]" << std::endl;
}
for(typename VectorPairType::const_iterator it = m_ReduceResponse->GetResponse().begin(); it != m_ReduceResponse->GetResponse().end(); ++it)
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
index 62050167d329f38c746a213a520fed10629a64cb..c07fbd4c97638e0154b88e1d2c2a4df8d614ecda 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
@@ -153,7 +153,7 @@ private:
*
* \ingroup AtmosphericRadiativeTerms
* \ingroup AtmosphericCorrectionParameters
- * \ingroup LuminanceToReflectanceImageFilter
+ * \ingroup RadianceToReflectanceImageFilter
* \ingroup ImageToReflectanceImageFilter
* \ingroup Radiometry
*
diff --git a/Modules/Radiometry/Simulation/test/otbReduceSpectralResponse.cxx b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponse.cxx
index 1d03b3a6a0f4ba9e50a8790eeb9faa30f2bd9705..388f66977591e377c4c30bab58112cd857f4e7c0 100644
--- a/Modules/Radiometry/Simulation/test/otbReduceSpectralResponse.cxx
+++ b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponse.cxx
@@ -62,7 +62,7 @@ int otbReduceSpectralResponse(int argc, char * argv[])
myReduceResponse->SetInputSatRSR(myRSR);
/** Load the spectral response of the object in the simulator*/
myReduceResponse->SetInputSpectralResponse(mySpectralResponse);
- /** Set the reflectance or luminance mode */
+ /** Set the reflectance or radiance mode */
myReduceResponse->SetReflectanceMode(reflectanceMode);
myReduceResponse->CalculateResponse();
/** Print the Reduce SR*/
@@ -194,7 +194,7 @@ int otbReduceSpectralResponseSimpleValues(int argc, char * argv[])
if(fabs(b0Result-b0Expected)>tolerance)
{
- std::cout << "Wrong value for B0: expected eq. luminance = " << b0Expected
+ std::cout << "Wrong value for B0: expected eq. radiance = " << b0Expected
<< "; got " << b0Result
<< std::endl;
return EXIT_FAILURE;
@@ -207,7 +207,7 @@ int otbReduceSpectralResponseSimpleValues(int argc, char * argv[])
if(fabs(b1Result-b1Expected)>tolerance)
{
- std::cout << "Wrong value for B1: expected eq. luminance = " << b1Expected
+ std::cout << "Wrong value for B1: expected eq. radiance = " << b1Expected
<< "; got " << b1Result
<< std::endl;
return EXIT_FAILURE;
diff --git a/Utilities/Doxygen/doxygen.config.in b/Utilities/Doxygen/doxygen.config.in
index f23888ac099da3173b533dbd68d4db667ca6140c..c77823e62a62e27a128e9eb45880439187afe79e 100644
--- a/Utilities/Doxygen/doxygen.config.in
+++ b/Utilities/Doxygen/doxygen.config.in
@@ -1121,7 +1121,7 @@ HTML_COLORSTYLE_HUE = 220
HTML_COLORSTYLE_SAT = 100
# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
+# radiance component of the colors in the HTML output. Values below 100
# gradually make the output lighter, whereas values above 100 make the output
# darker. The value divided by 100 is the actual gamma applied, so 80 represents
# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not