Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / AliAnalysisTaskScale.h

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskScale.h b/PWGJE/EMCALJetTasks/AliAnalysisTaskScale.h
index e990d4c74caa85ddc7377c824b3e1a0aeaf3f833..3c95bf80ebe41d11328ee4107577a3fb3824cb38 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskScale.h
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskScale.h
@@ -3,11 +3,8 @@
 
 // $Id$
 
-class TList;
-class TH1F;
 class TH2F;
 class TF1;
-class AliEMCALGeometry;
 
 #include "AliAnalysisTaskEmcal.h"
 
@@ -18,38 +15,49 @@ class AliAnalysisTaskScale : public AliAnalysisTaskEmcal {
   virtual ~AliAnalysisTaskScale() {}
   
   void                   UserCreateOutputObjects();
-  void                   Terminate(Option_t *);
 
   void                   SetScaleFunction(TF1* sf)  { fScaleFunction = sf   ; }
   
  protected:
-  virtual Double_t       GetScaleFactor(Double_t cent);
-  virtual Bool_t         FillHistograms();
   void                   ExecOnce();
+  Double_t               GetScaleFactor(Double_t cent);
+  Bool_t                 FillHistograms();
 
  private:
-  TF1                   *fScaleFunction;          // scale factor as a function of centrality
-
-  AliEMCALGeometry      *fGeom;                   //!ptr to emcal geometry object
-  TH1F                  *fHistCentrality;         //!output histogram
-  TH2F                  *fHistPtTPCvsCent;        //!output histogram
-  TH2F                  *fHistPtEMCALvsCent;      //!output histogram
-  TH2F                  *fHistEtvsCent;           //!output histogram
-  TH2F                  *fHistScalevsCent;        //!output histogram
-  TH2F                  *fHistDeltaScalevsCent;   //!output histogram
-  TH2F                  *fHistPtTPCvsNtrack;      //!output histogram
-  TH2F                  *fHistPtEMCALvsNtrack;    //!output histogram
-  TH2F                  *fHistEtvsNtrack;         //!output histogram
-  TH2F                  *fHistScalevsNtrack;      //!output histogram
-  TH2F                  *fHistDeltaScalevsNtrack; //!output histogram
-  TH2F                  *fHistTrackPtvsCent;      //!output histogram
-  TH2F                  *fHistClusterPtvsCent;    //!output histogram
-  TH2F                  *fHistTrackEtaPhi;        //!output histogram
-  TH2F                  *fHistClusterEtaPhi;      //!output histogram
+  TF1                   *fScaleFunction;               // scale factor as a function of centrality
+
+  Double_t               fEmcalArea;                   //!Emcal area
+  Double_t               fTpcArea;                     //!Tpc area
+
+  TH2F                  *fHistPtTPCvsCent;             //!output histogram
+  TH2F                  *fHistPtEMCALvsCent;           //!output histogram
+  TH2F                  *fHistEtvsCent;                //!output histogram
+  TH2F                  *fHistScalevsCent;             //!output histogram
+  TH2F                  *fHistDeltaScalevsCent;        //!output histogram
+  TH2F                  *fHistScaleEmcalvsCent;        //!output histogram
+  TH2F                  *fHistScale2EmcalvsCent;       //!output histogram
+  TH2F                  *fHistChScalevsCent;           //!output histogram
+  TH2F                  *fHistChScale2EmcalvsCent;     //!output histogram
+  TH2F                  *fHistPtTPCvsNtrack;           //!output histogram
+  TH2F                  *fHistPtEMCALvsNtrack;         //!output histogram
+  TH2F                  *fHistEtvsNtrack;              //!output histogram
+  TH2F                  *fHistScalevsNtrack;           //!output histogram
+  TH2F                  *fHistDeltaScalevsNtrack;      //!output histogram
+  TH2F                  *fHistScaleEmcalvsNtrack;      //!output histogram
+  TH2F                  *fHistScale2EmcalvsNtrack;     //!output histogram
+  TH2F                  *fHistChScalevsNtrack;         //!output histogram
+  TH2F                  *fHistChScale2EmcalvsNtrack;   //!output histogram
+  TH2F                  *fHistTrackPtvsCent;           //!output histogram
+  TH2F                  *fHistClusterPtvsCent;         //!output histogram
+  TH2F                  *fHistTrackEtaPhi;             //!output histogram
+  TH2F                  *fHistClusterEtaPhi;           //!output histogram
+  TH2F                  *fHistScalevsScale2Emcal;      //!output histogram
+  TH2F                  *fHistScalevsScaleEmcal;       //!output histogram
+  TH2F                  *fHistScaleEmcalvsScale2Emcal; //!output histogram
 
   AliAnalysisTaskScale(const AliAnalysisTaskScale&); // not implemented
   AliAnalysisTaskScale& operator=(const AliAnalysisTaskScale&); // not implemented
   
-  ClassDef(AliAnalysisTaskScale, 7); // Scale task
+  ClassDef(AliAnalysisTaskScale, 10); // Scale task
 };
 #endif