- Updates necessary for newio.

[u/mrichter/AliRoot.git] / PYTHIA6 / AliGenPythia.h

diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index f9610c571a3ec4b75d7bf859a7235b4b543bf97f..d1a4ffc43c287f905bf1a5004d6bc2b4f407f291 100644 (file)
--- a/PYTHIA6/AliGenPythia.h
+++ b/PYTHIA6/AliGenPythia.h
@@ -20,6 +20,7 @@
 
 class AliPythia;
 class TParticle;
+class AliGenPythiaEventHeader;
 
 class AliGenPythia : public AliGenMC
 {
@@ -84,13 +85,15 @@ class AliGenPythia : public AliGenMC
     virtual void SetCountMode(const CountMode_t mode) {
       fCountMode = mode;
     }
+
+    virtual void SetQuench(Int_t flag = 0) {fQuench = flag;}
     
+           
     // get cross section of process
     virtual Float_t GetXsection() const {return fXsection;}
     // get triggered jets
     void GetJets(Int_t& njets, Int_t& ntrig, Float_t[4][10]);
-    void RecJetsUA1(Float_t eCellMin, Float_t eCellSeed, Float_t eMin, Float_t rMin, 
-                   Int_t& njets, Float_t jets[4][50]);
+    void RecJetsUA1(Int_t& njets, Float_t jets[4][50]);
     void SetPycellParameters(Float_t etamax = 2., Int_t neta = 274, Int_t nphi = 432,
                             Float_t thresh = 0., Float_t etseed = 4.,
                             Float_t minet = 10., Float_t r = 1.);
@@ -103,7 +106,7 @@ class AliGenPythia : public AliGenMC
        {ptmin = fPtHardMin; ptmax = fPtHardMax = ptmax;}
     virtual Float_t      GetEnergyCMS() {return fEnergyCMS;}
     virtual void         GetNuclei(Int_t&  a1, Int_t& a2)
-       {a1 = fNucA1; a2 = fNucA2;}
+       {a1 = fAProjectile; a2 = fATarget;}
     virtual void         GetJetEtRange(Float_t& etamin, Float_t& etamax)
        {etamin = fEtaMinJet; etamax = fEtaMaxJet;}
     virtual void         GetJetPhiRange(Float_t& phimin, Float_t& phimax)
@@ -124,7 +127,6 @@ class AliGenPythia : public AliGenMC
     Int_t  GenerateMB();
     void   MakeHeader();    
 
-    TClonesArray* fParticles;       //Particle  List
     
     Process_t   fProcess;           //Process type
     StrucFunc_t fStrucFunc;         //Structure Function
@@ -143,10 +145,9 @@ class AliGenPythia : public AliGenMC
     Float_t     fPtHardMax;         //higher pT-hard cut
     Float_t     fYHardMin;          //lower  y-hard cut 
     Float_t     fYHardMax;          //higher y-hard cut
-    Int_t       fNucA1;             //mass number nucleus side 1
-    Int_t       fNucA2;             //mass number nucleus side 2
     Int_t       fGinit;             //initial state gluon radiation
     Int_t       fGfinal;            //final state gluon radiation
+    Int_t       fQuench;            //Flag for quenching
     Float_t     fPtKick;            //Transverse momentum kick
     Bool_t      fFullEvent;         //!Write Full event if true
     AliDecayer  *fDecayer;          //!Pointer to the decayer instance
@@ -176,16 +177,19 @@ class AliGenPythia : public AliGenMC
     Bool_t fFeedDownOpt;            // Option to set feed down from higher
                                     // quark families (e.g. b->c)
     Bool_t fFragmentation;          // Option to activate fragmentation by Pythia
+    Bool_t fSetNuclei;              // Flag indicating that SetNuclei has been called
     //
 
     CountMode_t fCountMode;         // Options for counting when the event will be finished.
+    AliGenPythiaEventHeader* fHeader; //! Event header
+     
     // fCountMode = kCountAll         --> All particles that end up in the
     //                                    stack are counted
     // fCountMode = kCountParents     --> Only selected parents are counted
     // fCountMode = kCountTrackabless --> Only particles flagged for tracking
     //                                     are counted
     //
-    ClassDef(AliGenPythia,4) // AliGenerator interface to Pythia
+    ClassDef(AliGenPythia,5) // AliGenerator interface to Pythia
 };
 #endif