TPC preclusterization enabled and outer QA skipped for Xe-Xe

alisw · Oct 4, 2017 · 699675b · 699675b
1 parent 52aaf61
commit 699675b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 15 deletions.
diff --git a/DataProc/CPass0/runCPass0.sh b/DataProc/CPass0/runCPass0.sh
@@ -76,7 +76,15 @@ ulimit -S -v 3500000
 
 # run TPC clusterization in separate process before reconstruction
 export preclusterizeTPC='0'
-# enabling it for 2015 PbPb
+# enabling it for PbPb and XeXe based on environment variable
+if [ -z "$ALIEN_JDL_LPMINTERACTIONTYPE" ]; then
+    echo "ALIEN_JDL_LPMINTERACTIONTYPE not defined"
+else
+    if [ "$ALIEN_JDL_LPMINTERACTIONTYPE" == "PbPb" ] || [ "$ALIEN_JDL_LPMINTERACTIONTYPE" == "XeXe" ]; then
+	preclusterizeTPC='1'
+    fi
+fi
+# enabling it for 2015 PbPb based on run numbers 
 if [ "$runNum" -ge 244917 ] && [ "$runNum" -le 246994 ]; then
  preclusterizeTPC='1'
 fi

diff --git a/DataProc/CPass1/runCPass1.sh b/DataProc/CPass1/runCPass1.sh
@@ -68,17 +68,6 @@ runNum=`echo "$runNumF" |  sed 's/^0*//'`
 ##runNum=`echo $1 | cut -d "/" -f 6 | sed 's/^0*//'`
 
 defAlias="kCalibBarrel"
-#default alias for CPass1 2015 PbPb is kCalibBarrelMB
-if [ "$runNum" -ge 244917 ] && [ "$runNum" -le 246994 ]; then 
-defAlias="kCalibBarrelMB"
-fi	
-
-#optionallly skip Outer pass, set to true for 2015 PbPb
-export outerUsesFullITS=1
-if [ "$runNum" -ge 244917 ] && [ "$runNum" -le 246994 ]; then
-export skipOuter='1'
-outerUsesFullITS=0
-fi
 
 # Exporting variable to define that we are in CPass1 to be used in reconstruction
 export CPass='1'
@@ -88,11 +77,28 @@ export PRODUCTION_METADATA="$ALIEN_JDL_LPMMETADATA"
 # Set memory limits to a value lower than the hard site limits to at least get the logs of failing jobs
 ulimit -S -v 3500000
 
+
+#optionallly skip Outer pass (set to true for PbPb and XeXe)
+export outerUsesFullITS=1
 # run TPC clusterization in separate process before reconstruction
 export preclusterizeTPC='0'
-# enabling it for 2015 PbPb
+# enabling it for PbPb and XeXe based on environment variable
+if [ -z "$ALIEN_JDL_LPMINTERACTIONTYPE" ]; then
+    echo "ALIEN_JDL_LPMINTERACTIONTYPE not defined"
+else
+    if [ "$ALIEN_JDL_LPMINTERACTIONTYPE" == "PbPb" ] || [ "$ALIEN_JDL_LPMINTERACTIONTYPE" == "XeXe" ]; then
+	preclusterizeTPC='1'
+	export skipOuter='1'
+	outerUsesFullITS=0
+    fi
+fi
+# enabling preclusterization, disabling outer for 2015 PbPb based on run numbers 
 if [ "$runNum" -ge 244917 ] && [ "$runNum" -le 246994 ]; then
  preclusterizeTPC='1'
+ export skipOuter='1'
+ outerUsesFullITS=0
+#default alias for CPass1 2015 PbPb is kCalibBarrelMB
+ defAlias="kCalibBarrelMB"
 fi
 
 

diff --git a/DataProc/PPass/runPPass.sh b/DataProc/PPass/runPPass.sh
@@ -83,11 +83,24 @@ echo runstripped is $runstripped
 
 # run TPC clusterization in separate process before reconstruction
 export preclusterizeTPC='0'
-if [ "$pass_type" == "ppass" ] && [ "$runstripped" -ge 244917 ] && [ "$runstripped" -le 246994 ]; then
- preclusterizeTPC='1'
+if [ "$pass_type" == "ppass" ]; then
+# enabling it for PbPb and XeXe based on environment variable
+    if [ -z "$ALIEN_JDL_LPMINTERACTIONTYPE" ]; then
+	echo "ALIEN_JDL_LPMINTERACTIONTYPE not defined"
+    else
+	if [ "$ALIEN_JDL_LPMINTERACTIONTYPE" == "PbPb" ] || [ "$ALIEN_JDL_LPMINTERACTIONTYPE" == "XeXe" ]; then
+	    preclusterizeTPC='1'
+	fi
+    fi
+# enabling it for 2015 PbPb based on run numbers 
+    if [ "$pass_type" == "ppass" ] && [ "$runstripped" -ge 244917 ] && [ "$runstripped" -le 246994 ]; then
+	preclusterizeTPC='1'
+    fi
 fi
 
 
+
+
 if [ "$1" == "OCDB" ]; then
     echo "* Generating OCDB.root only"
     export OCDB_SNAPSHOT_CREATE="kTRUE"