Skip to content

Commit 3935b91

Browse files
miranov25miranov25
authored
Merge branch 'master' into master
2 parents 1afc6d4 + 6f985de commit 3935b91

File tree

203 files changed

+5895
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+5895
-514
lines changed

‎CODEOWNERS‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* @davidrohr @shahor02 @chiarazampolli @sawenzel @benedikt-voelkel
1+
* @davidrohr @shahor02 @chiarazampolli @sawenzel
22
/DATA/production @davidrohr @shahor02 @chiarazampolli
33

44
/DATA/testing/detectors/CPV
@@ -8,24 +8,23 @@
88
/DATA/testing/detectors/FV0
99
/DATA/testing/detectors/HMP
1010
/DATA/testing/detectors/ITS
11-
/DATA/testing/detectors/MCH @aphecetche
11+
/DATA/testing/detectors/MCH
1212
/DATA/testing/detectors/MFT
13-
/DATA/testing/detectors/MID @aphecetche
13+
/DATA/testing/detectors/MID
1414
/DATA/testing/detectors/PHS
1515
/DATA/testing/detectors/TOF @noferini @chiarazampolli
1616
/DATA/testing/detectors/TPC @wiechula
1717
/DATA/testing/detectors/TRD
1818
/DATA/testing/detectors/ZDC
1919

20-
/MC @sawenzel @chiarazampolli @benedikt-voelkel
20+
/MC @sawenzel @chiarazampolli @jackal1-66
2121

2222
# PWG experts
23-
/MC/*/PWGHF @AliceO2Group/reviewers-pwg-hf @sawenzel @chiarazampolli @benedikt-voelkel
24-
/MC/*/PWGLF @AliceO2Group/reviewers-pwg-lf @sawenzel @chiarazampolli @benedikt-voelkel
25-
/MC/*/PWGEM @AliceO2Group/reviewers-pwg-em @sawenzel @chiarazampolli @benedikt-voelkel
26-
/MC/*/PWGGAJE @AliceO2Group/reviewers-pwg-je @sawenzel @chiarazampolli @benedikt-voelkel
27-
/MC/*/PWGCF @AliceO2Group/reviewers-pwg-cf @sawenzel @chiarazampolli @benedikt-voelkel
28-
/MC/*/PWGDQ @AliceO2Group/reviewers-pwg-dq @sawenzel @chiarazampolli @benedikt-voelkel
29-
/MC/*/PWGUD @AliceO2Group/reviewers-pwg-ud @sawenzel @chiarazampolli @benedikt-voelkel
30-
31-
/RelVal @sawenzel @chiarazampolli @benedikt-voelkel
23+
/MC/*/PWGHF @AliceO2Group/reviewers-pwg-hf
24+
/MC/*/PWGLF @AliceO2Group/reviewers-pwg-lf
25+
/MC/*/PWGEM @AliceO2Group/reviewers-pwg-em
26+
/MC/*/PWGGAJE @AliceO2Group/reviewers-pwg-je
27+
/MC/*/PWGCF @AliceO2Group/reviewers-pwg-cf
28+
/MC/*/PWGDQ @AliceO2Group/reviewers-pwg-dq
29+
/MC/*/PWGUD @AliceO2Group/reviewers-pwg-ud
30+
/RelVal @sawenzel @chiarazampolli

