From 610fe7843d3029c1af8a8e1dfebda23746f6d0e1 Mon Sep 17 00:00:00 2001
From: Robert Muenzer <robert.muenzer@cern.ch>
Date: Wed, 26 Jun 2024 17:28:53 +0200
Subject: [PATCH 1/6] Add Runtype as apricot parameter

---
 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           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DATA/production/calib/tpc-laser-aggregator.sh b/DATA/production/calib/tpc-laser-aggregator.sh
index 2507a1e39..04d8f9810 100755
--- a/DATA/production/calib/tpc-laser-aggregator.sh
+++ b/DATA/production/calib/tpc-laser-aggregator.sh
@@ -12,7 +12,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 06a98525e..f6ad32488 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 a5135b330..5b4c55bb2 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..0921fb42a 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

From 061c1c58f23751473f68fd192b234b87ff28a64c Mon Sep 17 00:00:00 2001
From: Robert Muenzer <robert.muenzer@cern.ch>
Date: Wed, 3 Jul 2024 15:12:58 +0200
Subject: [PATCH 2/6] add options in common helper function

---
 DATA/common/gen_topo_helper_functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
index e7fc3fa68..10dae40cc 100755
--- a/DATA/common/gen_topo_helper_functions.sh
+++ b/DATA/common/gen_topo_helper_functions.sh
@@ -272,7 +272,7 @@ 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"
+    curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true&${3}"
     if [[ $? != 0 ]]; then
       echo "Error fetching QC JSON $1"
       exit 1

From a58825814dacb57bd8726d85dfead65bfd45274e Mon Sep 17 00:00:00 2001
From: Robert Muenzer <robert.muenzer@cern.ch>
Date: Wed, 3 Jul 2024 17:41:14 +0200
Subject: [PATCH 3/6] Further tests

---
 DATA/common/gen_topo_helper_functions.sh | 7 ++++++-
 DATA/production/calib/tpc-pulser.sh      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
index 10dae40cc..0e76897c9 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&${3}"
+	if [[ ${1} =~ "?" ]]; then
+		echo curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}&process=true"
+	else
+		echo 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
@@ -281,6 +285,7 @@ add_QC_from_apricot()
   else
     QC_CONFIG_ARG="apricot://${GEN_TOPO_QC_APRICOT_SERVER}$1"
   fi
+  echo $GEN_TOPO_QC_JSON_FILE
   add_W o2-qc "--config $QC_CONFIG_ARG $2"
 }
 
diff --git a/DATA/production/calib/tpc-pulser.sh b/DATA/production/calib/tpc-pulser.sh
index 0921fb42a..8e32d67dc 100755
--- a/DATA/production/calib/tpc-pulser.sh
+++ b/DATA/production/calib/tpc-pulser.sh
@@ -35,7 +35,7 @@ fi
 
 #################################################################################################################################
 
-
+echo "QC_command:" $QC_CONFIG 
 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}" 

From f0a6663c0c1cc4025011171f97c2a5d79ecc210a Mon Sep 17 00:00:00 2001
From: Robert Muenzer <robert.muenzer@cern.ch>
Date: Fri, 5 Jul 2024 16:16:40 +0200
Subject: [PATCH 4/6] Change of curl request

---
 DATA/common/gen_topo_helper_functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
index 0e76897c9..b20679e19 100755
--- a/DATA/common/gen_topo_helper_functions.sh
+++ b/DATA/common/gen_topo_helper_functions.sh
@@ -273,7 +273,7 @@ add_QC_from_apricot()
 {
   if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then
 	if [[ ${1} =~ "?" ]]; then
-		echo curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}&process=true"
+		echo curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
 	else
 		echo curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
 	fi

From 3c666feb0da6571c7e8e4cc994665454e2813273 Mon Sep 17 00:00:00 2001
From: Robert Muenzer <robert.muenzer@cern.ch>
Date: Fri, 5 Jul 2024 17:14:56 +0200
Subject: [PATCH 5/6] Modify curl command to in add_qc_from_apricot to allow
 for parameters

---
 DATA/common/gen_topo_helper_functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
index b20679e19..c68d94785 100755
--- a/DATA/common/gen_topo_helper_functions.sh
+++ b/DATA/common/gen_topo_helper_functions.sh
@@ -273,9 +273,9 @@ add_QC_from_apricot()
 {
   if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then
 	if [[ ${1} =~ "?" ]]; then
-		echo curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
+		curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
 	else
-		echo curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
+		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"

From 76c5e4269cdda4dfe6e866765d507f954cc3690f Mon Sep 17 00:00:00 2001
From: Robert Muenzer <robert.muenzer@cern.ch>
Date: Fri, 5 Jul 2024 17:16:17 +0200
Subject: [PATCH 6/6] Remove debug output

---
 DATA/common/gen_topo_helper_functions.sh | 1 -
 DATA/production/calib/tpc-pulser.sh      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
index c68d94785..da4b087eb 100755
--- a/DATA/common/gen_topo_helper_functions.sh
+++ b/DATA/common/gen_topo_helper_functions.sh
@@ -285,7 +285,6 @@ add_QC_from_apricot()
   else
     QC_CONFIG_ARG="apricot://${GEN_TOPO_QC_APRICOT_SERVER}$1"
   fi
-  echo $GEN_TOPO_QC_JSON_FILE
   add_W o2-qc "--config $QC_CONFIG_ARG $2"
 }
 
diff --git a/DATA/production/calib/tpc-pulser.sh b/DATA/production/calib/tpc-pulser.sh
index 8e32d67dc..7800c0c81 100755
--- a/DATA/production/calib/tpc-pulser.sh
+++ b/DATA/production/calib/tpc-pulser.sh
@@ -35,7 +35,6 @@ fi
 
 #################################################################################################################################
 
-echo "QC_command:" $QC_CONFIG 
 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}"