Skip to content

Commit b860a96

Browse files
rmunzerrmunzer
authored
Change from consul to apricot (tpc standalone + global sync) (#1667)
* Change tpc qc from consul to apricot configuration * change path of laser qc
1 parent 36522d4 commit b860a96

File tree

7 files changed

+13
-52
lines changed

7 files changed

+13
-52
lines changed

‎DATA/production/calib/tpc-laser-aggregator.sh‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ HOST=localhost
1414

1515
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
1616

17-
QC_CONFIG_CONSUL="/o2/components/qc/ANY/any/tpc-raw-qcmn"
17+
QC_CONFIG="components/qc/ANY/any/tpc-raw-qcmn"
1818
max_events=300
1919
publish_after=440
2020
min_tracks=0
@@ -50,7 +50,7 @@ add_W o2-dpl-raw-proxy " --proxy-name tpc-laser-input-proxy --dataspec \"$PROXY_
5050
add_W o2-tpc-calib-laser-tracks "${REMAP} --use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks} "
5151
add_W o2-tpc-calib-pad-raw " ${EXTRA_CONFIG}" "${CALIB_CONFIG}"
5252
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path ${CCDB_PATH}" "" 0
53-
#add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
53+
#add_QC_from_apricot "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
5454

5555
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
5656
if [ $WORKFLOWMODE == "print" ]; then
@@ -62,16 +62,4 @@ else
6262
eval $WORKFLOW
6363
fi
6464

65-
#o2-dpl-raw-proxy $ARGS_ALL \
66-
# --proxy-name tpc-laser-input-proxy \
67-
# --dataspec "${PROXY_INSPEC}" \
68-
# --network-interface ib0 \
69-
# --channel-config "name=tpc-laser-input-proxy,method=bind,type=pull,rateLogging=0,transport=zeromq" \
70-
# | o2-tpc-calib-laser-tracks ${ARGS_ALL} --use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks} \
71-
# --condition-remap "file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPECS;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPMagField;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser=TPC/Calib/LaserTracks" \
72-
# | o2-tpc-calib-pad-raw ${ARGS_ALL} \
73-
# --configKeyValues ${CALIB_CONFIG} ${EXTRA_CONFIG} \
74-
# | o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
75-
# --ccdb-path ${CCDB_PATH} \
76-
# | o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE}
7765

‎DATA/production/calib/tpc-laser-filter.sh‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ PROXY_OUTSPEC="A:TPC/LASERTRACKS;B:TPC/CEDIGITS;D:TPC/CLUSREFS"
4747
HOST=localhost
4848

4949
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-laser-calib-qcmn"
50-
QC_CONFIG_CONSUL=/o2/components/qc/ANY/any/tpc-laser-calib-qcmn
50+
QC_CONFIG="components/qc/ANY/any/tpc-laser-calib-qcmn"
5151

5252

5353
RAWDIGIT_CONFIG="TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR"
@@ -74,7 +74,7 @@ add_W o2-tpc-raw-to-digits-workflow "--ignore-grp --input-spec \"$CALIB_INSPEC\"
7474
add_W o2-tpc-reco-workflow " ${TPC_CORR_SCALING:-} --disable-ctp-lumi-request --input-type digitizer --output-type \"tracks,disable-writer,clusters\" --disable-mc --pipeline tpc-zsEncoder:20,tpc-tracker:8 ${GPU_CONFIG} ${REMAP} " "${RECO_CONFIG}"
7575
add_W o2-tpc-laser-track-filter "" "" 0
7676
add_W o2-dpl-output-proxy " --proxy-name tpc-laser-input-proxy --proxy-channel-name tpc-laser-input-proxy --dataspec \"$PROXY_OUTSPEC\" --channel-config \"name=tpc-laser-input-proxy,method=connect,type=push,transport=zeromq,rateLogging=0\" " "" 0
77-
add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
77+
add_QC_from_apricot "${QC_CONFIG}" "--local --host lcoalhost"
7878

7979
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
8080
if [ $WORKFLOWMODE == "print" ]; then
@@ -86,30 +86,3 @@ else
8686
eval $WORKFLOW
8787
fi
8888

89-
#o2-dpl-raw-proxy ${ARGS_ALL} \
90-
# --dataspec "$PROXY_INSPEC" --inject-missing-data \
91-
# --readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
92-
# | o2-tpc-raw-to-digits-workflow ${ARGS_ALL} ${LASER_DECODER_ADD} \
93-
# --input-spec "$CALIB_INSPEC" \
94-
# --configKeyValues "TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;$ARGS_ALL_CONFIG" \
95-
# --pipeline tpc-raw-to-digits-0:20 \
96-
# --remove-duplicates \
97-
# --send-ce-digits \
98-
# | o2-tpc-reco-workflow ${ARGS_ALL} ${TPC_CORR_SCALING:-} \
99-
# --input-type digitizer \
100-
# --output-type "tracks,disable-writer,clusters" \
101-
# --disable-ctp-lumi-request \
102-
# --disable-mc \
103-
# --pipeline tpc-zsEncoder:20,tpc-tracker:8 \
104-
# ${GPU_CONFIG} \
105-
# --condition-remap "file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPECS;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPMagField;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser=TPC/Calib/LaserTracks" \
106-
# --configKeyValues "${ARGS_ALL_CONFIG};align-geom.mDetectors=none;GPU_global.deviceType=$GPUTYPE;GPU_proc.tpcIncreasedMinClustersPerRow=500000;GPU_proc.ignoreNonFatalGPUErrors=1;$GPU_CONFIG_KEY;GPU_global.tpcTriggeredMode=1;GPU_rec_tpc.clusterError2AdditionalY=0.1;GPU_rec_tpc.clusterError2AdditionalZ=0.15;GPU_rec_tpc.clustersShiftTimebinsClusterizer=35;GPU_proc.memoryScalingFactor=2;GPU_proc_param.tpcTriggerHandling=0" \
107-
# | o2-tpc-laser-track-filter ${ARGS_ALL} \
108-
# | o2-dpl-output-proxy ${ARGS_ALL} \
109-
# --dataspec "$PROXY_OUTSPEC" \
110-
# --proxy-name tpc-laser-input-proxy \
111-
# --proxy-channel-name tpc-laser-input-proxy \
112-
# --channel-config "name=tpc-laser-input-proxy,method=connect,type=push,transport=zeromq,rateLogging=0" \
113-
# | o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
114-
# | o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
115-

‎DATA/production/calib/tpc-laser.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ HOST=localhost
4848

4949

5050
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
51-
QC_CONFIG_CONSUL="/o2/components/qc/ANY/any/tpc-raw-qcmn"
51+
QC_CONFIG="components/qc/ANY/any/tpc-raw-qcmn"
5252

5353
max_events=300
5454
publish_after=440
@@ -95,7 +95,7 @@ add_W o2-tpc-laser-track-filter "" "" 0
9595
add_W o2-tpc-calib-laser-tracks "--use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks}"
9696
add_W o2-tpc-calib-pad-raw " ${EXTRA_CONFIG}" "${CALIB_CONFIG}"
9797
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path ${CCDB_PATH}" "" 0
98-
add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
98+
add_QC_from_apricot "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
9999

100100
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
101101
if [ $WORKFLOWMODE == "print" ]; then

‎DATA/production/calib/tpc-pedestal.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CCDB_PATH="http://o2-ccdb.internal"
1818
HOST=localhost
1919

2020
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
21-
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
21+
QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn"
2222

2323
max_events=50
2424
publish_after=400
@@ -39,7 +39,7 @@ WORKFLOW=
3939
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
4040
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36"
4141
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
42-
add_QC_from_consul "${QC_CONFIG}" "--local --host localhost"
42+
add_QC_from_apricot "${QC_CONFIG}" "--local --host localhost"
4343

4444
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
4545

‎DATA/production/calib/tpc-pulser-long.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CCDB_PATH="http://o2-ccdb.internal"
1818
HOST=localhost
1919

2020
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
21-
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
21+
QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn"
2222
max_events=1000000
2323
publish_after=200
2424

@@ -38,7 +38,7 @@ WORKFLOW=
3838
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
3939
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --calib-type pulser --reset-after-publish --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --check-calib-infos"
4040
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
41-
add_QC_from_consul "${QC_CONFIG}" "--local --host localhost"
41+
add_QC_from_apricot "${QC_CONFIG}" "--local --host localhost"
4242

4343
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
4444

‎DATA/production/calib/tpc-pulser.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CCDB_PATH="http://o2-ccdb.internal"
1919

2020
HOST=localhost
2121

22-
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
22+
QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn"
2323

2424
max_events=200
2525
publish_after=230
@@ -40,7 +40,7 @@ WORKFLOW=
4040
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
4141
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}"
4242
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
43-
add_QC_from_consul "${QC_CONFIG}" "--local --host localhost"
43+
add_QC_from_apricot "${QC_CONFIG}" "--local --host localhost"
4444

4545
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
4646

‎DATA/production/qc-workflow.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if [[ -z ${QC_JSON_FROM_OUTSIDE:-} && ! -z ${GEN_TOPO_QC_JSON_FILE:-} && -f $GEN
5252
QC_JSON_FROM_OUTSIDE=$GEN_TOPO_QC_JSON_FILE
5353
elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
5454
if [[ $EPNSYNCMODE == 1 || "${GEN_TOPO_LOAD_QC_JSON_FROM_CONSUL:-}" == "1" ]]; then # Sync processing running on the EPN
55-
[[ -z "${QC_JSON_TPC:-}" ]] && QC_JSON_TPC=consul://o2/components/qc/ANY/any/tpc-full-qcmn
55+
[[ -z "${QC_JSON_TPC:-}" ]] && QC_JSON_TPC=apricot://o2/components/qc/ANY/any/tpc-full-qcmn
5656
[[ -z "${QC_JSON_ITS:-}" ]] && QC_JSON_ITS=consul://o2/components/qc/ANY/any/its-qcmn-epn-full
5757
if [[ -z "${QC_JSON_MFT:-}" ]]; then
5858
if has_detector MFT && has_processing_step MFT_RECO; then

0 commit comments

Comments
 (0)