New version including TOF

[u/mrichter/AliRoot.git] / STEER / AliGenerator.h

diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h
index 97d3dd593d181bd2b95b8f629fc2ce6ba0123d84..699dbe6952c01553e95fef296f308f0b859a0acf 100644 (file)
--- a/STEER/AliGenerator.h
+++ b/STEER/AliGenerator.h
@@ -18,6 +18,7 @@
 
 #include "AliRndm.h"
 
+class AliVertexGenerator;
 class AliCollisionGeometry;
 class AliStack;
 
@@ -38,7 +39,7 @@ class AliGenerator : public TNamed, public AliRndm
     AliGenerator(const AliGenerator &gen);
     virtual ~AliGenerator();
     virtual void Init();
-    void Copy(AliGenerator &gen) const;
+    void Copy(TObject &gen) const;
     virtual void SetOrigin(Float_t ox, Float_t oy, Float_t oz);
     virtual void SetOrigin(const TLorentzVector &o);
     virtual void SetSigma(Float_t sx, Float_t sy, Float_t sz);
@@ -61,14 +62,14 @@ class AliGenerator : public TNamed, public AliRndm
     virtual void SetVertexSource(VertexSource_t source = kInternal) {fVertexSource = source;}
     virtual void SetVertex(Float_t vx, Float_t vy, Float_t vz)
        {fVertex[0] = vx; fVertex[1] = vy; fVertex[2] = vz;}
+    void SetVertexGenerator(AliVertexGenerator* vertexGenerator)
+      {fVertexGenerator = vertexGenerator; fVertexSource = kExternal; fVertexSmear = kPerEvent;}
     virtual void SetTrackingFlag(Int_t flag=1) {fTrackIt=flag;}
     void Vertex();
     void VertexExternal();
     virtual void VertexInternal();
     virtual void FinishRun();
-    virtual void SetMC(TGenerator *theMC) 
-       {if (!fgMCEvGen) fgMCEvGen =theMC;}
-
+    virtual void SetMC(TGenerator *theMC) {fMCEvGen =theMC;}
     AliGenerator & operator=(const AliGenerator &gen);
 
   // Getters
@@ -83,7 +84,7 @@ class AliGenerator : public TNamed, public AliRndm
   // Collision Geometry
     virtual Bool_t ProvidesCollisionGeometry() const {return kFALSE;}
     virtual Bool_t NeedsCollisionGeometry()    const {return kFALSE;}    
-    virtual AliCollisionGeometry* CollisionGeometry() {return fCollisionGeometry;}
+    virtual AliCollisionGeometry* CollisionGeometry() const {return fCollisionGeometry;}
     virtual void SetCollisionGeometry(AliCollisionGeometry* geom) {fCollisionGeometry = geom;}
  protected:
     virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
@@ -99,7 +100,7 @@ class AliGenerator : public TNamed, public AliRndm
     virtual void   SetHighWaterMark(Int_t nt);
     
  protected:
-    static  TGenerator* fgMCEvGen; //Pointer to the generator
+    TGenerator* fMCEvGen;      //!Pointer to the generator
     Float_t     fThetaMin;     //Minimum theta of generation in radians
     Float_t     fThetaMax;     //Maximum theta of generation in radians
     Float_t     fPhiMin;       //Minimum phi of generation in radians
@@ -121,6 +122,7 @@ class AliGenerator : public TNamed, public AliRndm
     VertexSource_t    fVertexSource; //Vertex source (internal/external)
     Float_t     fCutVertexZ;    // Vertex cut in units of sigma_z
     Int_t       fTrackIt;    // if 1, Track final state particles 
+    AliVertexGenerator* fVertexGenerator;  //! Generator for the vertex
     TArrayF     fOrigin;     // Origin of event
     TArrayF     fOsigma;     // Sigma of the Origin of event
     TArrayF     fVertex;     //! Vertex of current event