From b4215a15bb5bcc5eaa8060535196a1d7facbd7cd Mon Sep 17 00:00:00 2001 From: schutz Date: Fri, 24 Mar 2006 21:39:48 +0000 Subject: [PATCH] Modification needed to include PHOS in the global trigger framework --- EMCAL/AliEMCAL.h | 14 ++++++++++---- PHOS/AliPHOS.h | 9 +++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h index 7ac28d42206..8a166ccf16c 100644 --- 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 c4c22d7edc8..4a2f4cff5c3 100644 --- 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 ; } -- 2.43.0