ENH : polynomial coefs save inside vectors instead of multiple independent attributes (SARDeramp)

include/otbSARDerampTSXImageFilter.h

@@ -55,9 +55,9 @@
 namespace otb
 {
 /** \class SARDerampImageFilter 
- * \brief Deramps or Reramps a burst from Sentinel-1 IW product. 
+ * \brief Deramps or Reramps a TSX product. 
  * 
- * This filter deramps or reramps an input burst.
+ * This filter deramps or reramps an input mono-burst.
  *
  * \ingroup DiapOTBModule
  */
@@ -158,29 +158,28 @@ protected:
  
   
 
-
+  // 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);
+  // 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);
+  // method to initialize all the parameters needed to get the phi 
   void ThreadInit(ImageKeywordlist inputKWL); 
  private:
   SARDerampTSXImageFilter(const Self&); // purposely not implemented
   void operator=(const Self &); // purposely not 
 
   // Set Polynomial Coefficient for Centroid and FMRate polynomes
-  void setPolynomeFMRate(ImageKeywordlist  const& kwl);
-  void setPolynomeDCF(ImageKeywordlist  const& kwl);
-
-  // Parameters coefficients for Doppler FM Rate
-  double m_FM1_C0;
-  double m_FMN_C0;
+  void setPolynomeFMRate(ImageKeywordlist  const& kwl, std::vector<FMRateRecordType> & FMRateRecords);
+  void setPolynomeDCF(ImageKeywordlist  const& kwl, std::vector<DCFRecordType> & DCFRecords);
 
-  // Parameters coefficients for Doppler Centroid Frequency
-  double m_DCF1_C0, m_DCF1_C1, m_DCF1_Tau0;
-  double m_DCFN_C0, m_DCFN_C1, m_DCFN_Tau0;
-  TimeType m_TDC1_raw,m_TDCN_raw;
+  // List of polynoms for FMRate and Doppler Centroid
+  std::vector<FMRateRecordType> FMRatePolynoms;
+  std::vector<DCFRecordType> DCFPolynoms;
 
   // Parameter average
   double m_FM;

include/otbSARDerampTSXImageFilter.txx

@@ -49,9 +49,6 @@ namespace otb
    */
   template <class TImage> 
   SARDerampTSXImageFilter< TImage >::SARDerampTSXImageFilter()
-    :  m_FM1_C0(0), m_DCF1_C0(0), m_DCF1_C1(0), m_DCF1_Tau0(0),
-       m_FMN_C0(0), m_DCFN_C0(0), m_DCFN_C1(0), m_DCFN_Tau0(0),
-       m_FM(0), m_PRF(0), m_TDC1_raw(0), m_TDCN_raw(0)
   {
     // Inputs required and/or needed
     this->SetNumberOfRequiredInputs(1);
@@ -68,10 +65,11 @@ namespace otb
   }
 
 
+
   template<class TImage>
   void
   SARDerampTSXImageFilter< TImage >
-  ::setPolynomeFMRate(ImageKeywordlist  const& kwl)
+  ::setPolynomeFMRate(ImageKeywordlist  const& kwl, std::vector<FMRateRecordType> & FMRateRecords)
   {
     char fmRatePrefix_[1024];
     std::size_t nbLists(0);
@@ -84,20 +82,23 @@ namespace otb
     const int pos1 = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), 1);
     assert(pos1 > 0 && (unsigned long) pos1 < sizeof(fmRatePrefix_));
     const std::string FMPrefix1(fmRatePrefix_, pos1);
-    this->m_FM1_C0 = std::stod(kwl.GetMetadataByKey(FMPrefix1 + "1.azi_fm_rate_coef"));
-    
+    FMRateRecordType fmRateRecord1;
+    fmRateRecord1.coef0FMRate = std::stod(kwl.GetMetadataByKey(FMPrefix1 + "1.azi_fm_rate_coef"));
+    FMRateRecords.push_back(fmRateRecord1);
     
     //set coefficient for last polynome FMRate
     const int posn = sprintf(fmRatePrefix_, "%s%zu.", FM_PREFIX.c_str(), nbLists);
     assert(posn > 0 && (unsigned long) posn < sizeof(fmRatePrefix_));
     const std::string FMPrefixn(fmRatePrefix_, posn);
-    this->m_FMN_C0 = std::stod(kwl.GetMetadataByKey(FMPrefixn + "1.azi_fm_rate_coef"));
+    FMRateRecordType fmRateRecordn;
+    fmRateRecordn.coef0FMRate = std::stod(kwl.GetMetadataByKey(FMPrefixn + "1.azi_fm_rate_coef"));
+    FMRateRecords.push_back(fmRateRecordn);
   }
 
   template<class TImage>
   void
   SARDerampTSXImageFilter< TImage >
-  ::setPolynomeDCF(ImageKeywordlist  const& kwl)
+  ::setPolynomeDCF(ImageKeywordlist  const& kwl, std::vector<DCFRecordType> & DCFRecords)
   {
     char dcfPrefix_[1024];
     std::size_t nbLists(0);
@@ -110,21 +111,26 @@ namespace otb
     const int pos1 = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), 1);
     assert(pos1 > 0 && (unsigned long) pos1 < sizeof(dcfPrefix_));
     const std::string DCFPrefix1(dcfPrefix_, pos1);
+    DCFRecordType dcfRecord1;
 
