Skip to content

Commit c1b57b1

Browse files
davidrohrdavidrohr
committed
Script cleanup: use -n instead of ! -z
1 parent 51d4f86 commit c1b57b1

File tree

8 files changed

+70
-70
lines changed

8 files changed

+70
-70
lines changed

‎prodtests/full-system-test/aggregator-workflow.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ fi
145145
# adding input proxies
146146
if workflow_has_parameter CALIB_PROXIES; then
147147
if [[ $AGGREGATOR_TASKS == BARREL_TF ]]; then
148-
if [[ ! -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
148+
if [[ -n ${CALIBDATASPEC_BARREL_TF:-} ]]; then
149149
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf input timeframe)" "" 0
150150
fi
151151
elif [[ $AGGREGATOR_TASKS == BARREL_SPORADIC ]]; then
152-
if [[ ! -z ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
152+
if [[ -n ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
153153
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp input sporadic)" "" 0
154154
fi
155155
elif [[ $AGGREGATOR_TASKS == TPC_IDCBOTH_SAC ]]; then
@@ -158,7 +158,7 @@ if workflow_has_parameter CALIB_PROXIES; then
158158
fi
159159
CHANNELS_LIST=
160160
[[ $EPNSYNCMODE == 0 ]] && FLP_ADDRESS="tcp://localhost:29950"
161-
if [[ ! -z ${CALIBDATASPEC_TPCIDC_A:-} ]] || [[ ! -z ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
161+
if [[ -n ${CALIBDATASPEC_TPCIDC_A:-} ]] || [[ -n ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
162162
# define port for FLP
163163
: ${TPC_IDC_FLP_PORT:=29950}
164164
# expand FLPs; TPC uses from 001 to 145, but 145 is reserved for SAC
@@ -173,47 +173,47 @@ if workflow_has_parameter CALIB_PROXIES; then
173173
done
174174
fi
175175
fi
176-
if [[ ! -z ${CALIBDATASPEC_TPCSAC:-} ]]; then
176+
if [[ -n ${CALIBDATASPEC_TPCSAC:-} ]]; then
177177
# define port for FLP
178178
[[ -z ${TPC_SAC_FLP_PORT:-} ]] && TPC_SAC_FLP_PORT=29951
179179
[[ $EPNSYNCMODE == 1 ]] && FLP_ADDRESS="tcp://alio2-cr1-flp145-ib:${TPC_SAC_FLP_PORT}"
180180
CHANNELS_LIST+="type=pull,name=tpcidc_sac,transport=zeromq,address=$FLP_ADDRESS,method=connect,rateLogging=10;"
181181
fi
182-
if [[ ! -z $CHANNELS_LIST ]]; then
182+
if [[ -n $CHANNELS_LIST ]]; then
183183
DATASPEC_LIST=
184-
if [[ ! -z ${CALIBDATASPEC_TPCIDC_A:-} ]]; then
184+
if [[ -n ${CALIBDATASPEC_TPCIDC_A:-} ]]; then
185185
add_semicolon_separated DATASPEC_LIST "\"$CALIBDATASPEC_TPCIDC_A\""
186186
fi
187-
if [[ ! -z ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
187+
if [[ -n ${CALIBDATASPEC_TPCIDC_C:-} ]]; then
188188
add_semicolon_separated DATASPEC_LIST "\"$CALIBDATASPEC_TPCIDC_C\""
189189
fi
190-
if [[ ! -z ${CALIBDATASPEC_TPCSAC:-} ]]; then
190+
if [[ -n ${CALIBDATASPEC_TPCSAC:-} ]]; then
191191
add_semicolon_separated DATASPEC_LIST "\"$CALIBDATASPEC_TPCSAC\""
192192
fi
193193
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
194194
fi
195195
elif [[ $AGGREGATOR_TASKS == CALO_TF ]]; then
196-
if [[ ! -z ${CALIBDATASPEC_CALO_TF:-} ]]; then
196+
if [[ -n ${CALIBDATASPEC_CALO_TF:-} ]]; then
197197
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf input timeframe)" "" 0
198198
fi
199199
elif [[ $AGGREGATOR_TASKS == CALO_SPORADIC ]]; then
200-
if [[ ! -z ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
200+
if [[ -n ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
201201
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp input sporadic)" "" 0
202202
fi
203203
elif [[ $AGGREGATOR_TASKS == MUON_TF ]]; then
204-
if [[ ! -z ${CALIBDATASPEC_MUON_TF:-} ]]; then
204+
if [[ -n ${CALIBDATASPEC_MUON_TF:-} ]]; then
205205
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf input timeframe)" "" 0
206206
fi
207207
elif [[ $AGGREGATOR_TASKS == MUON_SPORADIC ]]; then
208-
if [[ ! -z ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
208+
if [[ -n ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
209209
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp input sporadic)" "" 0
210210
fi
211211
elif [[ $AGGREGATOR_TASKS == FORWARD_TF ]]; then
212-
if [[ ! -z ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
212+
if [[ -n ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
213213
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf input timeframe)" "" 0
214214
fi
215215
elif [[ $AGGREGATOR_TASKS == FORWARD_SPORADIC ]]; then
216-
if [[ ! -z ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
216+
if [[ -n ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
217217
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_SPORADIC\" $(get_proxy_connection fwd_sp input sporadic)" "" 0
218218
fi
219219
fi
@@ -273,7 +273,7 @@ if [[ $AGGREGATOR_TASKS == BARREL_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
273273
if [[ $CALIB_TRD_T0 == 1 ]]; then
274274
TRD_CALIB_CONFIG+=" --t0"
275275
fi
276-
if [[ ! -z ${TRD_CALIB_CONFIG} ]]; then
276+
if [[ -n ${TRD_CALIB_CONFIG} ]]; then
277277
add_W o2-calibration-trd-workflow "${TRD_CALIB_CONFIG}"
278278
fi
279279
fi
@@ -404,13 +404,13 @@ if [[ "${GEN_TOPO_VERBOSE:-}" == "1" ]]; then
404404
fi
405405
fi
406406

407-
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
407+
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
408408

409-
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
409+
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
410410

411411
if ! workflow_has_parameter CALIB_LOCAL_INTEGRATED_AGGREGATOR; then
412412
WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
413413
[[ $WORKFLOWMODE != "print" ]] && WORKFLOW+=" --${WORKFLOWMODE} ${WORKFLOWMODE_FILE:-}"
414414
[[ $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')
415-
if [[ $WORKFLOWMODE != "print" ]] && [[ ! -z $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]]; then eval $WORKFLOW; else true; fi
415+
if [[ $WORKFLOWMODE != "print" ]] && [[ -n $WORKFLOW ]] && [[ $WORKFLOW != "echo '{}' | " ]]; then eval $WORKFLOW; else true; fi
416416
fi

‎prodtests/full-system-test/calib-workflow.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ if [[ $CALIB_ASYNC_EXTRACTTPCCURRENTS == 1 ]]; then
5555
fi
5656
if [[ $CALIB_ASYNC_EXTRACTTIMESERIES == 1 ]] ; then
5757
: ${CALIB_ASYNC_SAMPLINGFACTORTIMESERIES:=0.001}
58-
if [[ ! -z ${CALIB_ASYNC_ENABLEUNBINNEDTIMESERIES:-} ]]; then
58+
if [[ -n ${CALIB_ASYNC_ENABLEUNBINNEDTIMESERIES:-} ]]; then
5959
CONFIG_TPCTIMESERIES+=" --enable-unbinned-root-output --sample-unbinned-tsallis --threads ${TPCTIMESERIES_THREADS:-1}"
6060
fi
61-
if [[ $ON_SKIMMED_DATA == 1 ]] || [[ ! -z "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then
61+
if [[ $ON_SKIMMED_DATA == 1 ]] || [[ -n "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then
6262
if [[ $ON_SKIMMED_DATA == 1 ]]; then
6363
SAMPLINGFACTORTIMESERIES=0.1
6464
fi
65-
if [[ ! -z "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then # this takes priority, even if we were on skimmed data
65+
if [[ -n "$CALIB_ASYNC_SAMPLINGFACTORTIMESERIES" ]]; then # this takes priority, even if we were on skimmed data
6666
SAMPLINGFACTORTIMESERIES=${CALIB_ASYNC_SAMPLINGFACTORTIMESERIES}
6767
fi
6868
CONFIG_TPCTIMESERIES+=" --sampling-factor ${SAMPLINGFACTORTIMESERIES}"
@@ -74,28 +74,28 @@ fi
7474

7575
# output-proxy for aggregator
7676
if workflow_has_parameter CALIB_PROXIES; then
77-
if [[ ! -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
77+
if [[ -n ${CALIBDATASPEC_BARREL_TF:-} ]]; then
7878
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf output timeframe)" "" 0
7979
fi
80-
if [[ ! -z ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
80+
if [[ -n ${CALIBDATASPEC_BARREL_SPORADIC:-} ]]; then
8181
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp output sporadic)" "" 0
8282
fi
83-
if [[ ! -z ${CALIBDATASPEC_CALO_TF:-} ]]; then
83+
if [[ -n ${CALIBDATASPEC_CALO_TF:-} ]]; then
8484
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf output timeframe)" "" 0
8585
fi
86-
if [[ ! -z ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
86+
if [[ -n ${CALIBDATASPEC_CALO_SPORADIC:-} ]]; then
8787
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp output sporadic)" "" 0
8888
fi
89-
if [[ ! -z ${CALIBDATASPEC_MUON_TF:-} ]]; then
89+
if [[ -n ${CALIBDATASPEC_MUON_TF:-} ]]; then
9090
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf output timeframe)" "" 0
9191
fi
92-
if [[ ! -z ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
92+
if [[ -n ${CALIBDATASPEC_MUON_SPORADIC:-} ]]; then
9393
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp output sporadic)" "" 0
9494
fi
95-
if [[ ! -z ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
95+
if [[ -n ${CALIBDATASPEC_FORWARD_TF:-} ]]; then
9696
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf output timeframe)" "" 0
9797
fi
98-
if [[ ! -z ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
98+
if [[ -n ${CALIBDATASPEC_FORWARD_SPORADIC:-} ]]; then
9999
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_SPORADIC\" $(get_proxy_connection fwd_sp output sporadic)" "" 0
100100
fi
101101
fi

‎prodtests/full-system-test/datadistribution.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
# For benchmark only, do NOT copy&paste!
1212
[[ $NUMAGPUIDS == 1 ]] && [[ -z $SHM_MANAGER_SHMID ]] && export DATADIST_SHM_DELAY=10
1313

14-
if [[ ! -z $DD_STARTUP_DELAY ]]; then
14+
if [[ -n $DD_STARTUP_DELAY ]]; then
1515
sleep $DD_STARTUP_DELAY
1616
fi
1717

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

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

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

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

0 commit comments

Comments
 (0)