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

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index 192b754d70c..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;};
@@ -84,7 +85,7 @@ public:
   // CDB storage activation
   void InitCDBStorage();
   void SetDefaultStorage(const char* uri);
-  void SetSpecificStorage(const char* detName, const char* uri);    
+  void SetSpecificStorage(const char* calibType, const char* uri);    
 
   virtual Bool_t Run(Int_t nEvents = 0);
 
@@ -102,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;
@@ -133,7 +135,7 @@ private:
 
   TString 	 fCDBUri;	      // Uri of the default CDB storage
   TObjArray      fSpecCDBUri;         // Array with detector specific CDB storages
-
+  Bool_t         fEmbeddingFlag;      // Flag for embedding
   ClassDef(AliSimulation, 3)  // class for running generation, simulation and digitization
 };