Skip to content

Commit 2bfc588

Browse files
aphecetcheaphecetche
committed
MCH: split QC configuration
1 parent 327b3b6 commit 2bfc588

5 files changed

Lines changed: 173 additions & 9 deletions

File tree

‎DATA/production/qc-async/mch-digits.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"qc": {
3+
"config": {
4+
"database": {
5+
"implementation": "CCDB",
6+
"host": "localhost:6464",
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": "infologger:///debug?qc"
17+
},
18+
"consul": {
19+
"url": ""
20+
},
21+
"conditionDB": {
22+
"url": ""
23+
}
24+
},
25+
"tasks": {
26+
"QcTaskMCHDigits": {
27+
"active": "true",
28+
"className": "o2::quality_control_modules::muonchambers::PhysicsTaskDigits",
29+
"moduleName": "QcMuonChambers",
30+
"detectorName": "MCH",
31+
"cycleDurationSeconds": "60",
32+
"maxNumberCycles": "-1",
33+
"dataSource": {
34+
"type": "direct",
35+
"query": "digits:MCH/DIGITS/0"
36+
},
37+
"taskParameters": {
38+
"Diagnostic": "false"
39+
}
40+
}
41+
},
42+
"checks": {}
43+
}
44+
}

‎DATA/production/qc-async/mch-reco.json‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"qc": {
3+
"config": {
4+
"database": {
5+
"implementation": "CCDB",
6+
"host": "localhost:6464",
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": "infologger:///debug?qc"
17+
},
18+
"consul": {
19+
"url": ""
20+
},
21+
"conditionDB": {
22+
"url": ""
23+
}
24+
},
25+
"tasks": {
26+
"MCHRofs": {
27+
"active": "true",
28+
"className": "o2::quality_control_modules::muonchambers::PhysicsTaskRofs",
29+
"moduleName": "QcMuonChambers",
30+
"detectorName": "MCH",
31+
"cycleDurationSeconds": "300",
32+
"maxNumberCycles": "-1",
33+
"dataSource": {
34+
"type": "direct",
35+
"query": "digits:MCH/DIGITS;rofs:MCH/DIGITROFS"
36+
}
37+
},
38+
"MCHPreclusters": {
39+
"active": "true",
40+
"className": "o2::quality_control_modules::muonchambers::PhysicsTaskPreclusters",
41+
"moduleName": "QcMuonChambers",
42+
"detectorName": "MCH",
43+
"cycleDurationSeconds": "540",
44+
"maxNumberCycles": "-1",
45+
"dataSource": {
46+
"type": "direct",
47+
"query": "preclusters:MCH/PRECLUSTERS/0;preclusterdigits:MCH/PRECLUSTERDIGITS/0"
48+
}
49+
}
50+
},
51+
"checks": {
52+
"QcCheckMCHPreclusters": {
53+
"active": "true",
54+
"className": "o2::quality_control_modules::muonchambers::PhysicsPreclustersCheck",
55+
"moduleName": "QcMuonChambers",
56+
"detectorName": "MCH",
57+
"policy": "OnAny",
58+
"dataSource": [
59+
{
60+
"type": "Task",
61+
"name": "MCHPreclusters",
62+
"MOs": "all"
63+
}
64+
]
65+
}
66+
}
67+
}
68+
}

