From 0eb3189c57a150460c2f0d0a2733b220cb154733 Mon Sep 17 00:00:00 2001 From: gconesab Date: Wed, 20 Aug 2014 11:34:31 +0200 Subject: [PATCH] Move data member fFixTau from AliCaloRawAnalyzerFitter to the mother class --- EMCAL/AliCaloRawAnalyzer.cxx | 15 +++++---------- EMCAL/AliCaloRawAnalyzer.h | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/EMCAL/AliCaloRawAnalyzer.cxx b/EMCAL/AliCaloRawAnalyzer.cxx index bdec18b523c..60f7c67b641 100644 --- 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 261d5822020..5aa5b979311 100644 --- 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 &/*bunchvector*/, const UInt_t /*altrocfg1*/, const UInt_t /*altrocfg2*/ ) = 0; @@ -90,9 +90,13 @@ public: int SelectBunch( const std::vector &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) }; -- 2.43.0