Skip local Terminate if there was a merging+terminate job
authoragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 7 Apr 2010 11:44:45 +0000 (11:44 +0000)
committeragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 7 Apr 2010 11:44:45 +0000 (11:44 +0000)
ANALYSIS/AliAnalysisAlien.cxx

index f614c80..e1d8d7c 100644 (file)
@@ -1624,7 +1624,8 @@ Bool_t AliAnalysisAlien::MergeOutputs()
       Info("MergeOutputs", "Submitting merging JDL");
       SubmitMerging();
       Info("MergeOutputs", "### Re-run with <MergeViaJDL> off to collect results after merging jobs are done ###");
-      Info("MergeOutputs", "### Trying to continue merging ... (may fail if exited the shell prematurely)");
+      Info("MergeOutputs", "### Not executing Terminate for now. This is not an error.");
+      return kFALSE;
    }   
    // Get the output path
    if (!fGridOutputDir.Contains("/")) fGridOutputDir = Form("/%s/%s/%s", gGrid->GetHomeDirectory(), fGridWorkingDir.Data(), fGridOutputDir.Data());