From d37606659bf74be03f420d0386b25c944e114d0a Mon Sep 17 00:00:00 2001 From: aferrero2707 Date: Tue, 20 Sep 2022 17:09:30 +0200 Subject: [PATCH] [MCH] updated standalone MCH tracks task configuration - removed the duplicated MCHStdTracks task - changed MCHTracks to use o2::quality_control_modules::muon::TracksTask - renamed consul file to "mch-qcmn-remote-full-track-matching" --- jit/mch-qcmn-epn-full-track-matching-remote | 2 +- .../etc/mch-qcmn-epn-full-track-matching.json | 44 +++------------- scripts/mch-qcmn-epn-full-track-matching.sh | 2 +- ...-matching-remote-GLO-MUONTracks-proxy.yaml | 2 - ...ching-remote-MCH-MCHPreclusters-proxy.yaml | 2 - ...ack-matching-remote-MCH-MCHRofs-proxy.yaml | 2 - ...k-matching-remote-MCH-MCHTracks-proxy.yaml | 2 - ...-remote-MCH-MERGER-MCHPreclusters1l-0.yaml | 2 +- ...hing-remote-MCH-QcTaskMCHDigits-proxy.yaml | 2 - ...hing-remote-MCH-QcTaskMCHErrors-proxy.yaml | 2 - ...ck-matching-remote-internal-dpl-clock.yaml | 14 ------ ...h-qcmn-epn-full-track-matching-remote.yaml | 50 +------------------ 12 files changed, 11 insertions(+), 115 deletions(-) diff --git a/jit/mch-qcmn-epn-full-track-matching-remote b/jit/mch-qcmn-epn-full-track-matching-remote index 08e1c2df3..ff37d9fb8 100644 --- a/jit/mch-qcmn-epn-full-track-matching-remote +++ b/jit/mch-qcmn-epn-full-track-matching-remote @@ -1 +1 @@ -o2-qc --config consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-epn-full-track-matching --remote -b +o2-qc --config consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-remote-full-track-matching --remote -b diff --git a/scripts/etc/mch-qcmn-epn-full-track-matching.json b/scripts/etc/mch-qcmn-epn-full-track-matching.json index 61d5e3588..a26289215 100644 --- a/scripts/etc/mch-qcmn-epn-full-track-matching.json +++ b/scripts/etc/mch-qcmn-epn-full-track-matching.json @@ -38,7 +38,6 @@ "mergingMode": "delta", "localControl": "odc", "localMachines": [ - "localhost", "epn" ], "remotePort": "47790", @@ -59,7 +58,6 @@ "mergingMode": "delta", "localControl": "odc", "localMachines": [ - "localhost", "epn" ], "remotePort": "47791", @@ -80,7 +78,6 @@ "mergingMode": "delta", "localControl": "odc", "localMachines": [ - "localhost", "epn" ], "remotePort": "47792", @@ -91,7 +88,7 @@ "className": "o2::quality_control_modules::muonchambers::PhysicsTaskPreclusters", "moduleName": "QcMuonChambers", "detectorName": "MCH", - "cycleDurationSeconds": "360", + "cycleDurationSeconds": "300", "maxNumberCycles": "-1", "dataSource": { "type": "direct", @@ -101,41 +98,16 @@ "mergingMode": "delta", "localControl": "odc", "localMachines": [ - "localhost", "epn" ], "remotePort": "47794", "remoteMachine": "alio2-cr1-qc01.cern.ch" }, "MCHTracks": { - "active": "true", - "className": "o2::quality_control_modules::muonchambers::TracksTask", - "moduleName": "QcMuonChambers", - "detectorName": "MCH", - "cycleDurationSeconds": "300", - "maxNumberCycles": "-1", - "dataSource": { - "type": "direct", - "query": "tracks:MCH/TRACKS;trackrofs:MCH/TRACKROFS;trackclusters:MCH/TRACKCLUSTERS;trackdigits:MCH/CLUSTERDIGITS" - }, - "taskParameters": { - "maxTracksPerTF": "100" - }, - "location": "local", - "mergingMode": "delta", - "localControl": "odc", - "localMachines": [ - "localhost", - "epn" - ], - "remotePort": "47795", - "remoteMachine": "alio2-cr1-qc01.cern.ch" - }, - "MUONTracks": { "active": "true", "className": "o2::quality_control_modules::muon::TracksTask", "moduleName": "QcMUONCommon", - "detectorName": "GLO", + "detectorName": "MCH", "cycleDurationSeconds": "300", "maxNumberCycles": "-1", "dataSource": { @@ -151,13 +123,12 @@ "mergingMode": "delta", "localControl": "odc", "localMachines": [ - "localhost", "epn" ], - "remotePort": "47789", + "remotePort": "47795", "remoteMachine": "alio2-cr1-qc01.cern.ch" }, - "MCHStdTracks": { + "MUONTracks": { "active": "true", "className": "o2::quality_control_modules::muon::TracksTask", "moduleName": "QcMUONCommon", @@ -166,21 +137,20 @@ "maxNumberCycles": "-1", "dataSource": { "type": "direct", - "query": "mchtracks:MCH/TRACKS;mchtrackrofs:MCH/TRACKROFS;mchtrackclusters:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/TRACKDIGITS" + "query": "mchtracks:MCH/TRACKS;mchtrackrofs:MCH/TRACKROFS;mchtrackclusters:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/TRACKDIGITS;muontracks:GLO/MTC_MCHMID" }, "taskParameters": { "maxTracksPerTF": "600", "standaloneMCHTracks": true, - "matchedMCHMIDTracks": false + "matchedMCHMIDTracks": true }, "location": "local", "mergingMode": "delta", "localControl": "odc", "localMachines": [ - "localhost", "epn" ], - "remotePort": "47788", + "remotePort": "47789", "remoteMachine": "alio2-cr1-qc01.cern.ch" } }, diff --git a/scripts/mch-qcmn-epn-full-track-matching.sh b/scripts/mch-qcmn-epn-full-track-matching.sh index 77e1a982e..826404234 100755 --- a/scripts/mch-qcmn-epn-full-track-matching.sh +++ b/scripts/mch-qcmn-epn-full-track-matching.sh @@ -8,7 +8,7 @@ set -u source helpers.sh QC_GEN_CONFIG_PATH="json://${PWD}/etc/mch-qcmn-epn-full-track-matching.json" -QC_FINAL_CONFIG_PATH="consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-epn-full-track-matching" +QC_FINAL_CONFIG_PATH="consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-remote-full-track-matching" QC_CONFIG_PARAM="qc_config_uri" WF_NAME=mch-qcmn-epn-full-track-matching-remote diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-GLO-MUONTracks-proxy.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-GLO-MUONTracks-proxy.yaml index 05c0de94d..7e248219d 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-GLO-MUONTracks-proxy.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-GLO-MUONTracks-proxy.yaml @@ -140,8 +140,6 @@ command: - "'0'" - "--orbit-offset-enumeration" - "'0'" - - "--ready-state-policy" - - "'drain'" - "--start-value-enumeration" - "'0'" - "--step-value-enumeration" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHPreclusters-proxy.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHPreclusters-proxy.yaml index 7fb5ba96e..4e985ad46 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHPreclusters-proxy.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHPreclusters-proxy.yaml @@ -140,8 +140,6 @@ command: - "'0'" - "--orbit-offset-enumeration" - "'0'" - - "--ready-state-policy" - - "'drain'" - "--start-value-enumeration" - "'0'" - "--step-value-enumeration" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHRofs-proxy.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHRofs-proxy.yaml index d91697b1f..7959bc6e1 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHRofs-proxy.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHRofs-proxy.yaml @@ -140,8 +140,6 @@ command: - "'0'" - "--orbit-offset-enumeration" - "'0'" - - "--ready-state-policy" - - "'drain'" - "--start-value-enumeration" - "'0'" - "--step-value-enumeration" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHTracks-proxy.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHTracks-proxy.yaml index eed89c35a..d1b10670d 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHTracks-proxy.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MCHTracks-proxy.yaml @@ -140,8 +140,6 @@ command: - "'0'" - "--orbit-offset-enumeration" - "'0'" - - "--ready-state-policy" - - "'drain'" - "--start-value-enumeration" - "'0'" - "--step-value-enumeration" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MERGER-MCHPreclusters1l-0.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MERGER-MCHPreclusters1l-0.yaml index faf5628ee..f0105cab4 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MERGER-MCHPreclusters1l-0.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-MERGER-MCHPreclusters1l-0.yaml @@ -128,4 +128,4 @@ command: - "--workflow-suffix" - "''" - "--period-timer-publish" - - "'360000000'" + - "'300000000'" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHDigits-proxy.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHDigits-proxy.yaml index 4b82de175..e1b4a7e88 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHDigits-proxy.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHDigits-proxy.yaml @@ -140,8 +140,6 @@ command: - "'0'" - "--orbit-offset-enumeration" - "'0'" - - "--ready-state-policy" - - "'drain'" - "--start-value-enumeration" - "'0'" - "--step-value-enumeration" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHErrors-proxy.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHErrors-proxy.yaml index 0f914563b..fdcfbc879 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHErrors-proxy.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHErrors-proxy.yaml @@ -140,8 +140,6 @@ command: - "'0'" - "--orbit-offset-enumeration" - "'0'" - - "--ready-state-policy" - - "'drain'" - "--start-value-enumeration" - "'0'" - "--step-value-enumeration" diff --git a/tasks/mch-qcmn-epn-full-track-matching-remote-internal-dpl-clock.yaml b/tasks/mch-qcmn-epn-full-track-matching-remote-internal-dpl-clock.yaml index 0d0c64398..3c4dea54f 100644 --- a/tasks/mch-qcmn-epn-full-track-matching-remote-internal-dpl-clock.yaml +++ b/tasks/mch-qcmn-epn-full-track-matching-remote-internal-dpl-clock.yaml @@ -13,13 +13,6 @@ wants: cpu: 0.01 memory: 1 bind: - - name: from_internal-dpl-clock_to_GLO-MCHStdTracks-proxy - type: push - transport: shmem - addressing: ipc - rateLogging: "{{ fmq_rate_logging }}" - sndBufSize: 4 - rcvBufSize: 4 - name: from_internal-dpl-clock_to_GLO-MUONTracks-proxy type: push transport: shmem @@ -62,13 +55,6 @@ bind: rateLogging: "{{ fmq_rate_logging }}" sndBufSize: 4 rcvBufSize: 4 - - name: from_internal-dpl-clock_to_GLO-MERGER-MCHStdTracks1l-0 - type: push - transport: shmem - addressing: ipc - rateLogging: "{{ fmq_rate_logging }}" - sndBufSize: 4 - rcvBufSize: 4 - name: from_internal-dpl-clock_to_GLO-MERGER-MUONTracks1l-0 type: push transport: shmem diff --git a/workflows/mch-qcmn-epn-full-track-matching-remote.yaml b/workflows/mch-qcmn-epn-full-track-matching-remote.yaml index 7c299ea5c..b3c3adbc0 100644 --- a/workflows/mch-qcmn-epn-full-track-matching-remote.yaml +++ b/workflows/mch-qcmn-epn-full-track-matching-remote.yaml @@ -3,7 +3,7 @@ vars: dpl_command: >- o2-qc --config {{ qc_config_uri }} --remote -b defaults: - qc_config_uri: "consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-epn-full-track-matching" + qc_config_uri: "consul-json://{{ consul_endpoint }}/o2/components/qc/ANY/any/mch-qcmn-remote-full-track-matching" monitoring_dpl_url: "no-op://" user: "flp" fmq_rate_logging: 0 @@ -16,25 +16,6 @@ roles: connect: task: load: mch-qcmn-epn-full-track-matching-remote-internal-dpl-clock - - name: "GLO-MCHStdTracks-proxy" - connect: - - name: from_internal-dpl-clock_to_GLO-MCHStdTracks-proxy - type: pull - transport: shmem - target: "{{ Parent().Path }}.internal-dpl-clock:from_internal-dpl-clock_to_GLO-MCHStdTracks-proxy" - rateLogging: "{{ fmq_rate_logging }}" - sndBufSize: 4 - rcvBufSize: 4 - bind: - - name: GLO-MCHStdTracks-proxy - type: sub - transport: zeromq - addressing: tcp - rateLogging: "{{ fmq_rate_logging }}" - target: "tcp://*:47788" - rcvBufSize: 1 - task: - load: mch-qcmn-epn-full-track-matching-remote-GLO-MCHStdTracks-proxy - name: "GLO-MUONTracks-proxy" connect: - name: from_internal-dpl-clock_to_GLO-MUONTracks-proxy @@ -149,24 +130,6 @@ roles: rcvBufSize: 1 task: load: mch-qcmn-epn-full-track-matching-remote-MCH-QcTaskMCHErrors-proxy - - name: "GLO-MERGER-MCHStdTracks1l-0" - connect: - - name: from_internal-dpl-clock_to_GLO-MERGER-MCHStdTracks1l-0 - type: pull - transport: shmem - target: "{{ Parent().Path }}.internal-dpl-clock:from_internal-dpl-clock_to_GLO-MERGER-MCHStdTracks1l-0" - rateLogging: "{{ fmq_rate_logging }}" - sndBufSize: 4 - rcvBufSize: 4 - - name: from_GLO-MCHStdTracks-proxy_to_GLO-MERGER-MCHStdTracks1l-0 - type: pull - transport: shmem - target: "{{ Parent().Path }}.GLO-MCHStdTracks-proxy:from_GLO-MCHStdTracks-proxy_to_GLO-MERGER-MCHStdTracks1l-0" - rateLogging: "{{ fmq_rate_logging }}" - sndBufSize: 4 - rcvBufSize: 4 - task: - load: mch-qcmn-epn-full-track-matching-remote-GLO-MERGER-MCHStdTracks1l-0 - name: "GLO-MERGER-MUONTracks1l-0" connect: - name: from_internal-dpl-clock_to_GLO-MERGER-MUONTracks1l-0 @@ -308,17 +271,6 @@ roles: rcvBufSize: 4 task: load: mch-qcmn-epn-full-track-matching-remote-qc-check-MCH-QcCheckMCHPreclusters - - name: "qc-check-sink-QGLO_MCHStdTracks_0" - connect: - - name: from_GLO-MERGER-MCHStdTracks1l-0_to_qc-check-sink-QGLO_MCHStdTracks_0 - type: pull - transport: shmem - target: "{{ Parent().Path }}.GLO-MERGER-MCHStdTracks1l-0:from_GLO-MERGER-MCHStdTracks1l-0_to_qc-check-sink-QGLO_MCHStdTracks_0" - rateLogging: "{{ fmq_rate_logging }}" - sndBufSize: 4 - rcvBufSize: 4 - task: - load: mch-qcmn-epn-full-track-matching-remote-qc-check-sink-QGLO_MCHStdTracks_0 - name: "qc-check-sink-QGLO_MUONTracks_0" connect: - name: from_GLO-MERGER-MUONTracks1l-0_to_qc-check-sink-QGLO_MUONTracks_0