Tpc sac with optional ccdb path (#510)

rmunzer · web-flow · commit 64ca419ec0cb · 2022-09-27T13:48:30.000+02:00
* CCBD path as parameter for sac processing

* CCBD path as parameter for sac processing

* CCBD path as parameter for sac processing - correct parameter
diff --git a/scripts/tpc-idc-sac-simple.sh b/scripts/tpc-idc-sac-simple.sh
@@ -45,7 +45,8 @@ MERGER_C=epn024-ib
 PORT=47734
 
 nTFs=1000
-ccdb="ccdb-test.cern.ch:8080"
+#ccdb="ccdb-test.cern.ch:8080"
+ccdb="http://o2-ccdb.internal"
 export DPL_CONDITION_BACKEND="http://127.0.0.1:8084"
 export DPL_CONDITION_QUERY_RATE="${GEN_TOPO_EPN_CCDB_QUERY_RATE:--1}"
 DPL_PROCESSING_CONFIG_KEY_VALUES="NameConf.mCCDBServer=http://127.0.0.1:8084;"
@@ -107,7 +108,7 @@ o2-dpl-raw-proxy $ARGS_ALL \
   --compression 2 \
   | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 \
   --configKeyValues "${DPL_PROCESSING_CONFIG_KEY_VALUES};keyval.output_dir=/dev/null" \
-  | o2-calibration-ccdb-populator-workflow --ccdb-path ${ccdb} -b \
+  | o2-calibration-ccdb-populator-workflow --ccdb-path "{{ ccdb_path }}" -b \
   | o2-dpl-output-proxy $ARGS_ALL \
    --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' \
    --dataspec "${OUTSPEC}" \
@@ -149,6 +150,9 @@ sed -i /defaults:/\ a\\\ \\\ "merger_node_c":\ "${MERGER_C}" workflows/${WF_NAME
 sed -i /defaults:/\ a\\\ \\\ "merger_port":\ "${PORT}" workflows/${WF_NAME_A}.yaml
 sed -i /defaults:/\ a\\\ \\\ "merger_port":\ "${PORT}" workflows/${WF_NAME_C}.yaml
 
+sed -i /defaults:/\ a\\\ \\\ "ccdb_path":\ "${ccdb}" workflows/${WF_SAC}.yaml
+
+
 
 aside=" it == 'alio2-cr1-flp001'"
 cside=" it == 'alio2-cr1-flp073'"
diff --git a/tasks/tpc-sac-ccdb-populator.yaml b/tasks/tpc-sac-ccdb-populator.yaml
@@ -112,7 +112,7 @@ command:
     - "--workflow-suffix"
     - "''"
     - "--ccdb-path"
-    - "'ccdb-test.cern.ch:8080'"
+    - "'{{ ccdb_path }}'"
     - "--sspec-max"
     - "-1"
     - "--sspec-min"
diff --git a/workflows/tpc-sac.yaml b/workflows/tpc-sac.yaml
@@ -1,8 +1,9 @@
 name: tpc-sac
 vars:
   dpl_command: >-
-    o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path ccdb-test.cern.ch:8080 -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1
+    o2-dpl-raw-proxy -b --session default --dataspec 'x:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0' --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://tmp/stf-builder-dpl-pipe-0,transport=shmem,rateLogging=1"' | o2-tpc-sac-processing --severity warning --condition-tf-per-query -1 | o2-tpc-sac-distribute --timeframes 1000 --output-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-tpc-sac-factorize --timeframes 1000 --nthreads-SAC-factorization 4 --input-lanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' --compression 2 | o2-tpc-idc-ft-aggregator --rangeIDC 200 --nFourierCoeff 40 --process-SACs true --inputLanes 1 --configKeyValues 'NameConf.mCCDBServer=http://127.0.0.1:8084;;keyval.output_dir=/dev/null' | o2-calibration-ccdb-populator-workflow --ccdb-path '{{ ccdb_path }}' -b | o2-dpl-output-proxy -b --session default --dpl-output-proxy '--channel-config "name=downstream,type=push,method=bind,address=ipc:///tmp/stf-pipe-0,rateLogging=10,transport=shmem"' --dataspec 'xout:TPC/RAWDATA;ddout:FLP/DISTSUBTIMEFRAME/0' --environment DPL_OUTPUT_PROXY_ORDERED=1
 defaults:
+  ccdb_path: http://o2-ccdb.internal
   monitoring_dpl_url: "no-op://"
   user: "flp"
   fmq_rate_logging: 0
