Skip to content

Commit 75f013b

Browse files
chiarazampollidavidrohr
chiarazampolli
authored and
davidrohr
committed
Split proxies depending on lifetime of specs
1 parent 50492ea commit 75f013b

2 files changed

Lines changed: 116 additions & 47 deletions

File tree

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

Lines changed: 100 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,67 +44,124 @@ if [[ $BEAMTYPE == "PbPb" ]]; then
4444
fi
4545

4646
# Calibration workflows
47-
if ! workflow_has_parameter CALIB_LOCAL_INTEGRATED_AGGREGATOR; then WORKFLOW=; fi
47+
if ! workflow_has_parameter CALIB_LOCAL_INTEGRATED_AGGREGATOR; then
48+
WORKFLOW=
49+
else
50+
if [[ -z $AGGREGATOR_TASKS ]]; then
51+
AGGREGATOR_TASKS=ALL
52+
fi
53+
fi
54+
55+
if [[ -z $AGGREGATOR_TASKS ]]; then
56+
echo "ERROR: AGGREGATOR_TASKS is empty, you need to define it to run!" 1>&2
57+
exit 1
58+
fi
59+
60+
# Which calibrations are we aggregating
61+
echo "AGGREGATOR_TASKS = $AGGREGATOR_TASKS" 1>&2
4862

4963
# adding input proxies
5064
if workflow_has_parameter CALIB_PROXIES; then
51-
if [[ ! -z $CALIBDATASPEC_BARREL ]]; then
52-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL\" $(get_proxy_connection barrel input)" "" 0
53-
fi
54-
if [[ ! -z $CALIBDATASPEC_CALO ]]; then
55-
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO\" $(get_proxy_connection calo input)" "" 0
65+
if [[ $AGGREGATOR_TASKS == BARREL_TF ]]; then
66+
if [[ ! -z $CALIBDATASPEC_BARREL_TF ]]; then
67+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf input)" "" 0
68+
fi
69+
elif [[ $AGGREGATOR_TASKS == BARREL_SPORADIC ]]; then
70+
if [[ ! -z $CALIBDATASPEC_BARREL_SPORADIC ]]; then
71+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp input)" "" 0
72+
fi
73+
elif [[ $AGGREGATOR_TASKS == CALO_TF ]]; then
74+
if [[ ! -z $CALIBDATASPEC_CALO_TF ]]; then
75+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf input)" "" 0
76+
fi
77+
elif [[ $AGGREGATOR_TASKS == CALO_SPORADIC ]]; then
78+
if [[ ! -z $CALIBDATASPEC_CALO_SPORADIC ]]; then
79+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp input)" "" 0
80+
fi
81+
elif [[ $AGGREGATOR_TASKS == MUON_TF ]]; then
82+
if [[ ! -z $CALIBDATASPEC_MUON_TF ]]; then
83+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf input)" "" 0
84+
fi
85+
elif [[ $AGGREGATOR_TASKS == MUON_SPORADIC ]]; then
86+
if [[ ! -z $CALIBDATASPEC_MUON_SPORADIC ]]; then
87+
add_W o2-dpl-raw-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp input)" "" 0
88+
fi
5689
fi
5790
fi
5891

