tuning of histo ranges

diff --git a/EMCAL/AliEMCALQADataMakerRec.cxx b/EMCAL/AliEMCALQADataMakerRec.cxx
index fa7d572980415bdf3d37f9264d981fee5452d9c9..58c40314bc7088966eba7ffcc62533fd980db613 100644 (file)
--- a/EMCAL/AliEMCALQADataMakerRec.cxx
+++ b/EMCAL/AliEMCALQADataMakerRec.cxx
@@ -31,6 +31,7 @@ Authors:  J.Klay (Cal Poly) May 2008
 
 // --- AliRoot header files ---
 #include "AliESDCaloCluster.h"
+#include "AliESDCaloCells.h"
 #include "AliESDEvent.h"
 #include "AliLog.h"
 #include "AliEMCALQADataMakerRec.h"
@@ -79,21 +80,21 @@ void AliEMCALQADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArr
 void AliEMCALQADataMakerRec::InitESDs()
 {
   //Create histograms to controll ESD
- 
-  TH1F * h1 = new TH1F("hESDEmcalSpectrum",  "ESDs spectrum in EMCAL",    200, 0., 20.) ; 
+  TH1F * h1 = new TH1F("hESDCaloClusterE",  "ESDs CaloCluster energy in EMCAL",    200, 0., 20.) ; 
   h1->Sumw2() ;
-  Add2ESDsList(h1, kESDSpec)  ;                                                                                                        
-  TH1I * h2 = new TH1I("hESDEmcalMul", "ESDs multiplicity distribution in EMCAL", 100, 0,  100) ; 
+  Add2ESDsList(h1, kESDCaloClusE)  ;                                                     
+
+  TH1I * h2 = new TH1I("hESDCaloClusterM", "ESDs CaloCluster multiplicity in EMCAL", 100, 0,  100) ; 
   h2->Sumw2() ;
-  Add2ESDsList(h2, kESDNtot) ;
- 
-  TH1I * h3 = new TH1I("hESDEmcalEtot", "ESDs Etot in EMCAL", 100, 0,  1000.) ; 
+  Add2ESDsList(h2, kESDCaloClusM)  ;
+
+  TH1F * h3 = new TH1F("hESDCaloCellA",  "ESDs CaloCell amplitude in EMCAL",    500, 0., 250.) ; 
   h3->Sumw2() ;
-  Add2ESDsList(h3, kESDEtot) ;
+  Add2ESDsList(h3, kESDCaloCellA)  ;  
  
-  TH1F * h4 = new TH1F("hESDEmcalPid",    "ESDs PID distribution in EMCAL",       100, 0., 1.) ;
+  TH1I * h4 = new TH1I("hESDCaloCellM", "ESDs CaloCell multiplicity in EMCAL", 200, 0,  1000) ; 
   h4->Sumw2() ;
-  Add2ESDsList(h4, kESDpid) ;
+  Add2ESDsList(h4, kESDCaloCellM) ;
        
 }
 
