moved some TLists to members of class

[u/mrichter/AliRoot.git] / PWGJE / AliAnalysisTaskJetServices.h

diff --git a/PWGJE/AliAnalysisTaskJetServices.h b/PWGJE/AliAnalysisTaskJetServices.h
index 4ffc606f30c5b2dc0ffa2b941d6004fd1d5e4c5c..1fb309e6145278d9cccf684fbf9f907d8f6ce449 100644 (file)
--- a/PWGJE/AliAnalysisTaskJetServices.h
+++ b/PWGJE/AliAnalysisTaskJetServices.h
@@ -49,6 +49,7 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     virtual void UserExec(Option_t *option);
     virtual void Terminate(Option_t *option);
     virtual void SetZVertexCut(Float_t f){fVtxZCut = f;}
+    virtual void SetDeltaZVertexCut(Float_t f){fVtxDeltaZCut = f;}
     virtual void SetPtMinCosmic(Float_t ptMin) {fPtMinCosmic = ptMin;}
     virtual void SetRMinCosmic(Float_t rMin) {fRIsolMinCosmic = rMin;}
     virtual void SetMaxCosmicAngle(Float_t angle)   {fMaxCosmicAngle = angle;}
@@ -73,8 +74,8 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     Bool_t IsVertexValid(const AliESDVertex *vtx);
     Bool_t IsVertexValid(const AliAODVertex *vtx) const;
 
-    Bool_t IsVertexIn(const AliESDVertex *vtx);
-    Bool_t IsVertexIn(const AliAODVertex *vtx) const;
+    Bool_t IsVertexIn(const AliESDVertex *vtx,const AliESDVertex *vtxSPD);
+    Bool_t IsVertexIn(const AliAODVertex *vtx,const AliAODVertex *vtxSPD) const;
     Int_t GetEventClass(AliESDEvent *esd);
     Int_t GetEventClass(AliAODEvent *aod);
 
@@ -94,7 +95,14 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     Int_t   GetListOfTracks(TList *list);
 
 
-    enum { kAllTriggered = 0,kTriggeredVertex,kTriggeredVertexIn,kSelectedALICE,kSelectedALICEVertexValid,kSelectedALICEVertexIn,kSelected,kConstraints};
+    enum { kAllTriggered = 0,
+          kTriggeredVertex,          //1
+          kTriggeredVertexIn,        //2
+          kSelectedALICE,            //3
+          kSelectedALICEVertexValid, //4
+          kSelectedALICEVertexIn,    //5
+          kSelected,                 //6
+          kConstraints};             //7
     enum { kRPTracks = 0, kRPVZEROA,kRPVZEROC,kRPMethods};
 
     enum { kNoEventCut=1<<0,
@@ -108,7 +116,8 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
           kSPDDispersionCut=1<<8,
           kVertexZCut=1<<9,
           kVertexRCut=1<<10,
-          kTotalEventCuts=(1<<11)-1};
+          kVertexDeltaZCut=1<<11,
+          kTotalEventCuts=(1<<12)-1};
     enum {kPbPb = 0,kPP,kPbP};
 
  private:
@@ -133,6 +142,7 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     Float_t       fVtxZMean;           // mean z for cuts
     Float_t       fVtxRCut;            // vtx cut in R
     Float_t       fVtxZCut;            // vtzx cut in Z
+    Float_t       fVtxDeltaZCut;       // cut on difference between SPD and Global vtx
     Float_t       fPtMinCosmic;        // Minimum pT to be considered as cosmic candidate
     Float_t       fRIsolMinCosmic;     // Minimum R = sqrt{deltaPhi^2 + deltaEta^2} to be considered as cosmic candidate
     Float_t       fMaxCosmicAngle;     // Max deviation from pi (angle between two tracks) in case of cosmic candidate
@@ -149,8 +159,9 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
 
     TString       fNonStdFile;         // outputName for replication
     TString       *fTriggerName;  //[fNTrigger] array of trigger names
-    TProfile*     fh1Xsec;             //! pythia cross section and trials
-    TH1F*         fh1Trials;           //! trials are added
+    TProfile*     fh1Xsec;             //! pythia cross section is averaged
+    TH1F*         fh1Trials;           //! trials are added per notify...
+    TH1F*         fh1AvgTrials;        //! average trials are added per event
     TH1F*         fh1PtHard;           //! Pt har of the event...       
     TH1F*         fh1PtHardTrials;     //! Number of trials 
     TH1F*         fh1SelectionInfoESD; //! Masks that satisfy fSelectionInfo
@@ -192,7 +203,7 @@ class AliAnalysisTaskJetServices : public AliAnalysisTaskSE
     static AliAODHeader*    fgAODHeader;        //! Header for replication
     static AliAODVZERO*    fgAODVZERO;        //! vzero for replication
     static TClonesArray*  fgAODVertices;        //! primary vertex for replication
-    ClassDef(AliAnalysisTaskJetServices,15)
+    ClassDef(AliAnalysisTaskJetServices,17)
 };
  
 #endif