59-
# PrimVertex
60-
if [[ $CALIB_PRIMVTX_MEANVTX == 1 ]]; then
61-
add_W o2-calibration-mean-vertex-calibration-workflow ""
62-
fi
92+
# calibrations for AGGREGATOR_TASKS == BARREL_TF
93+
if [[ $AGGREGATOR_TASKS == BARREL_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
94+
# PrimVertex
95+
if [[ $CALIB_PRIMVTX_MEANVTX == 1 ]]; then
96+
add_W o2-calibration-mean-vertex-calibration-workflow "" "MeanVertexCalib.tfPerSlot=55000"
97+
fi
6398

64-
# TOF
65-
if [[ $CALIB_TOF_LHCPHASE == 1 ]] || [[ $CALIB_TOF_CHANNELOFFSETS == 1 ]]; then
66-
if [[ $CALIB_TOF_LHCPHASE == 1 ]]; then
67-
add_W o2-calibration-tof-calib-workflow "--do-lhc-phase --tf-per-slot $LHCPHASE_TF_PER_SLOT --use-ccdb" "" 0
99+
# TOF
100+
if [[ $CALIB_TOF_LHCPHASE == 1 ]] || [[ $CALIB_TOF_CHANNELOFFSETS == 1 ]]; then
101+
if [[ $CALIB_TOF_LHCPHASE == 1 ]]; then
102+
add_W o2-calibration-tof-calib-workflow "--do-lhc-phase --tf-per-slot $LHCPHASE_TF_PER_SLOT --use-ccdb" "" 0
103+
fi
104+
if [[ $CALIB_TOF_CHANNELOFFSETS == 1 ]]; then
105+
add_W o2-calibration-tof-calib-workflow "--do-channel-offset --update-interval $TOF_CHANNELOFFSETS_UPDATE --delta-update-interval $TOF_CHANNELOFFSETS_DELTA_UPDATE --min-entries 100 --range 100000 --use-ccdb --follow-ccdb-updates" "" 0
106+
fi
68107
fi
69-
if [[ $CALIB_TOF_CHANNELOFFSETS == 1 ]]; then
70-
add_W o2-calibration-tof-calib-workflow "--do-channel-offset --update-interval $TOF_CHANNELOFFSETS_UPDATE --delta-update-interval $TOF_CHANNELOFFSETS_DELTA_UPDATE --min-entries 100 --range 100000 --use-ccdb --follow-ccdb-updates" "" 0
108+
if [[ $CALIB_TOF_DIAGNOSTICS == 1 ]]; then
109+
add_W o2-calibration-tof-diagnostic-workflow "--tf-per-slot 26400 --max-delay 1" "" 0
110+
fi
111+
# TPC
112+
if [[ $CALIB_TPC_TIMEGAIN == 1 ]]; then
113+
add_W o2-tpc-calibrator-dedx "--min-entries-sector 3000 --min-entries-1d 200 --min-entries-2d 10000"
114+
fi
115+
# TRD
116+
if [[ $CALIB_TRD_VDRIFTEXB == 1 ]]; then
117+
add_W o2-calibration-trd-vdrift-exb ""
71118
fi
72-
fi
73-
if [[ $CALIB_TOF_DIAGNOSTICS == 1 ]]; then
74-
add_W o2-calibration-tof-diagnostic-workflow "--tf-per-slot 26400 --max-delay 1" "" 0
75-
fi
76-
77-
# TPC
78-
if [[ $CALIB_TPC_TIMEGAIN == 1 ]]; then
79-
add_W o2-tpc-calibrator-dedx "--min-entries-sector 3000 --min-entries-1d 200 --min-entries-2d 10000"
80-
fi
81-
if [[ $CALIB_TPC_RESPADGAIN == 1 ]]; then
82-
add_W o2-tpc-calibrator-gainmap-tracks "--tf-per-slot 10000" "" 0
83119
fi
84120

85-
# TRD
86-
if [[ $CALIB_TRD_VDRIFTEXB == 1 ]]; then
87-
add_W o2-calibration-trd-vdrift-exb ""
121+
# calibrations for AGGREGATOR_TASKS == BARREL_SPORADIC
122+
if [[ $AGGREGATOR_TASKS == BARREL_SPORADIC ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
123+
# TPC
124+
if [[ $CALIB_TPC_RESPADGAIN == 1 ]]; then
125+
add_W o2-tpc-calibrator-gainmap-tracks "--tf-per-slot 10000" "" 0
126+
fi
88127
fi
89128

90129
# Calo cal
91-
# EMC
92-
if [[ $CALIB_EMC_CHANNELCALIB == 1 ]]; then
93-
add_W o2-calibration-emcal-channel-calib-workflow "" "EMCALCalibParams.calibType=\"time\""
94-
fi
130+
# calibrations for AGGREGATOR_TASKS == CALO_TF
131+
if [[ $AGGREGATOR_TASKS == CALO_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
132+
# EMC
133+
if [[ $CALIB_EMC_CHANNELCALIB == 1 ]]; then
134+
add_W o2-calibration-emcal-channel-calib-workflow "" "EMCALCalibParams.calibType=\"time\""
135+
fi
95136

96-
# PHS
97-
if [[ $CALIB_PHS_ENERGYCALIB == 1 ]]; then
98-
add_W o2-phos-calib-workflow "--energy"
137+
# PHS
138+
if [[ $CALIB_PHS_ENERGYCALIB == 1 ]]; then
139+
add_W o2-phos-calib-workflow "--energy"
140+
fi
141+
if [[ $CALIB_PHS_BADMAPCALIB == 1 ]]; then
142+
add_W o2-phos-calib-workflow "--badmap --mode 0"
143+
fi
144+
if [[ $CALIB_PHS_TURNONCALIB == 1 ]]; then
145+
add_W o2-phos-calib-workflow "--turnon"
146+
fi
147+
if [[ $CALIB_PHS_RUNBYRUNCALIB == 1 ]]; then
148+
add_W o2-phos-calib-workflow "--runbyrun"
149+
fi
99150
fi
100-
if [[ $CALIB_PHS_BADMAPCALIB == 1 ]]; then
101-
add_W o2-phos-calib-workflow "--badmap --mode 0"
151+
152+
# calibrations for AGGREGATOR_TASKS == CALO_SPORADIC
153+
if [[ $AGGREGATOR_TASKS == CALO_SPORADIC ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
154+
echo "AGGREGATOR_TASKS == CALO_SPORADIC not defined for the time being"
102155
fi
103-
if [[ $CALIB_PHS_TURNONCALIB == 1 ]]; then
104-
add_W o2-phos-calib-workflow "--turnon"
156+
157+
# calibrations for AGGREGATOR_TASKS == MUON_TF
158+
if [[ $AGGREGATOR_TASKS == MUON_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
159+
echo "AGGREGATOR_TASKS == MUON_TF not defined for the time being"
105160
fi
106-
if [[ $CALIB_PHS_RUNBYRUNCALIB == 1 ]]; then
107-
add_W o2-phos-calib-workflow "--runbyrun"
161+
162+
# calibrations for AGGREGATOR_TASKS == MUON_SPORADIC
163+
if [[ $AGGREGATOR_TASKS == MUON_SPORADIC ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
164+
echo "AGGREGATOR_TASKS == MUON_SPORADIC not defined for the time being"
108165
fi
109166

110167
if [[ $CCDB_POPULATOR_UPLOAD_PATH != "none" ]]; then add_W o2-calibration-ccdb-populator-workflow "--ccdb-path $CCDB_POPULATOR_UPLOAD_PATH"; fi

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,23 @@ if [[ $CALIB_TPC_RESPADGAIN == 1 ]]; then add_W o2-tpc-calib-gainmap-tracks "--p
2121

2222
# output-proxy for aggregator
2323
if workflow_has_parameter CALIB_PROXIES; then
24-
if [[ ! -z $CALIBDATASPEC_BARREL ]]; then
25-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL\" $(get_proxy_connection barrel output)" "" 0
24+
if [[ ! -z $CALIBDATASPEC_BARREL_TF ]]; then
25+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_TF\" $(get_proxy_connection barrel_tf output)" "" 0
2626
fi
27-
if [[ ! -z $CALIBDATASPEC_CALO ]]; then
28-
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO\" $(get_proxy_connection calo output)" "" 0
27+
if [[ ! -z $CALIBDATASPEC_BARREL_SPORADIC ]]; then
28+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_BARREL_SPORADIC\" $(get_proxy_connection barrel_sp output)" "" 0
29+
fi
30+
if [[ ! -z $CALIBDATASPEC_CALO_TF ]]; then
31+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_TF\" $(get_proxy_connection calo_tf output)" "" 0
32+
fi
33+
if [[ ! -z $CALIBDATASPEC_CALO_SPORADIC ]]; then
34+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_CALO_SPORADIC\" $(get_proxy_connection calo_sp output)" "" 0
35+
fi
36+
if [[ ! -z $CALIBDATASPEC_MUON_TF ]]; then
37+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_TF\" $(get_proxy_connection muon_tf output)" "" 0
38+
fi
39+
if [[ ! -z $CALIBDATASPEC_MUON_SPORADIC ]]; then
40+
add_W o2-dpl-output-proxy "--dataspec \"$CALIBDATASPEC_MUON_SPORADIC\" $(get_proxy_connection muon_sp output)" "" 0
2941
fi
3042
fi
3143

0 commit comments

Comments
 (0)