From 21fb552bacc3d27e8962e2324c2f9c15c4f35f62 Mon Sep 17 00:00:00 2001
From: rmunzer <97919772+rmunzer@users.noreply.github.com>
Date: Sat, 20 Jul 2024 14:20:36 +0200
Subject: [PATCH] Apricot parameters in standalone runs (#1692)

* Add Runtype as apricot parameter

* add options in common helper function

* Further tests

* Change of curl request

* Modify curl command to in add_qc_from_apricot to allow for parameters

* Remove debug output
---
 DATA/common/gen_topo_helper_functions.sh      | 6 +++++-
 DATA/production/calib/tpc-laser-aggregator.sh | 2 +-
 DATA/production/calib/tpc-laser-filter.sh     | 2 +-
 DATA/production/calib/tpc-laser.sh            | 2 +-
 DATA/production/calib/tpc-pedestal.sh         | 2 +-
 DATA/production/calib/tpc-pulser-long.sh      | 2 +-
 DATA/production/calib/tpc-pulser.sh           | 3 +--
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
index e7fc3fa68..da4b087eb 100755
--- a/DATA/common/gen_topo_helper_functions.sh
+++ b/DATA/common/gen_topo_helper_functions.sh
@@ -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
diff --git a/DATA/production/calib/tpc-laser-aggregator.sh b/DATA/production/calib/tpc-laser-aggregator.sh
index c7d1b2cba..8d0acc5bf 100755
--- a/DATA/production/calib/tpc-laser-aggregator.sh
+++ b/DATA/production/calib/tpc-laser-aggregator.sh
@@ -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
diff --git a/DATA/production/calib/tpc-laser-filter.sh b/DATA/production/calib/tpc-laser-filter.sh
index 3c8523660..0d6c2ed64 100755
--- a/DATA/production/calib/tpc-laser-filter.sh
+++ b/DATA/production/calib/tpc-laser-filter.sh
@@ -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"
 
 
diff --git a/DATA/production/calib/tpc-laser.sh b/DATA/production/calib/tpc-laser.sh
index 3f5599dc8..b15b9311a 100755
--- a/DATA/production/calib/tpc-laser.sh
+++ b/DATA/production/calib/tpc-laser.sh
@@ -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
diff --git a/DATA/production/calib/tpc-pedestal.sh b/DATA/production/calib/tpc-pedestal.sh
index 5c7d7e55f..cbcf4bd2f 100755
--- a/DATA/production/calib/tpc-pedestal.sh
+++ b/DATA/production/calib/tpc-pedestal.sh
@@ -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"
  
 
diff --git a/DATA/production/calib/tpc-pulser-long.sh b/DATA/production/calib/tpc-pulser-long.sh
index 20edc981f..d233510a6 100755
--- a/DATA/production/calib/tpc-pulser-long.sh
+++ b/DATA/production/calib/tpc-pulser-long.sh
@@ -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
 
diff --git a/DATA/production/calib/tpc-pulser.sh b/DATA/production/calib/tpc-pulser.sh
index f5f4bba53..7800c0c81 100755
--- a/DATA/production/calib/tpc-pulser.sh
+++ b/DATA/production/calib/tpc-pulser.sh
@@ -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
@@ -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}"