Typo fixed + warnings removed.

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

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index defc4a0d2372d170c14643b041a54b2062908233..d2ab9338d029a98147b563c9dbd71b1575fbf985 100644 (file)
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -86,31 +86,11 @@ Bool_t AliESDInputHandler::Init(TTree* tree,  Option_t* opt)
     SwitchOffBranches();
     SwitchOnBranches();
     
-    if (fEvent) {
-      delete fEvent;
-      fEvent = 0;
-    }
-    fEvent = new AliESDEvent();
-
+    if (!fEvent) fEvent = new AliESDEvent();
     fEvent->ReadFromTree(fTree);
     fNEvents = fTree->GetEntries();
 
-    if (fUseHLT) {
-       // Get HLTesdTree from current file
-       TTree* cTree = tree;
-       if (fTree->GetTree()) cTree = fTree->GetTree();
-       TFile* cFile = cTree->GetCurrentFile();
-       cFile->GetObject("HLTesdTree", fHLTTree);
-       if (fHLTEvent) {
-           delete fHLTEvent;
-           fHLTEvent = 0;
-       }
-       if (fHLTTree) {
-           fHLTEvent = new AliESDEvent();
-           fHLTEvent->ReadFromTree(fHLTTree);
-       }
-    }
-    
+
     return kTRUE;
 }
 
@@ -142,6 +122,19 @@ Bool_t AliESDInputHandler::Notify(const char* path)
     // Notify a directory change
     AliInfo(Form("Directory change %s \n", path));
     //
+    if (fUseHLT) {
+       // Get HLTesdTree from current file
+       TTree* cTree = fTree;
+       if (fTree->GetTree()) cTree = fTree->GetTree();
+       TFile* cFile = cTree->GetCurrentFile();
+       cFile->GetObject("HLTesdTree", fHLTTree);
+       
+       if (fHLTTree) {
+         if (!fHLTEvent) fHLTEvent = new AliESDEvent();
+         fHLTEvent->ReadFromTree(fHLTTree);
+       }
+    }
+
     if (!fUseTags) return (kTRUE);
     
     Bool_t zip = kFALSE;