Modification needed to include PHOS in the global trigger framework

diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
index 7ac28d4220619a93e037e365811d03a10927ceae..8a166ccf16c67ad4555034aba51fbab801c99dc1 100644 (file)
--- a/EMCAL/AliEMCAL.h
+++ b/EMCAL/AliEMCAL.h
@@ -23,10 +23,12 @@ class TF1;
 class AliRawReader;
 #include "AliDetector.h"
 #include "AliEMCALGeometry.h" 
+#include "AliEMCALTrigger.h"
+
 class AliEMCAL : public AliDetector {
 
  public:
-
+  
   AliEMCAL(); 
   AliEMCAL(const char* name, const char* title="");
   AliEMCAL(const AliEMCAL& emcal) : AliDetector(emcal) {
@@ -45,15 +47,19 @@ class AliEMCAL : public AliDetector {
   virtual void  CreateMaterials() ;   
   //  virtual void  
   virtual void  Digits2Raw();
-
+  
   using AliDetector::Raw2Digits;
   virtual void  Raw2Digits(AliRawReader *reader);
-
+  
   virtual void  FinishRun() {}                  
   virtual AliEMCALGeometry * GetGeometry() const 
-  {return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  }   
+    {return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  }   
   virtual void    Hits2SDigits();
   virtual Int_t   IsVersion(void) const = 0 ;   
+  
+  virtual AliTriggerDetector* CreateTriggerDetector() const 
+    { return new AliEMCALTrigger(); }
+  
   // Raw Read Out
   Double_t GetRawFormatCapa() const { return fgCapa ; }   
   Double_t GetRawFormatHighCharge() const { return fHighCharge ; }  

diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h
index c4c22d7edc813f11a32310780312c2772e0c85c0..4a2f4cff5c3c1b68717f01f01e5e63588c886a5c 100644 (file)
--- a/PHOS/AliPHOS.h
+++ b/PHOS/AliPHOS.h
@@ -7,6 +7,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.65  2006/03/07 18:56:25  kharlov
+ * CDB is passed via environment variable
+ *
  * Revision 1.64  2005/11/03 13:09:19  hristov
  * Removing meaningless const declarations (linuxicc)
  *
@@ -39,6 +42,7 @@ class TRandom ;
 #include "AliDetector.h" 
 #include "AliLog.h"
 #include "AliPHOSGeometry.h" 
+#include "AliPHOSTrigger.h"
 class AliPHOSAlignData;
 
 class AliPHOS : public AliDetector {
@@ -68,8 +72,13 @@ public:
   {return AliPHOSGeometry::GetInstance(GetTitle(),"") ;  }
   virtual AliPHOSGeometry * GetGeometry(AliPHOSAlignData *alignda) const 
   {return AliPHOSGeometry::GetInstance(GetTitle(),"",alignda) ;  }
+
   virtual void    Hits2SDigits();
   virtual Int_t   IsVersion(void) const = 0 ;  
+
+  virtual AliTriggerDetector* CreateTriggerDetector() const 
+    { return new AliPHOSTrigger(); }
+
   // Raw Read Out
   Double_t GetRawFormatCapa() const { return fgCapa ; }   
   Double_t GetRawFormatHighCharge() const { return fHighCharge ; }