From 3a6b9ff5b2463ceb780cb89c6f92ee7291ff49fd Mon Sep 17 00:00:00 2001 From: Markus Frank Date: Wed, 13 Dec 2023 12:09:05 +0100 Subject: [PATCH] Incorporate https://github.com/AIDASoft/DD4hep/pull/1172 and fix examples --- DDCore/src/plugins/DetectorChecksum.cpp | 2 +- examples/CLICSiD/CMakeLists.txt | 4 ++-- examples/ClientTests/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DDCore/src/plugins/DetectorChecksum.cpp b/DDCore/src/plugins/DetectorChecksum.cpp index add09926f..728d80e29 100644 --- a/DDCore/src/plugins/DetectorChecksum.cpp +++ b/DDCore/src/plugins/DetectorChecksum.cpp @@ -978,7 +978,7 @@ const DetectorChecksum::entry_t& DetectorChecksum::handleSegmentation(Segmentati log << "/>" << newline; } log << " " << newline; - log << ""; + log << ""; ise = geo.emplace(seg, make_entry(log)).first; } return ise->second; diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt index de3c1d9cf..dade8e57b 100644 --- a/examples/CLICSiD/CMakeLists.txt +++ b/examples/CLICSiD/CMakeLists.txt @@ -133,7 +133,7 @@ endif() dd4hep_add_test_reg( CLICSiD_check_checksum_EcalBarrel COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" EXEC_ARGS geoPluginRun -input ${DD4hep_ROOT}/DDDetectors/compact/SiD.xml -plugin DD4hepDetectorChecksum -readout -detector EcalBarrel - REGEX_PASS "Combined hash code 4af999c3b33c5a53 \\(10375 sub-codes\\)" + REGEX_PASS "Combined hash code ec2a9dbb0aeccacc \\(10375 sub-codes\\)" REGEX_FAIL "Exception;EXCEPTION;ERROR" ) # @@ -141,7 +141,7 @@ dd4hep_add_test_reg( CLICSiD_check_checksum_EcalBarrel dd4hep_add_test_reg( CLICSiD_check_checksum_full COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" EXEC_ARGS geoPluginRun -input ${DD4hep_ROOT}/DDDetectors/compact/SiD.xml -plugin DD4hepDetectorChecksum -readout - REGEX_PASS "Combined hash code 2aa2f0fe61a8331f \\(3395674 sub-codes\\)" + REGEX_PASS "Combined hash code a2e90886360b3b75 \\(3395674 sub-codes\\)" REGEX_FAIL "Exception;EXCEPTION;ERROR" ) # diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt index 797bd9dd3..f60fe548a 100644 --- a/examples/ClientTests/CMakeLists.txt +++ b/examples/ClientTests/CMakeLists.txt @@ -379,7 +379,7 @@ dd4hep_add_test_reg( MiniTel_check_checksum_Minitel3 COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" EXEC_ARGS geoPluginRun -input ${ClientTestsEx_INSTALL}/compact/MiniTelGenerate.xml -plugin DD4hepDetectorChecksum -readout -detector Minitel3 - REGEX_PASS "Combined hash code 8e54af7d60ff83d0 \\(54 sub-codes\\)" + REGEX_PASS "Combined hash code 22de2a78a15abd64 \\(54 sub-codes\\)" REGEX_FAIL "Exception;EXCEPTION;ERROR" ) # @@ -388,7 +388,7 @@ dd4hep_add_test_reg( MiniTel_check_checksum_full COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" EXEC_ARGS geoPluginRun -input ${ClientTestsEx_INSTALL}/compact/MiniTelGenerate.xml -plugin DD4hepDetectorChecksum -readout - REGEX_PASS "Combined hash code 7330636481b0401d \\(207 sub-codes\\)" + REGEX_PASS "Combined hash code cbcafd06b9ee34c1 \\(207 sub-codes\\)" REGEX_FAIL "Exception;EXCEPTION;ERROR" ) #