From 26baa5adc0aa73729cc3ab5404120e2b6c4d1b7b Mon Sep 17 00:00:00 2001 From: ipalmame Date: Mon, 24 Feb 2025 17:15:25 +0100 Subject: [PATCH 01/13] Add test configuration files --- .../options/compare_hlt1_hlt2_rich_pixels.py | 40 +++++++++++++++++++ .../compare_hlt1_hlt2_rich_smart_ids.py | 10 ++++- .../compare_hlt1_hlt2_rich_pixels.qmt | 30 ++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py create mode 100644 Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py new file mode 100644 index 00000000000..fdc114ba721 --- /dev/null +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -0,0 +1,40 @@ +############################################################################### +# (c) Copyright 2000-2018 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. # +############################################################################### + +from Allen.config import setup_allen_non_event_data_service +from PyConf.Algorithms import TestAllenRichMakePixels +from PyConf.application import (configure_input, configure) +from PyConf.control_flow import (CompositeNode, NodeLogic) +from Allen.config import setup_allen_non_event_data_service +from AllenConf.rich_make_pixels import make_pixels +from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options +from Moore import options + +options.evt_max = 100 +config = configure_input(options) +non_event_data_node = setup_allen_non_event_data_service( + bank_types=["Rich1", "Rich2"]) + +allen_pixels = make_pixels() +reco_opts = default_rich_reco_options() +rec_rich_pixels = make_rich_pixels(options=reco_opts) + +test_hits = TestAllenRichMakePixels( + rich_pixels=allen_pixels["dev_rich_pixels"], + SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test + +cf_node = CompositeNode( + 'compare_rich_pixels', + combine_logic=NodeLogic.NONLAZY_OR, + children=[non_event_data_node, test_hits], + force_order=True) + +config.update(configure(options, cf_node)) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 90a79ad6dac..b77b79c2f81 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -30,10 +30,18 @@ test_hits = TestAllenRichPixels( RichDecodedData=rec_rich_pixels["RichDecodedData"], ) +from AllenConf.rich_make_pixels import make_pixels + +allen_pixels = make_pixels() + +test_pixels = TestAllenRichMakePixels( + rich_pixels=allen_pixels["dev_rich_pixels"], + SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test + cf_node = CompositeNode( "compare_rich_smart_ids", combine_logic=NodeLogic.NONLAZY_OR, - children=[non_event_data_node, test_hits], + children=[non_event_data_node, test_hits, test_pixels], force_order=True, ) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt new file mode 100644 index 00000000000..3d62a33070f --- /dev/null +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt @@ -0,0 +1,30 @@ + + + + +gaudirun.py + + $MOOREROOT/tests/options/mdf_input_and_conds_data_2022.py + $RECOCONFROOT/options/compare_hlt1_hlt2_rich_pixels.py + +true + + +from Moore.qmtest.exclusions import remove_known_warnings +countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, + stdout=remove_known_warnings(stdout)) + + + + -- GitLab From 45359644a070a007e7f8d59beace9ee01f91732a Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Wed, 5 Mar 2025 23:00:55 +0100 Subject: [PATCH 02/13] diff make_pixels for rich1 and 2, TODO: insert all pixels to .cu test --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index b77b79c2f81..3f4b470c9e0 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -32,10 +32,11 @@ test_hits = TestAllenRichPixels( from AllenConf.rich_make_pixels import make_pixels -allen_pixels = make_pixels() +allen_rich1_pixels = make_pixels(allen_rich1_decoding_rich, rich=1) +allen_rich2_pixels = make_pixels(allen_rich2_decoding_rich, rich=2) test_pixels = TestAllenRichMakePixels( - rich_pixels=allen_pixels["dev_rich_pixels"], + rich_pixels=allen_rich1_pixels["dev_rich_pixels"], #TODO: consider both Allen riches SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test cf_node = CompositeNode( -- GitLab From 3de18dfb97246c3d57ea6576474b8bf1c7d33b87 Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Fri, 7 Mar 2025 03:03:44 +0100 Subject: [PATCH 03/13] tests run, still not passing --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index fdc114ba721..3d1f718f1cd 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -20,15 +20,16 @@ from Moore import options options.evt_max = 100 config = configure_input(options) -non_event_data_node = setup_allen_non_event_data_service( - bank_types=["Rich1", "Rich2"]) +non_event_data_node = setup_allen_non_event_data_service() -allen_pixels = make_pixels() +allen_rich1_pixels = make_pixels(rich=1) +allen_rich2_pixels = make_pixels(rich=2) reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) test_hits = TestAllenRichMakePixels( - rich_pixels=allen_pixels["dev_rich_pixels"], + rich1_pixels=allen_rich1_pixels["dev_rich_pixels"], + rich2_pixels=allen_rich2_pixels["dev_rich_pixels"], SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test cf_node = CompositeNode( -- GitLab From 17f0bf0035d1357c63357612fb4933ad42261e0d Mon Sep 17 00:00:00 2001 From: ipalmame Date: Mon, 10 Mar 2025 21:00:21 +0100 Subject: [PATCH 04/13] Changed options from Moore to RecoConf --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index 3d1f718f1cd..2cafdf4c041 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -16,7 +16,7 @@ from PyConf.control_flow import (CompositeNode, NodeLogic) from Allen.config import setup_allen_non_event_data_service from AllenConf.rich_make_pixels import make_pixels from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options -from Moore import options +from RecoConf.options import options options.evt_max = 100 config = configure_input(options) @@ -27,7 +27,7 @@ allen_rich2_pixels = make_pixels(rich=2) reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) -test_hits = TestAllenRichMakePixels( +test_pixels = TestAllenRichMakePixels( rich1_pixels=allen_rich1_pixels["dev_rich_pixels"], rich2_pixels=allen_rich2_pixels["dev_rich_pixels"], SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test @@ -35,7 +35,7 @@ test_hits = TestAllenRichMakePixels( cf_node = CompositeNode( 'compare_rich_pixels', combine_logic=NodeLogic.NONLAZY_OR, - children=[non_event_data_node, test_hits], + children=[non_event_data_node, test_pixels], force_order=True) config.update(configure(options, cf_node)) -- GitLab From 027ba8d4b67cc88d456dd4af853352c323310edd Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Wed, 26 Mar 2025 02:29:43 +0000 Subject: [PATCH 05/13] Code cleanup --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py | 2 +- .../options/compare_hlt1_hlt2_rich_smart_ids.py | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index 2cafdf4c041..37db69212a1 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -30,7 +30,7 @@ rec_rich_pixels = make_rich_pixels(options=reco_opts) test_pixels = TestAllenRichMakePixels( rich1_pixels=allen_rich1_pixels["dev_rich_pixels"], rich2_pixels=allen_rich2_pixels["dev_rich_pixels"], - SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test + SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) cf_node = CompositeNode( 'compare_rich_pixels', diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 3f4b470c9e0..90a79ad6dac 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -30,19 +30,10 @@ test_hits = TestAllenRichPixels( RichDecodedData=rec_rich_pixels["RichDecodedData"], ) -from AllenConf.rich_make_pixels import make_pixels - -allen_rich1_pixels = make_pixels(allen_rich1_decoding_rich, rich=1) -allen_rich2_pixels = make_pixels(allen_rich2_decoding_rich, rich=2) - -test_pixels = TestAllenRichMakePixels( - rich_pixels=allen_rich1_pixels["dev_rich_pixels"], #TODO: consider both Allen riches - SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) # TODO change name to RichSIMDPixels & in test - cf_node = CompositeNode( "compare_rich_smart_ids", combine_logic=NodeLogic.NONLAZY_OR, - children=[non_event_data_node, test_hits, test_pixels], + children=[non_event_data_node, test_hits], force_order=True, ) -- GitLab From 92d6e455b8a843078241ba927c7f8055821d1407 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Wed, 26 Mar 2025 02:30:17 +0000 Subject: [PATCH 06/13] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53299531 --- .../options/compare_hlt1_hlt2_rich_pixels.py | 17 +++++++++-------- .../compare_hlt1_hlt2_rich_pixels.qmt | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index 37db69212a1..da67bee748f 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -9,14 +9,13 @@ # or submit itself to any jurisdiction. # ############################################################################### -from Allen.config import setup_allen_non_event_data_service -from PyConf.Algorithms import TestAllenRichMakePixels -from PyConf.application import (configure_input, configure) -from PyConf.control_flow import (CompositeNode, NodeLogic) from Allen.config import setup_allen_non_event_data_service from AllenConf.rich_make_pixels import make_pixels -from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options +from PyConf.Algorithms import TestAllenRichMakePixels +from PyConf.application import configure, configure_input +from PyConf.control_flow import CompositeNode, NodeLogic from RecoConf.options import options +from RecoConf.rich_reconstruction import default_rich_reco_options, make_rich_pixels options.evt_max = 100 config = configure_input(options) @@ -30,12 +29,14 @@ rec_rich_pixels = make_rich_pixels(options=reco_opts) test_pixels = TestAllenRichMakePixels( rich1_pixels=allen_rich1_pixels["dev_rich_pixels"], rich2_pixels=allen_rich2_pixels["dev_rich_pixels"], - SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"]) + SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"], +) cf_node = CompositeNode( - 'compare_rich_pixels', + "compare_rich_pixels", combine_logic=NodeLogic.NONLAZY_OR, children=[non_event_data_node, test_pixels], - force_order=True) + force_order=True, +) config.update(configure(options, cf_node)) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt index 3d62a33070f..6800fca5927 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt @@ -27,4 +27,3 @@ countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, - -- GitLab From 65e3f491060443bc7182dac42d155ffc8249dac4 Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Fri, 28 Mar 2025 04:29:29 +0100 Subject: [PATCH 07/13] Change test names to match previous tests --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py | 4 ++-- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index da67bee748f..98fec932c77 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -11,7 +11,7 @@ from Allen.config import setup_allen_non_event_data_service from AllenConf.rich_make_pixels import make_pixels -from PyConf.Algorithms import TestAllenRichMakePixels +from PyConf.Algorithms import CompareRecAllenRichPixels from PyConf.application import configure, configure_input from PyConf.control_flow import CompositeNode, NodeLogic from RecoConf.options import options @@ -26,7 +26,7 @@ allen_rich2_pixels = make_pixels(rich=2) reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) -test_pixels = TestAllenRichMakePixels( +test_pixels = CompareRecAllenRichPixels( rich1_pixels=allen_rich1_pixels["dev_rich_pixels"], rich2_pixels=allen_rich2_pixels["dev_rich_pixels"], SIMDPixelSummaries=rec_rich_pixels["RichSIMDPixels"], diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 90a79ad6dac..b315cf737f7 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -10,7 +10,7 @@ ############################################################################### from Allen.config import setup_allen_non_event_data_service from AllenConf.rich_reconstruction import decode_rich -from PyConf.Algorithms import TestAllenRichPixels +from PyConf.Algorithms import CompareRecAllenRichSmartIDs from PyConf.application import configure, configure_input from PyConf.control_flow import CompositeNode, NodeLogic from RecoConf.options import options @@ -24,7 +24,7 @@ allen_rich2_decoding_rich = decode_rich(rich=2) reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) -test_hits = TestAllenRichPixels( +test_hits = CompareRecAllenRichSmartIDs( rich1_smart_ids=allen_rich1_decoding_rich["dev_smart_ids"], rich2_smart_ids=allen_rich2_decoding_rich["dev_smart_ids"], RichDecodedData=rec_rich_pixels["RichDecodedData"], -- GitLab From 10243266d3ce5b5dd99a3d083eefc4476d3c06ec Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Fri, 28 Mar 2025 05:48:22 +0100 Subject: [PATCH 08/13] update test mdf to 2024 data --- .../tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt index 6800fca5927..9d16269a484 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt @@ -15,7 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $MOOREROOT/tests/options/mdf_input_and_conds_data_2022.py + $MOOREROOT/tests/options/mdf_input_and_conds_data_2024.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_pixels.py true -- GitLab From 496b2be18dff6af578d0726b01ad02177684cb57 Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Sun, 20 Apr 2025 00:23:58 +0200 Subject: [PATCH 09/13] redirected make_pixel function call to rich_reconstruction --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index 98fec932c77..3a104005702 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -10,7 +10,7 @@ ############################################################################### from Allen.config import setup_allen_non_event_data_service -from AllenConf.rich_make_pixels import make_pixels +from AllenConf.rich_reconstruction import make_pixels from PyConf.Algorithms import CompareRecAllenRichPixels from PyConf.application import configure, configure_input from PyConf.control_flow import CompositeNode, NodeLogic -- GitLab From 4b137824faf1afdffdee381051729e2f90ec48d2 Mon Sep 17 00:00:00 2001 From: Arthur Hennequin Date: Wed, 1 Oct 2025 14:13:15 +0200 Subject: [PATCH 10/13] Fix rich pixels comparison test in detdesc --- .../tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt index 9d16269a484..6800fca5927 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt @@ -15,7 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $MOOREROOT/tests/options/mdf_input_and_conds_data_2024.py + $MOOREROOT/tests/options/mdf_input_and_conds_data_2022.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_pixels.py true -- GitLab From a714a1dadd7c3bd2e99dbc3dcfd67d29807bc366 Mon Sep 17 00:00:00 2001 From: Josef Ruzicka Gonzalez Date: Thu, 2 Oct 2025 02:42:57 -0600 Subject: [PATCH 11/13] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Miroslav Saur --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py index 3a104005702..94a1491db7e 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_pixels.py @@ -1,5 +1,5 @@ ############################################################################### -# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration # +# (c) Copyright 2000-2025 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". # -- GitLab From 72f5fc453708e976d8f1ec1f4e1cfd207075068b Mon Sep 17 00:00:00 2001 From: Arthur Hennequin Date: Thu, 2 Oct 2025 15:08:40 +0200 Subject: [PATCH 12/13] Add rich pixels compare test on mcdata --- .../compare_hlt1_hlt2_rich_pixels_mcdata.qmt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels_mcdata.qmt diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels_mcdata.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels_mcdata.qmt new file mode 100644 index 00000000000..3b622eb72ec --- /dev/null +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels_mcdata.qmt @@ -0,0 +1,29 @@ + + + + +gaudirun.py + + $MOOREROOT/tests/options/mdf_input_and_conds_nominal_beamline_mc_expected_2024.py + $RECOCONFROOT/options/compare_hlt1_hlt2_rich_pixels.py + +true + + +from Moore.qmtest.exclusions import remove_known_warnings +countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, + stdout=remove_known_warnings(stdout)) + + + -- GitLab From 64594ee04fd1e3ee5180a0b247cb98cb6ed0f8eb Mon Sep 17 00:00:00 2001 From: Arthur Hennequin Date: Wed, 19 Nov 2025 02:13:02 +0100 Subject: [PATCH 13/13] Disable rich tests for detdesc, switch to 2025 data inputs --- Hlt/RecoConf/CMakeLists.txt | 3 +++ .../qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt | 2 +- .../qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Hlt/RecoConf/CMakeLists.txt b/Hlt/RecoConf/CMakeLists.txt index 43ed39d48aa..d01e7a7f700 100644 --- a/Hlt/RecoConf/CMakeLists.txt +++ b/Hlt/RecoConf/CMakeLists.txt @@ -50,6 +50,9 @@ if(BUILD_TESTING AND NOT USE_DD4HEP) RecoConf.hlt1_pvs_with_beamspotmoni_2025 RecoConf.decoding.compare_hlt1_hlt2_muon_decoding_v3geometry_data_2023 RecoConf.hlt2_reco_jet_efficiency + RecoConf.decoding.compare_hlt1_hlt2_rich_smart_ids + RecoConf.decoding.compare_hlt1_hlt2_rich_pixels + RecoConf.decoding.compare_hlt1_hlt2_rich_pixels_mcdata PROPERTY DISABLED TRUE ) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt index 6800fca5927..26d86c3f2e2 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_pixels.qmt @@ -15,7 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $MOOREROOT/tests/options/mdf_input_and_conds_data_2022.py + $MOOREROOT/tests/options/default_input_and_conds_hlt2_2025_data.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_pixels.py true diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt index ce74dfdcd00..77548b430f6 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt @@ -15,7 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $MOOREROOT/tests/options/mdf_input_and_conds_data_2022.py + $MOOREROOT/tests/options/default_input_and_conds_hlt2_2025_data.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_smart_ids.py true -- GitLab