Correct overloading of virtual functions in the derived classes (icc)

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

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index d09e93ce42f9a0a824da96a25d266128a5efb6e0..9fadb2ab55028467c1e902bad6687a366657cd2f 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -5,15 +5,24 @@
 
 /* $Id$ */
 
+//
+// class for running generation, simulation and digitization
+// Hits, sdigits and digits are created for all detectors by typing:
+//   AliSimulation sim;
+//   sim.Run();
+//
+
 #include <TNamed.h>
 #include <TString.h>
+#include <TObjArray.h>
 
 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);
@@ -21,47 +30,68 @@ public:
 
   void           SetNumberOfEvents(Int_t nEvents);
   void           SetConfigFile(const char* fileName);
+  void           SetGAliceFile(const char* fileName);
+  void           SetEventsPerFile(const char* detector, const char* type, 
+                                 Int_t nEvents);
 
   void           SetRunGeneration(Bool_t run) {fRunGeneration = run;};
   void           SetRunSimulation(Bool_t run) {fRunSimulation = run;};
   void           SetMakeSDigits(const char* detectors) 
                    {fMakeSDigits = detectors;};
-  void           MergeWith(const char* fileName, Int_t nSignalPerBkgrd = 1);
+  void           MergeWith(const char* fileName, Int_t nSignalPerBkgrd = 0);
+  void           SetUseBkgrdVertex(Bool_t useBkgrdVertex)
+                   {fUseBkgrdVertex = useBkgrdVertex;};
   void           SetRegionOfInterest(Bool_t flag) {fRegionOfInterest = flag;};
   void           SetMakeDigits(const char* detectors)
                    {fMakeDigits = detectors;};
   void           SetMakeDigitsFromHits(const char* detectors)
                    {fMakeDigitsFromHits = detectors;};
+  void           SetWriteRawData(const char* detectors, 
+                                const char* fileName = NULL,
+                                Bool_t deleteIntermediateFiles = kFALSE)
+                   {fWriteRawData = detectors; fRawDataFileName = fileName;
+                  fDeleteIntermediateFiles = deleteIntermediateFiles;};
 
   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");
+  virtual Bool_t WriteRawData(const char* detectors = "ALL",
+                             const char* fileName = NULL,
+                             Bool_t deleteIntermediateFiles = kFALSE);
+  virtual Bool_t WriteRawFiles(const char* detectors = "ALL");
+  virtual Bool_t ConvertRawFilesToDate(const char* dateFileName = "raw.date");
+  virtual Bool_t ConvertDateToRoot(const char* dateFileName = "raw.date",
+                                  const char* rootFileName = "raw.root");
 
+private:
+  AliRunLoader*  LoadRun(const char* mode = "UPDATE") const;
+  Int_t          GetNSignalPerBkgrd(Int_t nEvents = 0) 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
   TString        fMakeDigits;         // create digits for these detectors
   TString        fMakeDigitsFromHits; // create digits from hits for these detectors
+  TString        fWriteRawData;       // write raw data for these detectors
+  TString        fRawDataFileName;    // file name for the raw data file
+  Bool_t         fDeleteIntermediateFiles; // delete intermediate raw data files
   Bool_t         fStopOnError;        // stop or continue on errors
 
   Int_t          fNEvents;            // number of events
   TString        fConfigFileName;     // name of the config file
   TString        fGAliceFileName;     // name of the galice file
+  TObjArray      fEventsPerFile;      // number of events per file for given detectors and data types
+
   TObjArray*     fBkgrdFileNames;     // names of background files for merging
+  Bool_t         fUseBkgrdVertex;     // use vertex from background in case of 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
+  ClassDef(AliSimulation, 2)  // class for running generation, simulation and digitization
 };
 
 #endif