Merge branch 'feature-movesplit'

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

diff --git a/PWGJE/EMCALJetTasks/AliJetContainer.h b/PWGJE/EMCALJetTasks/AliJetContainer.h
index 62eb137a51e8cc7209b900a71bb49dc4aeccaca1..74ccb365c369047dbbff80f3390a83eb69c5015d 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetContainer.h
+++ b/PWGJE/EMCALJetTasks/AliJetContainer.h
@@ -12,11 +12,13 @@ class AliVEvent;
 class AliParticleContainer;
 class AliClusterContainer;
 class AliLocalRhoParameter;
-class AliStackPartonInfo;
+class AliPythiaInfo;
 
+#include <TMath.h>
 #include "AliRhoParameter.h"
-
 #include "AliEmcalContainer.h"
+#include "AliLog.h"
+#include "AliVEvent.h"
 
 class AliJetContainer : public AliEmcalContainer {
  public:
@@ -37,7 +39,7 @@ class AliJetContainer : public AliEmcalContainer {
   void LoadRho(AliVEvent *event);
   void LoadLocalRho(AliVEvent *event);
   void LoadRhoMass(AliVEvent *event);
-  void LoadPartonsInfo(AliVEvent *event);
+  void LoadPythiaInfo(AliVEvent *event);
 
   void                        SetJetAcceptanceType(JetAcceptanceType type)         { fJetAcceptanceType          = type ; }
   void                        PrintCuts();
@@ -69,28 +71,28 @@ class AliJetContainer : public AliEmcalContainer {
   virtual void                SetRhoName(const char *n)                            { fRhoName        = n                ; }
   virtual void                SetLocalRhoName(const char *n)                       { fLocalRhoName   = n                ; }
   virtual void                SetRhoMassName(const char *n)                        { fRhoMassName    = n                ; }
-  virtual void                SetPartonInfoName(const char *n)                      { fPartonInfoName    = n; }
+  virtual void                SetPythiaInfoName(const char *n)                      { fPythiaInfoName    = n; }
     
   void                        ConnectParticleContainer(AliParticleContainer *c)    { fParticleContainer = c             ; }
   void                        ConnectClusterContainer(AliClusterContainer *c)      { fClusterContainer  = c             ; }
 
   AliEmcalJet                *GetLeadingJet(const char* opt="")          ;
   AliEmcalJet                *GetJet(Int_t i)                       const;
-  AliEmcalJet                *GetAcceptJet(Int_t i)                 const;
+  AliEmcalJet                *GetAcceptJet(Int_t i)                      ;
   AliEmcalJet                *GetJetWithLabel(Int_t lab)            const;
-  AliEmcalJet                *GetAcceptJetWithLabel(Int_t lab)      const;
+  AliEmcalJet                *GetAcceptJetWithLabel(Int_t lab)           ;
   AliEmcalJet                *GetNextAcceptJet(Int_t i=-1)               ;
   AliEmcalJet                *GetNextJet(Int_t i=-1)                     ;
   void                        GetMomentum(TLorentzVector &mom, Int_t i) const;
-  Bool_t                      AcceptJet(AliEmcalJet* jet)           const;
-  Bool_t                      AcceptBiasJet(AliEmcalJet* jet)       const;
+  Bool_t                      AcceptJet(const AliEmcalJet* jet)          ;
+  Bool_t                      AcceptBiasJet(const AliEmcalJet* jet)      ;
   Int_t                       GetFlavourCut()                       const    {return fFlavourSelection;}
   Int_t                       GetNJets()                            const    {return GetNEntries();}
-  Double_t                    GetLeadingHadronPt(AliEmcalJet* jet)  const;
-  void                        GetLeadingHadronMomentum(TLorentzVector &mom, AliEmcalJet* jet)  const;
-  Double_t                    GetZ(AliEmcalJet *jet, TLorentzVector mom) const;
-  Double_t                    GetZLeadingEmc(AliEmcalJet *jet)      const;
-  Double_t                    GetZLeadingCharged(AliEmcalJet *jet)  const;
+  Double_t                    GetLeadingHadronPt(const AliEmcalJet* jet)  const;
+  void                        GetLeadingHadronMomentum(TLorentzVector &mom, const AliEmcalJet* jet)  const;
+  Double_t                    GetZ(const AliEmcalJet *jet, TLorentzVector mom) const;
+  Double_t                    GetZLeadingEmc(const AliEmcalJet *jet)      const;
+  Double_t                    GetZLeadingCharged(const AliEmcalJet *jet)  const;
   AliRhoParameter            *GetRhoParameter()                              {return fRho;}
   Double_t                    GetRhoVal()                           const    {if (fRho) return fRho->GetVal(); else return 0;}
   const TString&              GetRhoName()                          const    {return fRhoName;}
@@ -99,8 +101,8 @@ class AliJetContainer : public AliEmcalContainer {
   AliRhoParameter            *GetRhoMassParameter()                          {return fRhoMass;}
   Double_t                    GetRhoMassVal()                       const    {if (fRhoMass) return fRhoMass->GetVal(); else return 0;}
   const TString&              GetRhoMassName()                      const    {return fRhoMassName;}
-  const TString&              GetPartonInfoName()                   const    {return fPartonInfoName;}
-  AliStackPartonInfo         *GetStackPartonInfo()                  const    {return fPartonsInfo;}
+  const TString&              GetPythiaInfoName()                   const    {return fPythiaInfoName;}
+  AliPythiaInfo         *GetPythiaInfo()                  const    {return fPythiaInfo;}
   Double_t                    GetJetPtCorr(Int_t i)                 const;
   Double_t                    GetJetPtCorrLocal(Int_t i)            const;
   Float_t                     GetJetRadius()                        const    {return fJetRadius;}
@@ -108,11 +110,12 @@ class AliJetContainer : public AliEmcalContainer {
   Float_t                     GetJetEtaMax()                        const    {return fJetMaxEta;}
   Float_t                     GetJetPhiMin()                        const    {return fJetMinPhi;}
   Float_t                     GetJetPhiMax()                        const    {return fJetMaxPhi;}
+  Float_t                     GetJetPtCut()                         const    {return fJetPtCut;}
   void                        SetClassName(const char *clname);
   void                        SetArray(AliVEvent *event);
-  AliParticleContainer       *GetParticleContainer()                         {return fParticleContainer;}
-  AliClusterContainer        *GetClusterContainer()                          {return fClusterContainer;}
-  Double_t                    GetFractionSharedPt(AliEmcalJet *jet) const;
+  AliParticleContainer       *GetParticleContainer() const                   {return fParticleContainer;}
+  AliClusterContainer        *GetClusterContainer() const                    {return fClusterContainer;}
+  Double_t                    GetFractionSharedPt(const AliEmcalJet *jet) const;
  
 
  protected:
@@ -121,7 +124,7 @@ class AliJetContainer : public AliEmcalContainer {
   TString                     fRhoName;              //  Name of rho object
   TString                     fLocalRhoName;         //  Name of local rho object
   TString                     fRhoMassName;          //  Name of rho mass object
-  TString                     fPartonInfoName;       //  Name of parton info object
+  TString                     fPythiaInfoName;       //  Name of pythia info object
   Int_t                       fFlavourSelection;     //  selection on jet flavour
   Float_t                     fPtBiasJetTrack;       //  select jets with a minimum pt track
   Float_t                     fPtBiasJetClus;        //  select jets with a minimum pt cluster
@@ -148,7 +151,7 @@ class AliJetContainer : public AliEmcalContainer {
   AliRhoParameter            *fRho;                  //! event rho for these jets
   AliLocalRhoParameter       *fLocalRho;             //! event local rho for these jets
   AliRhoParameter            *fRhoMass;              //! event rho mass for these jets
-  AliStackPartonInfo         *fPartonsInfo;          //! event parton info
+  AliPythiaInfo         *fPythiaInfo;          //! event parton info
   AliEMCALGeometry           *fGeom;                 //! emcal geometry
   Int_t                       fRunNumber;            //! run number
 
@@ -156,7 +159,7 @@ class AliJetContainer : public AliEmcalContainer {
   AliJetContainer(const AliJetContainer& obj); // copy constructor
   AliJetContainer& operator=(const AliJetContainer& other); // assignment
 
-  ClassDef(AliJetContainer,9);
+  ClassDef(AliJetContainer,10);
 
 };