Small modifications for TOF in data taking

alisw · Mar 15, 2018 · a9e9028 · a9e9028
1 parent e079a2a
commit a9e9028
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/MC/Config.C b/MC/Config.C
@@ -214,6 +214,13 @@ ProcessEnvironment()
 	valid = kTRUE;
 	break;
       }
+    if (!valid) {
+      TString triggerConfigString(gSystem->Getenv("CONFIG_TRIGGER"));
+      if(triggerConfigString.Contains("Custom.cfg")){
+	triggerConfig = kTriggerCustom;
+	valid = kTRUE;
+      }
+    }
     if (!valid) {
       printf(">>>>> Unknown trigger configuration: %s \n", gSystem->Getenv("CONFIG_TRIGGER"));
       abort();

diff --git a/MC/dpgsim.sh b/MC/dpgsim.sh
@@ -637,13 +637,13 @@ fi
 if [ "$CONFIG_TRIGGER" == "Custom.cfg" ] && [ ! -f Custom.cfg ]; then
     echo "Custom.cfg trigger configuration requested, file not present"
     exit 1
-else
+elif [[ $OVERRIDE_TRIGGER == "" ]]; then
     aliroot -b -q "$ALIDPG_ROOT/MC/CheckTOF.C($CONFIG_RUN)"
     checkTOF=$?
     if [ $checkTOF == 1 ]; then
 	#echo "TOF was triggering but not in data acquisition --> Using custom trigger from AliDPG"
 	echo "TOF was not in data acquisition --> Using custom trigger from AliDPG"
-	$CONFIG_TRIGGER="$ALIDPG_ROOT/Utils/Custom.cfg"
+	CONFIG_TRIGGER="$ALIDPG_ROOT/Utils/Custom.cfg"
     fi
 fi