create the raw analyzer for TRU in the same place as for normal signal, set the algor...

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

diff --git a/EMCAL/AliEMCALQADataMakerRec.cxx b/EMCAL/AliEMCALQADataMakerRec.cxx
index 052dbbe259a7ca5095b849b082c5f526e23d61d9..de7598e55e15c22f1bff0c8ad15749167d6c806c 100644 (file)
--- a/EMCAL/AliEMCALQADataMakerRec.cxx
+++ b/EMCAL/AliEMCALQADataMakerRec.cxx
@@ -66,7 +66,6 @@ Also calculate the ratio of amplitude from LED Monitor system (current/Reference
 #include "AliCaloFitResults.h"
 #include "AliCaloRawAnalyzerFastFit.h"
 #include "AliCaloRawAnalyzerNN.h"
-//#include "AliCaloRawAnalyzerLMS.h"
 #include "AliCaloRawAnalyzerKStandard.h"
 #include "AliCaloRawAnalyzerPeakFinder.h"
 #include "AliCaloRawAnalyzerCrude.h"
@@ -80,13 +79,13 @@ using namespace std;
 ClassImp(AliEMCALQADataMakerRec)
            
 //____________________________________________________________________________ 
-AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(fitAlgorithm fitAlgo) : 
+AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(Int_t fitAlgo) :
   AliQADataMakerRec(AliQAv1::GetDetName(AliQAv1::kEMCAL), "EMCAL Quality Assurance Data Maker"),
   fFittingAlgorithm(0),
   fRawAnalyzer(0),
   fRawAnalyzerTRU(0),
-       fGeom(0),
-  fSuperModules(12), // FIXME!!! number of SuperModules; 12 for 2012; update default for later runs 
+  fGeom(0),
+  fSuperModules(20), // number of SuperModules; updated to 20 for EMCal + DCal 
   fFirstPedestalSample(0),
   fLastPedestalSample(3),
   fFirstPedestalSampleTRU(0),
@@ -112,15 +111,8 @@ AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(fitAlgorithm fitAlgo) :
 {
   // ctor
   SetFittingAlgorithm(fitAlgo);
-  
-  //fRawAnalyzerTRU = new AliCaloRawAnalyzerLMS();
-  
-  fRawAnalyzerTRU =  ( AliCaloRawAnalyzerKStandard*)AliCaloRawAnalyzerFactory::CreateAnalyzer(kLMS);
-  
-  fRawAnalyzerTRU->SetFixTau(kTRUE); 
-  fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper
 
-       fGeom = new AliEMCALGeometry("EMCAL_COMPLETE12SMV1", "EMCAL");
+  fGeom = new AliEMCALGeometry("EMCAL_COMPLETE12SMV1_DCAL_8SM", "EMCAL");
 //  for (Int_t sm = 0 ; sm < fSuperModules ; sm++){
 //    fTextSM[sm] = NULL ;
 //  }
@@ -161,10 +153,6 @@ AliEMCALQADataMakerRec::AliEMCALQADataMakerRec(const AliEMCALQADataMakerRec& qad
   SetTitle((const char*)qadm.GetTitle()); 
   SetFittingAlgorithm(qadm.GetFittingAlgorithm());
   
-  //fRawAnalyzerTRU = new AliCaloRawAnalyzerLMS();
-  fRawAnalyzerTRU = (AliCaloRawAnalyzerKStandard*)AliCaloRawAnalyzerFactory::CreateAnalyzer(kLMS);
-  fRawAnalyzerTRU->SetFixTau(kTRUE); 
-  fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper
 //  for (Int_t sm = 0 ; sm < fSuperModules ; sm++){
 //    fTextSM[sm] = qadm.fTextSM[sm] ;
 //  }  
@@ -518,7 +506,7 @@ void AliEMCALQADataMakerRec::InitRaws()
  TProfile2D *hS0 = new TProfile2D("hL1Amp", "Mean STU signal per Row and Column", nSTUCols, -0.5, nSTUCols-0.5, nSTURows, -0.5, nSTURows-0.5);
  Add2RawsList(hS0, kAmpL1, expert, !image, !saveCorr) ;
        
- TH2F *hS1 = new TH2F("hL1Gamma", "L1 Gamma patch position (FastOR top-left)", nSTUCols, -0.50, nSTUCols-0.5, nSTURows, -0.5, nSTURows-0.5);
+ TH2F *hS1 = new TH2F("hL1Gamma", "L1 Gamma patch position (FastOR top-left)", nSTUCols, -0.50, nSTUCols-0.5, nSTURows + 5, -0.5, nSTURows-0.5 + 5); //+5 for better visible error box
  Add2RawsList(hS1, kGL1, !expert, image, !saveCorr) ;
        
  TH2F *hS2 = new TH2F("hL1Jet", "L1 Jet patch position (FastOR top-left)", 12, -0.5, nSTUCols-0.5, 16, 0, nSTURows-0.5);
@@ -986,47 +974,14 @@ void AliEMCALQADataMakerRec::StartOfDetectorCycle()
 void AliEMCALQADataMakerRec::SetFittingAlgorithm(Int_t fitAlgo)              
 {
   //Set fitting algorithm and initialize it if this same algorithm was not set before.
-  //printf("**** Set Algorithm , number %d ****\n",fitAlgo);
 
-  
   fRawAnalyzer =  AliCaloRawAnalyzerFactory::CreateAnalyzer(fitAlgo);
-  fFittingAlgorithm = fitAlgo; 
-
-  /*
-  if(fitAlgo == fFittingAlgorithm && fRawAnalyzer) {
-    //Do nothing, this same algorithm already set before.
-    //printf("**** Algorithm already set before, number %d, %s ****\n",fitAlgo, fRawAnalyzer->GetName());
-    return;
-  }
-  //Initialize the requested algorithm
-  if(fitAlgo != fFittingAlgorithm || !fRawAnalyzer) {
-    //printf("**** Init Algorithm , number %d ****\n",fitAlgo);
-               
-    fFittingAlgorithm = fitAlgo; 
-    if (fRawAnalyzer) delete fRawAnalyzer;  // delete prev. analyzer if existed.
-               
-    if (fitAlgo == kFastFit) {
-      fRawAnalyzer = new AliCaloRawAnalyzerFastFit();
-    }
-    else if (fitAlgo == kNeuralNet) {
-      fRawAnalyzer = new AliCaloRawAnalyzerNN();
-    }
-    else if (fitAlgo == kLMS) {
-      fRawAnalyzer = new AliCaloRawAnalyzerLMS();
-    }
-    else if (fitAlgo == kPeakFinder) {
-      fRawAnalyzer = new AliCaloRawAnalyzerPeakFinder();
-    }
-    else if (fitAlgo == kCrude) {
-      fRawAnalyzer = new AliCaloRawAnalyzerCrude();
-    }
-    else {
-      AliWarning("EMCAL QA invalid fit algorithm choice") ; 
-    }
-
-  }
-  return;
-  */
+  fFittingAlgorithm = fitAlgo;
+  
+  // Init also here the TRU algo, even if it is fixed type.
+  fRawAnalyzerTRU = (AliCaloRawAnalyzerKStandard*)AliCaloRawAnalyzerFactory::CreateAnalyzer(Algo::kFakeAltro);
+  fRawAnalyzerTRU->SetFixTau(kTRUE);
+  fRawAnalyzerTRU->SetTau(2.5); // default for TRU shaper
 }
 
 //_____________________________________________________________________________________