@@ -101,42 +102,17 @@ void AliEMCALQADataMakerRec::InitESDs()
 void AliEMCALQADataMakerRec::InitRecPoints()
 {
   // create Reconstructed Points histograms in RecPoints subdir
-  TH2I * h0 = new TH2I("hRpEMCALxySMod1","RecPoints Rows x Columns for EMCAL supermodule 1", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h0,kRPsmod1) ;
-  TH2I * h1 = new TH2I("hRpEMCALxySMod2","RecPoints Rows x Columns for EMCAL supermodule 2", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h1,kRPsmod2) ;
-  TH2I * h2 = new TH2I("hRpEMCALxySMod3","RecPoints Rows x Columns for EMCAL supermodule 3", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h2,kRPsmod3) ;
-  TH2I * h3 = new TH2I("hRpEMCALxySMod4","RecPoints Rows x Columns for EMCAL supermodule 4", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h3,kRPsmod4) ;
-  TH2I * h4 = new TH2I("hRpEMCALxySMod5","RecPoints Rows x Columns for EMCAL supermodule 5", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h4,kRPsmod5) ;
-  TH2I * h5 = new TH2I("hRpEMCALxySMod6","RecPoints Rows x Columns for EMCAL supermodule 6", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h5,kRPsmod6) ;
-  TH2I * h6 = new TH2I("hRpEMCALxySMod7","RecPoints Rows x Columns for EMCAL supermodule 7", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h6,kRPsmod7) ;
-  TH2I * h7 = new TH2I("hRpEMCALxySMod8","RecPoints Rows x Columns for EMCAL supermodule 8", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h7,kRPsmod8) ;
-  TH2I * h8 = new TH2I("hRpEMCALxySMod9","RecPoints Rows x Columns for EMCAL supermodule 9", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h8,kRPsmod9) ;
-  TH2I * h9 = new TH2I("hRpEMCALxySMod10","RecPoints Rows x Columns for EMCAL supermodule 10", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h9,kRPsmod10) ;
-  TH2I * h10 = new TH2I("hRpEMCALxySMod11","RecPoints Rows x Columns for EMCAL supermodule 11", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h10,kRPsmod11) ;
-  TH2I * h11 = new TH2I("hRpEMCALxySMod12","RecPoints Rows x Columns for EMCAL supermodule 12", 64, -72., 72., 56, -63., 63.) ;
-  Add2RecPointsList(h11,kRPsmod12) ;
- 
-  TH1F * h12 = new TH1F("hEmcalRecPointsSpectrum",  "RecPoints spectrum in EMCAL",   2000, 0., 20.) ; 
-  h12->Sumw2() ;
-  Add2RecPointsList(h12, kRPSpec)  ;
+  TH1F* h0 = new TH1F("hEMCALRpE","EMCAL RecPoint energies",200, 0.,20.); //GeV
+  h0->Sumw2();
+  Add2RecPointsList(h0,kRecPE);
 
-  TH1I * h13 = new TH1I("hEmcalRecPointsMul", "RecPoints multiplicity distribution in EMCAL", 100, 0,  100) ; 
-  h13->Sumw2() ;
-  Add2RecPointsList(h13, kRPNtot) ;
+  TH1I* h1 = new TH1I("hEMCALRpM","EMCAL RecPoint multiplicities",100,0,100);
+  h1->Sumw2();
+  Add2RecPointsList(h1,kRecPM);
 
-  TH1I * h14 = new TH1I("hEmcalRecPointsEtot", "RecPoints Etot in EMCAL", 200, 0,  200.) ; 
-  h14->Sumw2() ;
-  Add2RecPointsList(h14, kRPEtot) ;
+  TH1I* h2 = new TH1I("hEMCALRpDigM","EMCAL RecPoint Digit Multiplicities",20,0,20);
+  h2->Sumw2();
+  Add2RecPointsList(h2,kRecPDigM);
 
 }
 
