Fixeded validation of merging
authoragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 15 Oct 2010 09:50:26 +0000 (09:50 +0000)
committeragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 15 Oct 2010 09:50:26 +0000 (09:50 +0000)
ANALYSIS/AliAnalysisAlien.cxx

index 7f99d76..c310a52 100644 (file)
@@ -3733,12 +3733,12 @@ void AliAnalysisAlien::WriteValidationScript(Bool_t merge)
       TObjArray *arr = outputFiles.Tokenize(",");
       TIter next1(arr);
       TString outputFile;
-      while ((os=(TObjString*)next1())) { 
+      while (!merge && (os=(TObjString*)next1())) { 
+         // No need to validate outputs produced by merging since the merging macro does this
          outputFile = os->GetString();
          Int_t index = outputFile.Index("@");
          if (index > 0) outputFile.Remove(index);
-         if (!merge && fTerminateFiles.Contains(outputFile)) continue;
-         if (merge && fMergeExcludes.Contains(outputFile)) continue;
+         if (fTerminateFiles.Contains(outputFile)) continue;
          if (outputFile.Contains("*")) continue;
          out << "if ! [ -f " << outputFile.Data() << " ] ; then" << endl;
          out << "   error=1" << endl;