Retagging v4-18-16-AN

sevdokim · Jan 15, 2010 · 99f83e1 · 99f83e1
2 parents 35aab77 + bf1105b
commit 99f83e1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
@@ -1582,6 +1582,8 @@ Bool_t AliAnalysisManager::ValidateOutputFiles() const
       if (filename == "default") {
          if (!fOutputEventHandler) continue;
          filename = fOutputEventHandler->GetOutputFileName();
+         // Main AOD may not be there
+         if (gSystem->AccessPathName(filename)) continue;
       }
       // Check if the file is closed
       if (openedFiles.Contains(filename)) continue;;

diff --git a/ANALYSIS/AliAnalysisTaskSE.cxx b/ANALYSIS/AliAnalysisTaskSE.cxx
@@ -189,7 +189,7 @@ void AliAnalysisTaskSE::CreateOutputObjects()
     if (handler) {
 	fOutputAOD   = handler->GetAOD();
 	fTreeA = handler->GetTree();
-	if (!(handler->IsStandard())) {
+	if (fOutputAOD && !(handler->IsStandard())) {
 	    if ((handler->NeedsHeaderReplication()) && !(fgAODHeader)) 
 		{
 		 if (fDebug > 1) AliInfo("Replicating header");

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHF.cxx b/PWG3/vertexingHF/AliAnalysisTaskSEVertexingHF.cxx
@@ -102,12 +102,14 @@ void AliAnalysisTaskSEVertexingHF::UserCreateOutputObjects()
   if(fDebug > 1) printf("AnalysisTaskSEVertexingHF::UserCreateOutPutData() \n");
   // Support both the case when the AOD + deltaAOD are produced in an ESD
   // analysis or if the deltaAOD is produced on an analysis on AOD's. (A.G. 27/04/09)
-  if (!AODEvent()) {
+  if (!AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler()) {
      Fatal("UserCreateOutputObjects", "This task needs an AOD handler");
      return;
   }   
   TString filename = "AliAOD.VertexingHF.root";
-  if (!IsStandardAOD()) filename = "";
+  // When running on standard AOD to produce deltas, IsStandardAOD is never set,
+  // If AODEvent is NULL, new branches have to be added to the new file(s) (A.G. 15/01/10)
+  if (!IsStandardAOD() && AODEvent()) filename = "";
   if(!fVHF) {
     printf("AnalysisTaskSEVertexingHF::UserCreateOutPutData() \n ERROR! no fvHF!\n");
     return;