@@ -144,92 +120,43 @@ void AliEMCALQADataMakerRec::InitRecPoints()
 void AliEMCALQADataMakerRec::InitRaws()
 {
   // create Raws histograms in Raws subdir
-  TH2I * h0 = new TH2I("hHighEMCALxySMod1","High Gain Rows x Columns for EMCAL supermodule 1", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h0,kHGsmod1) ;
-  TH2I * h1 = new TH2I("hHighEMCALxySMod2","High Gain Rows x Columns for EMCAL supermodule 2", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h1,kHGsmod2) ;
-  TH2I * h2 = new TH2I("hHighEMCALxySMod3","High Gain Rows x Columns for EMCAL supermodule 3", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h2,kHGsmod3) ;
-  TH2I * h3 = new TH2I("hHighEMCALxySMod4","High Gain Rows x Columns for EMCAL supermodule 4", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h3,kHGsmod4) ;
-  TH2I * h4 = new TH2I("hHighEMCALxySMod5","High Gain Rows x Columns for EMCAL supermodule 5", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h4,kHGsmod5) ;
-  TH2I * h5 = new TH2I("hHighEMCALxySMod6","High Gain Rows x Columns for EMCAL supermodule 6", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h5,kHGsmod6) ;
-  TH2I * h6 = new TH2I("hHighEMCALxySMod7","High Gain Rows x Columns for EMCAL supermodule 7", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h6,kHGsmod7) ;
-  TH2I * h7 = new TH2I("hHighEMCALxySMod8","High Gain Rows x Columns for EMCAL supermodule 8", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h7,kHGsmod8) ;
-  TH2I * h8 = new TH2I("hHighEMCALxySMod9","High Gain Rows x Columns for EMCAL supermodule 9", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h8,kHGsmod9) ;
-  TH2I * h9 = new TH2I("hHighEMCALxySMod10","High Gain Rows x Columns for EMCAL supermodule 10", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h9,kHGsmod10) ;
-  TH2I * h10 = new TH2I("hHighEMCALxySMod11","High Gain Rows x Columns for EMCAL supermodule 11", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h10,kHGsmod11) ;
-  TH2I * h11 = new TH2I("hHighEMCALxySMod12","High Gain Rows x Columns for EMCAL supermodule 12", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h11,kHGsmod12) ;
-
-
-  TH2I * h12 = new TH2I("hLowEMCALxySMod1","Low Gain Rows x Columns for EMCAL supermodule 1", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h12,kLGsmod1) ;
-  TH2I * h13 = new TH2I("hLowEMCALxySMod2","Low Gain Rows x Columns for EMCAL supermodule 2", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h13,kLGsmod2) ;
-  TH2I * h14 = new TH2I("hLowEMCALxySMod3","Low Gain Rows x Columns for EMCAL supermodule 3", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h14,kLGsmod3) ;
-  TH2I * h15 = new TH2I("hLowEMCALxySMod4","Low Gain Rows x Columns for EMCAL supermodule 4", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h15,kLGsmod4) ;    
-  TH2I * h16 = new TH2I("hLowEMCALxySMod5","Low Gain Rows x Columns for EMCAL supermodule 5", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h16,kLGsmod5) ;
-  TH2I * h17 = new TH2I("hLowEMCALxySMod6","Low Gain Rows x Columns for EMCAL supermodule 6", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h17,kLGsmod6) ;
-  TH2I * h18 = new TH2I("hLowEMCALxySMod7","Low Gain Rows x Columns for EMCAL supermodule 7", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h18,kLGsmod7) ;
-  TH2I * h19 = new TH2I("hLowEMCALxySMod8","Low Gain Rows x Columns for EMCAL supermodule 8", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h19,kLGsmod8) ;
-  TH2I * h20 = new TH2I("hLowEMCALxySMod9","Low Gain Rows x Columns for EMCAL supermodule 9", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h20,kLGsmod9) ;    
-  TH2I * h21 = new TH2I("hLowEMCALxySMod10","Low Gain Rows x Columns for EMCAL supermodule 10", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h21,kLGsmod10) ;
-  TH2I * h22 = new TH2I("hLowEMCALxySMod11","Low Gain Rows x Columns for EMCAL supermodule 11", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h22,kLGsmod11) ;
-  TH2I * h23 = new TH2I("hLowEMCALxySMod12","Low Gain Rows x Columns for EMCAL supermodule 12", 64, 0, 64, 56, 0, 56) ;
-  Add2RawsList(h23,kLGsmod12) ;
-
-
-  TH1I * h24 = new TH1I("hLowEmcalSupermodules",    "Low Gain Hits in EMCAL supermodules",       12, 0, 12) ;
-  h24->Sumw2() ;
-  Add2RawsList(h24, kNsmodLG) ;
-  TH1I * h25 = new TH1I("hHighEmcalSupermodules",   "High Gain Hits in EMCAL supermodules",       12, 0, 12) ;
-  h25->Sumw2() ;
-  Add2RawsList(h25, kNsmodHG) ;
-
-  TH1F * h26 = new TH1F("hLowEmcalRawtime", "Low Gain Time of raw hits in EMCAL", 500, -50., 200.) ;
-  h26->Sumw2() ;
-  Add2RawsList(h26, kLGtime) ;
-  TH1F * h27 = new TH1F("hHighEmcalRawtime", "High Gain Time of raw hits in EMCAL", 500, -50., 200.) ;
-  h27->Sumw2() ;
-  Add2RawsList(h27, kHGtime) ;
-
-  TH1F * h28 = new TH1F("hLowEmcalRawEnergy", "Low Gain Energy of raw hits in EMCAL", 500, 0., 1000.) ;
-  h28->Sumw2() ;
-  Add2RawsList(h28, kSpecLG) ;
-  TH1F * h29 = new TH1F("hHighEmcalRawEnergy", "High Gain Energy of raw hits in EMCAL",500,0., 1000.) ;
-  h29->Sumw2() ;
-  Add2RawsList(h29, kSpecHG) ;
+  //these need more thought
+  /*
+  TH1I * h0 = new TH1I("hLowEmcalSupermodules",    "Low Gain digits in EMCAL supermodules",       12, 0, 12) ;
+  h0->Sumw2() ;
+  Add2RawsList(h0, kNsmodLG) ;
+  TH1I * h1 = new TH1I("hHighEmcalSupermodules",   "High Gain Digits in EMCAL supermodules",       12, 0, 12) ;
+  h1->Sumw2() ;
+  Add2RawsList(h1, kNsmodHG) ;
 
-  TH1F * h30 = new TH1F("hLowNtot", "Low Gain Total Number of raw hits in EMCAL", 500, 0., 5000.) ;
-  h30->Sumw2() ;
-  Add2RawsList(h30, kNtotLG) ;
-  TH1F * h31 = new TH1F("hHighNtot", "High Gain Total Number of raw hits in EMCAL",500,0., 5000.) ;
-  h31->Sumw2() ;
-  Add2RawsList(h31, kNtotHG) ;
+  TH1F * h2 = new TH1F("hLowEmcalRawtime", "Low Gain Time of raw digits in EMCAL", 500, -50., 200.) ;
+  h2->Sumw2() ;
+  Add2RawsList(h2, kLGtime) ;
+  TH1F * h3 = new TH1F("hHighEmcalRawtime", "High Gain Time of raw digits in EMCAL", 500, -50., 200.) ;
+  h3->Sumw2() ;
+  Add2RawsList(h3, kHGtime) ;
 
-  TH1F * h32 = new TH1F("hLowEtot", "Low Gain Total Energy of raw hits in EMCAL", 500, 0., 5000.) ;
-  h32->Sumw2() ;
-  Add2RawsList(h32, kEtotLG) ;
-  TH1F * h33 = new TH1F("hHighEtot", "High Gain Total Energy of raw hits in EMCAL",500,0., 100000.) ;
-  h33->Sumw2() ;
-  Add2RawsList(h33, kEtotHG) ;
+  TH1F * h4 = new TH1F("hLowEmcalRawEnergy", "Low Gain Energy of raw digits in EMCAL", 500, 0., 1000.) ;
+  h4->Sumw2() ;
+  Add2RawsList(h4, kSpecLG) ;
+  TH1F * h5 = new TH1F("hHighEmcalRawEnergy", "High Gain Energy of raw digits in EMCAL",500,0., 1000.) ;
+  h5->Sumw2() ;
+  Add2RawsList(h5, kSpecHG) ;
+
+  TH1I * h6 = new TH1I("hLowNtot", "Low Gain Total Number of raw digits in EMCAL", 500, 0, 10000) ;
+  h6->Sumw2() ;
+  Add2RawsList(h6, kNtotLG) ;
+  TH1I * h7 = new TH1I("hHighNtot", "High Gain Total Number of raw digits in EMCAL",500,0, 10000) ;
+  h7->Sumw2() ;
+  Add2RawsList(h7, kNtotHG) ;
+
+  TH1F * h8 = new TH1F("hLowEtot", "Low Gain Total Energy of raw digits in EMCAL", 500, 0., 5000.) ;
+  h8->Sumw2() ;
+  Add2RawsList(h8, kEtotLG) ;
+  TH1F * h9 = new TH1F("hHighEtot", "High Gain Total Energy of raw digits in EMCAL",500,0., 100000.) ;
+  h9->Sumw2() ;
+  Add2RawsList(h9, kEtotHG) ;
+  */
   
 }
 
