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 d2bff3dc4c64d0ed6339e4802215fc92784a33b2..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,7 +71,7 @@ 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             ; }
@@ -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;}
@@ -122,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
@@ -149,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