‎DATA/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export WORKFLOW_PARAMETERS= # Additiona
227227
export RECO_NUM_NODES_OVERRIDE=0 # Override the number of EPN compute nodes to use (default is specified in description library file)
228228
export NHBPERTF=256 # Number of HBF per TF
229229
230-
/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
230+
/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
231231
[drohr@epn245 test]$ ./run.sh
232232
Loading ODC/0.36-1
233233
Loading requirement: BASE/1.0 GCC-Toolchain/v10.2.0-alice2-3 fmt/7.1.0-10 FairLogger/v1.9.1-7 zlib/v1.2.8-8 OpenSSL/v1.0.2o-9 libpng/v1.6.34-9 sqlite/v3.15.0-2 libffi/v3.2.1-2 FreeType/v2.10.1-8 Python/v3.6.10-12 Python-modules/1.0-16 boost/v1.75.0-13 ZeroMQ/v4.3.3-6 ofi/v1.7.1-8 asio/v1.19.1-2 asiofi/v0.5.1-2 DDS/3.5.16-5 FairMQ/v1.4.40-4
@@ -277,7 +277,7 @@ export WORKFLOW_PARAMETERS=EVENT_DISPLAY,CTF,GPU # Additiona
277277
export RECO_NUM_NODES_OVERRIDE=0 # Override the number of EPN compute nodes to use (default is specified in description library file)
278278
export NHBPERTF=256 # Number of HBF per TF
279279
280-
/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
280+
/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
281281
[drohr@epn245 test]$ ./run.sh
282282
Loading ODC/0.36-1
283283
Loading requirement: BASE/1.0 GCC-Toolchain/v10.2.0-alice2-3 fmt/7.1.0-10 FairLogger/v1.9.1-7 zlib/v1.2.8-8 OpenSSL/v1.0.2o-9 libpng/v1.6.34-9 sqlite/v3.15.0-2 libffi/v3.2.1-2 FreeType/v2.10.1-8 Python/v3.6.10-12 Python-modules/1.0-16 boost/v1.75.0-13 ZeroMQ/v4.3.3-6 ofi/v1.7.1-8 asio/v1.19.1-2 asiofi/v0.5.1-2 DDS/3.5.16-5 FairMQ/v1.4.40-4

‎DATA/common/gen_topo_helper_functions.sh‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ has_detector_matching()
4949
[[ $WORKFLOW_DETECTORS_MATCHING =~ (^|,)"ALL"(,|$) ]] || [[ $WORKFLOW_DETECTORS_MATCHING =~ (^|,)"$1"(,|$) ]]
5050
}
5151

52+
has_detector_gpu()
53+
{
54+
has_detector $1 && [[ $WORKFLOW_DETECTORS_GPU =~ (^|,)"$1"(,|$) ]]
55+
}
56+
5257
has_secvtx_source()
5358
{
5459
[[ $SVERTEXING_SOURCES =~ (^|,)"ALL"(,|$) ]] || [[ $SVERTEXING_SOURCES =~ (^|,)"$1"(,|$) ]]
@@ -137,6 +142,11 @@ has_detectors_flp_processing()
137142
_check_multiple has_detector_flp_processing "$@"
138143
}
139144

145+
has_detectors_gpu()
146+
{
147+
_check_multiple has_detector_gpu "$@"
148+
}
149+
140150
workflow_has_parameters()
141151
{
142152
_check_multiple workflow_has_parameter "$@"
@@ -252,19 +262,22 @@ add_W() # Add binarry to workflow command USAGE: add_W [BINARY] [COMMAND_LINE_OP
252262
WORKFLOW+=$WFADD
253263
}
254264

255-
if [[ "${GEN_TOPO_DEPLOYMENT_TYPE:-}" == "ALICE_STAGING" ]]; then
256-
GEN_TOPO_QC_CONSUL_SERVER=ali-staging.cern.ch
257-
else
258-
GEN_TOPO_QC_CONSUL_SERVER=alio2-cr1-hv-con01.cern.ch
265+
if [[ ${EPNSYNCMODE:-0} == 1 ]]; then
266+
if [[ "${GEN_TOPO_DEPLOYMENT_TYPE:-}" == "ALICE_STAGING" ]]; then
267+
GEN_TOPO_QC_CONSUL_SERVER=ali-staging.cern.ch
268+
else
269+
GEN_TOPO_QC_CONSUL_SERVER=alio2-cr1-hv-con01.cern.ch
270+
fi
271+
GEN_TOPO_QC_APRICOT_SERVER=`curl -s "http://${GEN_TOPO_QC_CONSUL_SERVER}:8500/v1/kv/o2/runtime/aliecs/vars/apricot_endpoint?raw"`
259272
fi
260-
GEN_TOPO_QC_APRICOT_SERVER=`curl -s "http://${GEN_TOPO_QC_CONSUL_SERVER}:8500/v1/kv/o2/runtime/aliecs/vars/apricot_endpoint?raw"`
261273

