From 4d84ff79981133379c10b7285b6faef329eadecd Mon Sep 17 00:00:00 2001 From: Xuhao Yuan Date: Tue, 13 Apr 2021 15:46:39 +0200 Subject: [PATCH 1/3] newID&Geo --- Hlt/RecoConf/python/RecoConf/data_from_file.py | 2 ++ Hlt/RecoConf/python/RecoConf/mc_checking.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Hlt/RecoConf/python/RecoConf/data_from_file.py b/Hlt/RecoConf/python/RecoConf/data_from_file.py index 90bc5682034..a8de5a79c97 100644 --- a/Hlt/RecoConf/python/RecoConf/data_from_file.py +++ b/Hlt/RecoConf/python/RecoConf/data_from_file.py @@ -292,6 +292,7 @@ def boole_links_digits_mcparticles(): "HcalDigits": "/Event/Link/Raw/Hcal/Digits2MCParticles", "MuonDigits": "/Event/Link/Raw/Muon/Digits", "UTClusters": "/Event/Link/Raw/UT/Clusters", + "UTDigits": "/Event/Link/Raw/UT/TightDigits", "VPDigits": "/Event/Link/Raw/VP/Digits", } return { @@ -308,6 +309,7 @@ def boole_links_digits_mchits(): locations = { "FTLiteClusters": "/Event/Link/Raw/FT/LiteClusters2MCHits", "UTClusters": "/Event/Link/Raw/UT/Clusters2MCHits", + "UTDigits": "/Event/Link/Raw/UT/TightDigits2MCHits", "VPDigits": "/Event/Link/Raw/VP/Digits2MCHits", } return { diff --git a/Hlt/RecoConf/python/RecoConf/mc_checking.py b/Hlt/RecoConf/python/RecoConf/mc_checking.py index 05e5d1315ad..cc6074d84a1 100644 --- a/Hlt/RecoConf/python/RecoConf/mc_checking.py +++ b/Hlt/RecoConf/python/RecoConf/mc_checking.py @@ -112,6 +112,7 @@ def make_links_lhcbids_mcparticles_tracking_system(): VPFullClustersLinkLocation=make_links_veloclusters_mcparticles(), UTHitsLocation=make_PrStoreUTHit_hits(), UTHitsLinkLocation=boole_links_digits_mcparticles()["UTClusters"], + #UTHitsLinkLocation=boole_links_digits_mcparticles()["UTDigits"], FTLiteClustersLocation=make_FTRawBankDecoder_clusters(), FTLiteClustersLinkLocation=boole_links_digits_mcparticles() ["FTLiteClusters"], @@ -576,6 +577,7 @@ def uthits_resolution_checker(): uthits = make_PrStorePrUTHits_hits() utlinks = make_data_with_FetchDataFromFile( "/Event/Link/Raw/UT/Clusters2MCHits") + #"/Event/Link/Raw/UT/TightDigits2MCHits") utchecker = PrUTHitsChecker( UTHitsLocation=uthits, MCHitsLocation=mcuthits, -- GitLab From e8811c4f0b7b95c5ce08afecb5c07aaaf12b60aa Mon Sep 17 00:00:00 2001 From: Xuhao Yuan Date: Tue, 17 May 2022 15:15:59 +0200 Subject: [PATCH 2/3] qmtest --- ...t_and_conds_for_ut_v4r2_decoding_newGeo.py | 14 +++++++ ...seline_UTTELL40_with_mcchecking_newGeo.qmt | 36 +++++++++++++++++ ...seline_UTTELL40_with_mcchecking_newGeo.qmt | 39 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py create mode 100644 Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt create mode 100644 Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt diff --git a/Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py b/Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py new file mode 100644 index 00000000000..e9025f00264 --- /dev/null +++ b/Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py @@ -0,0 +1,14 @@ +############################################################################### +# (c) Copyright 2021 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 Moore import options +from RecoConf.decoders import default_ft_decoding_version +options.set_input_and_conds_from_testfiledb('upgrade-baseline-ut-new-geo-digi') +default_ft_decoding_version.global_bind(value=6) diff --git a/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt b/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt new file mode 100644 index 00000000000..8d40803aee5 --- /dev/null +++ b/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt @@ -0,0 +1,36 @@ + + + + +gaudirun.py + + $MOOREROOT/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py + $RECOCONFROOT/options/hlt1_reco_baseline_UTTELL40_with_mcchecking.py + + + +true +../refs/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.ref +../refs/empty.ref + + +from Moore.qmtest.exclusions import ref_preprocessor +validateWithReference(preproc = ref_preprocessor) + +from Moore.qmtest.exclusions import remove_known_warnings +countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, + stdout=remove_known_warnings(stdout)) + + + diff --git a/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt b/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt new file mode 100644 index 00000000000..b6bf754bd9a --- /dev/null +++ b/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt @@ -0,0 +1,39 @@ + + + + +gaudirun.py + + $MOOREROOT/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py + $RECOCONFROOT/options/hlt2_reco_baseline_UTTELL40_with_mcchecking.py + + + +true +../refs/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.ref +../refs/empty.ref + + +from Moore.qmtest.exclusions import ref_preprocessor, counter_preprocessor +validateWithReference(preproc = ref_preprocessor, counter_preproc = counter_preprocessor) + +from Moore.qmtest.exclusions import remove_known_warnings +countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, + stdout=remove_known_warnings(stdout)) + + + + clang.*-dbg + + -- GitLab From 132bfb612b7c880f98ca6e33a15622ab79427a3a Mon Sep 17 00:00:00 2001 From: bkhanji Date: Fri, 5 May 2023 16:12:10 +0200 Subject: [PATCH 3/3] de-activating hlt12_reco_baseline_UTTELL40_with_mcchecking_newGeo temporarily --- .../hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt | 4 ++++ .../hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt b/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt index 8d40803aee5..bb81a9a8d77 100644 --- a/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt +++ b/Hlt/RecoConf/tests/qmtest/hlt1_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt @@ -32,5 +32,9 @@ from Moore.qmtest.exclusions import remove_known_warnings countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, stdout=remove_known_warnings(stdout)) + + + .*detdesc.* + diff --git a/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt b/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt index b6bf754bd9a..fad8156fde2 100644 --- a/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt +++ b/Hlt/RecoConf/tests/qmtest/hlt2_reco_baseline_UTTELL40_with_mcchecking_newGeo.qmt @@ -34,6 +34,6 @@ countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, - clang.*-dbg + .*detdesc.* -- GitLab