From b541b80633d1e2ceed899c7aa8ebb666097d836d Mon Sep 17 00:00:00 2001 From: agheata Date: Fri, 17 Aug 2012 14:18:19 +0000 Subject: [PATCH] Fix in AliAODEvent.h for MFT_UPGRADE: kAODListN should always be last in the enum. From Levente: Additions for merging HMPID rings. --- STEER/AOD/AliAODEvent.h | 6 +++--- STEER/AOD/AliAODInputHandler.cxx | 2 ++ STEER/AOD/AliAODInputHandler.h | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/STEER/AOD/AliAODEvent.h b/STEER/AOD/AliAODEvent.h index 8acbfa0afad..ec7b8c17fb8 100644 --- a/STEER/AOD/AliAODEvent.h +++ b/STEER/AOD/AliAODEvent.h @@ -67,10 +67,10 @@ class AliAODEvent : public AliVEvent { kAODVZERO, kAODZDC, kTOFHeader, +#ifdef MFT_UPGRADE + kAODVZERO, +#endif kAODListN - #ifdef MFT_UPGRADE - ,kAODVZERO - #endif }; AliAODEvent(); diff --git a/STEER/AOD/AliAODInputHandler.cxx b/STEER/AOD/AliAODInputHandler.cxx index 835ade29514..848ea3d1361 100644 --- a/STEER/AOD/AliAODInputHandler.cxx +++ b/STEER/AOD/AliAODInputHandler.cxx @@ -52,6 +52,7 @@ AliAODInputHandler::AliAODInputHandler() : fMergePHOSCells(kTRUE), fMergeEMCALTrigger(kTRUE), fMergePHOSTrigger(kTRUE), + fMergeHMPIDrings(kTRUE), fFriendsConnected(kFALSE), fFileToMerge(0), fTreeToMerge(0), @@ -77,6 +78,7 @@ AliAODInputHandler::AliAODInputHandler(const char* name, const char* title): fMergePHOSCells(kTRUE), fMergeEMCALTrigger(kTRUE), fMergePHOSTrigger(kTRUE), + fMergeHMPIDrings(kTRUE), fFriendsConnected(kFALSE), fFileToMerge(0), fTreeToMerge(0), diff --git a/STEER/AOD/AliAODInputHandler.h b/STEER/AOD/AliAODInputHandler.h index f1023a55221..4fdb1c09761 100644 --- a/STEER/AOD/AliAODInputHandler.h +++ b/STEER/AOD/AliAODInputHandler.h @@ -60,6 +60,8 @@ class AliAODInputHandler : public AliInputEventHandler { Bool_t GetMergeEMCALTrigger() const {return fMergeEMCALTrigger ;} void SetMergePHOSTrigger(Bool_t flag) {fMergePHOSTrigger = flag;} Bool_t GetMergePHOSTrigger() const {return fMergePHOSTrigger ;} + void SetMergeHMPIDrings(Bool_t flag) {fMergeHMPIDrings = flag;} + Bool_t GetMergeHMPIDrings() const {return fMergeHMPIDrings ;} //PID response virtual AliPIDResponse* GetPIDResponse() {return (AliPIDResponse*)fAODpidUtil;} @@ -85,13 +87,14 @@ class AliAODInputHandler : public AliInputEventHandler { Bool_t fMergePHOSCells; // Merge EMCAL cluster Bool_t fMergeEMCALTrigger; // Merge EMCAL cluster Bool_t fMergePHOSTrigger; // Merge PHOS cluster + Bool_t fMergeHMPIDrings; // Merge HMPID rings information Bool_t fFriendsConnected;// Friends are connected TFile *fFileToMerge; //! File for merging TTree *fTreeToMerge; //! Tree for merging AliAODEvent *fAODEventToMerge; //! Event for merging Int_t fMergeOffset; //! Event offset for merging TH2F* fHistStatistics[2]; //! how many events are cut away why {all,bin 0} - ClassDef(AliAODInputHandler, 3); + ClassDef(AliAODInputHandler, 4); }; #endif -- 2.43.0