Updates to run with deltas (L. Cunqueiro)

[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliAnalysisTaskJetCore.h

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetCore.h b/PWG4/JetTasks/AliAnalysisTaskJetCore.h
index 00b6bca54da0251212d3d50dbf4938009c831f4c..98674f8fdd4ae210d9ef64bea6ac45f15a63595f 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetCore.h
+++ b/PWG4/JetTasks/AliAnalysisTaskJetCore.h
@@ -6,6 +6,7 @@ class TH2F;
 class TH3F;
 class THnSparse;
 class AliESDEvent;
 class TH3F;
 class THnSparse;
 class AliESDEvent;

+class AliAODExtension;

 class AliAODEvent;
 
 #include "AliAnalysisTaskSE.h"
 class AliAODEvent;
 
 #include "AliAnalysisTaskSE.h"


@@ -16,7 +17,6 @@ public:
    AliAnalysisTaskJetCore();
    AliAnalysisTaskJetCore(const char *name);
    virtual ~AliAnalysisTaskJetCore();
    AliAnalysisTaskJetCore();
    AliAnalysisTaskJetCore(const char *name);
    virtual ~AliAnalysisTaskJetCore();

-

    virtual void     LocalInit() {Init();}
    virtual void     Init();
    virtual void     UserCreateOutputObjects();
    virtual void     LocalInit() {Init();}
    virtual void     Init();
    virtual void     UserCreateOutputObjects();


@@ -24,8 +24,8 @@ public:
    virtual void     Terminate(const Option_t*);
 
    virtual Int_t      GetNInputTracks();
    virtual void     Terminate(const Option_t*);
 
    virtual Int_t      GetNInputTracks();

-

   
   

+   Double_t RelativePhi(Double_t angle1,Double_t angle2);     

 
    virtual AliVEvent::EOfflineTriggerTypes GetOfflineTrgMask() const { return fOfflineTrgMask; }
    virtual void     GetBranchNames(TString &branch1, TString &branch2) const { branch1 = fJetBranchName[0]; branch2 = fJetBranchName[1]; }
 
    virtual AliVEvent::EOfflineTriggerTypes GetOfflineTrgMask() const { return fOfflineTrgMask; }
    virtual void     GetBranchNames(TString &branch1, TString &branch2) const { branch1 = fJetBranchName[0]; branch2 = fJetBranchName[1]; }


@@ -53,10 +53,13 @@ public:
    virtual void     SetVtxZMax(Float_t z) { fVtxZMax = z; }
    virtual void     SetEvtClassMin(Int_t evtClass) { fEvtClassMin = evtClass; }
    virtual void     SetEvtClassMax(Int_t evtClass) { fEvtClassMax = evtClass; }
    virtual void     SetVtxZMax(Float_t z) { fVtxZMax = z; }
    virtual void     SetEvtClassMin(Int_t evtClass) { fEvtClassMin = evtClass; }
    virtual void     SetEvtClassMax(Int_t evtClass) { fEvtClassMax = evtClass; }

+   virtual void     SetRadioFrac(Float_t radiofrac) { fRadioFrac = radiofrac; }
+   virtual void     SetMinDist(Float_t minDist) { fMinDist = minDist; }

    virtual void     SetCentMin(Float_t cent) { fCentMin = cent; }
    virtual void     SetCentMax(Float_t cent) { fCentMax = cent; }
    virtual void     SetNInputTracksMin(Int_t nTr) { fNInputTracksMin = nTr; }
    virtual void     SetNInputTracksMax(Int_t nTr) { fNInputTracksMax = nTr; }
    virtual void     SetCentMin(Float_t cent) { fCentMin = cent; }
    virtual void     SetCentMax(Float_t cent) { fCentMax = cent; }
    virtual void     SetNInputTracksMin(Int_t nTr) { fNInputTracksMin = nTr; }
    virtual void     SetNInputTracksMax(Int_t nTr) { fNInputTracksMax = nTr; }

+   virtual void     SetAngStructCloseTracks(Int_t yesno){fAngStructCloseTracks=yesno;}

    virtual void     SetJetEtaMin(Float_t eta) { fJetEtaMin = eta; }
    virtual void     SetJetEtaMax(Float_t eta) { fJetEtaMax = eta; }
    virtual void     SetJetPtMin(Float_t pt) { fJetPtMin = pt; }
    virtual void     SetJetEtaMin(Float_t eta) { fJetEtaMin = eta; }
    virtual void     SetJetEtaMax(Float_t eta) { fJetEtaMax = eta; }
    virtual void     SetJetPtMin(Float_t pt) { fJetPtMin = pt; }


@@ -65,21 +68,22 @@ public:
    virtual void     SetNMatchJets(Int_t n) { fNMatchJets = n; }
    virtual void     SetFillEvent(Bool_t b) { fbEvent = b; }
    virtual void     SetKeepJets(Bool_t b = kTRUE) { fKeepJets = b; }
    virtual void     SetNMatchJets(Int_t n) { fNMatchJets = n; }
    virtual void     SetFillEvent(Bool_t b) { fbEvent = b; }
    virtual void     SetKeepJets(Bool_t b = kTRUE) { fKeepJets = b; }

-   virtual void     SetRadioFrac(Float_t radiofrac) { fRadioFrac = radiofrac; }
-   virtual void     SetMinDist(Float_t minDist) { fMinDist = minDist; }
+   virtual void SetNonStdFile(char* c){fNonStdFile = c;} 

 
 
 private:
    // ESD/AOD events
    AliESDEvent *fESD;    //! ESD object
    AliAODEvent *fAOD;    //! AOD event
 
 
 private:
    // ESD/AOD events
    AliESDEvent *fESD;    //! ESD object
    AliAODEvent *fAOD;    //! AOD event

-
+    AliAODExtension  *fAODExtension; //! where we take the jets from can be input or output AOD
+   Int_t   GetListOfTracks(TList *list);
+   Int_t   GetListOfTracksCloseToJet(TList *list,AliAODJet *jet);

    // jets to compare
    TString fJetBranchName[2]; //  name of jet branches to compare
    TList *fListJets[2];       //! jet lists
 
    TString fBackgroundBranch;
    // jets to compare
    TString fJetBranchName[2]; //  name of jet branches to compare
    TList *fListJets[2];       //! jet lists
 
    TString fBackgroundBranch;

-
+   TString       fNonStdFile; // name of delta aod file to catch the extension

    // event selection
    Bool_t fIsPbPb;         // is Pb-Pb (fast embedding) or p-p (detector response)
    AliVEvent::EOfflineTriggerTypes fOfflineTrgMask; // mask of offline triggers to accept
    // event selection
    Bool_t fIsPbPb;         // is Pb-Pb (fast embedding) or p-p (detector response)
    AliVEvent::EOfflineTriggerTypes fOfflineTrgMask; // mask of offline triggers to accept


@@ -88,10 +92,13 @@ private:
    Float_t fVtxZMax;     // upper bound on vertex z
    Int_t   fEvtClassMin;         // lower bound on event class
    Int_t   fEvtClassMax;         // upper bound on event class
    Float_t fVtxZMax;     // upper bound on vertex z
    Int_t   fEvtClassMin;         // lower bound on event class
    Int_t   fEvtClassMax;         // upper bound on event class

+   Float_t fRadioFrac;                          //!size of the concentric cone
+   Float_t fMinDist;   

    Float_t fCentMin;     // lower bound on centrality
    Float_t fCentMax;     // upper bound on centrality
    Int_t   fNInputTracksMin;  // lower bound of nb. of input tracks
    Int_t   fNInputTracksMax;  // upper bound of nb. of input tracks
    Float_t fCentMin;     // lower bound on centrality
    Float_t fCentMax;     // upper bound on centrality
    Int_t   fNInputTracksMin;  // lower bound of nb. of input tracks
    Int_t   fNInputTracksMax;  // upper bound of nb. of input tracks

+   Int_t   fAngStructCloseTracks;//only constituents or all tracks with R<0.8 for the angular structure

    Float_t fJetEtaMin;     // lower bound on eta for found jets
    Float_t fJetEtaMax;     // upper bound on eta for found jets
    Float_t fJetPtMin;      // minimum jet pT
    Float_t fJetEtaMin;     // lower bound on eta for found jets
    Float_t fJetEtaMax;     // upper bound on eta for found jets
    Float_t fJetPtMin;      // minimum jet pT


@@ -100,8 +107,7 @@ private:
    Int_t   fNMatchJets;       // maximal nb. of jets taken for matching
    Double_t fMatchMaxDist;     // maximal distance of matching jets
    Bool_t  fKeepJets;          // keep jets with negative pt after background subtraction
    Int_t   fNMatchJets;       // maximal nb. of jets taken for matching
    Double_t fMatchMaxDist;     // maximal distance of matching jets
    Bool_t  fKeepJets;          // keep jets with negative pt after background subtraction

-   Float_t fRadioFrac;                          //size of the concentric cone
-   Float_t fMinDist;                            //minimum jet axis distance
+  

 
    // output objects
    const Int_t fkNbranches;                   //! number of branches to be read
 
    // output objects
    const Int_t fkNbranches;                   //! number of branches to be read


@@ -112,20 +118,105 @@ private:
    TH1I  *fHistEvtSelection;                  //! event selection statistic
    TH1I  *fHistJetSelection;                  //! jet selection statistic
    TH2F  *fh2JetSelection;                    //! jet selection statistic, with 
    TH1I  *fHistEvtSelection;                  //! event selection statistic
    TH1I  *fHistJetSelection;                  //! jet selection statistic
    TH2F  *fh2JetSelection;                    //! jet selection statistic, with 

+     
+
+   TH2F      *fh2JetCoreMethod1C10;            //energy fraction in the jet core for
+   TH2F      *fh2JetCoreMethod2C10;            //different centralities and 3 methods 
+   TH2F      *fh2JetCoreMethod3C10;
+   TH2F      *fh2JetCoreMethod1C20;
+   TH2F      *fh2JetCoreMethod2C20;
+   TH2F      *fh2JetCoreMethod3C20;
+   TH2F      *fh2JetCoreMethod1C30;
+   TH2F      *fh2JetCoreMethod2C30;
+   TH2F      *fh2JetCoreMethod3C30;
+   TH2F      *fh2JetCoreMethod1C60;
+   TH2F      *fh2JetCoreMethod2C60;
+   TH2F      *fh2JetCoreMethod3C60;
+   TH2F      *fh2SumPtInC10;                 //energy fraction in external coronas
+   TH2F      *fh2SumPtInC20;
+   TH2F      *fh2SumPtInC30;
+   TH2F      *fh2SumPtInC60;
+   TH2F      *fh2SumPtOutC10;
+   TH2F      *fh2SumPtOutC10b;   
+   TH2F      *fh2SumPtOutC20;
+   TH2F      *fh2SumPtOutC30;
+   TH2F      *fh2SumPtOutC60;
+   TH2F      *fh2SumPtInC10bkg;        //energy fraction in external coronas expected
+   TH2F      *fh2SumPtInC20bkg;        //only from background
+   TH2F      *fh2SumPtInC30bkg;
+   TH2F      *fh2SumPtInC60bkg;
+   TH2F      *fh2SumPtOutC10bkg;
+   TH2F      *fh2SumPtOutC20bkg;
+   TH2F      *fh2SumPtOutC30bkg;
+   TH2F      *fh2SumPtOutC60bkg;
+

   
   

-   TH2F      *fh2JetCoreMethod1C10;           //jet core method1 0-10%
-   TH2F      *fh2JetCoreMethod2C10;           //jet core method2 0-10%
-   TH2F      *fh2JetCoreMethod3C10;           //jet core method3 0-10%
-
-   TH2F      *fh2JetCoreMethod1C30;           //jet core method1 30-60%
-   TH2F      *fh2JetCoreMethod2C30;           //jet core method2 30-60%
-   TH2F      *fh2JetCoreMethod3C30;           //jet core method3 30-60%
-      
-
-   TH2F      *fh2JetCoreMethod1C60;          //jet core method1 60-100% 
-   TH2F      *fh2JetCoreMethod2C60;          //jet core method2 60-100%
-   TH2F      *fh2JetCoreMethod3C60;          //jet core method3 60-100%

    
    

+     TH2F*      fh2DeltaRC10pt1;            //Jet track R distance in 3 high jet pT bins
+     TH2F*      fh2DeltaRC20pt1;            //for different centralities. 
+     TH2F*      fh2DeltaRC30pt1;
+     TH2F*      fh2DeltaRC60pt1;
+     TH2F*      fh2DeltaRC10pt2;
+     TH2F*      fh2DeltaRC20pt2;
+     TH2F*      fh2DeltaRC30pt2;
+     TH2F*      fh2DeltaRC60pt2;
+     TH2F*      fh2DeltaRC10pt3;
+     TH2F*      fh2DeltaRC20pt3;
+     TH2F*      fh2DeltaRC30pt3;
+     TH2F*      fh2DeltaRC60pt3;
+     TH2F*      fh2DeltaRC10pt4;
+     TH2F*      fh2DeltaRC20pt4;
+     TH2F*      fh2DeltaRC30pt4;
+     TH2F*      fh2DeltaRC60pt4;
+     TH2F*      fh2DeltaEtaC10pt1;             //The same but eta distance
+     TH2F*      fh2DeltaEtaC20pt1;
+     TH2F*      fh2DeltaEtaC30pt1;
+     TH2F*      fh2DeltaEtaC60pt1;
+     TH2F*      fh2DeltaEtaC10pt2;
+     TH2F*      fh2DeltaEtaC20pt2;
+     TH2F*      fh2DeltaEtaC30pt2;
+     TH2F*      fh2DeltaEtaC60pt2;
+     TH2F*      fh2DeltaEtaC10pt3;
+     TH2F*      fh2DeltaEtaC20pt3;
+     TH2F*      fh2DeltaEtaC30pt3;
+     TH2F*      fh2DeltaEtaC60pt3;
+     TH2F*      fh2DeltaEtaC10pt4;
+     TH2F*      fh2DeltaEtaC20pt4;
+     TH2F*      fh2DeltaEtaC30pt4;
+     TH2F*      fh2DeltaEtaC60pt4;
+     TH2F*      fh2DeltaPhiC10pt1;             //The same but phi distance
+     TH2F*      fh2DeltaPhiC20pt1;
+     TH2F*      fh2DeltaPhiC30pt1;
+     TH2F*      fh2DeltaPhiC60pt1;
+     TH2F*      fh2DeltaPhiC10pt2;
+     TH2F*      fh2DeltaPhiC20pt2;
+     TH2F*      fh2DeltaPhiC30pt2;
+     TH2F*      fh2DeltaPhiC60pt2;
+     TH2F*      fh2DeltaPhiC10pt3;
+     TH2F*      fh2DeltaPhiC20pt3;
+     TH2F*      fh2DeltaPhiC30pt3;
+     TH2F*      fh2DeltaPhiC60pt3;
+     TH2F*      fh2DeltaPhiC10pt4;
+     TH2F*      fh2DeltaPhiC20pt4;
+     TH2F*      fh2DeltaPhiC30pt4;
+     TH2F*      fh2DeltaPhiC60pt4;
+     TH2F*      fh2AngStructpt1C10;           //Average two particle correlation function
+     TH2F*      fh2AngStructpt2C10; 
+     TH2F*      fh2AngStructpt3C10;
+     TH2F*      fh2AngStructpt4C10;     
+     TH2F*      fh2AngStructpt1C20;
+     TH2F*      fh2AngStructpt2C20;
+     TH2F*      fh2AngStructpt3C20;
+     TH2F*      fh2AngStructpt4C20;     
+     TH2F*      fh2AngStructpt1C30;
+     TH2F*      fh2AngStructpt2C30;
+     TH2F*      fh2AngStructpt3C30;
+     TH2F*      fh2AngStructpt4C30;     
+     TH2F*      fh2AngStructpt1C60;
+     TH2F*      fh2AngStructpt2C60;
+     TH2F*      fh2AngStructpt3C60;
+     TH2F*      fh2AngStructpt4C60;     
+