Skip to content

Commit 79fcfff

Browse files
committed
[MCH] updated standalone MCH tracks task configuration
- removed the duplicated MCHStdTracks task - changed MCHTracks to use o2::quality_control_modules::muon::TracksTask
1 parent 00a70a2 commit 79fcfff

11 files changed

Lines changed: 10 additions & 114 deletions

scripts/etc/mch-qcmn-epn-full-track-matching.json

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"mergingMode": "delta",
3939
"localControl": "odc",
4040
"localMachines": [
41-
"localhost",
4241
"epn"
4342
],
4443
"remotePort": "47790",
@@ -59,7 +58,6 @@
5958
"mergingMode": "delta",
6059
"localControl": "odc",
6160
"localMachines": [
62-
"localhost",
6361
"epn"
6462
],
6563
"remotePort": "47791",
@@ -80,7 +78,6 @@
8078
"mergingMode": "delta",
8179
"localControl": "odc",
8280
"localMachines": [
83-
"localhost",
8481
"epn"
8582
],
8683
"remotePort": "47792",
@@ -91,7 +88,7 @@
9188
"className": "o2::quality_control_modules::muonchambers::PhysicsTaskPreclusters",
9289
"moduleName": "QcMuonChambers",
9390
"detectorName": "MCH",
94-
"cycleDurationSeconds": "360",
91+
"cycleDurationSeconds": "300",
9592
"maxNumberCycles": "-1",
9693
"dataSource": {
9794
"type": "direct",
@@ -101,41 +98,16 @@
10198
"mergingMode": "delta",
10299
"localControl": "odc",
103100
"localMachines": [
104-
"localhost",
105101
"epn"
106102
],
107103
"remotePort": "47794",
108104
"remoteMachine": "alio2-cr1-qc01.cern.ch"
109105
},
110106
"MCHTracks": {
111-
"active": "true",
112-
"className": "o2::quality_control_modules::muonchambers::TracksTask",
113-
"moduleName": "QcMuonChambers",
114-
"detectorName": "MCH",
115-
"cycleDurationSeconds": "300",
116-
"maxNumberCycles": "-1",
117-
"dataSource": {
118-
"type": "direct",
119-
"query": "tracks:MCH/TRACKS;trackrofs:MCH/TRACKROFS;trackclusters:MCH/TRACKCLUSTERS;trackdigits:MCH/CLUSTERDIGITS"
120-
},
121-
"taskParameters": {
122-
"maxTracksPerTF": "100"
123-
},
124-
"location": "local",
125-
"mergingMode": "delta",
126-
"localControl": "odc",
127-
"localMachines": [
128-
"localhost",
129-
"epn"
130-
],
131-
"remotePort": "47795",
132-
"remoteMachine": "alio2-cr1-qc01.cern.ch"
133-
},
134-
"MUONTracks": {
135107
"active": "true",
136108
"className": "o2::quality_control_modules::muon::TracksTask",
137109
"moduleName": "QcMUONCommon",
138-
"detectorName": "GLO",
110+
"detectorName": "MCH",
139111
"cycleDurationSeconds": "300",
140112
"maxNumberCycles": "-1",
141113
"dataSource": {
@@ -151,13 +123,12 @@
151123
"mergingMode": "delta",
152124
"localControl": "odc",
153125
"localMachines": [
154-
"localhost",
155126
"epn"
156127
],
157-
"remotePort": "47789",
128+
"remotePort": "47795",
158129
"remoteMachine": "alio2-cr1-qc01.cern.ch"
159130
},
160-
"MCHStdTracks": {
131+
"MUONTracks": {
161132
"active": "true",
162133
"className": "o2::quality_control_modules::muon::TracksTask",
163134
"moduleName": "QcMUONCommon",
@@ -166,21 +137,20 @@
166137
"maxNumberCycles": "-1",
167138
"dataSource": {
168139
"type": "direct",
169-
"query": "mchtracks:MCH/TRACKS;mchtrackrofs:MCH/TRACKROFS;mchtrackclusters:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/TRACKDIGITS"
140+
"query": "mchtracks:MCH/TRACKS;mchtrackrofs:MCH/TRACKROFS;mchtrackclusters:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/TRACKDIGITS;muontracks:GLO/MTC_MCHMID"
170141
},
171142
"taskParameters": {
172143
"maxTracksPerTF": "600",
173144
"standaloneMCHTracks": true,
174-
"matchedMCHMIDTracks": false
145+
"matchedMCHMIDTracks": true
175146
},
176147
"location": "local",
177148
"mergingMode": "delta",
178149
"localControl": "odc",
179150
"localMachines": [
180-
"localhost",
181151
"epn"
182152
],
183-
"remotePort": "47788",
153+
"remotePort": "47789",
184154
"remoteMachine": "alio2-cr1-qc01.cern.ch"
185155
}
186156
},

scripts/mch-qcmn-epn-full-track-matching.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -u
88
source helpers.sh
99

1010
QC_GEN_CONFIG_PATH="json://${PWD}/etc/mch-qcmn-epn-full-track-matching.json"
11-
QC_FINAL_CONFIG_PATH="consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-epn-full-track-matching"
11+
QC_FINAL_CONFIG_PATH="consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-remote-full-track-matching"
1212
QC_CONFIG_PARAM="qc_config_uri"
1313

1414
WF_NAME=mch-qcmn-epn-full-track-matching-remote

tasks/mch-qcmn-epn-full-track-matching-remote-GLO-MUONTracks-proxy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ command:
140140
- "'0'"
141141
- "--orbit-offset-enumeration"
142142
- "'0'"
143-
- "--ready-state-policy"
144-
- "'drain'"
145143
- "--start-value-enumeration"
146144
- "'0'"
147145
- "--step-value-enumeration"

tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHPreclusters-proxy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ command:
140140
- "'0'"
141141
- "--orbit-offset-enumeration"
142142
- "'0'"
143-
- "--ready-state-policy"
144-
- "'drain'"
145143
- "--start-value-enumeration"
146144
- "'0'"
147145
- "--step-value-enumeration"

tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHRofs-proxy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ command:
140140
- "'0'"
141141
- "--orbit-offset-enumeration"
142142
- "'0'"
143-
- "--ready-state-policy"
144-
- "'drain'"
145143
- "--start-value-enumeration"
146144
- "'0'"
147145
- "--step-value-enumeration"

tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHTracks-proxy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ command:
140140
- "'0'"
141141
- "--orbit-offset-enumeration"
142142
- "'0'"
143-
- "--ready-state-policy"
144-
- "'drain'"
145143
- "--start-value-enumeration"
146144
- "'0'"
147145
- "--step-value-enumeration"

tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MERGER-MCHPreclusters1l-0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ command:
128128
- "--workflow-suffix"
129129
- "''"
130130
- "--period-timer-publish"
131-
- "'360000000'"
131+
- "'300000000'"

tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHDigits-proxy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ command:
140140
- "'0'"
141141
- "--orbit-offset-enumeration"
142142
- "'0'"
143-
- "--ready-state-policy"
144-
- "'drain'"
145143
- "--start-value-enumeration"
146144
- "'0'"
147145
- "--step-value-enumeration"

tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHErrors-proxy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ command:
140140
- "'0'"
141141
- "--orbit-offset-enumeration"
142142
- "'0'"
143-
- "--ready-state-policy"
144-
- "'drain'"
145143
- "--start-value-enumeration"
146144
- "'0'"
147145
- "--step-value-enumeration"

tasks/mch-qcmn-epn-full-track-matching-remote-internal-dpl-clock.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ wants:
1313
cpu: 0.01
1414
memory: 1
1515
bind:
16-
- name: from_internal-dpl-clock_to_GLO-MCHStdTracks-proxy
17-
type: push
18-
transport: shmem
19-
addressing: ipc
20-
rateLogging: "{{ fmq_rate_logging }}"
21-
sndBufSize: 4
22-
rcvBufSize: 4
2316
- name: from_internal-dpl-clock_to_GLO-MUONTracks-proxy
2417
type: push
2518
transport: shmem
@@ -62,13 +55,6 @@ bind:
6255
rateLogging: "{{ fmq_rate_logging }}"
6356
sndBufSize: 4
6457
rcvBufSize: 4
65-
- name: from_internal-dpl-clock_to_GLO-MERGER-MCHStdTracks1l-0
66-
type: push
67-
transport: shmem
68-
addressing: ipc
69-
rateLogging: "{{ fmq_rate_logging }}"
70-
sndBufSize: 4
71-
rcvBufSize: 4
7258
- name: from_internal-dpl-clock_to_GLO-MERGER-MUONTracks1l-0
7359
type: push
7460
transport: shmem

0 commit comments

Comments
 (0)