Skip to content
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

Apricot parameters in standalone runs #1692

Merged
merged 10 commits into from
Jul 20, 2024
Merged

Apricot parameters in standalone runs #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
610fe78
Add Runtype as apricot parameter
rmunzer Jun 26, 2024
061c1c5
add options in common helper function
rmunzer Jul 3, 2024
4e02215
Merge branch 'AliceO2Group:master' into tpc_apricot_parameters
rmunzer Jul 3, 2024
a588258
Further tests
rmunzer Jul 3, 2024
f0a6663
Change of curl request
rmunzer Jul 5, 2024
2482e9c
Merge branch 'AliceO2Group:master' into tpc_apricot_parameters
rmunzer Jul 5, 2024
c5a40af
Merge branch 'tpc_apricot_parameters' of github.com:rmunzer/O2DPG int…
rmunzer Jul 5, 2024
3c666fe
Modify curl command to in add_qc_from_apricot to allow for parameters
rmunzer Jul 5, 2024
76c5e42
Remove debug output
rmunzer Jul 5, 2024
27749ac
Merge branch 'AliceO2Group:master' into tpc_apricot_parameters
rmunzer Jul 18, 2024
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
6 changes: 5 additions & 1 deletion DATA/common/gen_topo_helper_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,11 @@ add_QC_from_consul()
add_QC_from_apricot()
{
if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
if [[ ${1} =~ "?" ]]; then
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
else
curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
fi
if [[ $? != 0 ]]; then
echo "Error fetching QC JSON $1"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion DATA/production/calib/tpc-laser-aggregator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CCDB_PATH="http://o2-ccdb.internal"

HOST=localhost

QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn?run_type=${RUNTYPE:-}"

QC_CONFIG="components/qc/ANY/any/tpc-raw-qcmn"
max_events=300
Expand Down
2 changes: 1 addition & 1 deletion DATA/production/calib/tpc-laser-filter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ PROXY_OUTSPEC="A:TPC/LASERTRACKS;B:TPC/CEDIGITS;D:TPC/CLUSREFS"

HOST=localhost

QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-laser-calib-qcmn"
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-laser-calib-qcmn?run_type=${RUNTYPE:-}"
QC_CONFIG="components/qc/ANY/any/tpc-laser-calib-qcmn"


Expand Down
2 changes: 1 addition & 1 deletion DATA/production/calib/tpc-laser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CCDB_PATH="http://o2-ccdb.internal"
HOST=localhost


QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn?run_type=${RUNTYPE:-}"
QC_CONFIG="components/qc/ANY/any/tpc-raw-qcmn"

max_events=300
Expand Down
2 changes: 1 addition & 1 deletion DATA/production/calib/tpc-pedestal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CCDB_PATH="http://o2-ccdb.internal"
HOST=localhost

#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn"
QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn?run_type=${RUNTYPE:-}"
CALIB_CONFIG="TPCCalibPedestal.ADCMin=20"


Expand Down
2 changes: 1 addition & 1 deletion DATA/production/calib/tpc-pulser-long.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CCDB_PATH="http://o2-ccdb.internal"
HOST=localhost

#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn"
QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn?run_type=${RUNTYPE:-}"
max_events=1000000
publish_after=200

Expand Down
3 changes: 1 addition & 2 deletions DATA/production/calib/tpc-pulser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CCDB_PATH="http://o2-ccdb.internal"

HOST=localhost

QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn"
QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn?run_type=${RUNTYPE:-}"

max_events=200
publish_after=230
Expand All @@ -35,7 +35,6 @@ fi

#################################################################################################################################


WORKFLOW=
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
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --calib-type pulser --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --check-calib-infos" "${CALIB_CONFIG}"
Expand Down