Skip to content

Commit 100ab33

Browse files
dstoccodstocco
authored
Use full reconstruction QC in async mode or when MID_RECO is defined (#428)
* Use full reconstruction QC in async mode or when MID_RECO is defined * Remove conditions that are not needed in async mode * Fix conditional assignment * Fix query strings * Cope with modifications in MID QC
1 parent cccf7f9 commit 100ab33

File tree

5 files changed

+329
-15
lines changed

5 files changed

+329
-15
lines changed

‎DATA/production/qc-async/mid.json‎

Lines changed: 121 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,130 @@
3131
"cycleDurationSeconds": "60",
3232
"maxNumberCycles": "-1",
3333
"dataSource": {
34-
"type": "direct",
35-
"query": "digits:MID/DATA/0;digitrofs:MID/DATAROF/0;calib:MID/DATA/1;calibrofs:MID/DATAROF/1;fet:MID/DATA/2;fetrofs:MID/DATAROF/2"
34+
"type": "dataSamplingPolicy",
35+
"name": "mid-digits"
36+
}
37+
},
38+
"QcTaskMIDClust": {
39+
"active": "true",
40+
"className": "o2::quality_control_modules::mid::ClustQcTask",
41+
"moduleName": "QcMID",
42+
"detectorName": "MID",
43+
"cycleDurationSeconds": "60",
44+
"maxNumberCycles": "-1",
45+
"dataSource": {
46+
"type": "dataSamplingPolicy",
47+
"name": "mid-clusters"
48+
}
49+
},
50+
"QcTaskMIDTracks": {
51+
"active": "true",
52+
"className": "o2::quality_control_modules::mid::TracksQcTask",
53+
"moduleName": "QcMID",
54+
"detectorName": "MID",
55+
"cycleDurationSeconds": "60",
56+
"maxNumberCycles": "-1",
57+
"dataSource": {
58+
"type": "dataSamplingPolicy",
59+
"name": "mid-tracks"
3660
}
3761
}
62+
},
63+
"checks": {
64+
"QcCheckMIDDigits": {
65+
"active": "true",
66+
"className": "o2::quality_control_modules::mid::DigitsQcCheck",
67+
"moduleName": "QcMID",
68+
"detectorName": "MID",
69+
"policy": "OnAny",
70+
"checkParameters": {
71+
"MeanMultThreshold": "100."
72+
},
73+
"dataSource": [
74+
{
75+
"type": "Task",
76+
"name": "QcTaskMIDDigits",
77+
"MOs": [
78+
"mMultHitMT11B",
79+
"mMultHitMT12B",
80+
"mMultHitMT21B",
81+
"mMultHitMT22B"
82+
]
83+
}
84+
]
85+
},
86+
"QcCheckMIDClust": {
87+
"active": "true",
88+
"className": "o2::quality_control_modules::mid::ClustQcCheck",
89+
"moduleName": "QcMID",
90+
"detectorName": "MID",
91+
"policy": "OnAny",
92+
"dataSource": [
93+
{
94+
"type": "Task",
95+
"name": "QcTaskMIDClust",
96+
"MOs": []
97+
}
98+
]
99+
},
100+
"QcCheckMIDTracks": {
101+
"active": "true",
102+
"className": "o2::quality_control_modules::mid::TracksQcCheck",
103+
"moduleName": "QcMID",
104+
"detectorName": "MID",
105+
"policy": "OnAny",
106+
"dataSource": [
107+
{
108+
"type": "Task",
109+
"name": "QcTaskMIDTracks",
110+
"MOs": []
111+
}
112+
]
113+
}
38114
}
39115
},
40116
"dataSamplingPolicies": [
117+
{
118+
"id": "mid-tracks",
119+
"active": "true",
120+
"machines": [],
121+
"query": "tracks:MID/TRACKS;trackrofs:MID/TRACKROFS",
122+
"samplingConditions": [
123+
{
124+
"condition": "random",
125+
"fraction": "0.1",
126+
"seed": "1441"
127+
}
128+
],
129+
"blocking": "false"
130+
},
131+
{
132+
"id": "mid-clusters",
133+
"active": "true",
134+
"machines": [],
135+
"query": "clusters:MID/TRACKCLUSTERS;clusterrofs:MID/TRCLUSROFS",
136+
"samplingConditions": [
137+
{
138+
"condition": "random",
139+
"fraction": "0.1",
140+
"seed": "1441"
141+
}
142+
],
143+
"blocking": "false"
144+
},
145+
{
146+
"id": "mid-digits",
147+
"active": "true",
148+
"machines": [],
149+
"query": "digits:MID/DATA;digitrofs:MID/DATAROF",
150+
"samplingConditions": [
151+
{
152+
"condition": "random",
153+
"fraction": "0.1",
154+
"seed": "1441"
155+
}
156+
],
157+
"blocking": "false"
158+
}
41159
]
42-
}
160+
}

