bugfix: stopwatches for HLT benchmarks had been resumed at wrong point and measuremen...

[u/mrichter/AliRoot.git] / TDPMjet / AliGenDPMjet.h

diff --git a/TDPMjet/AliGenDPMjet.h b/TDPMjet/AliGenDPMjet.h
index 74482a0abb050caf7a8d325bce7c1917f4ed7d4e..588da78bf6ff41eb5db27a1f90e12448e7c86506 100644 (file)
--- a/TDPMjet/AliGenDPMjet.h
+++ b/TDPMjet/AliGenDPMjet.h
@@ -16,6 +16,12 @@ class TArrayI;
 class TParticle;
 class TClonesArray;
 class TGraph;
+class AliGenEventHeader;
+class AliStack;
+class AliRunLoader;
+class AliGenDPMjetEventHeader;
+
+
 
 class AliGenDPMjet : public AliGenMC
 {
@@ -27,8 +33,9 @@ class AliGenDPMjet : public AliGenMC
     virtual ~AliGenDPMjet(); 
     virtual void    Generate();
     virtual void    Init();
+    virtual void    FinishRun();
     virtual void    SetEnergyCMS(Float_t energy = 14000.) {fEnergyCMS = energy; fBeamEn = energy / 2.;}
-    virtual void    SetImpactParameterRange(Float_t bmin=0., Float_t bmax=16.)
+    virtual void    SetImpactParameterRange(Float_t bmin=0., Float_t bmax=1.)
                        {fMinImpactParam=bmin; fMaxImpactParam=bmax;}
     virtual void    SetProcess(DpmProcess_t iproc) {fProcess = iproc;}
     virtual void    SetCentral(Int_t icentr=-2) {fICentr = icentr;}
@@ -37,21 +44,16 @@ class AliGenDPMjet : public AliGenMC
     virtual void    SetSpectators(Int_t spects=1)     {fSpectators = spects;}
     virtual void    SetBoostLHC(Int_t flag=0)         {fLHC        = flag;}
     virtual void    SetPi0Decay(Int_t iPi0)  {fPi0Decay = iPi0;}
-    virtual Float_t GetEnergyCMS() {return fEnergyCMS;}
-    virtual void    GetProjectile(Int_t& a, Int_t& z)
-                       {a = fAProjectile; z = fZProjectile;}    
-    virtual void    GetTarget(Int_t& a, Int_t& z)
-                       {a = fATarget; z = fZTarget;}    
     virtual void    GetImpactParameterRange(Float_t& bmin, Float_t& bmax)
                        {bmin = fMinImpactParam; bmax = fMaxImpactParam;}
     virtual Int_t   GetSpectators()        {return fSpectators;}
     virtual Int_t   GetFlavor()            {return fFlavor;}
 
-    // Temporeaneo!?!
     virtual void    SetGenImpPar(Float_t bValue) {fGenImpPar=bValue;}
     virtual Float_t GetGenImpPar() {return fGenImpPar;}
     
     AliGenDPMjet &  operator=(const AliGenDPMjet & rhs);
+    void     AddHeader(AliGenEventHeader* header);
 
  protected:
     Bool_t SelectFlavor(Int_t pid);
@@ -59,7 +61,6 @@ class AliGenDPMjet : public AliGenMC
 
  protected:
     Float_t       fBeamEn;        // beam energy
-    Float_t       fEnergyCMS;      // Centre of mass energy
     Float_t       fMinImpactParam; // minimum impact parameter
     Float_t       fMaxImpactParam; // maximum impact parameter 
     Int_t        fICentr;         // Flag to force central production
@@ -70,7 +71,6 @@ class AliGenDPMjet : public AliGenMC
     Int_t        fSpecn;          // Num. of spectator neutrons
     Int_t        fSpecp;          // Num. of spectator protons
     TDPMjet      *fDPMjet;         // DPMjet
-    TClonesArray *fParticles;      // Particle List
     Int_t         fNoGammas;       // Don't write gammas if flag "on"
     Int_t         fLHC;            // Assume LHC as lab frame
     Int_t         fPi0Decay;       // Flag for pi0 decays
@@ -85,7 +85,7 @@ class AliGenDPMjet : public AliGenMC
     // check if stable
     Bool_t Stable(TParticle*  particle);
     
-    ClassDef(AliGenDPMjet,1) // AliGenerator interface to DPMJET
+    ClassDef(AliGenDPMjet,2) // AliGenerator interface to DPMJET
 };
 #endif