Fix for validation check of AOD output files in case filling of the AOD tree is disab...

diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx
index b390d9122100400d78b7cd604791c7bdbd204fa4..0038b097329d5e141958114cc2909861a451afd4 100644 (file)
--- a/ANALYSIS/AliAnalysisAlien.cxx
+++ b/ANALYSIS/AliAnalysisAlien.cxx
@@ -3698,9 +3698,11 @@ const char *AliAnalysisAlien::GetListOfFiles(const char *type)
       return files.Data();
    }
    if (mgr->GetOutputEventHandler()) {
-      aodfiles = mgr->GetOutputEventHandler()->GetOutputFileName();
+      aodfiles = "";
+      if (mgr->GetOutputEventHandler()->GetFillAOD())
+         aodfiles = mgr->GetOutputEventHandler()->GetOutputFileName();
       TString extraaod = mgr->GetOutputEventHandler()->GetExtraOutputs();
-      if (!extraaod.IsNull()) {
+      if (!extraaod.IsNull() && mgr->GetOutputEventHandler()->GetFillExtension()) {
          aodfiles += ",";
          aodfiles += extraaod;
       }

diff --git a/STEER/AOD/AliAODHandler.h b/STEER/AOD/AliAODHandler.h
index fc9b74ff9d737b0e6a6d6db99275cf64c6618112..96854ca2aa01dde93ad9f8d1f957e5a52001704f 100644 (file)
--- a/STEER/AOD/AliAODHandler.h
+++ b/STEER/AOD/AliAODHandler.h
@@ -83,6 +83,7 @@ class AliAODHandler : public AliVEventHandler {
 //    AliAODExtension*     FindExtensionContainingBranch(const char* bname) const;
     Bool_t               IsStandard()                         const {return fIsStandard;}
     Bool_t               GetFillAOD()                         const {return fFillAOD;} 
+    Bool_t               GetFillExtension()                   const {return fFillExtension;} 
     Bool_t               NeedsHeaderReplication()             const {return  fNeedsHeaderReplication;}
     Bool_t               NeedsTOFHeaderReplication()          const {return  fNeedsTOFHeaderReplication;}
     Bool_t               NeedsVZEROReplication()              const {return  fNeedsVZEROReplication;}

diff --git a/STEER/STEERBase/AliVEventHandler.h b/STEER/STEERBase/AliVEventHandler.h
index 37772e0369846c439a0c6c975dd0f1e397d0b10f..4743c837f5efcfd5a78736efe4e06ee6b1386686 100644 (file)
--- a/STEER/STEERBase/AliVEventHandler.h
+++ b/STEER/STEERBase/AliVEventHandler.h
@@ -26,6 +26,8 @@ enum EEventHandlerFlags {
     // Handled tree
     virtual TTree       *GetTree() const { return NULL; }
     virtual Option_t    *GetDataType() const { return NULL; }
+    virtual Bool_t       GetFillAOD() const {return kTRUE;}
+    virtual Bool_t       GetFillExtension() const {return kTRUE;}
     virtual void         SetFillAOD(Bool_t) {}
     virtual void         SetFillExtension(Bool_t) {}
     // Input