Skip to content
Snippets Groups Projects
Commit a89f1ced authored by Gaëlle USSEGLIO's avatar Gaëlle USSEGLIO
Browse files

Merge branch 'v1.1.0' into diapotb-2.0

parents 1a3920d6 7fb83858
No related branches found
No related tags found
2 merge requests!57Update to OTB V8,!56Update to OTB v8
......@@ -132,17 +132,15 @@ protected:
// Destructor
virtual ~SARDerampS1IWImageFilter() ITK_OVERRIDE;
void getAllCoefs(ImageKeywordlist const& kwl, std::vector<FMRateRecordType> & FMRateRecords);
void getAllCoefs(ImageKeywordlist const& kwl, std::vector<DCFRecordType> & DCFRecords);
long double applyFMRateCoefs(double index_sample);
long double applyDCFCoefs(double index_sample);
double getPhi(double indL, double indC);
void ThreadInit(ImageKeywordlist inputKWL);
double getPhi(double indL, double indC) override;
void ThreadInit(ImageKeywordlist inputKWL) override;
private:
SARDerampS1IWImageFilter(const Self&); // purposely not implemented
void operator=(const Self &); // purposely not
......@@ -152,10 +150,10 @@ protected:
bool selectDCFCoef();
// Parameters coefficients for Doppler FM Rate
double m_FM_C0, m_FM_C1, m_FM_C2,m_FM_Tau0;
double m_FM_C0, m_FM_C1, m_FM_C2, m_FM_Tau0;
// Parameters coefficients for Doppler Centroid Frequency
double m_DCF_C0, m_DCF_C1, m_DCF_C2,m_DCF_Tau0;
double m_DCF_C0, m_DCF_C1, m_DCF_C2, m_DCF_Tau0;
const double C = 299792458;
......
......@@ -40,7 +40,7 @@ namespace otb
*/
template <class TImage>
SARDerampS1IWImageFilter< TImage >::SARDerampS1IWImageFilter()
: m_FM_C0(0), m_FM_C1(0), m_FM_C2(0), m_DCF_C0(0), m_DCF_C1(0), m_DCF_C2(0),m_FM_Tau0(0), m_DCF_Tau0(0)
: m_FM_C0(0), m_FM_C1(0), m_FM_C2(0), m_FM_Tau0(0), m_DCF_C0(0), m_DCF_C1(0), m_DCF_C2(0), m_DCF_Tau0(0)
{
// Inputs required and/or needed
this->SetNumberOfRequiredInputs(1);
......
......@@ -35,7 +35,7 @@
namespace otb
{
/** \class SARDerampImageFilter
/** \class SARDerampTSXImageFilter
* \brief Deramps or Reramps a TSX product.
*
* This filter deramps or reramps an input mono-burst.
......@@ -129,21 +129,20 @@ protected:
// Destructor
virtual ~SARDerampTSXImageFilter() ITK_OVERRIDE;
// method to get FM parameter
double getFM();
// method to get the estimated frequency and time values from Doppler Centroid
double getFDC(double indC,char index);
TimeType getTDC(double fdc,char index);
double getFDC(double indC, char index);
TimeType getTDC(double fdc, char index);
// method to get the difference in azimuth time
TimeType getAzTimeL(double indL);
// method to compute and get the phi angle
double getPhi(double indL, double indC);
double getPhi(double indL, double indC) override;
// method to initialize all the parameters needed to get the phi
void ThreadInit(ImageKeywordlist inputKWL);
private:
void ThreadInit(ImageKeywordlist inputKWL) override;
private:
SARDerampTSXImageFilter(const Self&); // purposely not implemented
void operator=(const Self &); // purposely not
......
......@@ -61,14 +61,14 @@ namespace otb
::setPolynomeFMRate(ImageKeywordlist const& kwl, std::vector<FMRateRecordType> & FMRateRecords)
{
char fmRatePrefix_[1024];
std::size_t firstInd(1);
std::size_t nbLists(0);
nbLists = std::stoi(kwl.GetMetadataByKey("azimuthFmRate.azi_fm_rate_coef_nb_list"));
std::string FM_PREFIX = "azimuthFmRate.azi_fm_rate_coef_list";
//set coefficient for 1st polynome FMRate
const int pos1 = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), 1);
const int pos1 = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), firstInd);
assert(pos1 > 0 && (unsigned long) pos1 < sizeof(fmRatePrefix_));
const std::string FMPrefix1(fmRatePrefix_, pos1);
FMRateRecordType fmRateRecord1;
......@@ -90,14 +90,14 @@ namespace otb
::setPolynomeDCF(ImageKeywordlist const& kwl, std::vector<DCFRecordType> & DCFRecords)
{
char dcfPrefix_[1024];
std::size_t firstInd(1);
std::size_t nbLists(0);
nbLists = std::stoi(kwl.GetMetadataByKey("dopplerCentroid.dop_coef_nb_list"));
std::string DCF_PREFIX = "dopplerCentroid.dop_coef_list";
//set coefficients for 1st polynome DCF
const int pos1 = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), 1);
const int pos1 = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), firstInd);
assert(pos1 > 0 && (unsigned long) pos1 < sizeof(dcfPrefix_));
const std::string DCFPrefix1(dcfPrefix_, pos1);
DCFRecordType dcfRecord1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment