Return to the new version of AliSimulatioon

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

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index d09e93ce42f9a0a824da96a25d266128a5efb6e0..bda4d911bf53bd5eda2f0019b677480f3687d7f8 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -13,7 +13,8 @@ class AliRunLoader;
 
 class AliSimulation: public TNamed {
 public:
-  AliSimulation(const char* name = "AliSimulation", 
+  AliSimulation(const char* configFileName = "Config.C",
+               const char* name = "AliSimulation", 
                const char* title = "generation, simulation and digitization");
   AliSimulation(const AliSimulation& sim);
   AliSimulation& operator = (const AliSimulation& sim);
@@ -35,17 +36,16 @@ public:
 
   virtual Bool_t Run(Int_t nEvents = 0);
 
-private:
-  void           Init();
+  virtual Bool_t RunSimulation(Int_t nEvents = 0);
+  virtual Bool_t RunSDigitization(const char* detectors = "ALL");
+  virtual Bool_t RunDigitization(const char* detectors = "ALL",
+                                const char* excludeDetectors = "");
+  virtual Bool_t RunHitsDigitization(const char* detectors = "ALL");
 
+private:
+  AliRunLoader*  LoadRun() const;
   Bool_t         IsSelected(TString detName, TString& detectors) const;
 
-  Bool_t         RunSimulation();
-  Bool_t         RunSDigitization(const TString& detectors);
-  Bool_t         RunDigitization(const TString& detectors,
-                                const TString& excludeDetectors);
-  Bool_t         RunHitsDigitization(const TString& detectors);
-
   Bool_t         fRunGeneration;      // generate prim. particles or not
   Bool_t         fRunSimulation;      // simulate detectors (hits) or not
   TString        fMakeSDigits;        // create sdigits for these detectors
@@ -59,8 +59,6 @@ private:
   TObjArray*     fBkgrdFileNames;     // names of background files for merging
   Bool_t         fRegionOfInterest;   // digitization in region of interest
 
-  AliRunLoader*  fRunLoader;          //! current run loader object
-
   ClassDef(AliSimulation, 1)  // class for running generation, simulation and digitization
 };