Correct overloading of virtual functions in the derived classes (icc)

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

diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h
index 1b37afbe2374d2c18be3b7b865ce331f6ae43441..0e208826c0efd088063eb4044edefc18ecff5d11 100644 (file)
--- a/STEER/AliGenerator.h
+++ b/STEER/AliGenerator.h
@@ -18,15 +18,16 @@
 
 #include "AliRndm.h"
 
+class AliVertexGenerator;
 class AliCollisionGeometry;
+class AliGenEventHeader;
 class AliStack;
-
 class TGenerator;
 
 
 
-typedef enum { kNoSmear, kPerEvent, kPerTrack } VertexSmear_t;
-typedef enum { kExternal, kInternal}            VertexSource_t;
+typedef enum { kNoSmear, kPerEvent, kPerTrack }  VertexSmear_t;
+typedef enum { kExternal, kInternal, kContainer} VertexSource_t;
 
 
 class AliGenerator : public TNamed, public AliRndm
@@ -38,13 +39,13 @@ 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);
     virtual void SetMomentumRange(Float_t pmin=0, Float_t pmax=1.e10);
     virtual void SetPtRange(Float_t ptmin=0, Float_t ptmax=1.e10);
-    virtual void SetPhiRange(Float_t phimin=-180., Float_t phimax=180);
+    virtual void SetPhiRange(Float_t phimin = 0., Float_t phimax = 360.);
     virtual void SetYRange(Float_t ymin=-100, Float_t ymax=100);
     virtual void SetVRange(Float_t vxmin, Float_t vxmax,
                           Float_t vymin, Float_t vymax,
@@ -58,16 +59,19 @@ class AliGenerator : public TNamed, public AliRndm
     virtual void SetAnalog(Int_t flag=1) {fAnalog=flag;}       
     virtual void SetVertexSmear(VertexSmear_t smear) {fVertexSmear = smear;}
     virtual void SetCutVertexZ(Float_t cut=999999.) {fCutVertexZ = cut;}
-    virtual void SetVertexSource(VertexSource_t) {fVertexSource = kInternal;}    
+    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 FinishRun();
+    virtual void SetMC(TGenerator *theMC) {fMCEvGen =theMC;}
+    virtual void AddHeader(AliGenEventHeader* /*header*/) {;}
+    virtual void SetContainer(AliGenerator* container) {fContainer = container;}
     AliGenerator & operator=(const AliGenerator &gen);
 
   // Getters
@@ -82,14 +86,14 @@ 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  SetTrack(Int_t done, Int_t parent, Int_t pdg,
+    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
                                Float_t *pmom, Float_t *vpos, Float_t *polar,
                                Float_t tof, TMCProcess mech, Int_t &ntr,
                                Float_t weight = 1, Int_t is = 0);
-    virtual  void  SetTrack(Int_t done, Int_t parent, Int_t pdg,
+    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
                       Double_t px, Double_t py, Double_t pz, Double_t e,
                       Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                       Double_t polx, Double_t poly, Double_t polz,
@@ -98,7 +102,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
@@ -120,12 +124,14 @@ 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
-    TArrayF     fEventVertex;   //!The current event vertex
+    TArrayF     fVertex;        //! Vertex of current event
 
-    AliStack*   fStack;      //! Local pointer to stack
+    AliStack*   fStack;         //! Local pointer to stack
+    AliGenerator* fContainer;   //! Local pointer to container
+    
     AliCollisionGeometry* fCollisionGeometry; //!Collision geometry
     /*************************************************************************/
     enum {kThetaRange    = BIT(14),