AddTrial method added, changed trials to unsigned int

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

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index 531d65e30dd29bb4d226a4bdc0042c1f53341cf2..bef8127d5f56264a6332de841e3b371e496ee73c 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -13,8 +13,8 @@
 
 #include <TArrayF.h>
 #include <TArrayI.h>
-#include <TList.h>
 #include <TClonesArray.h>
+#include <TList.h>
 #include <TMCProcess.h>
 #include <TVirtualMCApplication.h>
 
@@ -49,7 +49,6 @@ public:
    virtual  void  FinishEvent();
    virtual  Double_t  TrackingZmax() const {return fTrZmax;}
    virtual  Double_t  TrackingRmax() const {return fTrRmax;}
-   virtual  void Field(const Double_t* x, Double_t* b) const;
    virtual  Int_t   DetFromMate(Int_t i) const { return (*fImedia)[i];}
 //
 
@@ -65,6 +64,8 @@ public:
    void          AddEnergyDeposit(Int_t id, Float_t edep) 
                                        {fEventEnergy[id]+=edep;}
    virtual  void  ResetHits();
+   virtual  void  ResetDigits();
+   virtual  void  ResetSDigits();
    virtual  void  TrackingLimits( Float_t rmax=1.e10, Float_t zmax=1.e10)
        {fTrRmax=rmax; fTrZmax=zmax;}
    virtual  void  DecayLimits( Float_t rmin = -1., Float_t rmax = -1., Int_t pdg = 0)
@@ -85,7 +86,7 @@ public:
    const TObjArray* Particles() const;
    TParticle     *Particle(Int_t i) const;
    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg, 
-                          Float_t *pmom, Float_t *vpos, Float_t *polar, 
+                          const Float_t *pmom, const Float_t *vpos, const Float_t *polar, 
                           Float_t tof, TMCProcess mech, Int_t &ntr,
                           Float_t weight = 1, Int_t is = 0) const;
    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
@@ -102,9 +103,13 @@ public:
 // Track reference related
    AliTrackReference* AddTrackReference(Int_t label, Int_t id = -999);
    // const TClonesArray*      TrackReferences()   const {return &fTrackReferences;}
-   virtual void       RemapTrackReferencesIDs(Int_t *map); //remaping track references MI
+   virtual void       RemapTrackReferencesIDs(const Int_t *map); //remaping track references MI
    virtual void       ResetTrackReferences();
    virtual void       FixParticleDecaytime();
+// Geometry related
+   void           SetGeometryFromCDB();
+   Bool_t         IsGeometryFromCDB() const;
+
  private:
    AliMC(const AliMC&); // Not implemented
    AliMC& operator= (const AliMC&); // Not implemented