Skip to content

Commit 66b2973

Browse files
mfasDamartenole
authored andcommitted
[EMCAL-1118] Make QC workflow mode settable
Allow adjustable QC workflow as stand-alone or multi-node workflow with separate configurations. In addition minor fixes in the input proxy configuration.
1 parent 5e94376 commit 66b2973

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

DATA/production/calib/emc-pedestal-aggregator.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ source common/setenv.sh
77
source common/getCommonArgs.sh
88

99
INPTYPE=""
10-
PROXY_INSPEC="A:EMC/PEDDATA/0;eos:***/INFORMATION"
10+
#PROXY_INSPEC="A:EMC/PEDDATA/0;eos:***/INFORMATION"
11+
PROXY_INSPEC="A:EMC/PEDDATA/0"
1112

1213
CCDBPATH1="http://o2-ccdb.internal"
1314
CCDBPATH2="$DCSCCDBSERVER"
@@ -16,14 +17,26 @@ if [[ $RUNTYPE == "SYNTHETIC" || "${GEN_TOPO_DEPLOYMENT_TYPE:-}" == "ALICE_STAGI
1617
CCDBPATH2="http://ccdb-test.cern.ch:8080"
1718
fi
1819

20+
QC_STANDALONE=0
21+
if [[ ! -z ${EMC_PEDQC_STANDALONE:-} ]]; then
22+
QC_STANDALONE=${EMC_PEDQC_STANDALONE}
23+
fi
24+
1925
QC_CONFIG="/o2/components/qc/ANY/any/emc-pedestal-qc"
26+
QC_OPT=
27+
if [ $QC_STANDALONE -gt 0 ]; then
28+
QC_CONFIG="/o2/components/qc/ANY/any/emc-pedestal-qc-standalone"
29+
else
30+
QC_CONFIG="/o2/components/qc/ANY/any/emc-pedestal-qc"
31+
QC_OPT="--local --host localhost"
32+
fi
2033

2134
WORKFLOW=
2235
add_W o2-dpl-raw-proxy "--proxy-name emc-pedestal-input-proxy --dataspec \"$PROXY_INSPEC\" --network-interface ib0 --channel-config \"name=emc-pedestal-input-proxy,method=bind,type=pull,rateLogging=1,transport=zeromq\"" "" 0
2336
add_W o2-calibration-emcal-pedestal-calib-workflow
2437
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDBPATH1\" --sspec-min 0 --sspec-max 0"
2538
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path=\"$CCDBPATH2\" --sspec-min 1 --sspec-max 1 --name-extention dcs"
26-
add_QC_from_consul "${QC_CONFIG}" "--local --host localhost"
39+
add_QC_from_consul "${QC_CONFIG}" "${QC_OPT}"
2740
WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
2841

2942
if [ $WORKFLOWMODE == "print" ]; then

DATA/production/calib/emc-pedestal-processing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source common/setenv.sh
66
# Set general arguments
77
source common/getCommonArgs.sh
88

9-
PROXY_INSPEC="A:EMC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
9+
PROXY_INSPEC="A:EMC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
1010

1111
PROXY_OUTSPEC="downstream:EMC/PEDDATA/0"
1212

0 commit comments

Comments
 (0)