‎DATA/production/qc-async/mch-tracks.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"qc": {
3+
"config": {
4+
"database": {
5+
"implementation": "CCDB",
6+
"host": "localhost:6464",
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": "infologger:///debug?qc"
17+
},
18+
"consul": {
19+
"url": ""
20+
},
21+
"conditionDB": {
22+
"url": ""
23+
}
24+
},
25+
"tasks": {
26+
"MCHTracks": {
27+
"active": "true",
28+
"className": "o2::quality_control_modules::muon::TracksTask",
29+
"moduleName": "QcMUONCommon",
30+
"detectorName": "MCH",
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;mchgeo:GLO/Config/0?lifetime=condition&ccdb-path=GLO/Config/GeometryAligned"
36+
},
37+
"taskParameters": {
38+
"maxTracksPerTF": "600",
39+
"GID": "MCH"
40+
}
41+
}
42+
}
43+
}
44+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"url": "null:8500"
2020
},
2121
"conditionDB": {
22-
"url": "null:8083"
22+
"url": "https://alice-ccdb.cern.ch"
2323
}
2424
},
2525
"tasks": {
@@ -32,7 +32,7 @@
3232
"maxNumberCycles": "-1",
3333
"dataSource": {
3434
"type": "direct",
35-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS"
35+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;mchgeo:GLO/Config/0?lifetime=condition&ccdb-path=GLO/Config/GeometryAligned"
3636
},
3737
"taskParameters": {
3838
"maxTracksPerTF": "600",

‎DATA/production/qc-workflow.sh‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ fi
1212

1313
FETCHTMPDIR=$(mktemp -d -t GEN_TOPO_DOWNLOAD_JSON-XXXXXX)
1414

15+
JSON_FILES=
16+
OUTPUT_SUFFIX=
17+
1518
add_QC_JSON() {
1619
if [[ ${2} =~ ^consul://.* ]]; then
1720
TMP_FILENAME=$FETCHTMPDIR/$1.$RANDOM.$RANDOM.json
@@ -99,7 +102,6 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
99102
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global-epn.json # this must be last
100103

101104
elif [[ $SYNCMODE == 1 ]]; then
102-
echo "TOTO SYNCMODE=1 TRACK_SOURCES=${TRACK_SOURCES}"
103105
[[ -z "$QC_JSON_TPC" ]] && QC_JSON_TPC=$O2DPG_ROOT/DATA/production/qc-sync/tpc.json
104106
[[ -z "$QC_JSON_ITS" ]] && QC_JSON_ITS=$O2DPG_ROOT/DATA/production/qc-sync/its.json
105107
if [[ -z "$QC_JSON_MFT" ]]; then
@@ -151,7 +153,6 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
151153
[[ -z "$QC_JSON_GLOBAL" ]] && QC_JSON_GLOBAL=$O2DPG_ROOT/DATA/production/qc-sync/qc-global.json # this must be last
152154

153155
else
154-
echo "TOTO SYNCMODE=0 TRACK_SOURCES=${TRACK_SOURCES}"
155156
[[ -z "$QC_JSON_TPC" ]] && QC_JSON_TPC=$O2DPG_ROOT/DATA/production/qc-async/tpc.json
156157
[[ -z "$QC_JSON_ITS" ]] && QC_JSON_ITS=$O2DPG_ROOT/DATA/production/qc-async/its.json
157158
[[ -z "$QC_JSON_MFT" ]] && QC_JSON_MFT=$O2DPG_ROOT/DATA/production/qc-async/mft.json
@@ -161,6 +162,15 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
161162
[[ -z "$QC_JSON_FDD" ]] && QC_JSON_FDD=$O2DPG_ROOT/DATA/production/qc-async/fdd.json
162163
[[ -z "$QC_JSON_EMC" ]] && QC_JSON_EMC=$O2DPG_ROOT/DATA/production/qc-async/emc.json
163164
[[ -z "$QC_JSON_MID" ]] && QC_JSON_MID=$O2DPG_ROOT/DATA/production/qc-async/mid.json
165+
if [[ -z "$QC_JSON_MCH" ]]; then
166+
QC_JSON_MCH=$O2DPG_ROOT/DATA/production/qc-async/mch-digits.json
167+
if has_processing_step "MCH_RECO"; then
168+
add_QC_JSON MCH_RECO $O2DPG_ROOT/DATA/production/qc-async/mch-reco.json
169+
fi
170+
if has_track_source "MCH"; then
171+
add_QC_JSON MCH_TRACK $O2DPG_ROOT/DATA/production/qc-async/mch-tracks.json
172+
fi
173+
fi
164174
[[ -z "$QC_JSON_CPV" ]] && QC_JSON_CPV=$O2DPG_ROOT/DATA/production/qc-async/cpv.json
165175
[[ -z "$QC_JSON_PHS" ]] && QC_JSON_PHS=$O2DPG_ROOT/DATA/production/qc-async/phs.json
166176
[[ -z "$QC_JSON_TRD" ]] && QC_JSON_TRD=$O2DPG_ROOT/DATA/production/qc-async/trd.json
@@ -189,11 +199,6 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
189199
exit 1
190200
fi
191201

192-
echo "TOTO==="
193-
printenv
194-
195-
JSON_FILES=
196-
OUTPUT_SUFFIX=
197202

198203
# TOF matching
199204
if has_detector_qc TOF && [[ $WORKFLOW_DETECTORS_QC =~ (^|,)"TOF_MATCH"(,|$) ]] && [ ! -z "$QC_JSON_TOF_MATCH" ]; then
@@ -284,6 +289,9 @@ if [[ ! -z "$QC_JSON_FROM_OUTSIDE" ]]; then
284289
QC_CONFIG_PARAM="--local-batch=QC.root"
285290
fi
286291
fi
292+
if [[ ! -z $FST_STAGE ]]; then
293+
QC_CONFIG_PARAM=$(echo $QC_CONFIG_PARAM | sed -e "s/\.root/-${FST_STAGE}\.root/")
294+
fi
287295
add_W o2-qc "--config json://$QC_JSON_FROM_OUTSIDE ${QC_CONFIG_PARAM} ${QC_CONFIG}"
288296
fi
289297

0 commit comments

Comments
 (0)