Removal of printf and cout messages (Per Thomas)

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

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 2a46688fe23a8ed41700e82724958b859edd7d52..c5d3543ba4b91e645255d509ca4541a6f0dfe869 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -30,9 +30,9 @@ class AliMC;
 class AliMagF;
 class AliStack;
 
-enum {kKeepBit=1, kDaughtersBit=2, kDoneBit=4};
 
 class AliRun : public TNamed {
+
 public:
    // Creators - distructors
    AliRun();
@@ -53,7 +53,6 @@ public:
    void           AddModule(AliModule* mod);
    Int_t          GetEvNumber() const;
    Int_t          GetRunNumber() const {return fRun;}
-   void           SetRunNumber(Int_t run) {fRun=run;}
    void           SetEventNrInRun(Int_t event) {fEventNrInRun=event;}
    Int_t          GetEventNrInRun() const {return fEventNrInRun;}
    Int_t          GetEventsPerRun() const {return fEventsPerRun;}
@@ -82,7 +81,14 @@ public:
    Bool_t         IsRootGeometry() const {return fIsRootGeometry;}
    void           SetRootGeometry(Bool_t flag=kTRUE);
    const char*    GetGeometryFileName() const {return fGeometryFileName.Data();}
-   void           SetGeometryFileName(const char *name) {fGeometryFileName = name;}
+   void           SetGeometryFromFile(const char *filename) {
+     SetRootGeometry();
+     fGeometryFileName = filename;
+   }
+   void           SetGeometryFromCDB();
+   Bool_t         IsGeomFromCDB() const {return fGeometryFromCDB;}
+   const char*    GetTriggerDescriptor() const {return fTriggerDescriptor.Data();}
+   void           SetTriggerDescriptor(const char *name) {fTriggerDescriptor = name;}
    virtual  void  ResetDigits();
    virtual  void  ResetSDigits();
    virtual  void  ResetPoints();
@@ -91,7 +97,7 @@ public:
    virtual  void  Run(Int_t nevent=1, const char *setup="Config.C") {RunMC(nevent,setup);}
    virtual  void  RunLego(const char *setup="Config.C",Int_t nc1=60,Float_t c1min=2,Float_t c1max=178,
                           Int_t nc2=60,Float_t c2min=0,Float_t c2max=360,Float_t rmin=0,
-                          Float_t rmax=430,Float_t zmax=10000, AliLegoGenerator* gener=NULL);
+                          Float_t rmax=430,Float_t zmax=10000, AliLegoGenerator* gener=NULL, Int_t nev = -1);
    virtual  Bool_t IsLegoRun() const {return (fLego!=0);}
    virtual  void  RunReco(const char *detector=0, Int_t first = 0, Int_t last = 0);
    virtual  void  SetDisplay(AliDisplay *display) {fDisplay = display;}
@@ -104,15 +110,10 @@ public:
    // Delegations
    virtual  void  ResetHits();
    virtual  AliGenerator* Generator() const;
-
-
-
-// Added by Alberto Colla
-
+   
    Bool_t         IsFileAccessible(Char_t* name, EAccessMode mode = kFileExists);
    static   Bool_t   IsFileAccessible(const char* fnam, EAccessMode mode = kFileExists);
-// Added by Alberto Colla
-
+   
    //
    // End of MC Application
 
@@ -139,11 +140,8 @@ public:
       else ::Warning(method, "method is depricated\nPlease use: %s", replace);
     }
 
-  // Method to introduce the detector misliagnment
-  // It is called by AliSimulation
-  static Bool_t  ApplyDisplacements(TClonesArray* AlObjArray);
-
 protected:
+  void           SetRunNumber(Int_t run) {fRun=run;}
   virtual  void  Tree2Tree(Option_t *option, const char *detector=0);
   Int_t          fRun;               //! Current run number
   Int_t          fEvent;             //! Current event number (from 1)
@@ -154,7 +152,6 @@ protected:
   AliMC         *fMCApp;             //  Pointer to virtual MC Application
   AliDisplay    *fDisplay;           //! Pointer to event display
   AliMagF       *fField;             //  Magnetic Field Map
-  TVirtualMC    *fMC;                //! Pointer to MonteCarlo object
   Int_t          fNdets;             //  Number of detectors
   Bool_t         fInitDone;          //! True when initialisation done
   AliLego       *fLego;              //! Pointer to aliLego object if it exists
@@ -163,12 +160,14 @@ protected:
   TRandom       *fRandom;            //  Pointer to the random number generator
   TString        fBaseFileName;      //  Name of the base root file
   Bool_t         fIsRootGeometry;    //! Flag telling if the geometry is loaded from file
+  Bool_t         fGeometryFromCDB;   //! Flag telling if the geometry is to be loaded from OCDB
   TString        fGeometryFileName;  //! Name of the geometry file
+  TString        fTriggerDescriptor; //  Trigger descriptor identifier
   AliRunLoader  *fRunLoader;         //!run getter - written as a separate object
 private:
   void Copy(TObject &arun) const;
 
-  ClassDef(AliRun,10)      //Supervisor class for all Alice detectors
+  ClassDef(AliRun,11)      //Supervisor class for all Alice detectors
 };
  
 R__EXTERN  AliRun *gAlice;