@@ -239,19 +166,23 @@ void AliEMCALQADataMakerRec::MakeESDs(AliESDEvent * esd)
   // make QA data from ESDs
 
   Int_t nTot = 0 ; 
-  Double_t eTot = 0 ; 
   for ( Int_t index = 0; index < esd->GetNumberOfCaloClusters() ; index++ ) {
     AliESDCaloCluster * clu = esd->GetCaloCluster(index) ;
     if( clu->IsEMCAL() ) {
-      GetESDsData(kESDSpec)->Fill(clu->E()) ;
-      Double_t *pid=clu->GetPid() ;
-      GetESDsData(kESDpid)->Fill(pid[AliPID::kPhoton]) ;
-      eTot+=clu->E() ;
+      GetESDsData(kESDCaloClusE)->Fill(clu->E()) ;
       nTot++ ;
     } 
   }
-  GetESDsData(kESDNtot)->Fill(nTot) ;
-  GetESDsData(kESDEtot)->Fill(eTot) ;
+  GetESDsData(kESDCaloClusM)->Fill(nTot) ;
+
+  //fill calo cells
+  AliESDCaloCells* cells = esd->GetEMCALCells();
+  GetESDsData(kESDCaloCellM)->Fill(cells->GetNumberOfCells()) ;
+
+  for ( Int_t index = 0; index < cells->GetNumberOfCells() ; index++ ) {
+    GetESDsData(kESDCaloCellA)->Fill(cells->GetAmplitude(index)) ;
+  }
+
 }
 
 //____________________________________________________________________________
