From 2dc84d3139431b17d41ea310bbd3ea2195a41407 Mon Sep 17 00:00:00 2001 From: gconesab Date: Wed, 2 Apr 2014 11:28:45 +0200 Subject: [PATCH] remove duplicate initialization of histogram, add histogram with pt spectra per super module --- PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx | 32 +++++++++++--------- PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h | 12 ++++++-- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx index 5fdc807afb9..e0e540e9156 100755 --- a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx +++ b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx @@ -57,7 +57,7 @@ fFillPileUpHistograms(0), fFillWeightHistograms(kFALSE), fFillTMHisto(0), fFillSelectClHisto(0), fFillOnlySimpleSSHisto(1), fFillEMCALBCHistograms(0), fInputAODGammaConvName(""), -fCheckSplitDistToBad(0), +fCheckSplitDistToBad(0), fNSuperModules(0), // Histograms fhPt(0), fhE(0), fhPtEta(0), fhPtPhi(0), fhEtaPhi(0), @@ -229,6 +229,8 @@ fhPtNPileUpSPDVtxTimeCut2(0), fhPtNPileUpTrkVtxTimeCut2(0) } + for(Int_t iSM = 0; iSM < 22; iSM++) fhNLocMaxPtSM[iSM] = 0; + //Initialize parameters InitParameters(); @@ -511,6 +513,9 @@ void AliAnaPi0EbE::FillSelectedClusterHistograms(AliVCluster* cluster, Float_t p fhNLocMaxPt->Fill(pt,nMaxima); + if(nSM < fNSuperModules && nSM >=0) + fhNLocMaxPtSM[nSM]->Fill(pt,nMaxima); + fhPtLambda0LocMax [indexMax]->Fill(pt,l0); fhPtLambda1LocMax [indexMax]->Fill(pt,l1); fhPtDispersionLocMax[indexMax]->Fill(pt,disp); @@ -526,7 +531,7 @@ void AliAnaPi0EbE::FillSelectedClusterHistograms(AliVCluster* cluster, Float_t p } - if(fCalorimeter=="EMCAL" && nSM < 6) + if(fCalorimeter=="EMCAL" && nSM < 6) // CAREFUL FOR 2012-13 runs change 6 to 4, -1 for 2015 ... { fhPtLambda0NoTRD ->Fill(pt, l0 ); fhPtFracMaxCellNoTRD->Fill(pt,maxCellFraction); @@ -845,18 +850,6 @@ TList * AliAnaPi0EbE::GetCreateOutputObjects() fhPtEta->SetXTitle("E (GeV)"); outputContainer->Add(fhPtEta) ; - fhPtPhi = new TH2F - ("hPtPhi","Selected #pi^{0} (#eta) pairs: p_{T} vs #phi",nptbins,ptmin,ptmax, nphibins,phimin,phimax); - fhPtPhi->SetYTitle("#phi (rad)"); - fhPtPhi->SetXTitle("p_{T} (GeV/c)"); - outputContainer->Add(fhPtPhi) ; - - fhPtEta = new TH2F - ("hPtEta","Selected #pi^{0} (#eta) pairs: p_{T} vs #eta",nptbins,ptmin,ptmax,netabins,etamin,etamax); - fhPtEta->SetYTitle("#eta"); - fhPtEta->SetXTitle("p_{T} (GeV/c)"); - outputContainer->Add(fhPtEta) ; - fhEtaPhi = new TH2F ("hEtaPhi","Selected #pi^{0} (#eta) pairs: #eta vs #phi",netabins,etamin,etamax, nphibins,phimin,phimax); fhEtaPhi->SetYTitle("#phi (rad)"); @@ -1208,6 +1201,15 @@ TList * AliAnaPi0EbE::GetCreateOutputObjects() fhNLocMaxPt ->SetXTitle("p_{T} (GeV/c)"); outputContainer->Add(fhNLocMaxPt) ; + for(Int_t iSM = 0; iSM < fNSuperModules; iSM++) + { + fhNLocMaxPtSM[iSM] = new TH2F(Form("hNLocMaxPt_SM%d",iSM),Form("Number of local maxima in cluster, selected clusters in SM %d",iSM), + nptbins,ptmin,ptmax,20,0,20); + fhNLocMaxPtSM[iSM] ->SetYTitle("N maxima"); + fhNLocMaxPtSM[iSM] ->SetXTitle("p_{T} (GeV/c)"); + outputContainer->Add(fhNLocMaxPtSM[iSM]) ; + } + if(fAnaType == kSSCalo) { @@ -2476,6 +2478,8 @@ void AliAnaPi0EbE::InitParameters() fNLMECutMin[1] = 6. ; fNLMECutMin[2] = 6. ; + fNSuperModules = 10; + } //__________________________________________________________________ diff --git a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h index 1a405bc0be2..1b77859cef7 100755 --- a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h +++ b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h @@ -120,6 +120,9 @@ class AliAnaPi0EbE : public AliAnaCaloTrackCorrBaseClass { void SwitchOnSplitClusterDistToBad() { fCheckSplitDistToBad = kTRUE ; } void SwitchOffSplitClusterDistToBad() { fCheckSplitDistToBad = kFALSE ; } + void SetNumberOfSuperModules(Int_t nSM) { fNSuperModules = nSM ; } + + //For histograms enum mcTypes { kmcPhoton = 0, kmcConversion = 1, kmcPi0 = 2, kmcEta = 3, kmcElectron = 4, kmcHadron = 5 }; @@ -152,6 +155,8 @@ class AliAnaPi0EbE : public AliAnaCaloTrackCorrBaseClass { Bool_t fCheckSplitDistToBad; // Check the distance to bad channel and to EMCal borders of split clusters + Int_t fNSuperModules; // Number of supermodules + //Histograms TH1F * fhPt ; //! Number of identified pi0/eta vs pT @@ -344,8 +349,9 @@ class AliAnaPi0EbE : public AliAnaCaloTrackCorrBaseClass { TH2F * fhEOverPNoTRD; //! matched track E cluster over P track vs cluster E, not behind TRD // Local maxima - TH2F * fhNLocMaxPt; //! number of maxima in selected clusters - TH2F * fhMCNLocMaxPt[6]; //! number of maxima in selected clusters, vs originating particle + TH2F * fhNLocMaxPt; //! number of maxima in selected clusters + TH2F * fhNLocMaxPtSM[22] ; //! Pt of identified clusters, vs NLM + TH2F * fhMCNLocMaxPt[6]; //! number of maxima in selected clusters, vs originating particle TH2F * fhPtLambda0LocMax[3] ; //! pT vs lambda0 of selected cluster, 1,2,>2 local maxima in cluster TH2F * fhMCPtLambda0LocMax[6][3] ;//! pT vs lambda0 of selected cluster, 1,2,>2 local maxima in cluster, vs originating particle TH2F * fhPtLambda1LocMax[3] ; //! pT vs lambda1 of selected cluster, 1,2,>2 local maxima in cluster @@ -385,7 +391,7 @@ class AliAnaPi0EbE : public AliAnaCaloTrackCorrBaseClass { AliAnaPi0EbE( const AliAnaPi0EbE & pi0ebe) ; // cpy ctor AliAnaPi0EbE & operator = (const AliAnaPi0EbE & pi0ebe) ; // cpy assignment - ClassDef(AliAnaPi0EbE,34) + ClassDef(AliAnaPi0EbE,35) } ; -- 2.43.0