Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGGA / CaloTrackCorrelations / AliAnaGeneratorKine.h

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h b/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h
index 2b1f3c84d2b2b24c3d05e1f2ea5ca8bcf3333867..c4d1dd36d7d572d4cccd41f763954638e1d521c8 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h
+++ b/PWGGA/CaloTrackCorrelations/AliAnaGeneratorKine.h
@@ -4,9 +4,10 @@
  * See cxx source for full Copyright notice     */
 
 //___________________________________________________________________________
-// Do photon/pi0 analysis for isolation and correlation
-// at the generator level. Only for kine stack (ESDs)
-//
+// Do direct photon/decay photon (eta, pi0, other)/pi0/eta isolation
+// and correlation with partons/jets/hadrons analysis at the generator level.
+// For MC kinematics at ESD and AOD level
+// Jets only considered in the case of Pythia, check what to do with others.//
 //
 //-- Author: Gustavo Conesa (LPSC-CNRS-Grenoble)
 
@@ -73,29 +74,34 @@ public:
   
 private:
 
-  Int_t       fTriggerDetector ;            // Detector : EMCAL, PHOS, CTS
-  TString     fTriggerDetectorString ;      // Detector : EMCAL, PHOS, CTS
+  Int_t            fTriggerDetector ;       // Detector : EMCAL, PHOS, CTS
+  TString          fTriggerDetectorString ; // Detector : EMCAL, PHOS, CTS
 
-  AliFiducialCut* fFidCutTrigger;           //! fiducial cut for the trigger detector
+  AliFiducialCut * fFidCutTrigger;          //! fiducial cut for the trigger detector
   
-  Float_t     fMinChargedPt;                //! Minimum energy for charged particles in correlation
-  Float_t     fMinNeutralPt;                //! Minimum energy for neutral particles in correlation
+  Float_t          fMinChargedPt;           //! Minimum energy for charged particles in correlation
+  Float_t          fMinNeutralPt;           //! Minimum energy for neutral particles in correlation
   
-  AliStack  * fStack;                       //! access stack
+  AliStack       * fStack;                  //! access ESD stack
+  TClonesArray   * fAODMCparticles ;        //! access AOD stack
+
+//  TParticle      * fParton2;              //! Initial state Parton
+//  TParticle      * fParton3;              //! Initial state Parton
   
-//  TParticle * fParton2;                     //! Initial state Parton
-//  TParticle * fParton3;                     //! Initial state Parton
+  TLorentzVector   fParton6;                //! Final state Parton
+  TLorentzVector   fParton7;                //! Final state Parton
   
-  TParticle * fParton6;                     //! Final state Parton
-  TParticle * fParton7;                     //! Final state Parton
+  Int_t            fParton6PDG;             //! Final state Parton PDG
+  Int_t            fParton7PDG;             //! Final state Parton PDG
   
-  TLorentzVector fJet6;                     //! Pythia jet close to parton in position 6
-  TLorentzVector fJet7;                     //! Pythia jet close to parton in position 7
+  TLorentzVector   fJet6;                   //! Pythia jet close to parton in position 6
+  TLorentzVector   fJet7;                   //! Pythia jet close to parton in position 7
 
-  TLorentzVector fTrigger;                  //! Trigger momentum, avoid generating TLorentzVectors per event
-  TLorentzVector fLVTmp;                    //! momentum, avoid generating TLorentzVectors per event
+  TLorentzVector   fTrigger;                //! Trigger momentum, avoid generating TLorentzVectors per event
+  TLorentzVector   fLVTmp;                  //! momentum, avoid generating TLorentzVectors per event
   
-  Float_t     fPtHard;                      //! Generated pT hard
+  Int_t            fNPrimaries;             //! N primaries
+  Float_t          fPtHard;                 //! Generated pT hard
   
   // Histograms
   
@@ -152,7 +158,7 @@ private:
   AliAnaGeneratorKine              (const AliAnaGeneratorKine & gk) ; // cpy ctor
   AliAnaGeneratorKine & operator = (const AliAnaGeneratorKine & gk) ; // cpy assignment
   
-  ClassDef(AliAnaGeneratorKine,5)
+  ClassDef(AliAnaGeneratorKine,6)
   
 } ;