@@ -260,6 +191,12 @@ void AliEMCALQADataMakerRec::MakeRaws(AliRawReader* /* rawReader */)
   //Fill prepared histograms with Raw digit properties
 
   //Raw histogram filling not yet implemented
+  //
+  //Need to figure out how to get the info we want without having to
+  //actually run Raw2Digits twice.
+  //I suspect what we actually want is a raw digits method, not a true
+  //emcal raw data method, but this doesn't seem to be allowed in
+  //AliQADataMakerRec.h
 
 }
 
@@ -276,33 +213,13 @@ void AliEMCALQADataMakerRec::MakeRecPoints(TTree * clustersTree)
   emcbranch->SetAddress(&emcrecpoints);
   emcbranch->GetEntry(0);
   
-  GetRecPointsData(kRPNtot)->Fill(emcrecpoints->GetEntriesFast()) ; 
+  GetRecPointsData(kRecPM)->Fill(emcrecpoints->GetEntriesFast()) ; 
   TIter next(emcrecpoints) ; 
   AliEMCALRecPoint * rp ; 
-  Double_t eTot = 0. ; 
   while ( (rp = dynamic_cast<AliEMCALRecPoint *>(next())) ) {
-    GetRecPointsData(kRPSpec)->Fill( rp->GetEnergy()) ;
-    Int_t smod = rp->GetSuperModuleNumber() ;
-    TVector3 pos ;
-    rp->GetLocalPosition(pos) ;
-    switch(smod){
-      case 0: GetRecPointsData(kRPsmod1)->Fill(pos.X(),pos.Z()) ; break ;
-      case 1: GetRecPointsData(kRPsmod2)->Fill(pos.X(),pos.Z()) ; break ;
-      case 2: GetRecPointsData(kRPsmod3)->Fill(pos.X(),pos.Z()) ; break ;
-      case 3: GetRecPointsData(kRPsmod4)->Fill(pos.X(),pos.Z()) ; break ;
-      case 4: GetRecPointsData(kRPsmod5)->Fill(pos.X(),pos.Z()) ; break ;
-      case 5: GetRecPointsData(kRPsmod6)->Fill(pos.X(),pos.Z()) ; break ;
-      case 6: GetRecPointsData(kRPsmod7)->Fill(pos.X(),pos.Z()) ; break ;
-      case 7: GetRecPointsData(kRPsmod8)->Fill(pos.X(),pos.Z()) ; break ;
-      case 8: GetRecPointsData(kRPsmod9)->Fill(pos.X(),pos.Z()) ; break ;
-      case 9: GetRecPointsData(kRPsmod10)->Fill(pos.X(),pos.Z()) ; break ;
-      case 10: GetRecPointsData(kRPsmod11)->Fill(pos.X(),pos.Z()) ; break ;
-      case 11: GetRecPointsData(kRPsmod12)->Fill(pos.X(),pos.Z()) ; break ;
-    }
-    
-    eTot+= rp->GetEnergy() ;
+    GetRecPointsData(kRecPE)->Fill( rp->GetEnergy()) ;
+    GetRecPointsData(kRecPDigM)->Fill(rp->GetMultiplicity());
   }
