Initialize in maker the reader and calorimeter utils pointers only if requested and...

Increase binning in one histogram of QA for cell behaviour studies
Correct PartCorr wagon macro setting the name of the reference objarrays produced by each correlation analysis.

diff --git a/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx b/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
index 6282fe6996aa605195e87e9472c7020de23d01cf..41c40d883657b55574cbe2d12c2537eb654a2ea4 100755 (executable)
--- a/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
+++ b/PWG4/PartCorrBase/AliAnaPartCorrMaker.cxx
@@ -35,8 +35,6 @@
 //---- AliRoot system ---- 
 #include "AliAnaPartCorrBaseClass.h" 
 #include "AliAnaPartCorrMaker.h" 
-#include "AliCaloTrackReader.h" 
-
 
 ClassImp(AliAnaPartCorrMaker)
 
@@ -46,7 +44,7 @@ AliAnaPartCorrMaker::AliAnaPartCorrMaker() :
 TObject(),
 fOutputContainer(new TList ), fAnalysisContainer(new TList ),
 fMakeHisto(kFALSE), fMakeAOD(kFALSE), fMakeMixing(kFALSE), fAnaDebug(0), 
-fReader(new AliCaloTrackReader()), fCaloUtils(new AliCalorimeterUtils()), 
+fReader(0), fCaloUtils(0), 
 fAODBranchList(new TList ),fCuts(new TList), fhNEvents(0x0)
 {
   //Default Ctor

diff --git a/PWG4/PartCorrBase/AliAnaPartCorrMaker.h b/PWG4/PartCorrBase/AliAnaPartCorrMaker.h
index ab3dccb804927ad5d5b9c3cdd9a27cc0357673d0..50c0a5c37ad428c953fd94262248b8dd3ab1d732 100755 (executable)
--- a/PWG4/PartCorrBase/AliAnaPartCorrMaker.h
+++ b/PWG4/PartCorrBase/AliAnaPartCorrMaker.h
@@ -21,8 +21,8 @@ class TString;
 class TH1I;
 
 // --- Analysis system ---
-class AliCaloTrackReader ;
-class AliCalorimeterUtils ;
+#include "AliCaloTrackReader.h" 
+#include "AliCalorimeterUtils.h"
 
 class AliAnaPartCorrMaker : public TObject {
 
@@ -62,10 +62,10 @@ class AliAnaPartCorrMaker : public TObject {
       abort();}
   }
   
-  AliCaloTrackReader * GetReader() const {return fReader ; }
+  AliCaloTrackReader * GetReader() {if(!fReader) fReader = new AliCaloTrackReader ();return fReader ; }
   void SetReader(AliCaloTrackReader * reader) { fReader = reader ; }
        
-  AliCalorimeterUtils * GetCaloUtils() const {return fCaloUtils ; }
+  AliCalorimeterUtils * GetCaloUtils() {if(!fCaloUtils) fCaloUtils = new AliCalorimeterUtils(); return fCaloUtils ; }
   void SetCaloUtils(AliCalorimeterUtils * caloutils) { fCaloUtils = caloutils ; }
        
   //Others

diff --git a/PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx b/PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx
index 1fd1998154739490727283bc3b80e84b32e6287a..c118350a1307a68d3af8853acfdd3f963b9d46cd 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx
+++ b/PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx
@@ -564,8 +564,10 @@ TList *  AliAnaCalorimeterQA::GetCreateOutputObjects()
        fhAmplitude  = new TH1F ("hAmplitude","Cell Energy", nptbins*2,ptmin,ptmax); 
        fhAmplitude->SetXTitle("Cell Energy (GeV)");
        outputContainer->Add(fhAmplitude);
-       
-       fhAmpId  = new TH2F ("hAmpId","Cell Energy", nptbins*2,ptmin,ptmax*2,rowmax*colmax*fNModules,0,rowmax*colmax*fNModules); 
+       Int_t nb = 5000;
+       Float_t ptmax2 = 5.;
+       if(fCalorimeter == "EMCAL") ptmax2 = 20.;
+       fhAmpId  = new TH2F ("hAmpId","Cell Energy", nb,0,ptmax2,rowmax*colmax*fNModules,0,rowmax*colmax*fNModules); 
        fhAmpId->SetXTitle("Cell Energy (GeV)");
        outputContainer->Add(fhAmpId);
        
@@ -1441,7 +1443,7 @@ void  AliAnaCalorimeterQA::MakeAnalysisFillHistograms()
                        if(nModule < fNModules) nClustersInModule[nModule]++;
                        //MC labels
                        nLabel = clus->GetNLabels();
-                       if(clus->GetLabels()) labels =  (clus->GetLabels())->GetArray();
+                       labels = clus->GetLabels();
                        //Cells per cluster
                        nCaloCellsPerCluster =  clus->GetNCells();
                        //if(mom.E() > 10 && nCaloCellsPerCluster == 1 ) printf("%s:************** E = %f ********** ncells = %d\n",fCalorimeter.Data(), mom.E(),nCaloCellsPerCluster);
@@ -1459,7 +1461,7 @@ void  AliAnaCalorimeterQA::MakeAnalysisFillHistograms()
                        //Shower shape parameters
                        showerShape[0] = clus->GetM20();
                        showerShape[1] = clus->GetM02();
-                       showerShape[2] = clus->GetClusterDisp();
+                       showerShape[2] = clus->GetDispersion();
 
                        //======================
                        //Cells in cluster
@@ -1595,7 +1597,7 @@ void  AliAnaCalorimeterQA::MakeAnalysisFillHistograms()
                        if(nModule < fNModules)  nClustersInModule[nModule]++;
                        //MC labels
                        nLabel = clus->GetNLabel();
-                       if(clus->GetLabels()) labels =  clus->GetLabels();
+                       labels = clus->GetLabels();
                        //Cells per cluster
                        nCaloCellsPerCluster = clus->GetNCells();
                        //matched cluster with tracks

diff --git a/PWG4/macros/AddTaskPartCorr.C b/PWG4/macros/AddTaskPartCorr.C
index a7e43a9cac826a9ac4e5bdd54fa6824441648978..9b137b0097af3dba6c7753d7a06004ebece1f78a 100644 (file)
--- a/PWG4/macros/AddTaskPartCorr.C
+++ b/PWG4/macros/AddTaskPartCorr.C
@@ -291,6 +291,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   anaisol->SetDebug(-1);
   anaisol->SetMinPt(0);
   anaisol->SetInputAODName(Form("Photons%s",calorimeter.Data()));
+  anaisol->SetAODObjArrayName("ICPhoton"); 
   anaisol->SetCalorimeter(calorimeter);
   if(kUseKinematics) anaisol->SwitchOnDataMC() ;//Access MC stack and fill more histograms
   else  anaisol->SwitchOffDataMC() ;
@@ -322,6 +323,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   anaisolpi0->SetMinPt(0);
   anaisolpi0->SetInputAODName(Form("Pi0s%s",calorimeter.Data()));
   anaisolpi0->AddToHistogramsName("AnaIsolPi0_");
+  anaisolpi0->SetAODObjArrayName("ICPi0"); 
   anaisolpi0->SetCalorimeter(calorimeter);
   if(kUseKinematics) anaisolpi0->SwitchOnDataMC() ;//Access MC stack and fill more histograms
   else  anaisolpi0->SwitchOffDataMC() ;
@@ -369,6 +371,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   AliAnaParticleHadronCorrelation *anacorrhadron = new AliAnaParticleHadronCorrelation();
   anacorrhadron->SetInputAODName(Form("Photons%s",calorimeter.Data()));
   anacorrhadron->AddToHistogramsName("AnaHadronCorrPhoton_");
+  anacorrhadron->SetAODObjArrayName("PhotonHadronCorr"); 
   anacorrhadron->SetDebug(-1);
   anacorrhadron->SwitchOffCaloPID();
   anacorrhadron->SwitchOffFiducialCut();
@@ -394,6 +397,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   AliAnaParticleHadronCorrelation *anacorrisohadron = new AliAnaParticleHadronCorrelation();
   anacorrisohadron->SetInputAODName(Form("Photons%s",calorimeter.Data()));
   anacorrisohadron->AddToHistogramsName("AnaHadronCorrIsoPhoton_");
+  anacorrisohadron->SetAODObjArrayName("IsoPhotonHadronCorr"); 
   anacorrisohadron->SetDebug(-1);
   anacorrisohadron->SwitchOffCaloPID();
   anacorrisohadron->SwitchOffFiducialCut();
@@ -420,6 +424,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   AliAnaParticleHadronCorrelation *anacorrhadronpi0 = new AliAnaParticleHadronCorrelation();
   anacorrhadronpi0->SetInputAODName(Form("Pi0s%s",calorimeter.Data()));
   anacorrhadronpi0->AddToHistogramsName("AnaHadronCorrPi0_");
+  anacorrhadronpi0->SetAODObjArrayName("Pi0HadronCorr"); 
   anacorrhadronpi0->SetDebug(-1);
   anacorrhadronpi0->SwitchOffCaloPID();
   anacorrhadronpi0->SwitchOffFiducialCut();
@@ -445,6 +450,7 @@ AliAnalysisTaskParticleCorrelation *AddTaskPartCorr(TString data, TString calori
   AliAnaParticleHadronCorrelation *anacorrhadronisopi0 = new AliAnaParticleHadronCorrelation();
   anacorrhadronisopi0->SetInputAODName(Form("Pi0s%s",calorimeter.Data()));
   anacorrhadronisopi0->AddToHistogramsName("AnaHadronCorrIsoPi0_");
+  anacorrhadronisopi0->SetAODObjArrayName("IsoPi0HadronCorr"); 
   anacorrhadronisopi0->SetDebug(-1);
   anacorrhadronisopi0->SwitchOffCaloPID();
   anacorrhadronisopi0->SwitchOffFiducialCut();