From 4377d75b6eea32a8108acc01644fcd25f8c34c2e Mon Sep 17 00:00:00 2001
From: rmunzer <97919772+rmunzer@users.noreply.github.com>
Date: Tue, 20 Aug 2024 10:20:29 +0200
Subject: [PATCH] Parameter for global workflow in apricot (#1729)

* Add parameter runtype for TPC QC in global runs

* Add beam_type option for tpc qc

* Remove parameter and fix typo

* Remove second option in qc for calibration workflows

* Remove debug lines
---
 DATA/production/calib/tpc-pulser-long.sh | 2 +-
 DATA/production/qc-workflow.sh           | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/DATA/production/calib/tpc-pulser-long.sh b/DATA/production/calib/tpc-pulser-long.sh
index d233510a6..e4bca03d1 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?run_type=${RUNTYPE:-}"
+QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn?run_type=${RUNTYPE:-}&beam_type=${BEAMTYPE:-}"
 max_events=1000000
 publish_after=200
 
diff --git a/DATA/production/qc-workflow.sh b/DATA/production/qc-workflow.sh
index 9038d0d49..421fae303 100755
--- a/DATA/production/qc-workflow.sh
+++ b/DATA/production/qc-workflow.sh
@@ -28,7 +28,12 @@ add_QC_JSON() {
     fi
   elif [[ ${2} =~ ^apricot://.* ]]; then
     TMP_FILENAME=$FETCHTMPDIR/$1.$RANDOM.$RANDOM.json
-    curl -s -o $TMP_FILENAME "${GEN_TOPO_QC_APRICOT_SERVER}/${2/apricot:\/\/o2\//}?process=true"
+	if [[ ${2} =~ "?" ]]; then
+		curl -s -o $TMP_FILENAME "${GEN_TOPO_QC_APRICOT_SERVER}/${2/apricot:\/\/o2\//}\&process=true"
+	else
+		curl -s -o $TMP_FILENAME "${GEN_TOPO_QC_APRICOT_SERVER}/${2/apricot:\/\/o2\//}?process=true"
+	fi
+    
     if [[ $? != 0 ]]; then
       echo "Error fetching QC JSON $2"
       exit 1
@@ -52,7 +57,7 @@ if [[ -z ${QC_JSON_FROM_OUTSIDE:-} && ! -z ${GEN_TOPO_QC_JSON_FILE:-} && -f $GEN
   QC_JSON_FROM_OUTSIDE=$GEN_TOPO_QC_JSON_FILE
 elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
   if [[ $EPNSYNCMODE == 1 || "${GEN_TOPO_LOAD_QC_JSON_FROM_CONSUL:-}" == "1" ]]; then # Sync processing running on the EPN
-    [[ -z "${QC_JSON_TPC:-}" ]] && QC_JSON_TPC=apricot://o2/components/qc/ANY/any/tpc-full-qcmn
+    [[ -z "${QC_JSON_TPC:-}" ]] && QC_JSON_TPC=apricot://o2/components/qc/ANY/any/tpc-full-qcmn?run_type=${RUNTYPE:-}
     [[ -z "${QC_JSON_ITS:-}" ]] && QC_JSON_ITS=apricot://o2/components/qc/ANY/any/its-qcmn-epn-full
     if [[ -z "${QC_JSON_MFT:-}" ]]; then
       if has_detector MFT && has_processing_step MFT_RECO; then