Skip to content

Commit 4bb65ca

Browse files
chiarazampollidavidrohr
chiarazampolli
authored and
davidrohr
committed
Split VTX and ITSTPC_MTCH
1 parent 6412268 commit 4bb65ca

3 files changed

Lines changed: 78 additions & 67 deletions

File tree

DATA/production/qc-sync/glo-qcmn-epn.json renamed to DATA/production/qc-sync/glo-itstpc-mtch-qcmn-epn.json

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,6 @@
2323
}
2424
},
2525
"tasks" : {
26-
"Vertexing" : {
27-
"active" : "true",
28-
"className" : "o2::quality_control_modules::glo::VertexingQcTask",
29-
"moduleName" : "QcGLO",
30-
"detectorName" : "GLO",
31-
"cycleDurationSeconds" : "600",
32-
"maxNumberCycles" : "-1",
33-
"dataSource" : {
34-
"type" : "dataSamplingPolicy",
35-
"name" : "VtxSampling"
36-
},
37-
"taskParameters" : {
38-
"isMC": "false"
39-
},
40-
"location" : "local",
41-
"localMachines": [
42-
"epn",
43-
"localhost"
44-
],
45-
"remoteMachine": "alio2-cr1-qc07.cern.ch",
46-
"remotePort": "47760",
47-
"localControl": "odc"
48-
},
4926
"MTCITSTPC" : {
5027
"active" : "true",
5128
"className" : "o2::quality_control_modules::glo::ITSTPCMatchingTask",
@@ -80,20 +57,6 @@
8057
}
8158
},
8259
"dataSamplingPolicies" : [
83-
{
84-
"id" : "VtxSampling",
85-
"active" : "true",
86-
"machines" : [],
87-
"query" : "pvtx:GLO/PVTX/0",
88-
"samplingConditions" : [
89-
{
90-
"condition" : "random",
91-
"fraction" : "0.1",
92-
"seed" : "1234"
93-
}
94-
],
95-
"blocking" : "false"
96-
},
9760
{
9861
"id" : "ITSTPCmSamp",
9962
"active" : "true",

‎DATA/production/qc-sync/glo-vtx-qcmn-epn.json‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"qc" : {
3+
"config" : {
4+
"database" : {
5+
"implementation" : "CCDB",
6+
"host" : "ali-qcdb.cern.ch:8083",
7+
"username" : "not_applicable",
8+
"password" : "not_applicable",
9+
"name" : "not_applicable"
10+
},
11+
"Activity" : {
12+
"number" : "42",
13+
"type" : "2"
14+
},
15+
"monitoring" : {
16+
"url" : "influxdb-unix:///tmp/telegraf.sock"
17+
},
18+
"consul" : {
19+
"url" : "http://ali-consul.cern.ch:8500"
20+
},
21+
"conditionDB" : {
22+
"url" : "http://localhost:8084"
23+
}
24+
},
25+
"tasks" : {
26+
"Vertexing" : {
27+
"active" : "true",
28+
"className" : "o2::quality_control_modules::glo::VertexingQcTask",
29+
"moduleName" : "QcGLO",
30+
"detectorName" : "GLO",
31+
"cycleDurationSeconds" : "600",
32+
"maxNumberCycles" : "-1",
33+
"dataSource" : {
34+
"type" : "dataSamplingPolicy",
35+
"name" : "VtxSampling"
36+
},
37+
"taskParameters" : {
38+
"isMC": "false"
39+
},
40+
"location" : "local",
41+
"localMachines": [
42+
"epn",
43+
"localhost"
44+
],
45+
"remoteMachine": "alio2-cr1-qc07.cern.ch",
46+
"remotePort": "47760",
47+
"localControl": "odc"
48+
}
49+
}
50+
},
51+
"dataSamplingPolicies" : [
52+
{
53+
"id" : "VtxSampling",
54+
"active" : "true",
55+
"machines" : [],
56+
"query" : "pvtx:GLO/PVTX/0",
57+
"samplingConditions" : [
58+
{
59+
"condition" : "random",
60+
"fraction" : "0.1",
61+
"seed" : "1234"
62+
}
63+
],
64+
"blocking" : "false"
65+
}
66+
]
67+
}

‎DATA/production/qc-workflow.sh‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
5656
[[ -z "$QC_JSON_CPV" ]] && QC_JSON_CPV=consul://o2/components/qc/ANY/any/cpv-physics-qcmn-epn
5757
[[ -z "$QC_JSON_TRD" ]] && QC_JSON_TRD=consul://o2/components/qc/ANY/any/trd-full-qcmn-nopulseheight-epn
5858
[[ -z "$QC_JSON_PHS" ]] && QC_JSON_PHS=consul://o2/components/qc/ANY/any/phos-raw-clusters-epn
59-
[[ -z "$QC_JSON_GLO" ]] && QC_JSON_GLO=consul://o2/components/qc/ANY/any/glo-qcmn-epn
59+
[[ -z "$QC_JSON_GLO_VTX" ]] && QC_JSON_GLO=consul://o2/components/qc/ANY/any/glo-vtx-qcmn-epn
60+
[[ -z "$QC_JSON_GLO_ITSTPC_MTCH" ]] && QC_JSON_GLO=consul://o2/components/qc/ANY/any/glo-itstpc-mtch-qcmn-epn
6061
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global-epn.json
6162
if [[ -z "$QC_JSON_TOF_MATCH" ]]; then
6263
if has_tof_matching_source ITS-TPC && has_tof_matching_source ITS-TPC-TRD; then
@@ -86,7 +87,8 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
8687
[[ -z "$QC_JSON_CPV" ]] && QC_JSON_CPV=$O2DPG_ROOT/DATA/production/qc-sync/cpv.json
8788
[[ -z "$QC_JSON_PHS" ]] && QC_JSON_PHS=$O2DPG_ROOT/DATA/production/qc-sync/phs.json
8889
[[ -z "$QC_JSON_TRD" ]] && QC_JSON_TRD=$O2DPG_ROOT/DATA/production/qc-sync/trd.json
89-
[[ -z "$QC_JSON_GLO" ]] && QC_JSON_GLO=$O2DPG_ROOT/DATA/production/qc-sync/glo-qcmn-epn.json
90+
[[ -z "$QC_JSON_GLO_VTX" ]] && QC_JSON_GLO=$O2DPG_ROOT/DATA/production/qc-sync/glo-vtx-qcmn-epn.json
91+
[[ -z "$QC_JSON_GLO_ITSTPC_MTCH" ]] && QC_JSON_GLO=$O2DPG_ROOT/DATA/production/qc-sync/glo-itstpc-mtch-qcmn-epn.json
9092
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global.json
9193
if [[ -z "$QC_JSON_TOF_MATCH" ]]; then
9294
if has_tof_matching_source ITS-TPC && has_tof_matching_source ITS-TPC-TRD; then
@@ -109,8 +111,8 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
109111
[[ -z "$QC_JSON_PHS" ]] && QC_JSON_PHS=$O2DPG_ROOT/DATA/production/qc-async/phs.json
110112
[[ -z "$QC_JSON_TRD" ]] && QC_JSON_TRD=$O2DPG_ROOT/DATA/production/qc-async/trd.json
111113
# the following two ($QC_JSON_PRIMVTX and $QC_JSON_ITSTPC) replace $QC_JSON_GLO for async processing
112-
[[ -z "$QC_JSON_PRIMVTX" ]] && QC_JSON_PRIMVTX=$O2DPG_ROOT/DATA/production/qc-async/primvtx.json
113-
[[ -z "$QC_JSON_ITSTPC" ]] && QC_JSON_ITSTPC=$O2DPG_ROOT/DATA/production/qc-async/itstpc.json
114+
[[ -z "$QC_JSON_GLO_VTX" ]] && QC_JSON_PRIMVTX=$O2DPG_ROOT/DATA/production/qc-async/primvtx.json
115+
[[ -z "$QC_JSON_GLO_ITSTPC_MTCH" ]] && QC_JSON_ITSTPC=$O2DPG_ROOT/DATA/production/qc-async/itstpc.json
114116
[[ -z "$QC_JSON_TOF_MATCH" ]] && QC_JSON_TOF_MATCH=$O2DPG_ROOT/DATA/production/qc-async/itstpctof.json
115117
[[ -z "$QC_JSON_PID_FT0TOF" ]] && QC_JSON_PID_FT0TOF=$O2DPG_ROOT/DATA/production/qc-async/pidft0tof.json
116118
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-async/qc-global.json
@@ -154,33 +156,12 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
154156
fi
155157
done
156158

157-
ADD_ITSTPCQC=1
158-
ADD_PRIMVTX=1
159-
if [[ $SYNCMODE == 1 ]]; then
160-
if ! has_detectors_reco ITS TPC || ! has_detector_matching ITSTPC; then
161-
QC_CONFIG+="--override-values \"qc.tasks.MTCITSTPC.active=false\""
162-
ADD_ITSTPCQC=0
163-
fi
164-
if ! has_detectors_reco ITS || ! has_detector_matching PRIMVTX; then
165-
QC_CONFIG+="--override-values \"qc.tasks.Vertexing.active=false\""
166-
ADD_PRIMVTX=0
167-
fi
168-
if [[ $ADD_ITSTPCQC == 1 ]] || [[ $ADD_PRIMVTX == 1 ]]; then
169-
add_QC_JSON GLO $QC_JSON_GLO
170-
fi
171-
else # async processing
172-
LIST_OF_GLOQC=
173-
has_detectors_reco ITS TPC && has_detector_matching ITSTPC && add_comma_separated LIST_OF_GLOQC ITSTPC
174-
has_detectors_reco ITS && has_detector_matching PRIMVTX && add_comma_separated LIST_OF_GLOQC PRIMVTX
175-
for i in $(echo $LIST_OF_GLOQC | sed "s/,/ /g"); do
176-
GLO_JSON_FILE="QC_JSON_$i"
177-
if has_detector_matching $i && has_matching_qc $i && [ ! -z "${!GLO_JSON_FILE}" ]; then
178-
add_QC_JSON $i ${!GLO_JSON_FILE}
179-
fi
180-
done
159+
# GLO QC: VTX and ITSTPC_MTCH
160+
if has_detectors_reco ITS && has_detector_matching PRIMVTX; then
161+
add_QC_JSON GLO $QC_JSON_GLO_VTX
181162
fi
182-
if [[ "0$GEN_TOPO_VERBOSE" == "01" ]]; then
183-
echo ADD_ITSTPCQC=$ADD_ITSTPCQC ADD_PRIMVTX=$ADD_PRIMVTX 1>&2
163+
if has_detectors_reco ITS TPC && has_detector_matching ITSTPC; then
164+
add_QC_JSON GLO $QC_JSON_GLO_ITSTPC_MTCH
184165
fi
185166

186167
# PID QC

0 commit comments

Comments
 (0)