‎DATA/production/qc-sync/mid-digits.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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": "null:8500"
20+
},
21+
"conditionDB": {
22+
"url": "null:8083"
23+
},
24+
"infologger": {
25+
"filterDiscardDebug": "true",
26+
"filterDiscardLevel": "1"
27+
}
28+
},
29+
"tasks": {
30+
"QcTaskMIDDigits": {
31+
"active": "true",
32+
"className": "o2::quality_control_modules::mid::DigitsQcTask",
33+
"moduleName": "QcMID",
34+
"detectorName": "MID",
35+
"cycleDurationSeconds": "60",
36+
"maxNumberCycles": "-1",
37+
"dataSource": {
38+
"type": "dataSamplingPolicy",
39+
"name": "middigits"
40+
},
41+
"location": "local",
42+
"mergingMode": "delta",
43+
"localControl": "odc",
44+
"localMachines": [
45+
"epn",
46+
"localhost"
47+
],
48+
"remotePort": "47780",
49+
"remoteMachine": "alio2-cr1-qme02.cern.ch"
50+
}
51+
}
52+
},
53+
"dataSamplingPolicies": [
54+
{
55+
"id": "middigits",
56+
"active": "true",
57+
"machines": [],
58+
"query": "digits:MID/DATA;digits_rof:MID/DATAROF",
59+
"samplingConditions": [
60+
{
61+
"condition": "random",
62+
"fraction": "1",
63+
"seed": "1441"
64+
}
65+
],
66+
"blocking": "false"
67+
}
68+
]
69+
}

‎DATA/production/qc-sync/mid.json‎

