Merge branch 'feature-movesplit'

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

diff --git a/PWGJE/EMCALJetTasks/AliJetModelBaseTask.h b/PWGJE/EMCALJetTasks/AliJetModelBaseTask.h
index 72bfedfd551d7f32f90ea4129f039db4e6f856ff..3760990780055e4b8dde5980632212e1d1f49b74 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetModelBaseTask.h
+++ b/PWGJE/EMCALJetTasks/AliJetModelBaseTask.h
@@ -11,7 +11,7 @@ class AliVCaloCells;
 class AliAODMCParticle;
 class AliNamedArrayI;
 class TF2;
-class AliStackPartonInfo;
+class AliPythiaInfo;
 
 #include <TH1F.h>
 #include <TF1.h>
@@ -43,7 +43,7 @@ class AliJetModelBaseTask : public AliAnalysisTaskSE {
   void                   SetClusName(const char *n)            { fCaloName     = n;    }
   void                   SetCellsName(const char *n)           { fCellsName    = n;    }
   void                   SetMCParticlesName(const char *n)     { fMCParticlesName = n; }
-    void                 SetPartonInfoName(const char *n)      { fPartonInfoName = n; }
+    void                 SetPythiaInfoName(const char *n)      { fPythiaInfoName = n; }
   void                   SetSuffix(const char *s)              { fSuffix       = s;    }
   void                   SetGeometryName(const char *n)        { fGeomName     = n;    }
   void                   SetMarkMC(Int_t m)                    { fMarkMC       = m;    }
@@ -86,7 +86,7 @@ class AliJetModelBaseTask : public AliAnalysisTaskSE {
   TString                fOutCellsName;           // name of output cells collection
   TString                fMCParticlesName;        // name of MC particle collection
   TString                fOutMCParticlesName;     // name of output MC particle collection
-  TString                fPartonInfoName;         // name of partons info
+  TString                fPythiaInfoName;         // name of pythia info
   Bool_t                 fIsMC;                   // whether the current event is MC or not
   TString                fSuffix;                 // suffix to add in the name of new collections
   Float_t                fEtaMin;                 // eta minimum value
@@ -125,7 +125,7 @@ class AliJetModelBaseTask : public AliAnalysisTaskSE {
   Int_t                  fMCLabelShift;           //!MC label shift
   Bool_t                 fEsdMode;                //!ESD/AOD mode
   TList                 *fOutput;                 //!output list for QA histograms
-  AliStackPartonInfo    *fStackPartonInfo;     //!Info on original partons:PDG,pt, eta, phi 
+  AliPythiaInfo    *fPythiaInfo;     //!Info on original partons:PDG,pt, eta, phi and pythia event weight
 
  private:
   AliJetModelBaseTask(const AliJetModelBaseTask&);            // not implemented