From 85dd0cedf611ac6cc151b4ea6a0b51d73a3f370f Mon Sep 17 00:00:00 2001
From: Roel Aaij <raaij@nikhef.nl>
Date: Wed, 20 Mar 2024 07:24:02 +0100
Subject: [PATCH 1/2] [Muon decoding] Add test to compare HLT1 and HLT2 muon
 decoding on 2023 data.

---
 .../options/compare_hlt1_hlt2_muon_hits.py    |  3 +-
 ...lt2_muon_decoding_v3geometry_data_2023.qmt | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_muon_decoding_v3geometry_data_2023.qmt

diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_muon_hits.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_muon_hits.py
index ec0c9a8969c..a5200950d70 100644
--- a/Hlt/RecoConf/options/compare_hlt1_hlt2_muon_hits.py
+++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_muon_hits.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from PyConf.Algorithms import CompareRecAllenMuonHits
-from PyConf.application import configure_input, configure
+from PyConf.application import configure_input, configure, make_odin
 from PyConf.control_flow import CompositeNode, NodeLogic
 from Allen.config import setup_allen_non_event_data_service
 from AllenConf.muon_reconstruction import decode_muon
@@ -22,6 +22,7 @@ allen_muon_hits = decode_muon()
 rec_muon_hits = make_muon_hits()
 
 test_hits = CompareRecAllenMuonHits(
+    ODIN=make_odin(),
     muon_offsets=allen_muon_hits["dev_station_ocurrences_offset"],
     muon_hits=allen_muon_hits["dev_muon_hits"],
     MuonHitsLocation=rec_muon_hits)
diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_muon_decoding_v3geometry_data_2023.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_muon_decoding_v3geometry_data_2023.qmt
new file mode 100644
index 00000000000..c047c2189a0
--- /dev/null
+++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_muon_decoding_v3geometry_data_2023.qmt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<!--
+    (c) Copyright 2022 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<!--
+Make sure HLT1- and HLT2-decoded muon hits correspond for muon v3 geometry
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+<argument name="program"><text>gaudirun.py</text></argument>
+<argument name="args"><set>
+  <text>$MOOREROOT/tests/options/mdf_input_and_conds_data_2023.py</text>
+  <text>$MOOREROOT/options/muon_geometry_v3.py</text>
+  <text>$RECOCONFROOT/options/compare_hlt1_hlt2_muon_hits.py</text>
+</set></argument>
+<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
+<argument name="validator"><text>
+
+from Moore.qmtest.exclusions import remove_known_warnings
+countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0},
+                stdout=remove_known_warnings(stdout))
+
+</text></argument>
+</extension>
-- 
GitLab


From 0b2de4e05e81072c64548530612d575583ade69a Mon Sep 17 00:00:00 2001
From: Roel Aaij <raaij@nikhef.nl>
Date: Mon, 25 Mar 2024 10:58:37 +0100
Subject: [PATCH 2/2] Disable muon test one data for detdesc builds

---
 Hlt/RecoConf/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Hlt/RecoConf/CMakeLists.txt b/Hlt/RecoConf/CMakeLists.txt
index 4fc4da0810a..8333cd10da4 100644
--- a/Hlt/RecoConf/CMakeLists.txt
+++ b/Hlt/RecoConf/CMakeLists.txt
@@ -130,6 +130,7 @@ if(BUILD_TESTING AND NOT USE_DD4HEP)
            RecoConf.phoenix_event_data_dump
            RecoConf.hlt2_reco_data_2023
            RecoConf.hlt1_pvs_with_beamspotmoni_2023
+           RecoConf.decoding.compare_hlt1_hlt2_muon_decoding_v3geometry_data_2023
         PROPERTY
             DISABLED TRUE
     )
-- 
GitLab