X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=STEER%2FAliSimulation.h;h=569edae371ea73226f37797b7462a024948db2eb;hb=c83e4f551376f7b02ec8aea43d5255ae7e602a12;hp=fa271f3d72604c0e68e734ecec4528377a902e27;hpb=6bae477a6727604106ee759e667bfaa7b882d810;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index fa271f3d726..569edae371e 100644
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -45,6 +45,7 @@ public:
   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;};
@@ -82,15 +83,16 @@ public:
   Bool_t         SetRunNumber();
 		   
   // CDB storage activation
-  static void InitCDBStorage(const char *uri);
-  static void SetDefaultStorage(const char* uri);
-  static void SetSpecificStorage(const char* detName, const char* uri);    
+  void InitCDBStorage();
+  void SetDefaultStorage(const char* uri);
+  void SetSpecificStorage(const char* calibType, const char* uri);    
 
   virtual Bool_t Run(Int_t nEvents = 0);
 
   virtual Bool_t RunSimulation(Int_t nEvents = 0);
   virtual Bool_t RunSDigitization(const char* detectors = "ALL");
   virtual Bool_t RunTrigger(const char* descriptors ="" );
+  virtual Bool_t WriteTriggerRawData();
   virtual Bool_t RunDigitization(const char* detectors = "ALL",
 				 const char* excludeDetectors = "");
   virtual Bool_t RunHitsDigitization(const char* detectors = "ALL");
@@ -101,7 +103,8 @@ 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 = "");
+  
 private:
   AliRunLoader*  LoadRun(const char* mode = "UPDATE") const;
   Int_t          GetNSignalPerBkgrd(Int_t nEvents = 0) const;
@@ -131,8 +134,9 @@ private:
   Bool_t         fRegionOfInterest;   // digitization in region of interest
 
   TString 	 fCDBUri;	      // Uri of the default CDB storage
-
-  ClassDef(AliSimulation, 2)  // class for running generation, simulation and digitization
+  TObjArray      fSpecCDBUri;         // Array with detector specific CDB storages
+  Bool_t         fEmbeddingFlag;      // Flag for embedding
+  ClassDef(AliSimulation, 3)  // class for running generation, simulation and digitization
 };
 
 #endif