Protected retrieval of statistics histograms from EventStat_temp.root when AOD is...

diff --git a/STEER/AliAODInputHandler.cxx b/STEER/AliAODInputHandler.cxx
index 6f082f8a1c442dc827ba5d395d8c8c63788b7265..52af5cd4b8fd15990450eb69c26f0475f5241104 100644 (file)
--- a/STEER/AliAODInputHandler.cxx
+++ b/STEER/AliAODInputHandler.cxx
@@ -135,9 +135,17 @@ Bool_t AliAODInputHandler::Notify(const char* path)
     
   TTree *ttree = fTree->GetTree();
   if (!ttree) ttree = fTree;
-  TString statFname(gSystem->DirName(ttree->GetCurrentFile()->GetName()));
-  statFname += "/EventStat_temp.root";
-  TFile *statFile = TFile::Open(statFname, "READ");
+  TString statFname(ttree->GetCurrentFile()->GetName());
+  Int_t indarchive = statFname.Index("#");
+  if (indarchive<0) {
+     statFname = gSystem->DirName(statFname);
+     statFname += "/";
+  } else {
+     statFname.Remove(indarchive+1);
+  }   
+  statFname += "EventStat_temp.root";
+  TFile *statFile = 0;
+  if (IsCheckStatistics()) statFile = TFile::Open(statFname, "READ");
   if (statFile) {
      TList *list = (TList*)statFile->Get("cstatsout");
      if (list) {

diff --git a/STEER/AliInputEventHandler.h b/STEER/AliInputEventHandler.h
index 10c8ae631b7b872c90326996cf67a9c3d2603d13..d5ced991aaf8db4f690e623dc296812c83dc9ba3 100644 (file)
--- a/STEER/AliInputEventHandler.h
+++ b/STEER/AliInputEventHandler.h
@@ -24,7 +24,8 @@ class AliInputEventHandler : public AliVEventHandler {
 
  public:
  enum EInputHandlerFlags {
-    kUserCallSelectionMask = BIT(14) // Watch out for defining base class bits
+    kUserCallSelectionMask = BIT(14), // Watch out for defining base class bits
+    kCheckStatistics       = BIT(15)
  };
     AliInputEventHandler();
     AliInputEventHandler(const char* name, const char* title);
@@ -46,6 +47,7 @@ class AliInputEventHandler : public AliVEventHandler {
     virtual void         SetInputTree(TTree* tree)                    {fTree = tree;}
     virtual void         SetEventSelection(AliVCuts* cuts)            {fEventCuts = cuts;}
     virtual void         SetUserCallSelectionMask(Bool_t flag=kTRUE)  {TObject::SetBit(kUserCallSelectionMask,flag);}
+    virtual void         SetCheckStatistics(Bool_t flag=kTRUE)        {TObject::SetBit(kCheckStatistics,flag);}
     //
     void SetInactiveBranches(const char* branches) {fBranches   = branches;}
     void SetActiveBranches  (const char* branches) {fBranchesOn = branches;}
@@ -59,6 +61,7 @@ class AliInputEventHandler : public AliVEventHandler {
     virtual TTree       *GetTree( )        const                      {return fTree;}
     virtual AliVCuts    *GetEventSelection() const                    {return fEventCuts;}
     virtual Long64_t     GetReadEntry()    const;
+    virtual Bool_t       IsCheckStatistics() const                    {return TObject::TestBit(kCheckStatistics);}
     virtual Bool_t       IsUserCallSelectionMask() const              {return TObject::TestBit(kUserCallSelectionMask);}
     virtual Bool_t       NewEvent()
        {Bool_t ne = fNewEvent; fNewEvent = kFALSE; return ne;}