262274
add_QC_from_consul()
263275
{
276+
[[ ${EPNSYNCMODE:-0} == 1 ]] || { echo "Error fetching QC JSON $1: consul server only set for EPNSYNCMODE == 1 " 1>&2 && exit 1; }
264277
if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then
265278
curl -s -o $GEN_TOPO_QC_JSON_FILE "http://${GEN_TOPO_QC_CONSUL_SERVER}:8500/v1/kv${1}?raw"
266279
if [[ $? != 0 ]]; then
267-
echo "Error fetching QC JSON $1"
280+
echo "Error fetching QC JSON $1 (1)" 1>&2
268281
exit 1
269282
fi
270283
QC_CONFIG_ARG="json://${GEN_TOPO_QC_JSON_FILE}"
@@ -276,14 +289,15 @@ add_QC_from_consul()
276289

277290
add_QC_from_apricot()
278291
{
292+
[[ ${EPNSYNCMODE:-0} == 1 ]] || { echo "Error fetching QC JSON $1: apricot server only set for EPNSYNCMODE == 1 " 1>&2 && exit 1; }
279293
if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then
280-
if [[ ${1} =~ "?" ]]; then
281-
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
282-
else
283-
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
284-
fi
294+
if [[ ${1} =~ "?" ]]; then
295+
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
296+
else
297+
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
298+
fi
285299
if [[ $? != 0 ]]; then
286-
echo "Error fetching QC JSON $1"
300+
echo "Error fetching QC JSON $1 (2)" 1>&2
287301
exit 1
288302
fi
289303
QC_CONFIG_ARG="json://${GEN_TOPO_QC_JSON_FILE}"

‎DATA/common/setenv.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ if [[ ! -z ${WORKFLOW_DETECTORS_EXCLUDE:-} ]]; then
4343
done
4444
fi
4545

46+
if [[ -z "${WORKFLOW_DETECTORS_GPU+x}" ]]; then export WORKFLOW_DETECTORS_GPU="TPC"; fi
4647
if [[ -z "${WORKFLOW_DETECTORS_QC+x}" ]] || [[ "0$WORKFLOW_DETECTORS_QC" == "0ALL" ]]; then export WORKFLOW_DETECTORS_QC="$WORKFLOW_DETECTORS,$LIST_OF_GLORECO,TOF_MATCH"; fi
4748
if [[ -z "${WORKFLOW_DETECTORS_CALIB+x}" ]] || [[ "0$WORKFLOW_DETECTORS_CALIB" == "0ALL" ]]; then export WORKFLOW_DETECTORS_CALIB=$WORKFLOW_DETECTORS; fi
4849
if [[ -z "${WORKFLOW_DETECTORS_RECO+x}" ]] || [[ "0$WORKFLOW_DETECTORS_RECO" == "0ALL" ]]; then export WORKFLOW_DETECTORS_RECO=$WORKFLOW_DETECTORS; fi

‎DATA/production/calib/its-threshold-processing.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@ if [ $RUNTYPE_ITS == "tuningbb" ]; then
2727
ADDITIONAL_OPTIONS_CAL="--min-vcasn 30 --max-vcasn 130"
2828
fi
2929
if [[ $RUNTYPE_ITS == "tot1row" || $RUNTYPE_ITS == "vresetd" ]]; then
30-
ADDITIONAL_OPTIONS_DEC="--allow-empty-rofs"
3130
ADDITIONAL_OPTIONS_CAL="--ninj 10"
3231
fi
3332
if [ $RUNTYPE_ITS == "totfullfast" ]; then
34-
ADDITIONAL_OPTIONS_DEC="--allow-empty-rofs"
3533
ADDITIONAL_OPTIONS_CAL="--calculate-slope --charge-a 30 --charge-b 60 --ninj 10"
3634
fi
3735

3836
WORKFLOW=
3937
add_W o2-dpl-raw-proxy "--exit-transition-timeout 20 --dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@$INRAWCHANNAME,rateLogging=0,transport=shmem\"" "" 0
40-
add_W o2-itsmft-stf-decoder-workflow "${ADDITIONAL_OPTIONS_DEC} --always-parse-trigger --condition-tf-per-query -1 --condition-backend \"http://localhost:8084\" --ignore-dist-stf --nthreads 1 --no-clusters --no-cluster-patterns --pipeline its-stf-decoder:${NDECODERS} --enable-calib-data --digits"
38+
add_W o2-itsmft-stf-decoder-workflow "${ADDITIONAL_OPTIONS_DEC} --allow-empty-rofs --always-parse-trigger --condition-tf-per-query -1 --condition-backend \"http://localhost:8084\" --ignore-dist-stf --nthreads 1 --no-clusters --no-cluster-patterns --pipeline its-stf-decoder:${NDECODERS} --enable-calib-data --digits"
4139
for i in $(seq 0 $((CHIPMODBASE-1)))
4240
do
4341
add_W o2-its-threshold-calib-workflow "-b ${ADDITIONAL_OPTIONS_CAL} --enable-single-pix-tag --ccdb-mgr-url=\"http://localhost:8084\" --nthreads 1 --chip-mod-selector $i --chip-mod-base $CHIPMODBASE --fittype derivative --output-dir \"/data/calibration\" --meta-output-dir \"/data/epn2eos_tool/epn2eos\" --meta-type \"calibration\"" "" 0

‎DATA/production/calib/mid-badchannels.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ workflow_has_parameter CTF && {
4444
add_W o2-mid-calibration-workflow "" "" 0
4545
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDB_POPULATOR_UPLOAD_PATH\" --sspec-min 0 --sspec-max 0"
4646
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDB_POPULATOR_UPLOAD_PATH_DCS\" --sspec-min 1 --sspec-max 1 --name-extention dcs"
47-
workflow_has_parameter QC && add_QC_from_consul "/o2/components/qc/ANY/any/mid-calib-qcmn" "--local --host localhost"
47+
workflow_has_parameter QC && add_QC_from_apricot "components/qc/ANY/any/mid-calib-qcmn" "--local --host localhost"
4848
WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
4949

5050
if [ "$WORKFLOWMODE" == "print" ]; then

‎DATA/production/calib/tpc-pedestal.sh‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,32 @@ HOST=localhost
2121
QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn?run_type=${RUNTYPE:-}"
2222
CALIB_CONFIG="TPCCalibPedestal.ADCMin=20"
2323

24-
25-
max_events=50
26-
publish_after=400
27-
28-
if [[ ! -z ${TPC_CALIB_MAX_EVENTS:-} ]]; then
29-
max_events=${TPC_CALIB_MAX_EVENTS}
30-
fi
31-
32-
if [[ ! -z ${TPC_CALIB_PUBLISH_AFTER:-} ]]; then
33-
publish_after=${TPC_CALIB_PUBLISH_AFTER}
34-
fi
35-
24+
# ===| configuration from environment variables |===============================
25+
max_events=${TPC_CALIB_MAX_EVENTS:-50}
26+
publish_after=${TPC_CALIB_PUBLISH_AFTER:-400}
27+
sendToDCS=${TPC_CALIB_SEND_TO_DCS:-1}
28+
29+
# ===| ccdb populator setup |===================================================
30+
# the production CCDB populator will accept subspecs in this range
31+
CCDBPRO_SUBSPEC_MIN=0
32+
CCDBPRO_SUBSPEC_MAX=32767
33+
CCDBPATHPRO="http://o2-ccdb.internal"
34+
35+
# the DCS CCDB populator will accept subspecs in this range
36+
CCDBDCS_SUBSPEC_MIN=32768
37+
CCDBDCS_SUBSPEC_MAX=65535
38+
CCDBPATHDCS="$DCSCCDBSERVER_PERS"
3639

3740
#################################################################################################################################
3841

3942

4043
WORKFLOW=
4144
add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
42-
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36" "${CALIB_CONFIG}"
43-
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
45+
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --send-to-dcs-ccdb $sendToDCS" "${CALIB_CONFIG}"
46+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"$CCDBPATHPRO\" --sspec-min $CCDBPRO_SUBSPEC_MIN --sspec-max $CCDBPRO_SUBSPEC_MAX" "" 0
47+
if [[ $sendToDCS -eq 1 ]]; then
48+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"$CCDBPATHDCS\" --sspec-min $CCDBDCS_SUBSPEC_MIN --sspec-max $CCDBDCS_SUBSPEC_MAX --name-extention dcs" "" 0
49+
fi
4450
add_QC_from_apricot "${QC_CONFIG}" "--local --host localhost"
4551

4652
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"

0 commit comments

Comments
 (0)