Allow to enter a triggerList for muon tracker QA. Possibility to run on private produ...

[u/mrichter/AliRoot.git] / PWG3 / muon / mergeGridFiles.C

diff --git a/PWG3/muon/mergeGridFiles.C b/PWG3/muon/mergeGridFiles.C
index 942b4cf97d762e8b6c6f9597bdd69762afa747ea..251261f6d48ac03c2dd1a64f2550b3336607e2f5 100644 (file)
--- a/PWG3/muon/mergeGridFiles.C
+++ b/PWG3/muon/mergeGridFiles.C
@@ -190,19 +190,19 @@ void completeProd(TString runListName="runList.txt", TString prodDir = "", TStri
 
   ofstream outFile(outFilename.Data());
 
-  if ( outTaskFilename.Contains("QAresults.root") ) {
-    const Int_t kNlibs = 5; // 1
-    //TString loadLibs[kNlibs] = {"libPWG3base.so"};
-    //TString loadLibs[kNlibs] = {"libANALYSIS.so", "libANALYSISalice.so", "libTENDER.so", "libPWG1.so", "libPWG3base.so"};
-    TString loadLibs[kNlibs] = {"libANALYSIS.so", "libOADB.so", "libANALYSISalice.so", "libCORRFW.so", "libPWG3base.so"};
-    for ( Int_t ilib=0; ilib<kNlibs; ilib++ ) {
-      Int_t exitVal = gSystem->Load(loadLibs[ilib].Data());
-      if ( exitVal < 0 ) {
-        printf("Please run with aliroot if you're merging QA objects!\n");
-        return;
-      }
+  // if ( outTaskFilename.Contains("QAresults.root") ) {
+  const Int_t kNlibs = 5; // 1
+  //TString loadLibs[kNlibs] = {"libPWG3base.so"};
+  //TString loadLibs[kNlibs] = {"libANALYSIS.so", "libANALYSISalice.so", "libTENDER.so", "libPWG1.so", "libPWG3base.so"};
+  TString loadLibs[kNlibs] = {"libANALYSIS.so", "libOADB.so", "libANALYSISalice.so", "libCORRFW.so", "libPWG3base.so"};
+  for ( Int_t ilib=0; ilib<kNlibs; ilib++ ) {
+    Int_t exitVal = gSystem->Load(loadLibs[ilib].Data());
+    if ( exitVal < 0 ) {
+      printf("Please run with aliroot if you're merging QA objects!\n");
+      return;
     }
   }
+  //}
 
   if ( ! gGrid )
     TGrid::Connect("alien://");
@@ -217,12 +217,12 @@ void completeProd(TString runListName="runList.txt", TString prodDir = "", TStri
 
     TString localOut = outTaskFilename;
     localOut.ReplaceAll(".root", Form("_%s.root", currRunString.Data()));
-    printf("Searching for %s\n", localOut.Data()); // REMEMBER TO CUT
     if ( ! gSystem->AccessPathName(localOut.Data()) ) {
       if ( overwriteExisting )
         printf("Overwriting existing file %s\n", localOut.Data());
       else {
         printf("Warning: merged file %s already exist: do not overwrite\n", localOut.Data());
+        outFile << gSystem->pwd() << "/" << localOut.Data() << endl;
         continue;
       }
     }
@@ -232,7 +232,7 @@ void completeProd(TString runListName="runList.txt", TString prodDir = "", TStri
     TString mergeFilename = "";
 
     for ( Int_t ipattern=0; ipattern<2; ipattern++ ) {
-      TString command = Form("find %s/*%s %s/%s%s", baseDir.Data(), currRunString.Data(), prodDir.Data(), filePattern[ipattern].Data(), outTaskFilename.Data());
+      TString command = ( prodDir.Contains("private") ) ? Form("find %s/ *%s/%s%s", baseDir.Data(), currRunString.Data(), filePattern[ipattern].Data(), outTaskFilename.Data()) : Form("find %s/*%s %s/%s%s", baseDir.Data(), currRunString.Data(), prodDir.Data(), filePattern[ipattern].Data(), outTaskFilename.Data());
 
       printf("%s\n", command.Data());