Avoid segmentation violation in Notify when MC event handler is used at the same...

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index 815aa394203ab9ccaf0dd81e1e21988a1777e68e..1be4fafe8e6fab6a9c0325ec6444d54ece91a2b9 100644 (file)
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -46,6 +46,7 @@ AliESDInputHandler::AliESDInputHandler() :
   fBranches(""),
   fBranchesOn(""),
   fAnalysisType(0),
+  fNEvents(0),
   fUseTags(kFALSE),
   fChainT(0),
   fTreeT(0),
@@ -87,6 +88,7 @@ Bool_t AliESDInputHandler::Init(TTree* tree,  Option_t* opt)
     fEvent = new AliESDEvent();
 
     fEvent->ReadFromTree(fTree);
+    fNEvents = fTree->GetEntries();
     return kTRUE;
 }
 

diff --git a/STEER/AliESDInputHandler.h b/STEER/AliESDInputHandler.h
index 6a0f39a221de3b7dd7a55057cad4ec1ace9cd8a6..198fd1ac203f37bec0be18205b5ad77e295de21b 100644 (file)
--- a/STEER/AliESDInputHandler.h
+++ b/STEER/AliESDInputHandler.h
@@ -43,12 +43,13 @@ class AliESDInputHandler : public AliInputEventHandler {
     void SwitchOnBranches()  const;
     AliESDInputHandler(const AliESDInputHandler& handler);             
     AliESDInputHandler& operator=(const AliESDInputHandler& handler);  
- private:
+ protected:
     // ESD event
     AliESDEvent    *fEvent;        //! Pointer to the event
     TString         fBranches;     //  List of branches to be switched off (separated by space)
     TString         fBranchesOn;   //  List of branches to be switched on  (separated by space)
     Option_t       *fAnalysisType; //! local, proof, grid
+    Int_t           fNEvents;      //! Number of events in the current tree 
     
     // ESD Tags (optional)
     Bool_t          fUseTags;    //  Flag to use tags

diff --git a/STEER/AliESDInputHandlerRP.cxx b/STEER/AliESDInputHandlerRP.cxx
index 844ffbd9daf9f1098363de9fcdc3f7d659953d4e..3fce5451d198f9664237cab74f0bfe53bb28f37c 100644 (file)
--- a/STEER/AliESDInputHandlerRP.cxx
+++ b/STEER/AliESDInputHandlerRP.cxx
@@ -44,7 +44,6 @@ AliESDInputHandlerRP::AliESDInputHandlerRP() :
     fDetectors(new TList()),
     fDirR(0),
     fEventNumber(-1),
-    fNEvent(-1),
     fFileNumber(0),
     fEventsPerFile(0),
     fExtension(""),
@@ -63,7 +62,6 @@ AliESDInputHandlerRP::AliESDInputHandlerRP(const char* name, const char* title):
     fDetectors(new TList()),
     fDirR(0),
     fEventNumber(-1),
-    fNEvent(-1),
     fFileNumber(0),
     fEventsPerFile(0),
     fExtension(""),
@@ -99,20 +97,19 @@ Bool_t AliESDInputHandlerRP::Init(Option_t* opt)
        if (!file) AliFatal(Form("AliESDInputHandlerRP: %s.RecPoints.root not found in %s ! \n", det->GetName(), fPathName->Data()));
        fRFiles->Add(file);
     }
+
     if (file) {
        fEventsPerFile = file->GetNkeys() - file->GetNProcessIDs();
     } else {
        AliFatal(Form("AliESDInputHandlerRP: No file with RecPoints found in %s ! \n", fPathName->Data()));
     }
     
-    
+
     // Reset the event number
     fEventNumber      = -1;
     fFileNumber       =  0;
     // Get number of events from esd tree 
-    fNEvent           =  fTree->GetEntries();
-    
-    printf("AliESDInputHandler::Init() %d\n",__LINE__);
+    printf("AliESDInputHandler::Init() %d %d\n",__LINE__, fNEvents);
     return kTRUE;
 }
 
@@ -129,8 +126,8 @@ Bool_t AliESDInputHandlerRP::BeginEvent(Long64_t entry)
        fEventNumber = entry;
     }
     
-    if (entry >= fNEvent) {
-       AliWarning(Form("AliESDInputHandlerRP: Event number out of range %5d %5d\n", entry, fNEvent));
+    if (entry >= fNEvents) {
+       AliWarning(Form("AliESDInputHandlerRP: Event number out of range %5d %5d\n", entry, fNEvents));
        return kFALSE;
     }
     return LoadEvent(entry);
@@ -152,10 +149,9 @@ Bool_t AliESDInputHandlerRP::LoadEvent(Int_t iev)
     char folder[20];
     sprintf(folder, "Event%d", iev);
     // Tree R
-    fRTrees->Clear();
-    
     TIter next(fRFiles);
     TFile* file;
+    Int_t idx = 0;
     while ((file = (TFile*) next()))
     {
        file->GetObject(folder, fDirR);
@@ -163,9 +159,9 @@ Bool_t AliESDInputHandlerRP::LoadEvent(Int_t iev)
            AliWarning(Form("AliESDInputHandlerRP: Event #%5d not found\n", iev));
            return kFALSE;
        }
-       TTree* tree;
+       TTree* tree = 0;
        fDirR ->GetObject("TreeR", tree);
-       fRTrees->Add(tree);
+       fRTrees->AddAt(tree, idx++);
     }
     return kTRUE;
 }
@@ -235,6 +231,8 @@ Bool_t AliESDInputHandlerRP::Notify(const char *path)
     TIter next(members);
     TFile* entry;
     Int_t ien = 0;
+    fRTrees->Clear();
+    
     while ( (entry = (TFile*) next()) )
     {
        printf("File %s \n", entry->GetName());
@@ -251,7 +249,7 @@ Bool_t AliESDInputHandlerRP::Notify(const char *path)
            fDetectors->Add(ent);
        }
     } // loop over files
-    
+
 
     // Now we have the path and the list of detectors
     
@@ -261,7 +259,7 @@ Bool_t AliESDInputHandlerRP::Notify(const char *path)
     InitIO("");
     // Some clean-up
     members->Delete();
-    //
+
     return kTRUE;
 }
 
@@ -276,8 +274,8 @@ Bool_t AliESDInputHandlerRP::FinishEvent()
 void AliESDInputHandlerRP::ResetIO()
 {
 // Delete trees and files
-    fRTrees->Delete();
-    fRFiles->Delete();
+//    fRTrees->Clear();
+    fRFiles->Clear();
     fExtension="";
 }
 

diff --git a/STEER/AliESDInputHandlerRP.h b/STEER/AliESDInputHandlerRP.h
index 877f4603cbd94a479c8d35e6e6ac46bd9495f7be..8460cbec8da35577001fea96b151f240647d9b1a 100644 (file)
--- a/STEER/AliESDInputHandlerRP.h
+++ b/STEER/AliESDInputHandlerRP.h
@@ -46,7 +46,6 @@ class AliESDInputHandlerRP : public AliESDInputHandler {
     TList*          fDetectors;        // List of detector names
     TDirectoryFile *fDirR;             //! Directory for RP Tree
     Int_t           fEventNumber;      //! Current event number
-    Int_t           fNEvent;           //! Number of events in current directory
     Int_t           fFileNumber;       //! Input file number
     Int_t           fEventsPerFile;    //! Number of events per file
     const Char_t   *fExtension;        //! File name extension