X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliSimulation.h;h=2f700eef0ba3c8731252f77bafc93e11e4fd471b;hb=cd888a899848afbdeedf2dcd93ae4be186c2508f;hp=192b754d70ca24107eff7a3364d8ed5534188512;hpb=ec92bee05d17297de2f1f1e1ba80db9c6f5058b7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index 192b754d70c..2f700eef0ba 100644
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -31,6 +31,8 @@ public:
   AliSimulation& operator = (const AliSimulation& sim);
   virtual ~AliSimulation();
 
+  static AliSimulation *GetInstance() {return fgInstance;}
+
   void           SetNumberOfEvents(Int_t nEvents);
   void           SetConfigFile(const char* fileName);
   void           SetGAliceFile(const char* fileName);
@@ -41,10 +43,11 @@ public:
   void           SetRunSimulation(Bool_t run) {fRunSimulation = run;};
   void           SetLoadAlignFromCDB(Bool_t load)  {fLoadAlignFromCDB = load;};
   void           SetLoadAlignData(const char* detectors) 
-                   {fLoadAlignData = detectors;};
+                   {fLoadAlObjsListOfDets = detectors;};
   void           SetMakeSDigits(const char* detectors) 
                    {fMakeSDigits = detectors;};
   void           MergeWith(const char* fileName, Int_t nSignalPerBkgrd = 0);
+  void           EmbedInto(const char* fileName, Int_t nSignalPerBkgrd = 0);
   void           SetUseBkgrdVertex(Bool_t useBkgrdVertex)
                    {fUseBkgrdVertex = useBkgrdVertex;};
   void           SetRegionOfInterest(Bool_t flag) {fRegionOfInterest = flag;};
@@ -59,24 +62,10 @@ public:
 				 Bool_t deleteIntermediateFiles = kFALSE)
                    {fWriteRawData = detectors; fRawDataFileName = fileName;
 		   fDeleteIntermediateFiles = deleteIntermediateFiles;};
-
-  Bool_t         ApplyAlignObjsToGeom(TObjArray* alObjArray);
-
-  Bool_t         ApplyAlignObjsToGeom(const char* fileName,
-				      const char* clArrayName);
-  Bool_t         ApplyAlignObjsToGeom(AliCDBParam* param,
-				      AliCDBId& Id);
-  Bool_t         ApplyAlignObjsToGeom(const char* uri, const char* path,
-				      Int_t runnum, Int_t version,
-				      Int_t sversion);
-  Bool_t         ApplyAlignObjsToGeom(const char* detName, Int_t runnum, Int_t version,
-				      Int_t sversion);
   void           SetAlignObjArray(TObjArray *array)
                    {fAlignObjArray = array;
 		   fLoadAlignFromCDB = kFALSE;}
 
-  Bool_t         SetAlignObjArraySingleDet(const char* detName); 		   
-
   Bool_t         MisalignGeometry(AliRunLoader *runLoader = NULL);
 
   Bool_t         SetRunNumber();
@@ -84,7 +73,8 @@ public:
   // CDB storage activation
   void InitCDBStorage();
   void SetDefaultStorage(const char* uri);
-  void SetSpecificStorage(const char* detName, const char* uri);    
+  void SetRemoteStorage(const char* uri);
+  void SetSpecificStorage(const char* calibType, const char* uri);
 
   virtual Bool_t Run(Int_t nEvents = 0);
 
@@ -102,16 +92,28 @@ public:
   virtual Bool_t ConvertRawFilesToDate(const char* dateFileName = "raw.date");
   virtual Bool_t ConvertDateToRoot(const char* dateFileName = "raw.date",
 				   const char* rootFileName = "raw.root");
+  virtual Bool_t ConvertRaw2SDigits(const char* rawDirectory, const char* esdFile = "");
+
+  // HLT
+  void SetRunHLT(const char* options) {fRunHLT=options;}
+  virtual Bool_t RunHLT();
+
+  //Quality Assurance
+  Int_t       GetDetIndex(const char * detector);
+  const Int_t GetQACycles(const char * detector) { return fQACycles[GetDetIndex(detector)] ; }
+  void        SetQACycles(const char * detector, const Int_t cycles) { fQACycles[GetDetIndex(detector)] = cycles ; }
 
 private:
   AliRunLoader*  LoadRun(const char* mode = "UPDATE") const;
   Int_t          GetNSignalPerBkgrd(Int_t nEvents = 0) const;
   Bool_t         IsSelected(TString detName, TString& detectors) const;
 
+  static AliSimulation *fgInstance;    // Static pointer to object
+
   Bool_t         fRunGeneration;      // generate prim. particles or not
   Bool_t         fRunSimulation;      // simulate detectors (hits) or not
   Bool_t         fLoadAlignFromCDB;   // Load alignment data from CDB and apply it to geometry or not
-  TString        fLoadAlignData;      // Load alignment data from CDB for these detectors
+  TString        fLoadAlObjsListOfDets;   // Load alignment data from CDB for these detectors
   TString        fMakeSDigits;        // create sdigits for these detectors
   TString        fMakeDigits;         // create digits for these detectors
   TString        fMakeTrigger;        // run trigger for these descriptors
@@ -132,9 +134,19 @@ private:
   Bool_t         fRegionOfInterest;   // digitization in region of interest
 
   TString 	 fCDBUri;	      // Uri of the default CDB storage
+  TString 	 fRemoteCDBUri;	      // Uri of the remote CDB storage
   TObjArray      fSpecCDBUri;         // Array with detector specific CDB storages
+  Bool_t         fEmbeddingFlag;      // Flag for embedding
+  
+  //QA stuff
+  static const Int_t  fgkNDetectors = 15 ;            // number of detectors
+  static const char * fgkDetectorName[fgkNDetectors] ; // names of detectors
+  Int_t               fQACycles[fgkNDetectors] ;      // cycle length (# events) over which QA data are accumulated
+
+  //HLT
+  TString        fRunHLT;             // HLT options, HLT is disabled if empty, default='default'
 
-  ClassDef(AliSimulation, 3)  // class for running generation, simulation and digitization
+  ClassDef(AliSimulation, 6)  // class for running generation, simulation and digitization
 };
 
 #endif