Refactoring: Removal of dead code, making

AliCaloRawAnalyzerFastFit.h inherit fro AliCaloRawAnalyzerFitter.h
in order to use common variables defiend in that class.

diff --git a/EMCAL/AliCaloRawAnalyzerFastFit.cxx b/EMCAL/AliCaloRawAnalyzerFastFit.cxx
index f8ba8c89de09ddffb8d5b6d99e45e046e11ce3bb..0a103ffe05f293f0086431c39a4018d86a4d9749 100644 (file)
--- a/EMCAL/AliCaloRawAnalyzerFastFit.cxx
+++ b/EMCAL/AliCaloRawAnalyzerFastFit.cxx
@@ -31,27 +31,19 @@
 #include "TMath.h"
 #include <iostream>
 
-
 using namespace std;
-
 #include "AliCaloConstants.h"
-//using namespace CaloConstants::FitAlgorithm;
-//using namespace CaloConstants::ReturnCodes;
 
 ClassImp( AliCaloRawAnalyzerFastFit )
 
-AliCaloRawAnalyzerFastFit::AliCaloRawAnalyzerFastFit() : AliCaloRawAnalyzer("Fast Fit (Alexei)", "FF")
+
+AliCaloRawAnalyzerFastFit::AliCaloRawAnalyzerFastFit() : AliCaloRawAnalyzerFitter("Fast Fit (Alexei)", "FF")
 {
   // Comment
   fAlgo= Algo::kFastFit;
-
-  for(int i=0; i <  1008; i++)
-    {
-      fXAxis[i] = i;
-    }
-
 }
 
+
 AliCaloRawAnalyzerFastFit::~AliCaloRawAnalyzerFastFit()
 {
 
@@ -105,7 +97,7 @@ AliCaloRawAnalyzerFastFit::Evaluate( const vector<AliCaloBunchInfo> &bunchvector
              Double_t chi2 = 0;
              Double_t dTau = 2.35; // time-bin units
              
-             AliCaloFastAltroFitv0::FastFit(fXAxis, ordered , nsamples,
+             AliCaloFastAltroFitv0::FastFit(fXaxis, ordered , nsamples,
                                             eSignal, dTau, dAmp, eAmp, dTime0, eTime, chi2);
           
              Double_t dTimeMax = dTime0 + timebinOffset - (maxrev - first) // abs. t0
@@ -124,8 +116,4 @@ AliCaloRawAnalyzerFastFit::Evaluate( const vector<AliCaloBunchInfo> &bunchvector
     } // bunch index    
 
   return AliCaloFitResults( Ret::kInvalid , Ret::kInvalid );
-
-  //  return AliCaloFitResults( kInvalid , kInvalid, 
-  //                       kInvalid, kInvalid, kInvalid );
-  
 }

diff --git a/EMCAL/AliCaloRawAnalyzerFastFit.h b/EMCAL/AliCaloRawAnalyzerFastFit.h
index 79675aa45615165cc01779b1a999fedc6b5bb51b..92c5e874b6d9179d6b6905d344ff242c746cffc4 100644 (file)
--- a/EMCAL/AliCaloRawAnalyzerFastFit.h
+++ b/EMCAL/AliCaloRawAnalyzerFastFit.h
@@ -19,29 +19,23 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-#include "AliCaloRawAnalyzer.h"
+#include "AliCaloRawAnalyzerFitter.h"
 #include "Rtypes.h"
 
 // Extraction of Amplitude and peak
 // position using specila algorithm
 // from Alexei Pavlinov
 
-
-class  AliCaloRawAnalyzerFastFit : public AliCaloRawAnalyzer
+class  AliCaloRawAnalyzerFastFit : public AliCaloRawAnalyzerFitter
 {
   friend class  AliCaloRawAnalyzerFactory;
  public:
-  //AliCaloRawAnalyzerFastFit();
   virtual ~AliCaloRawAnalyzerFastFit();
   virtual AliCaloFitResults Evaluate( const std::vector<AliCaloBunchInfo> &bunchvector, 
                                      const UInt_t altrocfg1,  const UInt_t altrocfg2 ); 
  private:
   AliCaloRawAnalyzerFastFit();
-  Double_t fXAxis[1008]; // Xaxis (time bins) corresponding to the ADC samples
-
   ClassDef( AliCaloRawAnalyzerFastFit, 1 )
-
-
 };
 
 #endif