Skip to content

Script cleanup: use -n instead of ! -z #14525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 1 commit into from
Jul 18, 2025
Merged

Script cleanup: use -n instead of ! -z #14525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions prodtests/full-system-test/aggregator-workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ fi
# adding input proxies
if workflow_has_parameter CALIB_PROXIES; then
if [[ $AGGREGATOR_TASKS == BARREL_TF ]]; then
if [[ ! -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_BARREL_TF:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf input timeframe)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == BARREL_SPORADIC ]]; then
if [[ ! -z ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp input sporadic)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == TPC_IDCBOTH_SAC ]]; then
Expand All @@ -158,7 +158,7 @@ if workflow_has_parameter CALIB_PROXIES; then
fi
CHANNELS_LIST=
[[ $EPNSYNCMODE == 0 ]] && FLP_ADDRESS="tcp://localhost:29950"
if [[ ! -z ${CALIBDATASPEC_TPCIDC_A:-} ]] || [[ ! -z ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
if [[ -n ${CALIBDATASPEC_TPCIDC_A:-} ]] || [[ -n ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
# define port for FLP
: ${TPC_IDC_FLP_PORT:=29950}
# expand FLPs; TPC uses from 001 to 145, but 145 is reserved for SAC
Expand All @@ -173,47 +173,47 @@ if workflow_has_parameter CALIB_PROXIES; then
done
fi
fi
if [[ ! -z ${CALIBDATASPEC_TPCSAC:-} ]]; then
if [[ -n ${CALIBDATASPEC_TPCSAC:-} ]]; then
# define port for FLP
[[ -z ${TPC_SAC_FLP_PORT:-} ]] && TPC_SAC_FLP_PORT=29951
[[ $EPNSYNCMODE == 1 ]] && FLP_ADDRESS="tcp://alio2-cr1-flp145-ib:${TPC_SAC_FLP_PORT}"
CHANNELS_LIST+="type=pull,name=tpcidc_sac,transport=zeromq,address=$FLP_ADDRESS,method=connect,rateLogging=10;"
fi
if [[ ! -z $CHANNELS_LIST ]]; then
if [[ -n $CHANNELS_LIST ]]; then
DATASPEC_LIST=
if [[ ! -z ${CALIBDATASPEC_TPCIDC_A:-} ]]; then
if [[ -n ${CALIBDATASPEC_TPCIDC_A:-} ]]; then
add_semicolon_separated DATASPEC_LIST "\"$CALIBDATASPEC_TPCIDC_A\""
fi
if [[ ! -z ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
if [[ -n ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
add_semicolon_separated DATASPEC_LIST "\"$CALIBDATASPEC_TPCIDC_C\""
fi
if [[ ! -z ${CALIBDATASPEC_TPCSAC:-} ]]; then
if [[ -n ${CALIBDATASPEC_TPCSAC:-} ]]; then
add_semicolon_separated DATASPEC_LIST "\"$CALIBDATASPEC_TPCSAC\""
fi
add_W o2-dpl-raw-proxy "--proxy-name tpcidc --io-threads 2 --dataspec \"$DATASPEC_LIST\" --sporadic-outputs --channel-config \"$CHANNELS_LIST\" ${TIMEFRAME_SHM_LIMIT+--timeframes-shm-limit} $TIMEFRAME_SHM_LIMIT" "" 0
fi
elif [[ $AGGREGATOR_TASKS == CALO_TF ]]; then
if [[ ! -z ${CALIBDATASPEC_CALO_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_CALO_TF:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf input timeframe)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == CALO_SPORADIC ]]; then
if [[ ! -z ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp input sporadic)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == MUON_TF ]]; then
if [[ ! -z ${CALIBDATASPEC_MUON_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_MUON_TF:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf input timeframe)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == MUON_SPORADIC ]]; then
if [[ ! -z ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp input sporadic)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == FORWARD_TF ]]; then
if [[ ! -z ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf input timeframe)" "" 0
fi
elif [[ $AGGREGATOR_TASKS == FORWARD_SPORADIC ]]; then
if [[ ! -z ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_SPORADIC\" $(get_proxy_connection fwd_sp input sporadic)" "" 0
fi
fi
Expand Down Expand Up @@ -273,7 +273,7 @@ if [[ $AGGREGATOR_TASKS == BARREL_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
if [[ $CALIB_TRD_T0 == 1 ]]; then
TRD_CALIB_CONFIG+=" --t0"
fi
if [[ ! -z ${TRD_CALIB_CONFIG} ]]; then
if [[ -n ${TRD_CALIB_CONFIG} ]]; then
add_W o2-calibration-trd-workflow "${TRD_CALIB_CONFIG}"
fi
fi
Expand Down Expand Up @@ -404,13 +404,13 @@ if [[ "${GEN_TOPO_VERBOSE:-}" == "1" ]]; then
fi
fi

if [[ $CCDB_POPULATOR_UPLOAD_PATH != "none" ]] && [[ ! -z $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]]; then add_W o2-calibration-ccdb-populator-workflow "--ccdb-path $CCDB_POPULATOR_UPLOAD_PATH --environment \"DPL_DONT_DROP_OLD_TIMESLICE=1\" --sspec-min $CCDBPRO_SUBSPEC_MIN --sspec-max $CCDBPRO_SUBSPEC_MAX"; fi
if [[ $CCDB_POPULATOR_UPLOAD_PATH != "none" ]] && [[ -n $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]]; then add_W o2-calibration-ccdb-populator-workflow "--ccdb-path $CCDB_POPULATOR_UPLOAD_PATH --environment \"DPL_DONT_DROP_OLD_TIMESLICE=1\" --sspec-min $CCDBPRO_SUBSPEC_MIN --sspec-max $CCDBPRO_SUBSPEC_MAX"; fi

if [[ $CCDB_DCS_POPULATOR_UPLOAD_PATH != "none" ]] && [[ ! -z $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]] && [[ $NEED_DCS_CCDB_POPULATOR != 0 ]]; then add_W o2-calibration-ccdb-populator-workflow "--ccdb-path $CCDB_DCS_POPULATOR_UPLOAD_PATH --environment \"DPL_DONT_DROP_OLD_TIMESLICE=1\" --sspec-min $CCDBDCS_SUBSPEC_MIN --sspec-max $CCDBDCS_SUBSPEC_MAX --name-extention dcs"; fi
if [[ $CCDB_DCS_POPULATOR_UPLOAD_PATH != "none" ]] && [[ -n $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]] && [[ $NEED_DCS_CCDB_POPULATOR != 0 ]]; then add_W o2-calibration-ccdb-populator-workflow "--ccdb-path $CCDB_DCS_POPULATOR_UPLOAD_PATH --environment \"DPL_DONT_DROP_OLD_TIMESLICE=1\" --sspec-min $CCDBDCS_SUBSPEC_MIN --sspec-max $CCDBDCS_SUBSPEC_MAX --name-extention dcs"; fi

if ! workflow_has_parameter CALIB_LOCAL_INTEGRATED_AGGREGATOR; then
WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
[[ $WORKFLOWMODE != "print" ]] && WORKFLOW+=" --${WORKFLOWMODE} ${WORKFLOWMODE_FILE:-}"
[[ $WORKFLOWMODE == "print" || "${PRINT_WORKFLOW:-}" == "1" ]] && echo "#Aggregator Workflow command:\n\n${WORKFLOW}\n" | sed -e "s/\\\\n/\n/g" -e"s/| */| \\\\\n/g" | eval cat $( [[ $WORKFLOWMODE == "dds" ]] && echo '1>&2')
if [[ $WORKFLOWMODE != "print" ]] && [[ ! -z $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]]; then eval $WORKFLOW; else true; fi
if [[ $WORKFLOWMODE != "print" ]] && [[ -n $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]]; then eval $WORKFLOW; else true; fi
fi
22 changes: 11 additions & 11 deletions prodtests/full-system-test/calib-workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ if [[ $CALIB_ASYNC_EXTRACTTPCCURRENTS == 1 ]]; then
fi
if [[ $CALIB_ASYNC_EXTRACTTIMESERIES == 1 ]] ; then
: ${CALIB_ASYNC_SAMPLINGFACTORTIMESERIES:=0.001}
if [[ ! -z ${CALIB_ASYNC_ENABLEUNBINNEDTIMESERIES:-} ]]; then
if [[ -n ${CALIB_ASYNC_ENABLEUNBINNEDTIMESERIES:-} ]]; then
CONFIG_TPCTIMESERIES+=" --enable-unbinned-root-output --sample-unbinned-tsallis --threads ${TPCTIMESERIES_THREADS:-1}"
fi
if [[ $ON_SKIMMED_DATA == 1 ]] || [[ ! -z "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then
if [[ $ON_SKIMMED_DATA == 1 ]] || [[ -n "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then
if [[ $ON_SKIMMED_DATA == 1 ]]; then
SAMPLINGFACTORTIMESERIES=0.1
fi
if [[ ! -z "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then # this takes priority, even if we were on skimmed data
if [[ -n "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then # this takes priority, even if we were on skimmed data
SAMPLINGFACTORTIMESERIES=${CALIB_ASYNC_SAMPLINGFACTORTIMESERIES}
fi
CONFIG_TPCTIMESERIES+=" --sampling-factor ${SAMPLINGFACTORTIMESERIES}"
Expand All @@ -74,28 +74,28 @@ fi

# output-proxy for aggregator
if workflow_has_parameter CALIB_PROXIES; then
if [[ ! -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_BARREL_TF:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf output timeframe)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp output sporadic)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_CALO_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_CALO_TF:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf output timeframe)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp output sporadic)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_MUON_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_MUON_TF:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf output timeframe)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp output sporadic)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
if [[ -n ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf output timeframe)" "" 0
fi
if [[ ! -z ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
if [[ -n ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_SPORADIC\" $(get_proxy_connection fwd_sp output sporadic)" "" 0
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions prodtests/full-system-test/datadistribution.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
# For benchmark only, do NOT copy&paste!
[[ $NUMAGPUIDS == 1 ]] && [[ -z $SHM_MANAGER_SHMID ]] && export DATADIST_SHM_DELAY=10

if [[ ! -z $DD_STARTUP_DELAY ]]; then
if [[ -n $DD_STARTUP_DELAY ]]; then
sleep $DD_STARTUP_DELAY
fi

Expand All @@ -34,7 +34,7 @@ export TFRATE=$(awk "BEGIN {printf \"%.6f\",1/$TFDELAY}")

ARGS_ALL="--session ${OVERRIDE_SESSION:-default} --severity $SEVERITY --shm-segment-id 2 --shm-segment-size 1000000 --no-cleanup"

[[ ! -z $SHM_MANAGER_SHMID ]] && SHM_TOOL_OPTIONS=" --shmid $SHM_MANAGER_SHMID --data-source-region-shmid 100 --data-source-header-shmid 101"
[[ -n $SHM_MANAGER_SHMID ]] && SHM_TOOL_OPTIONS=" --shmid $SHM_MANAGER_SHMID --data-source-region-shmid 100 --data-source-header-shmid 101"

eval StfBuilder --id stfb --discovery-partition FST --transport shmem \
--dpl-channel-name dpl-chan --channel-config "name=dpl-chan,type=push,method=bind,address=ipc://${UDS_PREFIX}${INRAWCHANNAME},transport=shmem,rateLogging=1" \
Expand Down
Loading