-  GetRecPointsData(kRPEtot)->Fill(eTot) ;
   emcrecpoints->Delete();
   delete emcrecpoints;
   

diff --git a/EMCAL/AliEMCALQADataMakerRec.h b/EMCAL/AliEMCALQADataMakerRec.h
index a51b1ec0e80c14687b3b8157f326e1711799ba8a..4523faf23dc04e0ba0b1d404a243db24dd77972b 100644 (file)
--- a/EMCAL/AliEMCALQADataMakerRec.h
+++ b/EMCAL/AliEMCALQADataMakerRec.h
@@ -26,19 +26,15 @@ class AliEMCALQADataMakerRec: public AliQADataMakerRec {
 
 public:
   //Histograms for Raw data control
-  enum HRawType_t {kHGsmod1,kHGsmod2,kHGsmod3,kHGsmod4,kHGsmod5,kHGsmod6,
-                  kHGsmod7,kHGsmod8,kHGsmod9,kHGsmod10,kHGsmod11,kHGsmod12,
-                  kLGsmod1,kLGsmod2,kLGsmod3,kLGsmod4,kLGsmod5,kLGsmod6,
-                  kLGsmod7,kLGsmod8,kLGsmod9,kLGsmod10,kLGsmod11,kLGsmod12,
-                  kNsmodLG,kNsmodHG,
-                  kNtotLG,kNtotHG,kEtotLG,kEtotHG,
-                  kLGtime,kHGtime,kSpecLG,kSpecHG} ;
+  enum HRawType_t {kNsmodLG,kNsmodHG,kLGtime,kHGtime,
+                  kSpecLG,kSpecHG,kNtotLG,kNtotHG,
+                  kEtotLG,kEtotHG} ;
+
   //Histograms for RecPoints  control
-  enum HRPType_t {kRPsmod1,kRPsmod2,kRPsmod3,kRPsmod4,kRPsmod5,kRPsmod6,
-                 kRPsmod7,kRPsmod8,kRPsmod9,kRPsmod10,kRPsmod11,kRPsmod12,
-                 kRPNtot,kRPEtot,kRPSpec,kRPTime} ;
+  enum HRPType_t {kRecPE,kRecPM,kRecPDigM};
+
   //Histograms for ESDs  control
-  enum HESDType_t {kESDNtot,kESDEtot,kESDSpec,kESDpid} ;
+  enum HESDType_t {kESDCaloClusE,kESDCaloClusM,kESDCaloCellA,kESDCaloCellM} ;
                  
 
 public:

diff --git a/EMCAL/AliEMCALQADataMakerSim.cxx b/EMCAL/AliEMCALQADataMakerSim.cxx
index ef670610bd2cd04888a37bab0a5e3209a5f2a6b7..680db64974690f81763a495993c162799fb09347 100644 (file)
--- a/EMCAL/AliEMCALQADataMakerSim.cxx
+++ b/EMCAL/AliEMCALQADataMakerSim.cxx
@@ -38,6 +38,7 @@
 #include "AliEMCALHit.h"
 #include "AliEMCALQADataMakerSim.h"
 #include "AliQAChecker.h"
+#include "AliEMCALSDigitizer.h"
 
 ClassImp(AliEMCALQADataMakerSim)
            
@@ -78,10 +79,10 @@ void AliEMCALQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArr
 void AliEMCALQADataMakerSim::InitHits()
 {
   // create Hits histograms in Hits subdir
-  TH1F * h0 = new TH1F("hEmcalHits",    "Hits energy distribution in EMCAL",       100, 0., 100.) ; 
+  TH1F * h0 = new TH1F("hEmcalHits",    "Hits energy distribution in EMCAL",       200, 0., 2.) ; //GeV
   h0->Sumw2() ;
   Add2HitsList(h0, 0) ;
-  TH1I * h1  = new TH1I("hEmcalHitsMul", "Hits multiplicity distribution in EMCAL", 500, 0., 10000) ; 
+  TH1I * h1  = new TH1I("hEmcalHitsMul", "Hits multiplicity distribution in EMCAL", 1000, 0, 10000) ; 
   h1->Sumw2() ;
   Add2HitsList(h1, 1) ;
 }
@@ -90,10 +91,10 @@ void AliEMCALQADataMakerSim::InitHits()
 void AliEMCALQADataMakerSim::InitDigits()
 {
   // create Digits histograms in Digits subdir
-  TH1I * h0 = new TH1I("hEmcalDigits",    "Digits amplitude distribution in EMCAL",    500, 0, 5000) ; 
+  TH1I * h0 = new TH1I("hEmcalDigits",    "Digits amplitude distribution in EMCAL",    500, 0, 500) ; 
   h0->Sumw2() ;
   Add2DigitsList(h0, 0) ;
-  TH1I * h1 = new TH1I("hEmcalDigitsMul", "Digits multiplicity distribution in EMCAL", 500, 0, 1000) ; 
+  TH1I * h1 = new TH1I("hEmcalDigitsMul", "Digits multiplicity distribution in EMCAL", 200, 0, 2000) ; 
   h1->Sumw2() ;
   Add2DigitsList(h1, 1) ;
 }
@@ -102,10 +103,10 @@ void AliEMCALQADataMakerSim::InitDigits()
 void AliEMCALQADataMakerSim::InitSDigits()
 {
   // create SDigits histograms in SDigits subdir
-  TH1F * h0 = new TH1F("hEmcalSDigits",    "SDigits energy distribution in EMCAL",       100, 0., 100.) ; 
+  TH1F * h0 = new TH1F("hEmcalSDigits",    "SDigits energy distribution in EMCAL",       200, 0., 20.) ; 
   h0->Sumw2() ;
   Add2SDigitsList(h0, 0) ;
-  TH1I * h1 = new TH1I("hEmcalSDigitsMul", "SDigits multiplicity distribution in EMCAL", 500, 0,  10000) ; 
+  TH1I * h1 = new TH1I("hEmcalSDigitsMul", "SDigits multiplicity distribution in EMCAL", 500, 0,  5000) ; 
   h1->Sumw2() ;
   Add2SDigitsList(h1, 1) ;
 }
@@ -187,14 +188,18 @@ void AliEMCALQADataMakerSim::MakeDigits(TTree * digitTree)
 void AliEMCALQADataMakerSim::MakeSDigits(TClonesArray * sdigits)
 {
   // makes data from SDigits
-  
+  //Need a copy of the SDigitizer to calibrate the sdigit amplitude to
+  //energy in GeV
+  AliEMCALSDigitizer* sDigitizer = new AliEMCALSDigitizer();
+
   GetSDigitsData(1)->Fill(sdigits->GetEntriesFast()) ; 
   TIter next(sdigits) ; 
   AliEMCALDigit * sdigit ; 
   while ( (sdigit = dynamic_cast<AliEMCALDigit *>(next())) ) {
-    GetSDigitsData(0)->Fill( sdigit->GetAmp()) ;
+    GetSDigitsData(0)->Fill( sDigitizer->Calibrate(sdigit->GetAmp())) ;
   } 
 
+  delete sDigitizer;
 }
 
 //____________________________________________________________________________