Properly deal with QA/AOD merging jobs where OCDB snapshots are not a…

…vailable. Attached tasks might need to access the OCDB, therefore in the merging case the use of RAW OCDB is enforced.
alisw · Apr 3, 2017 · 2cd1f04 · 2cd1f04
1 parent da94a4c
commit 2cd1f04
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/AOD/AODtrainsim.C b/AOD/AODtrainsim.C
@@ -101,7 +101,14 @@ void AODtrainsim(Int_t merge=0)
   TString ocdbConfig = "default,snapshot";
   if (gSystem->Getenv("CONFIG_OCDB"))
     ocdbConfig = gSystem->Getenv("CONFIG_OCDB");
-  if (ocdbConfig.Contains("alien")) {
+  if (merge != 0) {
+    //
+    gSystem->Setenv("CONFIG_RUN", gSystem->Getenv("ALIEN_JDL_LPMRUNNUMBER"));
+    // set OCDB 
+    gROOT->LoadMacro("$ALIDPG_ROOT/MC/OCDBConfig.C");
+    OCDBDefault(1);    
+  }
+  else if (ocdbConfig.Contains("alien")) {
     // set OCDB 
     gROOT->LoadMacro("$ALIDPG_ROOT/MC/OCDBConfig.C");
     OCDBDefault(1);

diff --git a/QA/QAtrainsim.C b/QA/QAtrainsim.C
@@ -94,7 +94,14 @@ void QAtrainsim(Int_t run = 0,
   TString ocdbConfig = "default,snapshot";
   if (gSystem->Getenv("CONFIG_OCDB"))
     ocdbConfig = gSystem->Getenv("CONFIG_OCDB");
-  if (ocdbConfig.Contains("alien")) {
+  if (stage != 0) {
+    //
+    gSystem->Setenv("CONFIG_RUN", gSystem->Getenv("ALIEN_JDL_LPMRUNNUMBER"));
+    // set OCDB 
+    gROOT->LoadMacro("$ALIDPG_ROOT/MC/OCDBConfig.C");
+    OCDBDefault(1);
+  }
+  else if (ocdbConfig.Contains("alien")) {
     // set OCDB 
     gROOT->LoadMacro("$ALIDPG_ROOT/MC/OCDBConfig.C");
     OCDBDefault(1);