AliESDHeader: AliTriggerConfiguration and more trigger scalers added

[u/mrichter/AliRoot.git] / STEER / AliAODInputHandler.h

diff --git a/STEER/AliAODInputHandler.h b/STEER/AliAODInputHandler.h
index 2eaecc6d75f298303ad1d30e7bba1eb253b411ab..a29f3764fb745a7ce2b0c85309cb29568e042ea8 100644 (file)
--- a/STEER/AliAODInputHandler.h
+++ b/STEER/AliAODInputHandler.h
@@ -43,8 +43,19 @@ class AliAODInputHandler : public AliInputEventHandler {
     void                 SetMergeEvents(Bool_t flag) {fMergeEvents = flag;}
     Bool_t               GetMergeEvents() const {return fMergeEvents;}
     AliAODEvent*         GetEventToMerge() {return fAODEventToMerge;}
+    TTree*               GetTreeToMerge()  const {return fTreeToMerge;}
     void                 SetMergeOffset(Int_t ioff) {fMergeOffset = ioff;}
-  
+    Int_t                GetMergeOffset()     const {return fMergeOffset;}
+    void                 SetMergeTracks(Bool_t flag) {fMergeTracks = flag;}
+    Bool_t               GetMergeTracks()      const {return fMergeTracks;}
+    void                 SetMergeEMCALClusters(Bool_t flag) {fMergeEMCALClusters = flag;}
+    Bool_t               GetMergeEMCALClusters()      const {return fMergeEMCALClusters;}
+    void                 SetMergeEMCALCells(Bool_t flag)    {fMergeEMCALCells    = flag;}
+    Bool_t               GetMergeEMCALCells()         const {return fMergeEMCALCells   ;} 
+    void                 SetMergePHOSClusters(Bool_t flag) {fMergePHOSClusters   = flag;}
+    Bool_t               GetMergePHOSClusters()      const {return fMergePHOSClusters  ;}
+    void                 SetMergePHOSCells(Bool_t flag)    {fMergePHOSCells      = flag;}
+    Bool_t               GetMergePHOSCells()         const {return fMergePHOSCells     ;}  
     //PID response
     virtual AliPIDResponse* GetPIDResponse() {return (AliPIDResponse*)fAODpidUtil;}
     virtual void CreatePIDResponse(Bool_t isMC=kFALSE);
@@ -62,6 +73,11 @@ class AliAODInputHandler : public AliInputEventHandler {
   
 // Support for merged events
     Bool_t          fMergeEvents;     // Flag for event merging
+    Bool_t          fMergeTracks;        // Merge tracks
+    Bool_t          fMergeEMCALClusters; // Merge PHOS  cluster
+    Bool_t          fMergePHOSClusters;  // Merge EMCAL cluster
+    Bool_t          fMergeEMCALCells;    // Merge PHOS  cluster
+    Bool_t          fMergePHOSCells;     // Merge EMCAL cluster
     Bool_t          fFriendsConnected;// Friends are connected
     TFile          *fFileToMerge;     //! File for merging
     TTree          *fTreeToMerge;     //! Tree for merging