Skip to content

Commit ec8a02d

Browse files
Fix the condition for the split wf (#1645)
1 parent 8c221ed commit ec8a02d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

DATA/production/configurations/asyncReco/async_pass.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,8 @@ if [[ $ALIEN_JDL_SSPLITWF != "1" ]]; then
480480
else
481481
# running the wf in split mode
482482
echo "We will run the workflow in SPLIT mode!"
483+
echo "ALIEN_JDL_STARTSPLITSTEP = $ALIEN_JDL_STARTSPLITSTEP"
484+
echo "ALIEN_JDL_SSPLITSTEP = $ALIEN_JDL_SSPLITSTEP"
483485
WORKFLOW_PARAMETERS_START=$WORKFLOW_PARAMETERS
484486

485487
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
580582
fi
581583
fi
582584

583-
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
585+
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
584586
# 3. matching, calib, AOD, potentially QC
585587
WORKFLOW_PARAMETERS=$WORKFLOW_PARAMETERS_START
586588
if [[ "$ALIEN_JDL_KEEPQCSEPARATE" == "1" ]]; then
@@ -635,7 +637,7 @@ else
635637
fi
636638
fi
637639
if [[ "$ALIEN_JDL_KEEPQCSEPARATE" == "1" ]]; then
638-
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
640+
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
639641
# 4. QC
640642
WORKFLOW_PARAMETERS="QC"
641643
echo "WORKFLOW_PARAMETERS=$WORKFLOW_PARAMETERS"
@@ -649,6 +651,7 @@ else
649651
export GLOBAL_READER_NEEDS_SV="0"
650652
export SVERTEXING_SOURCES="none"
651653
WORKFLOW_DETECTORS_EXCLUDE_QC_SCRIPT+=",CPV"
654+
echo "QC_JSON_FROM_OUTSIDE = $QC_JSON_FROM_OUTSIDE"
652655
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
653656
# run it
654657
if [[ "0$RUN_WORKFLOW" != "00" ]]; then

0 commit comments

Comments
 (0)