SetGenerator does not replace an existing generator, ResetGenerator does

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

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 70e54f749ff9f8509f2756469fd7067b5dcc16b6..ea9382b738959af954609847b3c68440cd1ae42a 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -1,5 +1,10 @@
 #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>
@@ -17,8 +22,6 @@
 
 enum {Keep_Bit=1, Daughters_Bit=2, Done_Bit=4};
 
-enum {kMaxModules = 25, kLenModuleName=7};
-
 class AliDisplay;
 
 class AliRun : public TNamed {
@@ -36,24 +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    *fModules;    //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[kMaxModules][kLenModuleName];
-                               //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
@@ -63,6 +64,7 @@ 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();
@@ -127,16 +129,10 @@ public:
    virtual  Int_t   DetFromMate(Int_t i) { return (*fImedia)[i];}
    virtual  AliGenerator* Generator() {return fGenerator;}
    virtual  void SetGenerator(AliGenerator *generator);
+   virtual  void ResetGenerator(AliGenerator *generator);
    virtual  void EnergySummary();
-   virtual  Int_t* Idtmed() {return fIdtmed;}
    virtual  const TDatabasePDG* PDGDB() const {return fPDGDB;}
 
-  // Functions from GEOCAD
-  //_______________________________________________________________________
-  
-   virtual void ReadEuclid(const char*, Int_t, const char*);
-   virtual void ReadEuclidMedia(const char*, Int_t);
-
    TTree         *TreeD() {return fTreeD;}
    TTree         *TreeE() {return fTreeE;}
    TTree         *TreeH() {return fTreeH;}
@@ -145,9 +141,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