AliESDHeader: AliTriggerConfiguration and more trigger scalers added

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

diff --git a/STEER/AliAODInputHandler.cxx b/STEER/AliAODInputHandler.cxx
index eddee692a5603b67b83098db29a500259075cc10..5e01f865b77e0fa0be978fdce54ac987630b851c 100644 (file)
--- a/STEER/AliAODInputHandler.cxx
+++ b/STEER/AliAODInputHandler.cxx
@@ -45,6 +45,11 @@ AliAODInputHandler::AliAODInputHandler() :
     fFriends(new TList()),
     fAODpidUtil(0x0),
     fMergeEvents(kFALSE),
+    fMergeTracks(kTRUE), 
+    fMergeEMCALClusters(kTRUE), 
+    fMergePHOSClusters(kTRUE), 
+    fMergeEMCALCells(kTRUE), 
+    fMergePHOSCells(kTRUE),
     fFriendsConnected(kFALSE),
     fFileToMerge(0),
     fTreeToMerge(0),
@@ -63,6 +68,11 @@ AliAODInputHandler::AliAODInputHandler(const char* name, const char* title):
   fFriends(new TList()),
   fAODpidUtil(0x0),
   fMergeEvents(kFALSE),
+  fMergeTracks(kTRUE), 
+  fMergeEMCALClusters(kTRUE), 
+  fMergePHOSClusters(kTRUE), 
+  fMergeEMCALCells(kTRUE), 
+  fMergePHOSCells(kTRUE),
   fFriendsConnected(kFALSE),
   fFileToMerge(0),
   fTreeToMerge(0),
@@ -165,10 +175,12 @@ Bool_t AliAODInputHandler::Notify(const char* path)
               tmplist.Add(hBin0);
               if (fHistStatistics[1] && hBin0) fHistStatistics[1]->Merge(&tmplist);
            } else {
-             fHistStatistics[0] = static_cast<TH2F*>(hAll->Clone());
-             fHistStatistics[1] = static_cast<TH2F*>(hBin0->Clone());
-             fHistStatistics[0]->SetDirectory(0);
-             fHistStatistics[1]->SetDirectory(0);
+             if (hAll && hBin0) {
+                fHistStatistics[0] = static_cast<TH2F*>(hAll->Clone());
+                fHistStatistics[1] = static_cast<TH2F*>(hBin0->Clone());
+                fHistStatistics[0]->SetDirectory(0);
+                fHistStatistics[1]->SetDirectory(0);
+             }   
            }   
         }
         delete list;
@@ -233,7 +245,7 @@ void AliAODInputHandler::ConnectFriends()
     } else {
        // Friends have to be merged
        TNamed* filename = (TNamed*) (fFriends->At(0));
-       fFileToMerge = new TFile(filename->GetName());
+        fFileToMerge = TFile::Open(filename->GetName());
        if (fFileToMerge) {
            fFileToMerge->GetObject("aodTree", fTreeToMerge);
            if (!fAODEventToMerge) fAODEventToMerge = new AliAODEvent();