Commit cf2ab0aa authored by Jonathan Guinet's avatar Jonathan Guinet
Browse files

ENH : constant and struct name modification.

parent e9dcb9ae
......@@ -21,7 +21,7 @@
namespace otb
{
const dataSpec dataSpecP5B[] = {
const DataSpec DataSpecP5B[] = {
{ 400, 1.4955, 2.676E-02, 2.895E-01, 5.272E-01, 5.800E-05, 1.097E+02, 5.910E-01, 2.413E+00, 2.377E-01, 3.208E-02 },
{ 401, 1.4958, 3.113E-02, 2.796E-01, 5.262E-01, 5.852E-05, 1.037E+02, 5.980E-01, 2.413E+00, 2.373E-01, 3.195E-02 },
......
......@@ -44,7 +44,7 @@ namespace otb
// and used with his autorization.
// ***********************************************************************
struct dataSpec {
struct DataSpec {
double lambda;
double refLeafMatInd;
double chlAbsCoef;
......@@ -58,7 +58,7 @@ struct dataSpec {
double wetSoil;
};
extern const dataSpec dataSpecP5B[2101];
extern const DataSpec DataSpecP5B[2101];
}
......
......@@ -145,14 +145,14 @@ ProspectModel
Cw = leafParameters->GetCw();
Cm = leafParameters->GetCm();
int nbdata = sizeof(dataSpecP5B) / sizeof(dataSpec);
int nbdata = sizeof(DataSpecP5B) / sizeof(DataSpec);
for (int i = 0; i < nbdata; i++)
{
lambda = dataSpecP5B[i].lambda;
n = dataSpecP5B[i].refLeafMatInd;
lambda = DataSpecP5B[i].lambda;
n = DataSpecP5B[i].refLeafMatInd;
k = Cab*dataSpecP5B[i].chlAbsCoef+Car*dataSpecP5B[i].carAbsCoef+CBrown*dataSpecP5B[i].brownAbsCoef+Cw*dataSpecP5B[i].waterAbsCoef;
k = k + Cm*dataSpecP5B[i].dryAbsCoef;
k = Cab*DataSpecP5B[i].chlAbsCoef+Car*DataSpecP5B[i].carAbsCoef+CBrown*DataSpecP5B[i].brownAbsCoef+Cw*DataSpecP5B[i].waterAbsCoef;
k = k + Cm*DataSpecP5B[i].dryAbsCoef;
k = k / N;
if(k == itk::NumericTraits<double>::ZeroValue() ) k=EPSILON;
......
......@@ -269,14 +269,14 @@ SailModel
double alf, sumint, fhot, x1, y1, f1, fint, x2, y2, f2;
double resh, resv;
int nbdata = sizeof(dataSpecP5B) / sizeof(dataSpec);
int nbdata = sizeof(DataSpecP5B) / sizeof(DataSpec);
for (int i = 0; i < nbdata; i++)
{
lambda = dataSpecP5B[i].lambda;
Es = dataSpecP5B[i].directLight; //8
Ed = dataSpecP5B[i].diffuseLight; //9
Rsoil1 = dataSpecP5B[i].drySoil; //10
Rsoil2 = dataSpecP5B[i].wetSoil; //11
lambda = DataSpecP5B[i].lambda;
Es = DataSpecP5B[i].directLight; //8
Ed = DataSpecP5B[i].diffuseLight; //9
Rsoil1 = DataSpecP5B[i].drySoil; //10
Rsoil2 = DataSpecP5B[i].wetSoil; //11
rho = inRefl->GetResponse()[i].second; //rho = LRT[1][i];
tau = inTrans->GetResponse()[i].second; //tau = LRT[2][i];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment