Parameters set for centrality selection

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisAlien.cxx

diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx
index a9690e146c4f264ed99dce6385b1e8724b5d2c39..47517705da7155173dadf2ce493a6adeb27e082f 100644 (file)
--- a/ANALYSIS/AliAnalysisAlien.cxx
+++ b/ANALYSIS/AliAnalysisAlien.cxx
@@ -596,8 +596,8 @@ Bool_t AliAnalysisAlien::LoadModule(AliAnalysisTaskCfg *mod)
    TString lib;
    for (Int_t i=0; i<nlibs; i++) {
       lib = mod->GetLibrary(i);
-      if (fAdditionalLibs.Contains(lib)) continue;
       lib = Form("lib%s.so", lib.Data());
+      if (fAdditionalLibs.Contains(lib)) continue;
       if (!fAdditionalLibs.IsNull()) fAdditionalLibs += " ";
       fAdditionalLibs += lib;
    }
@@ -1674,7 +1674,17 @@ Bool_t AliAnalysisAlien::CreateJDL()
          }
       }
       if (fOutputArchive.Length()) {
-         arr = fOutputArchive.Tokenize(" ");
+         TString outputArchive = fOutputArchive;
+         if (!fRegisterExcludes.IsNull()) {
+            arr = fRegisterExcludes.Tokenize(" ");
+            TIter next1(arr);
+            while ((os=(TObjString*)next1())) {
+               outputArchive.ReplaceAll(Form("%s,",os->GetString().Data()),"");
+               outputArchive.ReplaceAll(os->GetString(),"");
+            } 
+            delete arr;
+         }     
+         arr = outputArchive.Tokenize(" ");
          TIter next(arr);
          Bool_t first = kTRUE;
          const char *comment = "Files to be archived";
@@ -1689,7 +1699,6 @@ Bool_t AliAnalysisAlien::CreateJDL()
          }      
          delete arr;
          // Output archive for the merging jdl
-         TString outputArchive;
          if (TestBit(AliAnalysisGrid::kDefaultOutputs)) {
             outputArchive = "log_archive.zip:std*@disk=1 ";
             // Add normal output files, extra files + terminate files
@@ -3728,6 +3737,10 @@ void AliAnalysisAlien::WriteAnalysisMacro()
       out << "   TStopwatch timer;" << endl;
       out << "   timer.Start();" << endl << endl;
       // Change temp directory to current one
+      if (!IsLocalTest()) {  
+         out << "// connect to AliEn and make the chain" << endl;
+         out << "   if (!TGrid::Connect(\"alien://\")) return;" << endl;
+      }   
       out << "// Set temporary merging directory to current one" << endl;
       out << "   gSystem->Setenv(\"TMPDIR\", gSystem->pwd());" << endl << endl;   
       out << "// Set temporary compilation directory to current one" << endl;
@@ -3877,10 +3890,6 @@ void AliAnalysisAlien::WriteAnalysisMacro()
          out << "   gEnv->SetValue(\"XNet.ReconnectTimeout\",50);" << endl;
          out << "   gEnv->SetValue(\"XNet.FirstConnectMaxCnt\",1);" << endl << endl;
       } 
-      if (!IsLocalTest()) {  
-         out << "// connect to AliEn and make the chain" << endl;
-         out << "   if (!TGrid::Connect(\"alien://\")) return;" << endl;
-      }   
       out << "// read the analysis manager from file" << endl;
       TString analysisFile = fExecutable;
       analysisFile.ReplaceAll(".sh", ".root");
@@ -4225,12 +4234,12 @@ void AliAnalysisAlien::WriteMergingMacro()
          out << "   gEnv->SetValue(\"XNet.FirstConnectMaxCnt\",1);" << endl << endl;
       }
       // Change temp directory to current one
+      out << "// Connect to AliEn" << endl;
+      out << "   if (!TGrid::Connect(\"alien://\")) return;" << endl;
       out << "// Set temporary merging directory to current one" << endl;
       out << "   gSystem->Setenv(\"TMPDIR\", gSystem->pwd());" << endl << endl;   
       out << "// Set temporary compilation directory to current one" << endl;
       out << "   gSystem->SetBuildDir(gSystem->pwd(), kTRUE);" << endl << endl;   
-      out << "// Connect to AliEn" << endl;
-      out << "   if (!TGrid::Connect(\"alien://\")) return;" << endl;
       out << "   TString outputDir = dir;" << endl;  
       out << "   TString outputFiles = \"" << GetListOfFiles("out") << "\";" << endl;
       out << "   TString mergeExcludes = \"" << fMergeExcludes << " " << fRegisterExcludes << "\";" << endl;