Lines changed: 136 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
},
2121
"conditionDB": {
2222
"url": "null:8083"
23-
},
24-
"infologger": {
25-
"filterDiscardDebug": "true",
26-
"filterDiscardLevel": "1"
2723
}
2824
},
2925
"tasks": {
@@ -36,7 +32,7 @@
3632
"maxNumberCycles": "-1",
3733
"dataSource": {
3834
"type": "dataSamplingPolicy",
39-
"name": "middigits"
35+
"name": "mid-digits"
4036
},
4137
"location": "local",
4238
"mergingMode": "delta",
@@ -47,19 +43,150 @@
4743
],
4844
"remotePort": "47780",
4945
"remoteMachine": "alio2-cr1-qme02.cern.ch"
46+
},
47+
"QcTaskMIDClust": {
48+
"active": "true",
49+
"className": "o2::quality_control_modules::mid::ClustQcTask",
50+
"moduleName": "QcMID",
51+
"detectorName": "MID",
52+
"cycleDurationSeconds": "60",
53+
"maxNumberCycles": "-1",
54+
"dataSource": {
55+
"type": "dataSamplingPolicy",
56+
"name": "mid-clusters"
57+
},
58+
"location": "local",
59+
"mergingMode": "delta",
60+
"localControl": "odc",
61+
"localMachines": [
62+
"epn",
63+
"localhost"
64+
],
65+
"remotePort": "47781",
66+
"remoteMachine": "alio2-cr1-qme02.cern.ch"
67+
},
68+
"QcTaskMIDTracks": {
69+
"active": "true",
70+
"className": "o2::quality_control_modules::mid::TracksQcTask",
71+
"moduleName": "QcMID",
72+
"detectorName": "MID",
73+
"cycleDurationSeconds": "60",
74+
"maxNumberCycles": "-1",
75+
"dataSource": {
76+
"type": "dataSamplingPolicy",
77+
"name": "mid-tracks"
78+
},
79+
"location": "local",
80+
"mergingMode": "delta",
81+
"localControl": "odc",
82+
"localMachines": [
83+
"epn",
84+
"localhost"
85+
],
86+
"remotePort": "47782",
87+
"remoteMachine": "alio2-cr1-qme02.cern.ch"
88+
}
89+
},
90+
"checks": {
91+
"QcCheckMIDDigits": {
92+
"active": "true",
93+
"className": "o2::quality_control_modules::mid::DigitsQcCheck",
94+
"moduleName": "QcMID",
95+
"detectorName": "MID",
96+
"policy": "OnAny",
97+
"checkParameters": {
98+
"MeanMultThreshold": "100."
99+
},
100+
"dataSource": [
101+
{
102+
"type": "Task",
103+
"name": "QcTaskMIDDigits",
104+
"MOs": [
105+
"mMultHitMT11B",
106+
"mMultHitMT12B",
107+
"mMultHitMT21B",
108+
"mMultHitMT22B"
109+
]
110+
}
111+
]
112+
},
113+
"QcCheckMIDClust": {
114+
"active": "true",
115+
"className": "o2::quality_control_modules::mid::ClustQcCheck",
116+
"moduleName": "QcMID",
117+
"detectorName": "MID",
118+
"policy": "OnAny",
119+
"dataSource": [
120+
{
121+
"type": "Task",
122+
"name": "QcTaskMIDClust",
123+
"MOs": []
124+
}
125+
]
126+
},
127+
"QcCheckMIDTracks": {
128+
"active": "true",
129+
"className": "o2::quality_control_modules::mid::TracksQcCheck",
130+
"moduleName": "QcMID",
131+
"detectorName": "MID",
132+
"policy": "OnAny",
133+
"dataSource": [
134+
{
135+
"type": "Task",
136+
"name": "QcTaskMIDTracks",
137+
"MOs": []
138+
}
139+
]
50140
}
51141
}
52142
},
53143
"dataSamplingPolicies": [
54144
{
55-
"id": "middigits",
145+
"id": "mid-tracks",
146+
"active": "true",
147+
"machines": [
148+
"epn",
149+
"localhost"
150+
],
151+
"query": "tracks:MID/TRACKS;trackrofs:MID/TRACKROFS",
152+
"samplingConditions": [
153+
{
154+
"condition": "random",
155+
"fraction": "0.1",
156+
"seed": "1441"
157+
}
158+
],
159+
"blocking": "false"
160+
},
161+
{
162+
"id": "mid-clusters",
163+
"active": "true",
164+
"machines": [
165+
"epn",
166+
"localhost"
167+
],
168+
"query": "clusters:MID/TRACKCLUSTERS;clusterrofs:MID/TRCLUSROFS",
169+
"samplingConditions": [
170+
{
171+
"condition": "random",
172+
"fraction": "0.1",
173+
"seed": "1441"
174+
}
175+
],
176+
"blocking": "false"
177+
},
178+
{
179+
"id": "mid-digits",
56180
"active": "true",
57-
"machines": [],
58-
"query": "digits:MID/DATA/0;digitrofs:MID/DATAROF/0;calib:MID/DATA/1;calibrofs:MID/DATAROF/1;fet:MID/DATA/2;fetrofs:MID/DATAROF/2",
181+
"machines": [
182+
"epn",
183+
"localhost"
184+
],
185+
"query": "digits:MID/DATA;digits_rof:MID/DATAROF",
59186
"samplingConditions": [
60187
{
61188
"condition": "random",
62-
"fraction": "1",
189+
"fraction": "0.1",
63190
"seed": "1441"
64191
}
65192
],

‎DATA/production/qc-workflow.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
2222
[[ -z "$QC_JSON_FV0" ]] && QC_JSON_FV0=/home/afurs/O2DataProcessing/testing/detectors/FV0/fv0-digits-ds.json
2323
[[ -z "$QC_JSON_EMC" ]] && QC_JSON_EMC=consul://o2/components/qc/ANY/any/emc-qcmn-epnall
2424
[[ -z "$QC_JSON_MCH" ]] && QC_JSON_MCH=consul://o2/components/qc/ANY/any/mch-qcmn-epn-digits
25-
[[ -z "$QC_JSON_MID" ]] && QC_JSON_MID=/home/dstocco/config/mid-qcmn-epn-digits.json
25+
[[ -z "$QC_JSON_MID" ]] && QC_JSON_MID=consul://o2/components/qc/ANY/any/mid-full-qcmn
2626
[[ -z "$QC_JSON_CPV" ]] && QC_JSON_CPV=consul://o2/components/qc/ANY/any/cpv-physics-qcmn-epn
2727
[[ -z "$QC_JSON_TRD" ]] && QC_JSON_TRD=consul://o2/components/qc/ANY/any/trd-full-qcmn-norawdatastats-epn
2828
[[ -z "$QC_JSON_PHS" ]] && QC_JSON_PHS=consul://o2/components/qc/ANY/any/phos-raw-clusters-epn
@@ -45,7 +45,7 @@ if [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
4545
[[ -z "$QC_JSON_FV0" ]] && QC_JSON_FV0=$O2DPG_ROOT/DATA/production/qc-sync/fv0.json
4646
[[ -z "$QC_JSON_EMC" ]] && QC_JSON_EMC=$O2DPG_ROOT/DATA/production/qc-sync/emc.json
4747
[[ -z "$QC_JSON_MCH" ]] && QC_JSON_MCH=$O2DPG_ROOT/DATA/production/qc-sync/mch.json
48-
[[ -z "$QC_JSON_MID" ]] && QC_JSON_MID=$O2DPG_ROOT/DATA/production/qc-sync/mid.json
48+
[[ -z "$QC_JSON_MID" ]] && QC_JSON_MID=$O2DPG_ROOT/DATA/production/qc-sync/mid-digits.json && has_processing_step MID_RECO && QC_JSON_MID=$O2DPG_ROOT/DATA/production/qc-sync/mid.json
4949
[[ -z "$QC_JSON_CPV" ]] && QC_JSON_CPV=$O2DPG_ROOT/DATA/production/qc-sync/cpv.json
5050
[[ -z "$QC_JSON_PHS" ]] && QC_JSON_PHS=$O2DPG_ROOT/DATA/production/qc-sync/phs.json
5151
[[ -z "$QC_JSON_TRD" ]] && QC_JSON_TRD=$O2DPG_ROOT/DATA/production/qc-sync/trd.json

0 commit comments

Comments
 (0)