Added RAWPRODTYPE for AOD macro and tests for muon_calo pass

alisw · Apr 20, 2017 · a932b9f · a932b9f
1 parent a373804
commit a932b9f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/AOD/AODtrain.C b/AOD/AODtrain.C
@@ -6,7 +6,7 @@ export ALIEN_JDL_LPMINTERACTIONTYPE=pp
 export ALIEN_JDL_LPMANCHORYEAR=2015
 export ALIEN_JDL_LPMPRODUCTIONTAG=LHC15n
 export ALIEN_JDL_LPMRUNNUMBER=244628
-export ALIEN_JDL_LPMRAWPASSID=2
+export ALIEN_JDL_RAWPRODTYPE=PPass
 
 then source the same file
 ******************************************/
@@ -506,6 +506,18 @@ void ProcessEnvironment()
       abort();
     }
 
+  //
+  // Setting the period
+  //
+  if(gSystem->Getenv("ALIEN_JDL_LPMPRODUCTIONTAG"))
+    periodName = gSystem->Getenv("ALIEN_JDL_LPMPRODUCTIONTAG");
+  else
+    if(!localRunning)
+    {
+      printf(">>>>> Unknown production tag configuration ALIEN_JDL_LPMPRODUCTIONTAG \n");
+      abort();
+    }
+
   //
   // Run flag configuration
   //
@@ -530,15 +542,6 @@ void ProcessEnvironment()
       printf(">>>>> Unknown anchor year system configuration ALIEN_JDL_LPMANCHORYEAR \n");
       abort();
     }
-
-  if(gSystem->Getenv("ALIEN_JDL_LPMPRODUCTIONTAG"))
-    periodName = gSystem->Getenv("ALIEN_JDL_LPMPRODUCTIONTAG");
-  else
-    if(!localRunning)
-    {
-      printf(">>>>> Unknown production tag configuration ALIEN_JDL_LPMPRODUCTIONTAG \n");
-      abort();
-    }
 
   //
   // Run number
@@ -557,18 +560,18 @@ void ProcessEnvironment()
   //
   // Setting this to kTRUE will disable some not needed analysis tasks for a muon_calo pass
   //
-  if (gSystem->Getenv("ALIEN_JDL_LPMRAWPASSID"))
+  if (gSystem->Getenv("ALIEN_JDL_RAWPRODTYPE"))
   {
-    Int_t passNo = atoi(gSystem->Getenv("ALIEN_JDL_LPMRAWPASSID"));
-    if (passNo == 5 || passNo == 15) // hard-coded, check for all possible values
+    TString passType = gSystem->Getenv("ALIEN_JDL_RAWPRODTYPE");
+    if (passType.Contains("muon_calo"))
       isMuonCaloPass = kTRUE;
     else
       isMuonCaloPass = kFALSE;
   }
   else
     if(!localRunning)
     {
-      printf(">>>>> Unknown pass id ALIEN_JDL_LPMRAWPASSID \n");
+      printf(">>>>> Unknown production type ALIEN_JDL_RAWPRODTYPE \n");
       abort();
     }
 }

diff --git a/DataProc/PPass/runPPass.sh b/DataProc/PPass/runPPass.sh
@@ -58,10 +58,11 @@ export PRODUCTION_METADATA="$ALIEN_JDL_LPMMETADATA"
 echo "* PATH: $PATH"
 echo "* LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
 echo "* rec.C:"
-cat rec.C
+if [ -f rec.C ]; then
+  cat rec.C
+fi
 echo
 
-
 ls -l
 
 # $1 = raw input filename

diff --git a/DataProc/muon_calo/rec.C b/DataProc/muon_calo/rec.C
@@ -6,7 +6,7 @@ void rec(const char *filename="raw.root")
   //
   /////////////////////////////////////////////////////////////////////////////////////////
 
-
+  AliReconstruction rec;
 
   // Upload CDB entries from the snapshot (local root file) if snapshot exist
   if (gSystem->AccessPathName("OCDB.root", kFileExists)==0) {        
@@ -31,8 +31,6 @@ void rec(const char *filename="raw.root")
     }
   }
 
-  AliReconstruction rec;
-
   // Set reconstruction flags (skip detectors here if neded with -<detector name>
   rec.SetRunReconstruction("ALL -TPC -TRD -TOF -HLT -PMD");