-    this->m_TDC1_raw = ossimplugins::time::toModifiedJulianDate(kwl.GetMetadataByKey(DCFPrefix1 + "dop_coef_time"));
-    this->m_DCF1_C0 = std::stod(kwl.GetMetadataByKey(DCFPrefix1 + "1.dop_coef"));
-    this->m_DCF1_C1 = std::stod(kwl.GetMetadataByKey(DCFPrefix1 + "2.dop_coef"));
-    this->m_DCF1_Tau0 = std::stod(kwl.GetMetadataByKey(DCFPrefix1 + "slant_range_time"));
+    dcfRecord1.azimuthDCFTime = ossimplugins::time::toModifiedJulianDate(kwl.GetMetadataByKey(DCFPrefix1 + "dop_coef_time"));
+    dcfRecord1.coef0DCF = std::stod(kwl.GetMetadataByKey(DCFPrefix1 + "1.dop_coef"));
+    dcfRecord1.coef1DCF = std::stod(kwl.GetMetadataByKey(DCFPrefix1 + "2.dop_coef"));
+    dcfRecord1.tau0DCF = std::stod(kwl.GetMetadataByKey(DCFPrefix1 + "slant_range_time"));
 
+    DCFRecords.push_back(dcfRecord1);
     //set coefficients for last polynome DCF
     const int posn = sprintf(dcfPrefix_, "%s%zu.", DCF_PREFIX.c_str(), nbLists);
     assert(posn > 0 && (unsigned long) posn < sizeof(dcfPrefix_));
     const std::string DCFPrefixn(dcfPrefix_, posn);
+    DCFRecordType dcfRecordn;
 
-    this->m_TDCN_raw = ossimplugins::time::toModifiedJulianDate(kwl.GetMetadataByKey(DCFPrefixn + "dop_coef_time"));
-    this->m_DCFN_C0 = std::stod(kwl.GetMetadataByKey(DCFPrefixn + "1.dop_coef"));
-    this->m_DCFN_C1 = std::stod(kwl.GetMetadataByKey(DCFPrefixn + "2.dop_coef"));
-    this->m_DCFN_Tau0 = std::stod(kwl.GetMetadataByKey(DCFPrefixn + "slant_range_time"));
+    dcfRecordn.azimuthDCFTime = ossimplugins::time::toModifiedJulianDate(kwl.GetMetadataByKey(DCFPrefixn + "dop_coef_time"));
+    dcfRecordn.coef0DCF = std::stod(kwl.GetMetadataByKey(DCFPrefixn + "1.dop_coef"));
+    dcfRecordn.coef1DCF = std::stod(kwl.GetMetadataByKey(DCFPrefixn + "2.dop_coef"));
+    dcfRecordn.tau0DCF = std::stod(kwl.GetMetadataByKey(DCFPrefixn + "slant_range_time"));
+    
+    DCFRecords.push_back(dcfRecordn);
      
   }
 
@@ -138,7 +144,7 @@ namespace otb
   {
     double FM(0);
 
-    FM = (m_FM1_C0 + m_FMN_C0)/2;
+    FM = (this->FMRatePolynoms.front().coef0FMRate + this->FMRatePolynoms.back().coef0FMRate)/2.;
 
     return FM;
 
@@ -175,10 +181,10 @@ namespace otb
     double slant_range_time = this->m_FirstRangeTime + (indC / this->m_RangeSamplingRate);
     
     if(index == '1'){
-      fdc = m_DCF1_C0 + m_DCF1_C1*(slant_range_time - m_DCF1_Tau0);
+      fdc = this->DCFPolynoms.front().coef0DCF + this->DCFPolynoms.front().coef1DCF*(slant_range_time - this->DCFPolynoms.front().tau0DCF);
     }
     else if(index == 'N'){
-      fdc = m_DCFN_C0 + m_DCFN_C1*(slant_range_time - m_DCFN_Tau0);
+      fdc = this->DCFPolynoms.back().coef0DCF + this->DCFPolynoms.back().coef1DCF*(slant_range_time - this->DCFPolynoms.back().tau0DCF);
     }
     
 
@@ -200,10 +206,10 @@ namespace otb
 
     
     if(index == '1'){
-      tdc = m_TDC1_raw - seconds(fdc/m_FM);
+      tdc = this->DCFPolynoms.front().azimuthDCFTime - seconds(fdc/m_FM);
     }
     else if(index == 'N'){
-      tdc = m_TDCN_raw - seconds(fdc/m_FM);
+      tdc = this->DCFPolynoms.back().azimuthDCFTime - seconds(fdc/m_FM);
     }
     
 
@@ -219,8 +225,7 @@ namespace otb
   SARDerampTSXImageFilter<TImage>
   ::getPhi(double indL, double indC)
   {
-    // Zero Doppler azimuth Time
-    //double aziTime = this->getAzTimeL(indL); // zero-Doppler azimuth time centered in the middle of the burst
+    // Difference in azimuth time
     double azi_diff = indL/this->m_PRF;
     // FDC
     double fdc1 = this->getFDC(indC,'1');
@@ -252,8 +257,8 @@ namespace otb
 	this->m_FirstRangeTime = std::stod(inputKWL.GetMetadataByKey("support_data.slant_range_to_first_pixel"));
 	this->m_RangeSamplingRate = std::stod(inputKWL.GetMetadataByKey("support_data.range_sampling_rate"));
 	
-	this->setPolynomeFMRate(inputKWL);
-	this->setPolynomeDCF(inputKWL);
+	this->setPolynomeFMRate(inputKWL,this->FMRatePolynoms);
+	this->setPolynomeDCF(inputKWL,this->DCFPolynoms);
 	this->m_PRF = std::stod(inputKWL.GetMetadataByKey("support_data.pulse_repetition_frequency"));
 	this->m_FM = this->getFM();