Skip to content

Commit d21ea37

Browse files
aphecetcheaphecetche
committed
MUON: improve handling of QC for MCH-MID matching and add MFT-MCH matching
1 parent edb93d6 commit d21ea37

4 files changed

Lines changed: 198 additions & 4 deletions

File tree

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
},
25+
"tasks": {
26+
"FwdTracks": {
27+
"active": "true",
28+
"className": "o2::quality_control_modules::muon::TracksTask",
29+
"moduleName": "QcMUONCommon",
30+
"detectorName": "GLO",
31+
"cycleDurationSeconds": "180",
32+
"maxNumberCycles": "-1",
33+
"dataSource": {
34+
"type": "direct",
35+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID"
36+
},
37+
"taskParameters": {
38+
"maxTracksPerTF": "600",
39+
"GID": "MCH,MID,MCH-MID"
40+
},
41+
"location": "local",
42+
"mergingMode": "delta",
43+
"localControl": "odc",
44+
"localMachines": [
45+
"localhost",
46+
"epn"
47+
],
48+
"remotePort": "47789",
49+
"remoteMachine": "alio2-cr1-qc01.cern.ch"
50+
}
51+
},
52+
"checks": {}
53+
},
54+
"dataSamplingPolicies": []
55+
}

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
},
25+
"tasks": {
26+
"FwdTracks": {
27+
"active": "true",
28+
"className": "o2::quality_control_modules::muon::TracksTask",
29+
"moduleName": "QcMUONCommon",
30+
"detectorName": "GLO",
31+
"cycleDurationSeconds": "180",
32+
"maxNumberCycles": "-1",
33+
"dataSource": {
34+
"type": "direct",
35+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;fwdtracks:GLO/GLFWD;matchMCHMID:GLO/MTC_MCHMID;matchMFTMCH:GLO/MTC_MFTMCH"
36+
},
37+
"taskParameters": {
38+
"maxTracksPerTF": "600",
39+
"GID": "MFT,MCH,MID,MFT-MCH,MCH-MID"
40+
},
41+
"location": "local",
42+
"mergingMode": "delta",
43+
"localControl": "odc",
44+
"localMachines": [
45+
"localhost",
46+
"epn"
47+
],
48+
"remotePort": "47789",
49+
"remoteMachine": "alio2-cr1-qc01.cern.ch"
50+
}
51+
},
52+
"checks": {}
53+
},
54+
"dataSamplingPolicies": []
55+
}

‎DATA/production/qc-sync/mft-mch.json‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
},
25+
"tasks": {
26+
"FwdTracks": {
27+
"active": "true",
28+
"className": "o2::quality_control_modules::muon::TracksTask",
29+
"moduleName": "QcMUONCommon",
30+
"detectorName": "GLO",
31+
"cycleDurationSeconds": "180",
32+
"maxNumberCycles": "-1",
33+
"dataSource": {
34+
"type": "direct",
35+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;fwdtracks:GLO/GLFWD;matchMFTMCH:GLO/MTC_MFTMCH"
36+
},
37+
"taskParameters": {
38+
"maxTracksPerTF": "600",
39+
"GID": "MFT,MCH,MFT-MCH"
40+
},
41+
"location": "local",
42+
"mergingMode": "delta",
43+
"localControl": "odc",
44+
"localMachines": [
45+
"localhost",
46+
"epn"
47+
],
48+
"remotePort": "47789",
49+
"remoteMachine": "alio2-cr1-qc01.cern.ch"
50+
}
51+
},
52+
"checks": {}
53+
},
54+
"dataSamplingPolicies": []
55+
}

‎DATA/production/qc-workflow.sh‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ if [[ ! -z $GEN_TOPO_QC_JSON_FILE ]]; then
1010
flock 101 || exit 1
1111
fi
1212

