Fix the condition for the split wf (#1645)

AliceO2Group · May 24, 2024 · ec8a02d · ec8a02d
1 parent 8c221ed
commit ec8a02d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/DATA/production/configurations/asyncReco/async_pass.sh b/DATA/production/configurations/asyncReco/async_pass.sh
@@ -480,6 +480,8 @@ if [[ $ALIEN_JDL_SSPLITWF != "1" ]]; then
 else
   # running the wf in split mode
   echo "We will run the workflow in SPLIT mode!"
+  echo "ALIEN_JDL_STARTSPLITSTEP = $ALIEN_JDL_STARTSPLITSTEP"
+  echo "ALIEN_JDL_SSPLITSTEP = $ALIEN_JDL_SSPLITSTEP"
   WORKFLOW_PARAMETERS_START=$WORKFLOW_PARAMETERS
 
   if ([[ -z "$ALIEN_JDL_STARTSPLITSTEP" ]] && [[ -z "$ALIEN_JDL_SSPLITSTEP" ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq 1 ]] || ( [[ -n $ALIEN_JDL_STARTSPLITSTEP ]] && [[ "$ALIEN_JDL_STARTSPLITSTEP" -le 1 ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" == "all" ]]; then
@@ -580,7 +582,7 @@ else
     fi
   fi
 
-  if ([[ -z "$ALIEN_JDL_SSPLITSTEP" ]] && [[ -z "$ALIEN_JDL_SSPLITSTEP" ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq 3 ]] || ( [[ -n $ALIEN_JDL_STARTSPLITSTEP ]] && [[ "$ALIEN_JDL_STARTSPLITSTEP" -le 3 ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq "all" ]]; then
+  if ([[ -z "$ALIEN_JDL_STARTSPLITSTEP" ]] && [[ -z "$ALIEN_JDL_SSPLITSTEP" ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq 3 ]] || ( [[ -n $ALIEN_JDL_STARTSPLITSTEP ]] && [[ "$ALIEN_JDL_STARTSPLITSTEP" -le 3 ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" == "all" ]]; then
     # 3. matching, calib, AOD, potentially QC
     WORKFLOW_PARAMETERS=$WORKFLOW_PARAMETERS_START
     if [[ "$ALIEN_JDL_KEEPQCSEPARATE" == "1" ]]; then
@@ -635,7 +637,7 @@ else
     fi
   fi
   if [[ "$ALIEN_JDL_KEEPQCSEPARATE" == "1" ]]; then
-    if ([[ -z "$ALIEN_JDL_SSPLITSTEP" ]] && [[ -z "$ALIEN_JDL_SSPLITSTEP" ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq 4 ]] || ( [[ -n $ALIEN_JDL_STARTSPLITSTEP ]] && [[ "$ALIEN_JDL_STARTSPLITSTEP" -le 4 ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq "all" ]]; then
+    if ([[ -z "$ALIEN_JDL_STARTSPLITSTEP" ]] && [[ -z "$ALIEN_JDL_SSPLITSTEP" ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" -eq 4 ]] || ( [[ -n $ALIEN_JDL_STARTSPLITSTEP ]] && [[ "$ALIEN_JDL_STARTSPLITSTEP" -le 4 ]]) || [[ "$ALIEN_JDL_SSPLITSTEP" == "all" ]]; then
       # 4. QC
       WORKFLOW_PARAMETERS="QC"
       echo "WORKFLOW_PARAMETERS=$WORKFLOW_PARAMETERS"
@@ -649,6 +651,7 @@ else
       export GLOBAL_READER_NEEDS_SV="0"
       export SVERTEXING_SOURCES="none"
       WORKFLOW_DETECTORS_EXCLUDE_QC_SCRIPT+=",CPV"
+      echo "QC_JSON_FROM_OUTSIDE = $QC_JSON_FROM_OUTSIDE"
       env $SETTING_ROOT_OUTPUT IS_SIMULATED_DATA=0 WORKFLOWMODE=print TFDELAY=$TFDELAYSECONDS WORKFLOW_DETECTORS=ALL WORKFLOW_DETECTORS_EXCLUDE=$DETECTORS_EXCLUDE WORKFLOW_DETECTORS_USE_GLOBAL_READER_TRACKS=$READ_TRACKS WORKFLOW_DETECTORS_USE_GLOBAL_READER_CLUSTERS=$READ_CLUSTERS WORKFLOW_DETECTORS_EXCLUDE_GLOBAL_READER_TRACKS= WORKFLOW_DETECTORS_EXCLUDE_QC=$WORKFLOW_DETECTORS_EXCLUDE_QC_SCRIPT,$DETECTORS_EXCLUDE ./run-workflow-on-inputlist.sh $INPUT_TYPE list.list >> workflowconfig.log
       # run it
       if [[ "0$RUN_WORKFLOW" != "00" ]]; then