Move data member fFixTau from AliCaloRawAnalyzerFitter to the mother class

diff --git a/EMCAL/AliCaloRawAnalyzer.cxx b/EMCAL/AliCaloRawAnalyzer.cxx
index bdec18b523c47ffd4c60f83b5a787fb5d2892cd4..60f7c67b641e0924d5cd3e47f9b055a4b33a9a47 100644 (file)
--- a/EMCAL/AliCaloRawAnalyzer.cxx
+++ b/EMCAL/AliCaloRawAnalyzer.cxx
@@ -49,13 +49,13 @@ AliCaloRawAnalyzer::AliCaloRawAnalyzer(const char *name, const char *nameshort)
   fL1Phase(0),
   fAmp(0),
   fTof(0),
-  fTau( EMCAL::TAU )
+  fTau( EMCAL::TAU ),
+  fFixTau( true )
 {
-  //Comment 
-  snprintf(fName, 256,"%s", name);
+  // Ctor
+  
+  snprintf(fName,     256, "%s", name);
   snprintf(fNameShort,256, "%s", nameshort);
-  //  sprintf(fName ,"%s", name);
-  // sprintf(fNameShort, "%s", nameshort);
   
   for(int i=0; i < ALTROMAXSAMPLES; i++ )
     {
@@ -63,11 +63,6 @@ AliCaloRawAnalyzer::AliCaloRawAnalyzer(const char *name, const char *nameshort)
     }
 }
 
-AliCaloRawAnalyzer::~AliCaloRawAnalyzer()
-{
-
-}
-
 
 void 
 AliCaloRawAnalyzer::SetTimeConstraint(const int min, const int max ) 

diff --git a/EMCAL/AliCaloRawAnalyzer.h b/EMCAL/AliCaloRawAnalyzer.h
index 261d5822020b41e355a15088285f95157794a0a5..5aa5b979311fcf1dfc3b96926930ce573361d5c2 100644 (file)
--- a/EMCAL/AliCaloRawAnalyzer.h
+++ b/EMCAL/AliCaloRawAnalyzer.h
@@ -40,7 +40,7 @@ class  AliCaloRawAnalyzer : public TObject
 {
 public:
   AliCaloRawAnalyzer(const char *name="AliCaloRawAnalyzer", const char *nameshort="RawAna");
-  virtual ~AliCaloRawAnalyzer();
+  virtual ~AliCaloRawAnalyzer() { ; }
 
   virtual AliCaloFitResults Evaluate( const std::vector<AliCaloBunchInfo> &/*bunchvector*/, 
                                      const UInt_t /*altrocfg1*/,  const UInt_t /*altrocfg2*/ )  = 0;
@@ -90,9 +90,13 @@ public:
   int  SelectBunch( const std::vector<AliCaloBunchInfo> &bunchvector, short *const maxampbin, short *const maxamplitude );
   void SelectSubarray( const Double_t *date, const int length, const short maxindex, int *const  first, int *const last, const int cut) const;
   Float_t EvaluatePedestal(const UShort_t * const data, const int length ) const;
-  Float_t GetTau() const           { return fTau;};
-  void SetTau( const Float_t tau ) { fTau =tau ;}; 
   
+  // Used in AliCaloRawAnalyzerFitter
+  Float_t GetTau()         const { return fTau    ; }
+  void    SetTau   (Float_t tau) { fTau = tau     ; }
+  Bool_t  GetFixTau()      const { return fFixTau ; }
+  void    SetFixTau(Bool_t b)    { fFixTau = b    ; }
+
 protected:
   Double_t fReversed[ALTROMAXSAMPLES]; //Reversed sequence of samples (pedestalsubtracted)
   int fMinTimeIndex; //The timebin of the max signal value must be between fMinTimeIndex and fMaxTimeIndex
@@ -108,10 +112,12 @@ protected:
   char fNameShort[256]; // Abbrevation for the name
   Algo::fitAlgorithm fAlgo; // Which algorithm to use
   Double_t fL1Phase; // Phase of the ADC sampling clock relative to the LHC clock
-  Double_t fAmp; // The amplitude in entities of ADC counts
-  Double_t fTof; // The amplitude in entities of ADC counts
-  Float_t fTau;  // Rise time of the signal (peak position = t0 +tau), by defauly it is 235 ns
-  ClassDef(AliCaloRawAnalyzer, 2)  
+  Double_t fAmp;     // The amplitude in entities of ADC counts
+  Double_t fTof;     // The amplitude in entities of ADC counts
+  Float_t  fTau;     // Rise time of the signal (peak position = t0 +tau), by defauly it is 235 ns
+  Bool_t   fFixTau;  // Fixed fit parameter or not, used in AliCaloRawAnalyzerFitter
+  
+  ClassDef(AliCaloRawAnalyzer, 3)
 
 };