Fix in AliAODEvent.h for MFT_UPGRADE: kAODListN should always be last in the enum...

diff --git a/STEER/AOD/AliAODEvent.h b/STEER/AOD/AliAODEvent.h
index 8acbfa0afad37a1d87476128e8bcbfc9d2e0a304..ec7b8c17fb83d1094d0e470585ee920a515b71cb 100644 (file)
--- 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 835ade29514a67067788ab3352ae2efe6fe9757e..848ea3d136183b18579c7dcc702cd23bbd6e312d 100644 (file)
--- 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 f1023a55221a1159d27d073f2e47ad3ed3f1628d..4fdb1c09761c3a0c17a486b1fd56f7928af1c24a 100644 (file)
--- 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