X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TDPMjet%2FAliGenDPMjet.h;h=fcbad1bace3bb724ac7bdd725015f64bd96e8a38;hb=92fa6b676a242a5df90a991c81afc97d14eee9a4;hp=29fce8826424965a5a81e91f2256c33b6e7aabf0;hpb=1e6b599d8cd06c99592d983230a6c6505f9b499a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TDPMjet/AliGenDPMjet.h b/TDPMjet/AliGenDPMjet.h
index 29fce882642..fcbad1bace3 100644
--- a/TDPMjet/AliGenDPMjet.h
+++ b/TDPMjet/AliGenDPMjet.h
@@ -7,6 +7,7 @@
 // The main DPMJET options are accessable for the user through this interface.
 
 #include "AliGenMC.h"
+#include "TDPMjet.h"
 #include <TString.h>
 #include <TArrayI.h>
 
@@ -15,6 +16,12 @@ class TArrayI;
 class TParticle;
 class TClonesArray;
 class TGraph;
+class AliGenEventHeader;
+class AliStack;
+class AliRunLoader;
+class AliGenDPMjetEventHeader;
+
+
 
 class AliGenDPMjet : public AliGenMC
 {
@@ -26,20 +33,16 @@ class AliGenDPMjet : public AliGenMC
     virtual ~AliGenDPMjet(); 
     virtual void    Generate();
     virtual void    Init();
-
-    virtual void    SetBeamEnergy(Float_t energy=5400.) {fBeamEn=energy;}
-    virtual void    SetEnergyCMS(Float_t energy=5400.)   {fEnergyCMS=energy;}
-    virtual void    SetImpactParameterRange(Float_t bmin=0., Float_t bmax=16.)
+    virtual void    SetEnergyCMS(Float_t energy = 14000.) {fEnergyCMS = energy; fBeamEn = energy / 2.;}
+    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;}
-    virtual void    KeepFullEvent();
-    virtual void    SetDecaysOff(Int_t flag=1)        {fDecaysOff  = flag;}
     virtual void    SetFlavor(Int_t flag=0)           {fFlavor     = flag;}
-    virtual void    SetEvaluate(Int_t flag=0)         {fEvaluate   = flag;}
     virtual void    SetSelectAll(Int_t flag=0)        {fSelectAll  = flag;}
     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;}    
@@ -54,50 +57,32 @@ class AliGenDPMjet : public AliGenMC
     virtual void    SetGenImpPar(Float_t bValue) {fGenImpPar=bValue;}
     virtual Float_t GetGenImpPar() {return fGenImpPar;}
     
-    /*virtual void EvaluateCrossSections();
-    virtual void Boost();
-    virtual TGraph* CrossSection()     {return fDsigmaDb;}
-    virtual TGraph* BinaryCollisions() {return fDnDb;}
-    */
-
     AliGenDPMjet &  operator=(const AliGenDPMjet & rhs);
+    void     AddHeader(AliGenEventHeader* header);
 
  protected:
     Bool_t SelectFlavor(Int_t pid);
     void   MakeHeader();
 
  protected:
-
-    Int_t         fAProjectile;    // Projectile A
-    Int_t         fZProjectile;    // Projectile Z
-    Int_t         fATarget;        // Target A
-    Int_t         fZTarget;        // Target Z
     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
-    Float_t	  fCrossSec;	   // Fraction of x-section
-    Int_t         fKeep;           // Flag to keep full event information
-    Int_t         fDecaysOff;      // Flag to turn off decays of pi0, K_s, D, Lambda, sigma
-    Int_t         fEvaluate;       // Evaluate total and partial cross-sections
     Int_t         fSelectAll;      // Flag to write the full event
     Int_t         fFlavor;         // Selected particle flavor 4: charm+beauty 5: beauty
     Int_t         fTrials;         // Number of trials
-    TArrayI       fParentSelect;   // Parent particles to be selected 
-    TArrayI       fChildSelect;    // Decay products to be selected
-    Float_t       fXsection;       // Cross-section
     Int_t         fSpectators;     // put spectators on stack
     Int_t 	  fSpecn;	   // Num. of spectator neutrons
     Int_t 	  fSpecp;	   // Num. of spectator protons
     TDPMjet      *fDPMjet;         // DPMjet
-    TGraph*       fDsigmaDb;       // dSigma/db for the system
-    TGraph*       fDnDb;           // dNBinaryCollisions/db
     TClonesArray *fParticles;      // Particle List
     Int_t         fNoGammas;       // Don't write gammas if flag "on"
     Int_t         fLHC;            // Assume LHC as lab frame
-    // Temporaneo!
+    Int_t         fPi0Decay;       // Flag for pi0 decays
     Float_t	  fGenImpPar;	   // GeneratedImpactParameter
+    DpmProcess_t  fProcess;        // Process type
     
  private:
     // adjust the weight from kinematic cuts