From 3579964386bd6d4daebb9325221d330edfb06656 Mon Sep 17 00:00:00 2001 From: morsch Date: Fri, 4 May 2012 14:24:17 +0000 Subject: [PATCH] New base class Salvatore Aiola --- PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx | 8 +------- STEER/AOD/AliAODCaloTrigger.cxx | 8 ++++---- STEER/AOD/AliAODCaloTrigger.h | 6 +++--- STEER/CMakelibSTEERBase.pkg | 1 + STEER/ESD/AliESDCaloTrigger.cxx | 6 +++--- STEER/ESD/AliESDCaloTrigger.h | 6 +++--- STEER/STEERBase/AliVEvent.h | 2 ++ STEER/STEERBaseLinkDef.h | 2 ++ 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx index 411320c6ed5..170c2855133 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx @@ -278,14 +278,8 @@ void AliAnalysisTaskEMCALClusterizeFast::FillDigitsArray() } else if (fClusterizeFastORs) { // Fill digits from FastORs AliEMCALGeometry *fGeom = AliEMCALGeometry::GetInstance(fGeomName); - - AliESDEvent* esd = dynamic_cast(InputEvent()); - if (!esd){ - AliError("Cannot get the ESD event"); - return; - } - AliESDCaloTrigger *triggers = esd->GetCaloTrigger("EMCAL"); + AliVCaloTrigger *triggers = InputEvent()->GetCaloTrigger("EMCAL"); if (!triggers || !(triggers->GetEntries() > 0)) return; diff --git a/STEER/AOD/AliAODCaloTrigger.cxx b/STEER/AOD/AliAODCaloTrigger.cxx index 93abe0d4e3e..2e8575ffc46 100644 --- a/STEER/AOD/AliAODCaloTrigger.cxx +++ b/STEER/AOD/AliAODCaloTrigger.cxx @@ -31,7 +31,7 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3 ClassImp(AliAODCaloTrigger) //_______________ -AliAODCaloTrigger::AliAODCaloTrigger() : TNamed(), +AliAODCaloTrigger::AliAODCaloTrigger() : AliVCaloTrigger(), fNEntries(0), fCurrent(-1), fColumn(0x0), @@ -52,7 +52,7 @@ fL1FrameMask(0) } //_______________ -AliAODCaloTrigger::AliAODCaloTrigger(const char* name, const char* title) : TNamed(name, title), +AliAODCaloTrigger::AliAODCaloTrigger(const char* name, const char* title) : AliVCaloTrigger(name, title), fNEntries(0), fCurrent(-1), fColumn(0x0), @@ -73,7 +73,7 @@ AliAODCaloTrigger::AliAODCaloTrigger(const char* name, const char* title) : TNam } //_______________ -AliAODCaloTrigger::AliAODCaloTrigger(const AliAODCaloTrigger& src) : TNamed(src), +AliAODCaloTrigger::AliAODCaloTrigger(const AliAODCaloTrigger& src) : AliVCaloTrigger(src), fNEntries(0), fCurrent(-1), fColumn(0x0), @@ -132,7 +132,7 @@ AliAODCaloTrigger& AliAODCaloTrigger::operator=(const AliAODCaloTrigger& src) void AliAODCaloTrigger::Copy(TObject &obj) const { // - TNamed::Copy(obj); + AliVCaloTrigger::Copy(obj); AliAODCaloTrigger& dest = static_cast(obj); diff --git a/STEER/AOD/AliAODCaloTrigger.h b/STEER/AOD/AliAODCaloTrigger.h index 312f276b7e8..a09ce43cfbd 100644 --- a/STEER/AOD/AliAODCaloTrigger.h +++ b/STEER/AOD/AliAODCaloTrigger.h @@ -11,11 +11,11 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3 */ -#include +#include "AliVCaloTrigger.h" class TArrayI; -class AliAODCaloTrigger : public TNamed +class AliAODCaloTrigger : public AliVCaloTrigger { public: AliAODCaloTrigger(); @@ -78,7 +78,7 @@ private: Int_t fL1FrameMask; // Validation flag for L1 data - ClassDef(AliAODCaloTrigger, 2) + ClassDef(AliAODCaloTrigger, 3) }; #endif diff --git a/STEER/CMakelibSTEERBase.pkg b/STEER/CMakelibSTEERBase.pkg index 7ce027ca0c6..baf0f698469 100644 --- a/STEER/CMakelibSTEERBase.pkg +++ b/STEER/CMakelibSTEERBase.pkg @@ -78,6 +78,7 @@ set ( SRCS STEERBase/AliTPCdEdxInfo.cxx STEERBase/AliCounterCollection.cxx STEERBase/AliTOFHeader.cxx + STEERBase/AliVCaloTrigger.cxx ) string(REPLACE ".cxx" ".h" HDRS "${SRCS}") diff --git a/STEER/ESD/AliESDCaloTrigger.cxx b/STEER/ESD/AliESDCaloTrigger.cxx index 0b7d075da77..69af427a37d 100644 --- a/STEER/ESD/AliESDCaloTrigger.cxx +++ b/STEER/ESD/AliESDCaloTrigger.cxx @@ -31,7 +31,7 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3 ClassImp(AliESDCaloTrigger) //_______________ -AliESDCaloTrigger::AliESDCaloTrigger() : TNamed(), +AliESDCaloTrigger::AliESDCaloTrigger() : AliVCaloTrigger(), fNEntries(0), fCurrent(-1), fColumn(0x0), @@ -52,7 +52,7 @@ fL1FrameMask(0) } //_______________ -AliESDCaloTrigger::AliESDCaloTrigger(const AliESDCaloTrigger& src) : TNamed(src), +AliESDCaloTrigger::AliESDCaloTrigger(const AliESDCaloTrigger& src) : AliVCaloTrigger(src), fNEntries(0), fCurrent(-1), fColumn(0x0), @@ -111,7 +111,7 @@ AliESDCaloTrigger& AliESDCaloTrigger::operator=(const AliESDCaloTrigger& src) void AliESDCaloTrigger::Copy(TObject &obj) const { // - TNamed::Copy(obj); + AliVCaloTrigger::Copy(obj); AliESDCaloTrigger& dest = static_cast(obj); diff --git a/STEER/ESD/AliESDCaloTrigger.h b/STEER/ESD/AliESDCaloTrigger.h index 5c216707ca3..e13d63ddf56 100644 --- a/STEER/ESD/AliESDCaloTrigger.h +++ b/STEER/ESD/AliESDCaloTrigger.h @@ -11,11 +11,11 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3 */ -#include +#include "AliVCaloTrigger.h" class TArrayI; -class AliESDCaloTrigger : public TNamed +class AliESDCaloTrigger : public AliVCaloTrigger { public: AliESDCaloTrigger(); @@ -77,7 +77,7 @@ private: Int_t fL1FrameMask; // Validation flag for L1 data - ClassDef(AliESDCaloTrigger, 5) + ClassDef(AliESDCaloTrigger, 6) }; #endif diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h index c4d6cf8bc51..4dcd03b178b 100644 --- a/STEER/STEERBase/AliVEvent.h +++ b/STEER/STEERBase/AliVEvent.h @@ -21,6 +21,7 @@ #include "AliVVertex.h" #include "AliVCluster.h" #include "AliVCaloCells.h" +#include "AliVCaloTrigger.h" #include "TRefArray.h" #include "AliTOFHeader.h" class AliCentrality; @@ -148,6 +149,7 @@ public: virtual AliVCaloCells *GetPHOSCells() const {return 0;} const TGeoHMatrix* GetPHOSMatrix(Int_t /*i*/) const {return NULL;} const TGeoHMatrix* GetEMCALMatrix(Int_t /*i*/) const {return NULL;} + virtual AliVCaloTrigger *GetCaloTrigger(TString /*calo*/) const {return NULL;} // Primary vertex diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h index f6f02634826..f8a8b29e7c5 100644 --- a/STEER/STEERBaseLinkDef.h +++ b/STEER/STEERBaseLinkDef.h @@ -111,4 +111,6 @@ #pragma link C++ class AliVMFT+; #pragma link C++ class AliCounterCollection+; +#pragma link C++ class AliVCaloTrigger+; + #endif -- 2.43.0