AliVMC and AliGeant3 classes introduced

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

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 86be4ad87b72c8e3010ad856e240ebb49008ccdc..a678e9c0c03c4bfb98fe085628ce34c2d8cf028a 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -1,11 +1,18 @@
 #ifndef AliRun_H
 #define AliRun_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
 #include <TROOT.h>
 #include <TBrowser.h>
 #include <TList.h>
 #include <TStopwatch.h>
 #include <TTree.h>
 #include <TGeometry.h>
+#include <TDatabasePDG.h>
+
 #include "AliDetector.h"
 #include "AliHeader.h"
 #include "AliMagF.h"
@@ -13,6 +20,7 @@
 #include "AliGenerator.h"
 #include "AliLego.h"
 
+enum {Keep_Bit=1, Daughters_Bit=2, Done_Bit=4};
 
 class AliDisplay;
 
@@ -31,22 +39,22 @@ protected:
   TTree        *fTreeH;        //Pointer to Tree for Hits
   TTree        *fTreeE;        //Pointer to Tree for Header
   TTree        *fTreeR;        //Pointer to Tree for Reconstructed Objects
-  TObjArray    *fDetectors;    //List of Detectors
+  TObjArray    *fModules;      //List of Detectors
   TClonesArray *fParticles;    //Pointer to list of particles
   TGeometry    *fGeometry;     //Pointer to geometry
   AliDisplay   *fDisplay;      //Pointer to event display
   TStopwatch    fTimer;        //Timer object
   AliMagF      *fField;        //Magnetic Field Map
   AliMC        *fMC;           //pointer to MonteCarlo object
-  char          fDnames[21][7];//Array of detector names
   TArrayI      *fImedia;       //Array of correspondence between media and detectors
   Int_t         fNdets;        //Number of detectors
   Float_t       fTrRmax;       //Maximum radius for tracking
   Float_t       fTrZmax;       //Maximu z for tracking
   AliGenerator *fGenerator;    //Generator used in the MC
-  Int_t        *fIdtmed;       //Array to contain media numbers
   Bool_t        fInitDone;     //true when initialisation done
   AliLego      *fLego;         //pointer to aliLego object if it exists
+  TDatabasePDG *fPDGDB;        //Particle factory object!
+  TList        *fHitLists;     //Lists of hits to be remapped by PurifyKine
   
 public:
    // Creators - distructors
@@ -56,12 +64,14 @@ public:
 
    virtual  void  AddHit(Int_t id, Int_t track, Int_t *vol, Float_t *hits) const;
    virtual  void  AddDigit(Int_t id, Int_t *tracks, Int_t *digits) const;
+   virtual  void  AddHitList(TCollection *hitList) {fHitLists->Add(hitList);}
    virtual  void  Browse(TBrowser *b);
    virtual  void  Build();
    virtual  void  BuildSimpleGeometry();
    virtual  void  CleanDetectors();
    virtual  void  CleanParents();
-   TObjArray     *Detectors() const {return fDetectors;}
+   TObjArray     *Detectors() const {return fModules;}
+   TObjArray     *Modules() const {return fModules;}
    Int_t          CurrentTrack() const {return fCurrent;}
    AliDisplay    *Display() { return fDisplay;}
    virtual  Int_t DistancetoPrimitive(Int_t px, Int_t py);
@@ -75,10 +85,11 @@ public:
    virtual  void  FlagTrack(Int_t track);
    Int_t          GetEvNumber() const {return fEvent;}
    Int_t          GetRunNumber() const {return fRun;}
-  void           SetRunNumber(Int_t run) {fRun=run;}
+   void           SetRunNumber(Int_t run) {fRun=run;}
    Int_t          GetDebug() const {return fDebug;}
+   AliModule     *GetModule(const char *name);
    AliDetector   *GetDetector(const char *name);
-   Int_t          GetDetectorID(const char *name);
+   Int_t          GetModuleID(const char *name);
    virtual  Int_t GetEvent(Int_t event);
    TGeometry     *GetGeometry();
    AliHeader     *GetHeader() {return &fHeader;}
@@ -106,7 +117,7 @@ public:
    virtual  void  SetDisplay(AliDisplay *display) {fDisplay = display;}
    virtual  void  StepManager(Int_t id) const;
    virtual  void  SetField(Int_t type=2, Int_t version=1, Float_t scale=1, Float_t maxField=10, char*filename="$(ALICE_ROOT)/data/field01.dat");
-   virtual  void  SetTrack(Int_t done, Int_t parent, Int_t ipart, 
+   virtual  void  SetTrack(Int_t done, Int_t parent, Int_t pdg, 
                               Float_t *pmom, Float_t *vpos, Float_t *polar, 
                                Float_t tof, const char *mecha, Int_t &ntr,
                                Float_t weight=1);
@@ -119,13 +130,7 @@ public:
    virtual  AliGenerator* Generator() {return fGenerator;}
    virtual  void SetGenerator(AliGenerator *generator);
    virtual  void EnergySummary();
-   virtual  Int_t* Idtmed() {return fIdtmed;}
-
-  // Functions from GEOCAD
-  //_______________________________________________________________________
-  
-   virtual void ReadEuclid(const char*, Int_t, const char*);
-   virtual void ReadEuclidMedia(const char*, Int_t);
+   virtual  const TDatabasePDG* PDGDB() const {return fPDGDB;}
 
    TTree         *TreeD() {return fTreeD;}
    TTree         *TreeE() {return fTreeE;}
@@ -135,9 +140,9 @@ public:
 
   // --------------------------- commons -------------------------------------
 
-   ClassDef(AliRun,1)      //Supervisor class for all Alice detectors
+   ClassDef(AliRun,2)      //Supervisor class for all Alice detectors
 };
  
-EXTERN  AliRun *gAlice;
+R__EXTERN  AliRun *gAlice;
  
 #endif