13+
echo "TRACK_SOURCES=${TRACK_SOURCES}"
14+
1315
if [[ -z $QC_JSON_FROM_OUTSIDE && ! -z $GEN_TOPO_QC_JSON_FILE && -f $GEN_TOPO_QC_JSON_FILE ]]; then
1416
QC_JSON_FROM_OUTSIDE=$GEN_TOPO_QC_JSON_FILE
1517
elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
@@ -37,11 +39,7 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
3739
[[ -z "$QC_JSON_ZDC" ]] && has_processing_step ZDC_RECO && QC_JSON_ZDC=consul://o2/components/qc/ANY/any/zdc-rec-epn
3840
if [[ -z "$QC_JSON_MCH" ]]; then
3941
if has_detector MCH && has_processing_step MCH_RECO; then
40-
if has_track_source "MCH-MID"; then
41-
QC_JSON_MCH=consul://o2/components/qc/ANY/any/mch-qcmn-epn-full-track-matching
42-
else
4342
QC_JSON_MCH=consul://o2/components/qc/ANY/any/mch-qcmn-epn-full
44-
fi
4543
else
4644
QC_JSON_MCH=consul://o2/components/qc/ANY/any/mch-qcmn-epn-digits
4745
fi
@@ -65,7 +63,19 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
6563
QC_JSON_TOF_MATCH=consul://o2/components/qc/ANY/any/tof-qcmn-match-itstpctof
6664
fi
6765
fi
66+
67+
if [[ -z "$QC_JSON_MUON_MATCH" ]]; then
68+
if has_track_source "MFT-MCH" && has_track_source "MCH-MID"; then
69+
QC_JSON_MUON_MATCH=consul://o2/components/qc/ANY/any/muon-qcmn-epn-mft-mch-mid
70+
elif has_track_source "MFT-MCH"; then
71+
QC_JSON_MUON_MATCH=consul://o2/components/qc/ANY/any/muon-qcmn-epn-mft-mch
72+
elif has_track_source "MCH-MID"; then
73+
QC_JSON_MUON_MATCH=consul://o2/components/qc/ANY/any/muon-qcmn-epn-mch-mid
74+
fi
75+
fi
76+
6877
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global-epn.json # this must be last
78+
6979
elif [[ $SYNCMODE == 1 ]]; then
7080
[[ -z "$QC_JSON_TPC" ]] && QC_JSON_TPC=$O2DPG_ROOT/DATA/production/qc-sync/tpc.json
7181
[[ -z "$QC_JSON_ITS" ]] && QC_JSON_ITS=$O2DPG_ROOT/DATA/production/qc-sync/its.json
@@ -96,7 +106,19 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
96106
QC_JSON_TOF_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/itstpctof.json
97107
fi
98108
fi
109+
110+
if [[ -z "$QC_JSON_MUON_MATCH" ]]; then
111+
if has_track_source "MFT-MCH" && has_track_source "MCH-MID"; then
112+
QC_JSON_MUON_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/mft-mch-mid.json
113+
elif has_track_source "MFT-MCH"; then
114+
QC_JSON_MUON_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/mft-mch.json
115+
elif has_track_source "MCH-MID"; then
116+
QC_JSON_MUON_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/mch-mid.json
117+
fi
118+
fi
119+
99120
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global.json # this must be last
121+
100122
else
101123
[[ -z "$QC_JSON_TPC" ]] && QC_JSON_TPC=$O2DPG_ROOT/DATA/production/qc-async/tpc.json
102124
[[ -z "$QC_JSON_ITS" ]] && QC_JSON_ITS=$O2DPG_ROOT/DATA/production/qc-async/its.json
@@ -148,6 +170,13 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
148170
if has_detector_qc TOF && [ ! -z "$QC_JSON_TOF_MATCH" ]; then
149171
add_QC_JSON matchTOF ${QC_JSON_TOF_MATCH}
150172
fi
173+
174+
echo "QC_JSON_MUON_MATCH=${QC_JSON_MUON_MATCH}"
175+
176+
# MUON matchings
177+
if [[ ! -z "$QC_JSON_MUON_MATCH" ]]; then
178+
add_QC_JSON matchMUON ${QC_JSON_MUON_MATCH}
179+
fi
151180

152181
for i in ${LIST_OF_DETECTORS//,/ }; do
153182
DET_JSON_FILE="QC_JSON_$i"

0 commit comments

Comments
 (0)