change definition of TRU fitter, remove unneeded class dependencies

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALQADataMakerRec.cxx

diff --git a/EMCAL/AliEMCALQADataMakerRec.cxx b/EMCAL/AliEMCALQADataMakerRec.cxx
index a81a776ab7938da1688195fe54f28dea0fbfc8c3..a1b51e92475160a5478b46e7a18818ec582008bf 100644 (file)
--- a/EMCAL/AliEMCALQADataMakerRec.cxx
+++ b/EMCAL/AliEMCALQADataMakerRec.cxx
@@ -64,15 +64,12 @@ Also calculate the ratio of amplitude from LED Monitor system (current/Reference
 
 #include "AliCaloBunchInfo.h"
 #include "AliCaloFitResults.h"
-#include "AliCaloRawAnalyzerFastFit.h"
-#include "AliCaloRawAnalyzerNN.h"
-#include "AliCaloRawAnalyzerKStandard.h"
-#include "AliCaloRawAnalyzerPeakFinder.h"
-#include "AliCaloRawAnalyzerCrude.h"
+#include "AliCaloRawAnalyzer.h"
+#include "AliCaloRawAnalyzerFactory.h"
+
 #include "AliEMCALGeometry.h"
 #include "AliEMCALTriggerSTURawStream.h"
 
-#include "AliCaloRawAnalyzerFactory.h"
 
 using namespace std;
 
@@ -111,11 +108,6 @@ AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(Int_t fitAlgo) :
 {
   // ctor
   SetFittingAlgorithm(fitAlgo);
-  
-  fRawAnalyzerTRU =  ( AliCaloRawAnalyzerKStandard*)AliCaloRawAnalyzerFactory::CreateAnalyzer(Algo::kFastFit);
-  
-  fRawAnalyzerTRU->SetFixTau(kTRUE); 
-  fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper
 
   fGeom = new AliEMCALGeometry("EMCAL_COMPLETE12SMV1_DCAL_8SM", "EMCAL");
 //  for (Int_t sm = 0 ; sm < fSuperModules ; sm++){
@@ -158,9 +150,6 @@ AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(const AliEMCALQADataMakerRec& qad
   SetTitle((const char*)qadm.GetTitle()); 
   SetFittingAlgorithm(qadm.GetFittingAlgorithm());
   
-  fRawAnalyzerTRU = (AliCaloRawAnalyzerKStandard*)AliCaloRawAnalyzerFactory::CreateAnalyzer(Algo::kFastFit);
-  fRawAnalyzerTRU->SetFixTau(kTRUE); 
-  fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper
 //  for (Int_t sm = 0 ; sm < fSuperModules ; sm++){
 //    fTextSM[sm] = qadm.fTextSM[sm] ;
 //  }  
@@ -983,9 +972,14 @@ void AliEMCALQADataMakerRec::SetFittingAlgorithm(Int_t fitAlgo)
 {
   //Set fitting algorithm and initialize it if this same algorithm was not set before.
 
-  fRawAnalyzer =  AliCaloRawAnalyzerFactory::CreateAnalyzer(fitAlgo);
-  fFittingAlgorithm = fitAlgo; 
+  fFittingAlgorithm = fitAlgo; // Not sure we need this
 
+  fRawAnalyzer    =  AliCaloRawAnalyzerFactory::CreateAnalyzer(fitAlgo);
+  
+  // Init also here the TRU algo, even if it is fixed type.
+  fRawAnalyzerTRU = AliCaloRawAnalyzerFactory::CreateAnalyzer(Algo::kFakeAltro);
+  fRawAnalyzerTRU->SetFixTau(kTRUE);
+  fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper
 }
 
 //_____________________________________________________________________________________