From a13d7d1475e38d7777665bc4f25575b7fd7b024c Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Tue, 18 May 2010 15:58:46 +0800
Subject: [PATCH] DOC: wavelength, not wavelenght
---
.../otbAtmosphericCorrectionParameters.cxx | 16 ++---
.../otbAtmosphericCorrectionParameters.h | 60 ++++++++---------
...arametersTo6SAtmosphericRadiativeTerms.cxx | 12 ++--
...ectanceToSurfaceReflectanceImageFilter.txx | 4 +-
Code/Radiometry/otbSIXSTraits.cxx | 66 +++++++++----------
Code/Radiometry/otbSIXSTraits.h | 20 +++---
...djacencyEffect6SCorrectionSchemeFilter.txx | 2 +-
.../AtmosphericCorrectionSequencement.cxx | 6 +-
Examples/Radiometry/CMakeLists.txt | 2 +-
Testing/Code/Radiometry/CMakeLists.txt | 18 ++---
...arametersTo6SAtmosphericRadiativeTerms.cxx | 8 +--
.../otbAtmosphericCorrectionSequencement.cxx | 4 +-
.../Radiometry/otbFilterFunctionValues.cxx | 6 +-
...ToRomaniaSurfaceReflectanceImageFilter.cxx | 4 +-
...SIXSTraitsComputeAtmosphericParameters.cxx | 4 +-
...djacencyEffect6SCorrectionSchemeFilter.cxx | 4 +-
Testing/Utilities/6SFunctionMainTest.cxx | 12 ++--
17 files changed, 124 insertions(+), 124 deletions(-)
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
index 12235edbaf..cafdda332b 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
@@ -42,7 +42,7 @@ FilterFunctionValues
{
os << indent << "Minimum spectral value : " << m_MinSpectralValue << std::endl;
os << indent << "Maximum spectral value : " << m_MaxSpectralValue << std::endl;
- os << indent << "Wavelenght spectral band step: " << m_UserStep << std::endl;
+ os << indent << "Wavelength spectral band step: " << m_UserStep << std::endl;
os << indent << "Filter function values: " << std::endl;
for (unsigned int i = 0; i < m_FilterFunctionValues.size(); ++i)
{
@@ -74,7 +74,7 @@ AtmosphericCorrectionParameters
m_OzoneAmount = 0.28;
m_AerosolModel = CONTINENTAL;
m_AerosolOptical = 0.2;
- m_WavelenghtSpectralBand.clear();
+ m_WavelengthSpectralBand.clear();
}
/** Get data from aeronet file*/
@@ -104,7 +104,7 @@ void
AtmosphericCorrectionParameters
::LoadFilterFunctionValue(std::string filename)
{
- m_WavelenghtSpectralBand.clear();
+ m_WavelengthSpectralBand.clear();
FilterFunctionValues::Pointer ffv = FilterFunctionValues::New();
ossimFilename fname(filename);
@@ -120,7 +120,7 @@ AtmosphericCorrectionParameters
FilterFunctionValues::Pointer function = FilterFunctionValues::New();
FilterFunctionValues::ValuesVectorType vect;
- m_WavelenghtSpectralBand.clear();
+ m_WavelengthSpectralBand.clear();
vect.clear();
while (std::getline(file, line))
@@ -133,7 +133,7 @@ AtmosphericCorrectionParameters
if (bandId != 0)
{
function->SetFilterFunctionValues(vect);
- m_WavelenghtSpectralBand.push_back(function);
+ m_WavelengthSpectralBand.push_back(function);
function = FilterFunctionValues::New();
vect.clear();
}
@@ -146,7 +146,7 @@ AtmosphericCorrectionParameters
else if (keywordStrings.size() != 0) itkExceptionMacro("File " << filename << " not valid.");
}
function->SetFilterFunctionValues(vect);
- m_WavelenghtSpectralBand.push_back(function);
+ m_WavelengthSpectralBand.push_back(function);
}
/**PrintSelf method */
@@ -168,10 +168,10 @@ AtmosphericCorrectionParameters
// Function values print :
os << "Filter function values: " << std::endl;
- for (unsigned int i = 0; i < m_WavelenghtSpectralBand.size(); ++i)
+ for (unsigned int i = 0; i < m_WavelengthSpectralBand.size(); ++i)
{
os << indent << "Channel " << i + 1 << " : " << std::endl;
- os << indent << m_WavelenghtSpectralBand[i] << std::endl;
+ os << indent << m_WavelengthSpectralBand[i] << std::endl;
}
}
} // end namespace otb
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index a2d16f9943..1e19f0ddb1 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -51,8 +51,8 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
- typedef double WavelenghtSpectralBandType;
- typedef std::vector<WavelenghtSpectralBandType> ValuesVectorType;
+ typedef double WavelengthSpectralBandType;
+ typedef std::vector<WavelengthSpectralBandType> ValuesVectorType;
/** Set vector that contains the filter function value. */
void SetFilterFunctionValues(const ValuesVectorType& vect)
@@ -78,17 +78,17 @@ public:
}
/** Set minimum spectral value. */
- itkSetMacro(MinSpectralValue, WavelenghtSpectralBandType);
+ itkSetMacro(MinSpectralValue, WavelengthSpectralBandType);
/** Get minimum spectral value. */
- itkGetMacro(MinSpectralValue, WavelenghtSpectralBandType);
+ itkGetMacro(MinSpectralValue, WavelengthSpectralBandType);
/** Set maximum spectral value. This value is automatically computed.*/
- itkSetMacro(MaxSpectralValue, WavelenghtSpectralBandType);
+ itkSetMacro(MaxSpectralValue, WavelengthSpectralBandType);
/** Get maximum spectral value. This value is automatically computed.*/
- itkGetMacro(MaxSpectralValue, WavelenghtSpectralBandType);
- /** Set user step between each wavelenght spectral band values. */
- itkSetMacro(UserStep, WavelenghtSpectralBandType);
- /** Get user step between each wavelenght spectral band values. */
- itkGetMacro(UserStep, WavelenghtSpectralBandType);
+ itkGetMacro(MaxSpectralValue, WavelengthSpectralBandType);
+ /** Set user step between each wavelength spectral band values. */
+ itkSetMacro(UserStep, WavelengthSpectralBandType);
+ /** Get user step between each wavelength spectral band values. */
+ itkGetMacro(UserStep, WavelengthSpectralBandType);
protected:
/** Constructor */
@@ -110,11 +110,11 @@ private:
*/
ValuesVectorType m_FilterFunctionValues6S;
/** Minimum spectral value (in µm). */
- WavelenghtSpectralBandType m_MinSpectralValue;
+ WavelengthSpectralBandType m_MinSpectralValue;
/** Maximum spectral value (in µm). */
- WavelenghtSpectralBandType m_MaxSpectralValue;
- /** User step between each wavelenght spectral band values. (in µm) */
- WavelenghtSpectralBandType m_UserStep;
+ WavelengthSpectralBandType m_MaxSpectralValue;
+ /** User step between each wavelength spectral band values. (in µm) */
+ WavelengthSpectralBandType m_UserStep;
};
/** \class AtmosphericCorrectionParameters
@@ -143,7 +143,7 @@ public:
typedef enum {NO_AEROSOL = 0, CONTINENTAL = 1, MARITIME = 2, URBAN = 3, DESERTIC = 5} AerosolModelType;
- typedef std::vector<FilterFunctionValues::Pointer> WavelenghtSpectralBandVectorType;
+ typedef std::vector<FilterFunctionValues::Pointer> WavelengthSpectralBandVectorType;
/**
* Set/Get the solar zenithal angle.
@@ -210,31 +210,31 @@ public:
itkGetMacro(AerosolOptical, double);
/**
- * Set/Get the wavelenght spectral band.
+ * Set/Get the wavelength spectral band.
*/
- void SetWavelenghtSpectralBand(const WavelenghtSpectralBandVectorType& waveband)
+ void SetWavelengthSpectralBand(const WavelengthSpectralBandVectorType& waveband)
{
- m_WavelenghtSpectralBand = waveband;
+ m_WavelengthSpectralBand = waveband;
}
- void SetWavelenghtSpectralBandWithIndex(unsigned int id, const FilterFunctionValues::Pointer& function)
+ void SetWavelengthSpectralBandWithIndex(unsigned int id, const FilterFunctionValues::Pointer& function)
{
- if (m_WavelenghtSpectralBand.size() < id + 1)
+ if (m_WavelengthSpectralBand.size() < id + 1)
{
- for (unsigned int j = 0; j < (id + 1 - m_WavelenghtSpectralBand.size()); ++j)
+ for (unsigned int j = 0; j < (id + 1 - m_WavelengthSpectralBand.size()); ++j)
{
FilterFunctionValues::Pointer temp;
- m_WavelenghtSpectralBand.push_back(temp);
+ m_WavelengthSpectralBand.push_back(temp);
}
}
- m_WavelenghtSpectralBand[id] = function;
+ m_WavelengthSpectralBand[id] = function;
}
- WavelenghtSpectralBandVectorType GetWavelenghtSpectralBand() const
+ WavelengthSpectralBandVectorType GetWavelengthSpectralBand() const
{
- return m_WavelenghtSpectralBand;
+ return m_WavelengthSpectralBand;
}
- const WavelenghtSpectralBandVectorType * GetWavelenghtSpectralBandRef() const
+ const WavelengthSpectralBandVectorType * GetWavelengthSpectralBandRef() const
{
- return &m_WavelenghtSpectralBand;
+ return &m_WavelengthSpectralBand;
}
/** Read the aeronet data and extract aerosol optical and water vapor amount. */
@@ -292,10 +292,10 @@ private:
double m_OzoneAmount;
/** The Aerosol model */
AerosolModelType m_AerosolModel;
- /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
+ /** The Aerosol optical (radiative impact of aerosol for the reference wavelength 550-nm) */
double m_AerosolOptical;
- /** Wavelenght for the each spectral band definition */
- WavelenghtSpectralBandVectorType m_WavelenghtSpectralBand;
+ /** Wavelength for the each spectral band definition */
+ WavelengthSpectralBandVectorType m_WavelengthSpectralBand;
};
} // end namespace otb
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
index 600c783998..82e3e81818 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
@@ -140,9 +140,9 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
AtmosphericRadiativeTermsPointer output = this->GetOutput();
output->GetValues().clear();
- typedef AtmosphericCorrectionParameters::WavelenghtSpectralBandVectorType WavelenghtSpectralBandVectorType;
- WavelenghtSpectralBandVectorType WavelenghtSpectralBandVector = input->GetWavelenghtSpectralBand();
- unsigned int NbBand = WavelenghtSpectralBandVector.size();
+ typedef AtmosphericCorrectionParameters::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
+ WavelengthSpectralBandVectorType WavelengthSpectralBandVector = input->GetWavelengthSpectralBand();
+ unsigned int NbBand = WavelengthSpectralBandVector.size();
double atmosphericReflectance(0.);
double atmosphericSphericalAlbedo(0.);
@@ -176,9 +176,9 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
input->GetWaterVaporAmount(), /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
input->GetOzoneAmount(), /** The Ozone amount (Stratospheric ozone layer content) */
input->GetAerosolModel(), /** The Aerosol model */
- input->GetAerosolOptical(), /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
- input->GetWavelenghtSpectralBand()[i], /** Wavelenght for the spectral band definition */
- /** Note : The Max wavelenght spectral band value must be updated ! */
+ input->GetAerosolOptical(), /** The Aerosol optical (radiative impact of aerosol for the reference wavelength 550-nm) */
+ input->GetWavelengthSpectralBand()[i], /** Wavelength for the spectral band definition */
+ /** Note : The Max wavelength spectral band value must be updated ! */
atmosphericReflectance, /** Atmospheric reflectance */
atmosphericSphericalAlbedo, /** atmospheric spherical albedo */
totalGaseousTransmission, /** Total gaseous transmission */
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
index 8eaadf2dad..b305fbfb84 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -96,7 +96,7 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
m_CorrectionParameters->LoadFilterFunctionValue(m_FilterFunctionValuesFileName);
}
// the user has set the filter function values
- else if (m_CorrectionParameters->GetWavelenghtSpectralBand().size() !=
+ else if (m_CorrectionParameters->GetWavelengthSpectralBand().size() !=
this->GetInput()->GetNumberOfComponentsPerPixel())
{
bool ffvfOK = true;
@@ -116,7 +116,7 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
functionValues->SetUserStep(functionValues->GetMaxSpectralValue() - functionValues->GetMinSpectralValue() / 2.);
}
- m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ m_CorrectionParameters->SetWavelengthSpectralBandWithIndex(i, functionValues);
}
}
diff --git a/Code/Radiometry/otbSIXSTraits.cxx b/Code/Radiometry/otbSIXSTraits.cxx
index 154284bb68..34827567d5 100644
--- a/Code/Radiometry/otbSIXSTraits.cxx
+++ b/Code/Radiometry/otbSIXSTraits.cxx
@@ -38,9 +38,9 @@ SIXSTraits::ComputeAtmosphericParameters(
const double WaterVaporAmount, /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
const double OzoneAmount, /** The Ozone amount (Stratospheric ozone layer content) */
const AerosolModelType& AerosolModel, /** The Aerosol model */
- const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
- WavelenghtSpectralType* WavelenghtSpectralBand, /** Wavelenght for the spectral band definition */
- /** Note : The Max wavelenght spectral band value must be updated ! */
+ const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelength 550-nm) */
+ WavelengthSpectralType* WavelengthSpectralBand, /** Wavelength for the spectral band definition */
+ /** Note : The Max wavelength spectral band value must be updated ! */
double& AtmosphericReflectance, /** Atmospheric reflectance */
double& AtmosphericSphericalAlbedo, /** atmospheric spherical albedo */
double& TotalGaseousTransmission, /** Total gaseous transmission */
@@ -81,31 +81,31 @@ SIXSTraits::ComputeAtmosphericParameters(
otb_6s_doublereal otb_ratm__(0.), sast(0.), tgasm(0.), sdtott(0.), sutott(0.);
otb_6s_doublereal tdif_up(0.), tdir_up(0.), tdif_up_ray(0.), tdif_up_aer(0.);
- // 6S official Wavelenght Spectral Band step value
- const float SIXSStepOfWavelenghtSpectralBandValues = .0025;
- // Generate 6s Wavelenght Spectral Band with the offcicial step value
- ComputeWavelenghtSpectralBandValuesFor6S(SIXSStepOfWavelenghtSpectralBandValues,
- WavelenghtSpectralBand // Update
+ // 6S official Wavelength Spectral Band step value
+ const float SIXSStepOfWavelengthSpectralBandValues = .0025;
+ // Generate 6s Wavelength Spectral Band with the offcicial step value
+ ComputeWavelengthSpectralBandValuesFor6S(SIXSStepOfWavelengthSpectralBandValues,
+ WavelengthSpectralBand // Update
);
try
{
- // 6S official tab size Wavelenght Spectral
+ // 6S official tab size Wavelength Spectral
const unsigned int S_6S_SIZE = 1501;
- // Generate WavelenghtSpectralBand in 6S compatible buffer s[1501]
- wlinf = static_cast<otb_6s_doublereal>(WavelenghtSpectralBand->GetMinSpectralValue());
- wlsup = static_cast<otb_6s_doublereal>(WavelenghtSpectralBand->GetMaxSpectralValue());
+ // Generate WavelengthSpectralBand in 6S compatible buffer s[1501]
+ wlinf = static_cast<otb_6s_doublereal>(WavelengthSpectralBand->GetMinSpectralValue());
+ wlsup = static_cast<otb_6s_doublereal>(WavelengthSpectralBand->GetMaxSpectralValue());
otb_6s_integer iinf =
- static_cast<otb_6s_integer>((wlinf - (float) .25) / SIXSStepOfWavelenghtSpectralBandValues + (float) 1.5);
+ static_cast<otb_6s_integer>((wlinf - (float) .25) / SIXSStepOfWavelengthSpectralBandValues + (float) 1.5);
otb_6s_integer isup =
- static_cast<otb_6s_integer>((wlsup - (float) .25) / SIXSStepOfWavelenghtSpectralBandValues + (float) 1.5);
+ static_cast<otb_6s_integer>((wlsup - (float) .25) / SIXSStepOfWavelengthSpectralBandValues + (float) 1.5);
otb_6s_integer cpt = iinf - 1;
otb_6s_doublereal * s(NULL);
s = new otb_6s_doublereal[S_6S_SIZE];
memset(s, 0, S_6S_SIZE * sizeof(otb_6s_doublereal));
- const ValuesVectorType& FilterFunctionValues6S = WavelenghtSpectralBand->GetFilterFunctionValues6S();
+ const ValuesVectorType& FilterFunctionValues6S = WavelengthSpectralBand->GetFilterFunctionValues6S();
// Set the values of FilterFunctionValues6S in s between [iinf-1;isup]
for (unsigned int i = 0; cpt < isup; ++i)
{
@@ -156,16 +156,16 @@ SIXSTraits::ComputeAtmosphericParameters(
}
void
-SIXSTraits::ComputeWavelenghtSpectralBandValuesFor6S(
- const double SIXSStepOfWavelenghtSpectralBandValues,
- WavelenghtSpectralType* WavelenghtSpectralBand
+SIXSTraits::ComputeWavelengthSpectralBandValuesFor6S(
+ const double SIXSStepOfWavelengthSpectralBandValues,
+ WavelengthSpectralType* WavelengthSpectralBand
)
{
const double epsilon(.000001);
- const double L_min = static_cast<double>(WavelenghtSpectralBand->GetMinSpectralValue());
- const double L_max = static_cast<double>(WavelenghtSpectralBand->GetMaxSpectralValue());
- const double L_userStep = static_cast<double>(WavelenghtSpectralBand->GetUserStep());
- const ValuesVectorType& FilterFunctionValues = WavelenghtSpectralBand->GetFilterFunctionValues();
+ const double L_min = static_cast<double>(WavelengthSpectralBand->GetMinSpectralValue());
+ const double L_max = static_cast<double>(WavelengthSpectralBand->GetMaxSpectralValue());
+ const double L_userStep = static_cast<double>(WavelengthSpectralBand->GetUserStep());
+ const ValuesVectorType& FilterFunctionValues = WavelengthSpectralBand->GetFilterFunctionValues();
unsigned int i = 1;
unsigned int j = 1;
const double invStep = static_cast<double>(1. / L_userStep);
@@ -182,16 +182,16 @@ SIXSTraits::ComputeWavelenghtSpectralBandValuesFor6S(
" < (" << L_max << "-" << epsilon << ") is not respected !");
}
- // Generate WavelenghtSpectralBand if the step is not the offical 6S step value
- if (vcl_abs(L_userStep - SIXSStepOfWavelenghtSpectralBandValues) > epsilon)
+ // Generate WavelengthSpectralBand if the step is not the offical 6S step value
+ if (vcl_abs(L_userStep - SIXSStepOfWavelengthSpectralBandValues) > epsilon)
{
ValuesVectorType values(1, FilterFunctionValues[0]); //vector size 1 with the value vect[0]
// Stop the interpolation at the max spectral value.
- value = i * SIXSStepOfWavelenghtSpectralBandValues;
+ value = i * SIXSStepOfWavelengthSpectralBandValues;
while (L_min + value <= L_max)
{
- // Search the User interval that surround the StepOfWavelenghtSpectralBandValues current value.
+ // Search the User interval that surround the StepOfWavelengthSpectralBandValues current value.
// removed the <= here, might be wrong
while (j * L_userStep < value)
@@ -212,27 +212,27 @@ SIXSTraits::ComputeWavelenghtSpectralBandValuesFor6S(
+ ((static_cast<double>(FilterFunctionValues[j]) -
static_cast<double>(FilterFunctionValues[j - 1])) * invStep)
* (value - L_userStep * (j - 1));
- values.push_back(static_cast<WavelenghtSpectralBandType>(valueTemp));
+ values.push_back(static_cast<WavelengthSpectralBandType>(valueTemp));
++i;
- value = i * SIXSStepOfWavelenghtSpectralBandValues;
+ value = i * SIXSStepOfWavelengthSpectralBandValues;
}
- if (L_min + (i - 1) * SIXSStepOfWavelenghtSpectralBandValues != L_max)
+ if (L_min + (i - 1) * SIXSStepOfWavelengthSpectralBandValues != L_max)
{
values.push_back(0);
}
// Store this values
- WavelenghtSpectralBand->SetFilterFunctionValues6S(values);
+ WavelengthSpectralBand->SetFilterFunctionValues6S(values);
// Store the new Max MaxSpectralValue
- WavelenghtSpectralBand->SetMaxSpectralValue(static_cast<WavelenghtSpectralBandType>(L_min + i *
- SIXSStepOfWavelenghtSpectralBandValues));
+ WavelengthSpectralBand->SetMaxSpectralValue(static_cast<WavelengthSpectralBandType>(L_min + i *
+ SIXSStepOfWavelengthSpectralBandValues));
}
else
{
// Init with copy of FilterFunctionValues input vector values
- WavelenghtSpectralBand->SetFilterFunctionValues6S(FilterFunctionValues);
+ WavelengthSpectralBand->SetFilterFunctionValues6S(FilterFunctionValues);
}
}
diff --git a/Code/Radiometry/otbSIXSTraits.h b/Code/Radiometry/otbSIXSTraits.h
index 8e53c3663c..79a67d2c72 100644
--- a/Code/Radiometry/otbSIXSTraits.h
+++ b/Code/Radiometry/otbSIXSTraits.h
@@ -39,10 +39,10 @@ public:
/** Standard class typedefs. */
typedef SIXSTraits Self;
- typedef FilterFunctionValues WavelenghtSpectralType;
+ typedef FilterFunctionValues WavelengthSpectralType;
typedef AtmosphericCorrectionParameters::AerosolModelType AerosolModelType;
- typedef WavelenghtSpectralType::WavelenghtSpectralBandType WavelenghtSpectralBandType;
- typedef WavelenghtSpectralType::ValuesVectorType ValuesVectorType;
+ typedef WavelengthSpectralType::WavelengthSpectralBandType WavelengthSpectralBandType;
+ typedef WavelengthSpectralType::ValuesVectorType ValuesVectorType;
/** Call 6S main function */
static void ComputeAtmosphericParameters(
@@ -56,9 +56,9 @@ public:
const double WaterVaporAmount, /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
const double OzoneAmount, /** The Ozone amount (Stratospheric ozone layer content) */
const AerosolModelType& AerosolModel, /** The Aerosol model */
- const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
- WavelenghtSpectralType* WavelenghtSpectralBand, /** Wavelenght for the spectral band definition */
- /** Note : The Max wavelenght spectral band value must be updated ! */
+ const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelength 550-nm) */
+ WavelengthSpectralType* WavelengthSpectralBand, /** Wavelength for the spectral band definition */
+ /** Note : The Max wavelength spectral band value must be updated ! */
double& AtmosphericReflectance, /** Atmospheric reflectance */
double& AtmosphericSphericalAlbedo, /** atmospheric spherical albedo */
double& TotalGaseousTransmission, /** Total gaseous transmission */
@@ -75,12 +75,12 @@ public:
* the interval number between min and max.
* If the vector step is not at 0.0025, the new values are computed.
* The output vector values is store in the m_FilterFunctionValues6S
- * of WavelenghtSpectralBand
+ * of WavelengthSpectralBand
*
*/
- static void ComputeWavelenghtSpectralBandValuesFor6S(
- const double SIXSStepOfWavelenghtSpectralBandValues,
- WavelenghtSpectralType* WavelenghtSpectralBand
+ static void ComputeWavelengthSpectralBandValuesFor6S(
+ const double SIXSStepOfWavelengthSpectralBandValues,
+ WavelengthSpectralType* WavelengthSpectralBand
);
static void ComputeEnvironmentalContribution(const double diffuseTransmittanceForRayleighScattering,
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx
index 43f5f3634d..7135f45f8e 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx
@@ -158,7 +158,7 @@ SurfaceAdjacencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
- m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ m_CorrectionParameters->SetWavelengthSpectralBandWithIndex(i, functionValues);
}
}
diff --git a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
index 7fd42002ea..6d670797ac 100644
--- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -25,7 +25,7 @@
// Software Guide : BeginCommandLineArgs
// INPUTS: {Romania_Extract.tif}
// OUTPUTS: {AtmosphericCorrectionSequencement.tif}
-// ${OTB_DATA_ROOT}/Examples/atmosphericCorrectionSequencement_alpha_beta.txt ${OTB_DATA_ROOT}/Examples/atmosphericCorrectionSequencement_solar_illumination.txt ${OTB_DATA_ROOT}/Examples/atmosphericCorrectionSequencement_wavelenght_spectral_bands_spot4_1.txt 27.3 4 12 152.7 2.5 -77.0 1013. 2.48134 0.34400 1 0.199854 2 0.020
+// ${OTB_DATA_ROOT}/Examples/atmosphericCorrectionSequencement_alpha_beta.txt ${OTB_DATA_ROOT}/Examples/atmosphericCorrectionSequencement_solar_illumination.txt ${OTB_DATA_ROOT}/Examples/atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt 27.3 4 12 152.7 2.5 -77.0 1013. 2.48134 0.34400 1 0.199854 2 0.020
// Software Guide : EndCommandLineArgs
// Software Guide : BeginLatex
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
std::cerr << "Missing Parameters " << std::endl;
std::cerr << "Usage: " << argv[0] << std::endl;
std::cerr <<
- " inputImage outputImage atmosphericCorrectionSequencement_alpha_beta.txt atmosphericCorrectionSequencement_solar_illumination.txt atmosphericCorrectionSequencement_wavelenght_spectral_bands_spot4_1.txt SolarZenithalAngle day month SolarAzimuthalAngle ViewingZenithalAngle ViewingAzimuthalAngle AtmosphericPresure WaterVaporAmount OzoneAmount AerosolModel AerosolOpticalThickness WindowRadiusForAdjacencyCorrection PixelSpacing"
+ " inputImage outputImage atmosphericCorrectionSequencement_alpha_beta.txt atmosphericCorrectionSequencement_solar_illumination.txt atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt SolarZenithalAngle day month SolarAzimuthalAngle ViewingZenithalAngle ViewingAzimuthalAngle AtmosphericPresure WaterVaporAmount OzoneAmount AerosolModel AerosolOpticalThickness WindowRadiusForAdjacencyCorrection PixelSpacing"
<< std::endl;
std::cerr << std::endl;
return 1;
@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
functionValues->SetMinSpectralValue(minSpectralValue);
functionValues->SetMaxSpectralValue(maxSpectralValue);
functionValues->SetUserStep(userStep);
- dataAtmosphericCorrectionParameters->SetWavelenghtSpectralBandWithIndex(
+ dataAtmosphericCorrectionParameters->SetWavelengthSpectralBandWithIndex(
i,
functionValues);
}
diff --git a/Examples/Radiometry/CMakeLists.txt b/Examples/Radiometry/CMakeLists.txt
index c1fb422c6d..b2fbe85617 100644
--- a/Examples/Radiometry/CMakeLists.txt
+++ b/Examples/Radiometry/CMakeLists.txt
@@ -94,7 +94,7 @@ ADD_TEST(raTeAtmosphericCorrectionSequencementTest ${EXE_TESTS}
${TEMP}/Example_RomaniaAtmosphericCorrectionSequencement.tif
${INPUTDATA}/atmosphericCorrectionSequencement_alpha_beta.txt
${INPUTDATA}/atmosphericCorrectionSequencement_solar_illumination.txt
- ${INPUTDATA}/atmosphericCorrectionSequencement_wavelenght_spectral_bands_spot4_1.txt
+ ${INPUTDATA}/atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt
# ImageToLuminance parameters
# LuminanceToReflectance parameters
diff --git a/Testing/Code/Radiometry/CMakeLists.txt b/Testing/Code/Radiometry/CMakeLists.txt
index 60dd7a9481..efb6c71131 100644
--- a/Testing/Code/Radiometry/CMakeLists.txt
+++ b/Testing/Code/Radiometry/CMakeLists.txt
@@ -444,10 +444,10 @@ ADD_TEST(raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter ${RADIOMET
${BASELINE}/raTvRomania_Reflectance.tif
${TEMP}/raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.tif
${INPUTDATA}/romania_parameter.txt # atmo param;
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt # wavelenghts, channel 3
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt # wavelenghts, channel 2
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt # wavelenghts, channel 1
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt # wavelenghts, channel 4
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt # wavelengths, channel 3
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt # wavelengths, channel 2
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt # wavelengths, channel 1
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt # wavelengths, channel 4
)
# ------- otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter ------------------------------
@@ -466,10 +466,10 @@ ADD_TEST(raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter ${RADIOMETRY_TESTS3}
2 # Radius;
0.020 # pixel spacing in kilometers
${INPUTDATA}/romania_parameter.txt # atmo param;
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt # wavelenghts, channel 3
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt # wavelenghts, channel 2
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt # wavelenghts, channel 1
- ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt # wavelenghts, channel 4
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt # wavelengths, channel 3
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt # wavelengths, channel 2
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt # wavelengths, channel 1
+ ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt # wavelengths, channel 4
# FOR plateform verification only : to remove when OK
${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
)
@@ -513,7 +513,7 @@ ADD_TEST(raTvAtmosphericCorrectionSequencementTest ${RADIOMETRY_TESTS4}
0.34400
1
0.199854
- ${INPUTDATA}/atmosphericCorrectionSequencement_wavelenght_spectral_bands_spot4_1.txt
+ ${INPUTDATA}/atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt
# ReflectanceToSurfaceReflectance parameters
# SurfaceAdjacencyEffect6SCorrectionSchemeFilter parameters
2 # Radius;
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
index 95fb500941..c5dd894400 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
@@ -35,7 +35,7 @@ int otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms(int argc, ch
typedef otb::AtmosphericRadiativeTerms RadiativeTermsType;
typedef CorrectionParametersType::AerosolModelType AerosolModelType;
typedef otb::FilterFunctionValues FilterFunctionValuesType;
- typedef FilterFunctionValuesType::WavelenghtSpectralBandType ValueType;
+ typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType;
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType;
// Instantiating object
@@ -101,7 +101,7 @@ int otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms(int argc, ch
functionValues->SetMinSpectralValue(minSpectralValue);
functionValues->SetMaxSpectralValue(maxSpectralValue);
functionValues->SetUserStep(val);
- param->SetWavelenghtSpectralBandWithIndex(0, functionValues);
+ param->SetWavelengthSpectralBandWithIndex(0, functionValues);
//}
//aerosolModel = static_cast<AerosolModelType>(::atoi(argv[16]));
@@ -165,13 +165,13 @@ int otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms(int argc, ch
fout << " -----> MaxSpectralValue update : " << functionValues->GetMaxSpectralValue() <<
std::endl;
fout << " ---------------------------------------------------------" << std::endl;
- fout << "Input wavelenght band values [" << functionValues->GetFilterFunctionValues().size() << "]:" << std::endl;
+ fout << "Input wavelength band values [" << functionValues->GetFilterFunctionValues().size() << "]:" << std::endl;
for (unsigned int i = 0; i < functionValues->GetFilterFunctionValues().size(); i++)
{
fout << " " << functionValues->GetFilterFunctionValues()[i] << std::endl;
}
fout << " ---------------------------------------------------------" << std::endl;
- fout << "Output wavelenght band values 6S [" << functionValues->GetFilterFunctionValues6S().size() << "]:" <<
+ fout << "Output wavelength band values 6S [" << functionValues->GetFilterFunctionValues6S().size() << "]:" <<
std::endl;
for (unsigned int i = 0; i < functionValues->GetFilterFunctionValues6S().size(); i++)
{
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index bb4d868db3..3969bbb7db 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -48,7 +48,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
std::cerr << " atmosphericPressure , waterVaporAmount , ozoneAmount , aerosolModel , AerosolOptical," <<
std::endl;
std::cerr <<
- " wavelenghtSpectralBandFileName , adjacencyEffect6SCorrectionWindowRadius, pixelSpacingInKilometers" << std::endl;
+ " wavelengthSpectralBandFileName , adjacencyEffect6SCorrectionWindowRadius, pixelSpacingInKilometers" << std::endl;
std::cerr << std::endl;
return 1;
}
@@ -173,7 +173,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
functionValues->SetMinSpectralValue(minSpectralValue);
functionValues->SetMaxSpectralValue(maxSpectralValue);
functionValues->SetUserStep(userStep);
- dataAtmosphericCorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ dataAtmosphericCorrectionParameters->SetWavelengthSpectralBandWithIndex(i, functionValues);
}
fin.close();
diff --git a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
index 29933e3cc1..c81dc08000 100644
--- a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
+++ b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
@@ -28,7 +28,7 @@
int otbFilterFunctionValuesTest(int argc, char * argv[])
{
char * outname = argv[1];
- const double SIXSStepOfWavelenghtSpectralBandValues(0.0025);
+ const double SIXSStepOfWavelengthSpectralBandValues(0.0025);
typedef otb::FilterFunctionValues FilterFunctionValuesType;
// Instantiating object
@@ -46,8 +46,8 @@ int otbFilterFunctionValuesTest(int argc, char * argv[])
object->SetFilterFunctionValues(vect);
// Call interpolate
- otb::SIXSTraits::ComputeWavelenghtSpectralBandValuesFor6S(
- SIXSStepOfWavelenghtSpectralBandValues,
+ otb::SIXSTraits::ComputeWavelengthSpectralBandValuesFor6S(
+ SIXSStepOfWavelengthSpectralBandValues,
object);
// Writing output file
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
index 29de9896f1..8f56bb7604 100644
--- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
@@ -51,7 +51,7 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int argc, char *
typedef otb::AtmosphericRadiativeTerms RadiativeTermsType;
typedef otb::FilterFunctionValues FilterFunctionValuesType;
typedef CorrectionParametersType::AerosolModelType AerosolModelType;
- typedef FilterFunctionValuesType::WavelenghtSpectralBandType ValueType;
+ typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType;
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType;
RadiativeTermsType::Pointer radiative = RadiativeTermsType::New();
@@ -143,7 +143,7 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int argc, char *
functionValues->SetMaxSpectralValue(maxSpectralValue);
functionValues->SetUserStep(val);
- param->SetWavelenghtSpectralBandWithIndex(j, functionValues);
+ param->SetWavelengthSpectralBandWithIndex(j, functionValues);
}
corrToRadia->SetInput(param);
diff --git a/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx b/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
index 2eb88b7f36..35838e39e8 100644
--- a/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
+++ b/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
@@ -157,13 +157,13 @@ int otbSIXSTraitsComputeAtmosphericParametersTest(int argc, char * argv[])
fout << " -----> MaxSpectralValue update : " << functionValues->GetMaxSpectralValue() <<
std::endl;
fout << " ---------------------------------------------------------" << std::endl;
- fout << "Input wavelenght band values [" << functionValues->GetFilterFunctionValues().size() << "]:" << std::endl;
+ fout << "Input wavelength band values [" << functionValues->GetFilterFunctionValues().size() << "]:" << std::endl;
for (unsigned int i = 0; i < functionValues->GetFilterFunctionValues().size(); i++)
{
fout << " " << functionValues->GetFilterFunctionValues()[i] << std::endl;
}
fout << " ---------------------------------------------------------" << std::endl;
- fout << "Output wavelenght band values 6S [" << functionValues->GetFilterFunctionValues6S().size() << "]:" <<
+ fout << "Output wavelength band values 6S [" << functionValues->GetFilterFunctionValues6S().size() << "]:" <<
std::endl;
for (unsigned int i = 0; i < functionValues->GetFilterFunctionValues6S().size(); i++)
{
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
index acde128ed3..316f4d3b1f 100644
--- a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
+++ b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.cxx
@@ -54,7 +54,7 @@ int otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter(int argc, char * argv[])
typedef otb::AtmosphericRadiativeTerms RadiativeTermsType;
typedef otb::FilterFunctionValues FilterFunctionValuesType;
typedef CorrectionParametersType::AerosolModelType AerosolModelType;
- typedef FilterFunctionValuesType::WavelenghtSpectralBandType ValueType;
+ typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType;
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType;
RadiativeTermsType::Pointer radiative = RadiativeTermsType::New();
@@ -150,7 +150,7 @@ int otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter(int argc, char * argv[])
functionValues->SetMaxSpectralValue(maxSpectralValue);
functionValues->SetUserStep(val);
- param->SetWavelenghtSpectralBandWithIndex(j, functionValues);
+ param->SetWavelengthSpectralBandWithIndex(j, functionValues);
}
corrToRadia->SetInput(param);
diff --git a/Testing/Utilities/6SFunctionMainTest.cxx b/Testing/Utilities/6SFunctionMainTest.cxx
index df3f838e60..b2631b92ff 100644
--- a/Testing/Utilities/6SFunctionMainTest.cxx
+++ b/Testing/Utilities/6SFunctionMainTest.cxx
@@ -49,7 +49,7 @@ int SIXSFunctionMainOtbTest( int argc, char *argv[] )
otb_6s_integer iinf(0), isup(0);
const unsigned int S_SIZE=1501;
- std::vector<otb_6s_doublereal> vector_wavelenght;
+ std::vector<otb_6s_doublereal> vector_wavelength;
std::ifstream fin;
std::ofstream fout;
@@ -76,7 +76,7 @@ int SIXSFunctionMainOtbTest( int argc, char *argv[] )
while (fin.good())
{
fin >> value;
- vector_wavelenght.push_back(value);
+ vector_wavelength.push_back(value);
}
fin.close();
@@ -92,7 +92,7 @@ int SIXSFunctionMainOtbTest( int argc, char *argv[] )
otb_6s_integer cpt=iinf-1;
for(unsigned int i=0 ; cpt<isup ; i++)
{
- s[cpt] = vector_wavelenght[i];
+ s[cpt] = vector_wavelength[i];
cpt++;
}
@@ -149,10 +149,10 @@ int SIXSFunctionMainOtbTest( int argc, char *argv[] )
fout << " -----> upward diffuse transmittance for rayleigh : "<<tdif_up_ray<<std::endl;
fout << " -----> upward diffuse transmittance for aerosols : "<<tdif_up_aer<<std::endl;
fout <<" ---------------------------------------------------------"<<std::endl;
- fout << " -----> Inputs wavelenght values ["<<vector_wavelenght.size()<<"]"<<std::endl;
- for(unsigned int i=0 ; i<vector_wavelenght.size() ; i++)
+ fout << " -----> Inputs wavelength values ["<<vector_wavelength.size()<<"]"<<std::endl;
+ for(unsigned int i=0 ; i<vector_wavelength.size() ; i++)
{
- fout << " "<<vector_wavelenght[i]<<std::endl;
+ fout << " "<<vector_wavelength[i]<<std::endl;
}
fout.close();
--
GitLab