]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Small fix related to the train output path.
authoragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 11 Aug 2009 14:01:57 +0000 (14:01 +0000)
committeragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 11 Aug 2009 14:01:57 +0000 (14:01 +0000)
ANALYSIS/AliAnalysisAlien.cxx

index 4fa300eb109a8babea28ece0fdb54118cd2d4516..0ab77a038248ba60b67769a8084887f8590e561b 100644 (file)
@@ -792,6 +792,10 @@ Bool_t AliAnalysisAlien::CreateJDL()
       arr = fOutputFiles.Tokenize(" ");
       TIter next(arr);
       while ((os=(TObjString*)next())) {
+         // Ignore ouputs in jdl that are also in outputarchive
+         TString sout = os->GetString();
+         if (sout.Index("@")>0) sout.Remove(sout.Index("@"));
+         if (fOutputArchive.Contains(sout)) continue;
          if (!os->GetString().Contains("@") && fCloseSE.Length())
             fGridJDL->AddToOutputSandbox(Form("%s@%s",os->GetString().Data(), fCloseSE.Data())); 
          else
@@ -851,7 +855,7 @@ Bool_t AliAnalysisAlien::WriteJDL(Bool_t copy)
    } else {
       // One jdl to be submitted with 2 input parameters: data collection name and output dir prefix
       fGridJDL->AddToInputDataCollection(Form("LF:%s/$1,nodownload", workdir.Data()));
-      fGridJDL->SetOutputDirectory(Form("%s/$2#alien_counter_03i#", fGridOutputDir.Data()));
+      fGridJDL->SetOutputDirectory(Form("%s/$2/#alien_counter_03i#", fGridOutputDir.Data()));
    }