Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / UserTasks / AliAnalysisTaskSAQA.h

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h
index 9b6b4c3d2649995f26c407e382bbf479e3ae889a..e1250c8427da549ba1a4db305c03cbd55b4c3224 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h
@@ -30,6 +30,7 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
 
  protected:
 
+  void                        AllocateHistogramArrays()                                     ;
   void                        ExecOnce()                                                    ;
   Bool_t                      FillHistograms()                                              ;
   void                        FillEventQAHisto(Float_t cent, Float_t cent2, Float_t cent3, Float_t v0a, Float_t v0c, Float_t ep, Float_t rho, 
@@ -38,12 +39,11 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
                                               Float_t maxClusterE, Float_t maxClusterEta, Float_t maxClusterPhi,
                                               Float_t maxJetPt, Float_t maxJetEta, Float_t maxJetPhi);
   Bool_t                      RetrieveEventObjects()                                        ;
-  Int_t                       DoCellLoop(Float_t &sum, Float_t &sum_cut)                    ;
+  Int_t                       DoCellLoop(Float_t &sum)                    ;
   Int_t                       DoTrackLoop(Float_t &sum, AliVParticle* &leading)             ;
   Int_t                       DoClusterLoop(Float_t &sum, AliVCluster* &leading)            ;
   Int_t                       DoJetLoop(AliEmcalJet* &leading)                              ;
   Double_t                    GetFcross(AliVCluster *cluster, AliVCaloCells *cells)         ;
-  Double_t                    GetCellEnergySum(AliVCluster *cluster, AliVCaloCells *cells)  ;
 
   Float_t                     fCellEnergyCut;            // Energy cell cut
   Bool_t                      fParticleLevel;            // Set particle level analysis
@@ -64,33 +64,33 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
   THnSparse                  *fHistEventQA;              //!Event-wise QA observables
 
   // Tracks
-  TH1                        *fHistTrNegativeLabels[4];  //!Percentage of negative label tracks
-  TH1                        *fHistTrZeroLabels[4];      //!Percentage of tracks with label=0
-  TH3                        *fHistTrPhiEtaPt[4][4];     //!Phi-Eta-Pt distribution of tracks
-  TH2                        *fHistTrPhiEtaZeroLab[4];   //!Phi-Eta distribution of tracks with label=0
-  TH1                        *fHistTrPtZeroLab[4];       //!Pt distribution of tracks with label=0
-  TH2                        *fHistTrEmcPhiEta[4];       //!Phi-Eta emcal propagated distribution of tracks
-  TH1                        *fHistTrEmcPt[4];           //!Pt emcal propagated distribution of tracks
-  TH2                        *fHistTrPhiEtaNonProp[4];   //!Phi-Eta distribution of non emcal propagated tracks
-  TH1                        *fHistTrPtNonProp[4];       //!Pt distribution of non emcal propagated tracks
-  TH2                        *fHistDeltaEtaPt[4];        //!Eta-EtaProp vs. Pt
-  TH2                        *fHistDeltaPhiPt[4];        //!Phi-PhiProp vs. Pt
-  TH2                        *fHistDeltaPtvsPt[4];       //!Pt-PtProp vs. Pt
+  TH1                       **fHistTrNegativeLabels;  //!Percentage of negative label tracks
+  TH1                       **fHistTrZeroLabels;      //!Percentage of tracks with label=0
+  TH3                      ***fHistTrPhiEtaPt;        //!Phi-Eta-Pt distribution of tracks
+  TH2                       **fHistTrPhiEtaZeroLab;   //!Phi-Eta distribution of tracks with label=0
+  TH1                       **fHistTrPtZeroLab;       //!Pt distribution of tracks with label=0
+  TH2                       **fHistTrEmcPhiEta;       //!Phi-Eta emcal propagated distribution of tracks
+  TH1                       **fHistTrEmcPt;           //!Pt emcal propagated distribution of tracks
+  TH2                       **fHistTrPhiEtaNonProp;   //!Phi-Eta distribution of non emcal propagated tracks
+  TH1                       **fHistTrPtNonProp;       //!Pt distribution of non emcal propagated tracks
+  TH2                       **fHistDeltaEtaPt;        //!Eta-EtaProp vs. Pt
+  TH2                       **fHistDeltaPhiPt;        //!Phi-PhiProp vs. Pt
+  TH2                       **fHistDeltaPtvsPt;       //!Pt-PtProp vs. Pt
 
   // Clusters
-  TH3                        *fHistClusPhiEtaEnergy[4];       //!Phi-Eta-Energy distribution of clusters
-  TH2                        *fHistClusDeltaPhiEPEnergy[4];   //!DeltaPhi EP vs Energy of clusters
-  TH2                        *fHistNCellsEnergy[4];           //!Number of cells vs. energy of cluster
-  TH2                        *fHistFcrossEnergy[4];           //!Fcross vs. energy of cluster
-  TH2                        *fHistClusTimeEnergy[4];         //!Time vs. energy of cluster
-  TH1                        *fHistClusMCEnergyFraction[4];   //!MC energy fraction (embedding)
+  TH3                       **fHistClusPhiEtaEnergy;       //!Phi-Eta-Energy distribution of clusters
+  TH2                       **fHistClusDeltaPhiEPEnergy;   //!DeltaPhi EP vs Energy of clusters
+  TH2                       **fHistNCellsEnergy;           //!Number of cells vs. energy of cluster
+  TH2                       **fHistFcrossEnergy;           //!Fcross vs. energy of cluster
+  TH2                       **fHistClusTimeEnergy;         //!Time vs. energy of cluster
+  TH1                       **fHistClusMCEnergyFraction;   //!MC energy fraction (embedding)
 
   // EMCAL Cells
-  TH2                        *fHistCellsAbsIdEnergy[4];  //!Energy spectrum of cells
+  TH2                       **fHistCellsAbsIdEnergy;  //!Energy spectrum of cells
 
   // Jets
-  TH2                        *fHistJetsPhiEta[4];        //!Phi-Eta distribution of jets
-  TH2                        *fHistJetsPtArea[4];        //!Pt vs. area of jets
+  TH2                       **fHistJetsPhiEta;        //!Phi-Eta distribution of jets
+  TH2                       **fHistJetsPtArea;        //!Pt vs. area of jets
 
  private:
   AliAnalysisTaskSAQA(const AliAnalysisTaskSAQA&);            // not implemented