X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCAL.h;h=6e3c9479a438dff19b64de185ec943f68403268f;hb=30b549105c18735fea3323b60464f8045a25f282;hp=63ba6711aec6eb1529c5897454f1cca063d1db03;hpb=c2ef87c2a6b39d93755efddce42e65740148925e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
index 63ba6711aec..6e3c9479a43 100644
--- a/EMCAL/AliEMCAL.h
+++ b/EMCAL/AliEMCAL.h
@@ -31,7 +31,6 @@
 // --- ROOT system ---
 
 class TString ;
-class TTask ;
 class TFolder ;
 class TRandom ; 
 class TGraph;
@@ -42,26 +41,29 @@ class AliRawReader;
 #include "AliDetector.h"
 #include "AliEMCALGeometry.h" 
 #include "AliEMCALTrigger.h" 
+class AliEMCALRawUtils;
+#include "AliReconstructor.h"
+class AliEMCALTriggerData;
 
 class AliEMCAL : public AliDetector {
 
  public:
   
   AliEMCAL(); 
-  AliEMCAL(const char* name, const char* title="");
+  AliEMCAL(const char* name, const char* title="", const Bool_t checkGeoAndRun = kTRUE);
 
   virtual ~AliEMCAL() ; 
   virtual void   AddHit(Int_t, Int_t*, Float_t *) {
     Fatal("AddHit(Int_t, Int_t*, Float_t *", "not to be used: use AddHit( Int_t shunt, Int_t primary, Int_t track,Int_t id, Float_t *hits )") ;  
   }
-  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
+  virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const;
   virtual void  CreateMaterials() ;   
   virtual void  Init() ;   
   virtual void  Digits2Raw();
   
   virtual void  FinishRun() {}                  
-  virtual AliEMCALGeometry * GetGeometry() const 
-    {return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  }   
+  virtual AliEMCALGeometry * GetGeometry() const ;
+   // {return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  }   
   virtual void    Hits2SDigits();
   virtual Int_t   IsVersion(void) const = 0 ;   
   
@@ -74,6 +76,7 @@ class AliEMCAL : public AliDetector {
 
   virtual void  SetCheckRunNumberAndGeoVersion(Bool_t check) { fCheckRunNumberAndGeoVersion = check ; }
 
+  Bool_t Raw2SDigits(AliRawReader* rawReader);
   
 protected:
   void InitConstants();  //initializes some params
@@ -84,12 +87,16 @@ protected:
 
   AliEMCALGeometry* fGeometry;              //!
   Bool_t   fCheckRunNumberAndGeoVersion;    // Check if run number corresponds to the requested geometry and V1 is used
+  
+  //For embedding
+  static AliEMCALRawUtils    * fgRawUtils;        // raw utilities class, for embedding 
+  AliEMCALTriggerData        * fTriggerData;      // Trigger parameters data container
 
 private:
   AliEMCAL(const AliEMCAL& emcal);
   AliEMCAL & operator = (const AliEMCAL & /*rvalue*/);
 
-  ClassDef(AliEMCAL,11) // Electromagnetic calorimeter (base class)
+  ClassDef(AliEMCAL,12) // Electromagnetic calorimeter (base class)
     
 } ;