Skip to content

Commit 2438fee

Browse files
davidrohrdavidrohr
committed
Calib workflow: indicate whether output proxies are for sporadic or for timeframe data in get_proxy_connection
1 parent 3cf2b8d commit 2438fee

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ fi
111111
if workflow_has_parameter CALIB_PROXIES; then
112112
if [[ $AGGREGATOR_TASKS == BARREL_TF ]]; then
113113
if [[ ! -z $CALIBDATASPEC_BARREL_TF ]]; then
114-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf input)" "" 0
114+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf input timeframe)" "" 0
115115
fi
116116
elif [[ $AGGREGATOR_TASKS == BARREL_SPORADIC ]]; then
117117
if [[ ! -z $CALIBDATASPEC_BARREL_SPORADIC ]]; then
118-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp input)" "" 0
118+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp input sporadic)" "" 0
119119
fi
120120
elif [[ $AGGREGATOR_TASKS == TPC_IDCBOTH_SAC ]]; then
121121
if [[ ! -z $CALIBDATASPEC_TPCIDC_A ]] || [[ ! -z $CALIBDATASPEC_TPCIDC_C ]]; then
@@ -141,23 +141,23 @@ if workflow_has_parameter CALIB_PROXIES; then
141141
fi
142142
elif [[ $AGGREGATOR_TASKS == CALO_TF ]]; then
143143
if [[ ! -z $CALIBDATASPEC_CALO_TF ]]; then
144-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf input)" "" 0
144+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf input timeframe)" "" 0
145145
fi
146146
elif [[ $AGGREGATOR_TASKS == CALO_SPORADIC ]]; then
147147
if [[ ! -z $CALIBDATASPEC_CALO_SPORADIC ]]; then
148-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp input)" "" 0
148+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp input sporadic)" "" 0
149149
fi
150150
elif [[ $AGGREGATOR_TASKS == MUON_TF ]]; then
151151
if [[ ! -z $CALIBDATASPEC_MUON_TF ]]; then
152-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf input)" "" 0
152+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf input timeframe)" "" 0
153153
fi
154154
elif [[ $AGGREGATOR_TASKS == MUON_SPORADIC ]]; then
155155
if [[ ! -z $CALIBDATASPEC_MUON_SPORADIC ]]; then
156-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp input)" "" 0
156+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp input sporadic)" "" 0
157157
fi
158158
elif [[ $AGGREGATOR_TASKS == FORWARD_TF ]]; then
159159
if [[ ! -z $CALIBDATASPEC_FORWARD_TF ]]; then
160-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf input)" "" 0
160+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf input timeframe)" "" 0
161161
fi
162162
fi
163163
fi

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ if [[ $CALIB_FT0_TIMEOFFSET == 1 ]]; then add_W o2-calibration-ft0-time-spectra-
3030
# output-proxy for aggregator
3131
if workflow_has_parameter CALIB_PROXIES; then
3232
if [[ ! -z $CALIBDATASPEC_BARREL_TF ]]; then
33-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf output)" "" 0
33+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf output timeframe)" "" 0
3434
fi
3535
if [[ ! -z $CALIBDATASPEC_BARREL_SPORADIC ]]; then
36-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp output)" "" 0
36+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp output sporadic)" "" 0
3737
fi
3838
if [[ ! -z $CALIBDATASPEC_CALO_TF ]]; then
39-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf output)" "" 0
39+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf output timeframe)" "" 0
4040
fi
4141
if [[ ! -z $CALIBDATASPEC_CALO_SPORADIC ]]; then
42-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp output)" "" 0
42+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp output sporadic)" "" 0
4343
fi
4444
if [[ ! -z $CALIBDATASPEC_MUON_TF ]]; then
45-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf output)" "" 0
45+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf output timeframe)" "" 0
4646
fi
4747
if [[ ! -z $CALIBDATASPEC_MUON_SPORADIC ]]; then
48-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp output)" "" 0
48+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp output sporadic)" "" 0
4949
fi
5050
if [[ ! -z $CALIBDATASPEC_FORWARD_TF ]]; then
51-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf output)" "" 0
51+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_FORWARD_TF\" $(get_proxy_connection fwd_tf output timeframe)" "" 0
5252
fi
5353

5454
fi

0 commit comments

Comments
 (0)