Skip to content

Commit fafbae3

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

4 files changed

Lines changed: 192 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: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
3737
[[ -z "$QC_JSON_ZDC" ]] && has_processing_step ZDC_RECO && QC_JSON_ZDC=consul://o2/components/qc/ANY/any/zdc-rec-epn
3838
if [[ -z "$QC_JSON_MCH" ]]; then
3939
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
4340
QC_JSON_MCH=consul://o2/components/qc/ANY/any/mch-qcmn-epn-full
44-
fi
4541
else
4642
QC_JSON_MCH=consul://o2/components/qc/ANY/any/mch-qcmn-epn-digits
4743
fi
@@ -65,7 +61,17 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
6561
QC_JSON_TOF_MATCH=consul://o2/components/qc/ANY/any/tof-qcmn-match-itstpctof
6662
fi
6763
fi
64+
if [[ -z "$QC_JSON_MUON_MATCH" ]]; then
65+
if has_track_source "MFT-MCH" && has_track_source "MCH-MID"; then
66+
QC_JSON_MUON_MATCH=consul://o2/components/qc/ANY/any/muon-qcmn-epn-mft-mch-mid
67+
elif has_track_source "MFT-MCH"; then
68+
QC_JSON_MUON_MATCH=consul://o2/components/qc/ANY/any/muon-qcmn-epn-mft-mch
69+
elif has_track_source "MCH-MID"; then
70+
QC_JSON_MUON_MATCH=consul://o2/components/qc/ANY/any/muon-qcmn-epn-mch-mid
71+
fi
72+
fi
6873
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global-epn.json # this must be last
74+
6975
elif [[ $SYNCMODE == 1 ]]; then
7076
[[ -z "$QC_JSON_TPC" ]] && QC_JSON_TPC=$O2DPG_ROOT/DATA/production/qc-sync/tpc.json
7177
[[ -z "$QC_JSON_ITS" ]] && QC_JSON_ITS=$O2DPG_ROOT/DATA/production/qc-sync/its.json
@@ -96,7 +102,17 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
96102
QC_JSON_TOF_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/itstpctof.json
97103
fi
98104
fi
105+
if [[ -z "$QC_JSON_MUON_MATCH" ]]; then
106+
if has_track_source "MFT-MCH" && has_track_source "MCH-MID"; then
107+
QC_JSON_MUON_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/mft-mch-mid.json
108+
elif has_track_source "MFT-MCH"; then
109+
QC_JSON_MUON_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/mft-mch.json
110+
elif has_track_source "MCH-MID"; then
111+
QC_JSON_MUON_MATCH=$O2DPG_ROOT/DATA/production/qc-sync/mch-mid.json
112+
fi
113+
fi
99114
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global.json # this must be last
115+
100116
else
101117
[[ -z "$QC_JSON_TPC" ]] && QC_JSON_TPC=$O2DPG_ROOT/DATA/production/qc-async/tpc.json
102118
[[ -z "$QC_JSON_ITS" ]] && QC_JSON_ITS=$O2DPG_ROOT/DATA/production/qc-async/its.json
@@ -150,6 +166,13 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
150166
fi
151167

152168
for i in ${LIST_OF_DETECTORS//,/ }; do
169+
170+
# MUON matchings
171+
if [[ ! -z "$QC_JSON_MUON_MATCH" ]]; then
172+
add_QC_JSON matchMUON ${QC_JSON_MUON_MATCH}
173+
fi
174+
175+
for i in $(echo $LIST_OF_DETECTORS | sed "s/,/ /g"); do
153176
DET_JSON_FILE="QC_JSON_$i"
154177
if has_detector_qc $i && [ ! -z "${!DET_JSON_FILE}" ]; then
155178
add_QC_JSON $i ${!DET_JSON_FILE}

0 commit comments

Comments
 (0)