From 3c5cb7e3cc951216023525e7c65d37f55b59aff2 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Tue, 25 Apr 2023 14:03:49 +0200
Subject: [PATCH] Fix checksum example after modification of MiniTel
---
examples/ClientTests/CMakeLists.txt | 4 ++--
examples/ClientTests/src/MiniTel.cpp | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 5b6ff9627..c35a127d9 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 36773df7c4d6cf2b \\(52 sub-codes\\)"
+ REGEX_PASS "Combined hash code 96566298cb469f79 \\(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 99b55eb7a563d587 \\(201 sub-codes\\)"
+ REGEX_PASS "Combined hash code 97ecf7772fe1d462 \\(207 sub-codes\\)"
REGEX_FAIL "Exception;EXCEPTION;ERROR"
)
#
diff --git a/examples/ClientTests/src/MiniTel.cpp b/examples/ClientTests/src/MiniTel.cpp
index b91a01845..f03ffd645 100644
--- a/examples/ClientTests/src/MiniTel.cpp
+++ b/examples/ClientTests/src/MiniTel.cpp
@@ -89,22 +89,23 @@ static Ref_t create_detector(Detector &description, xml_h e, SensitiveDetector s
xml_comp_t x_pos = m;
if ( x_pos.z() > env_dim_max.z() ) {
env_dim_max.SetZ(x_pos.z());
- printout(ALWAYS,"","z_max = %f",x_pos.z());
+ printout(DEBUG,"MiniTel","Envelope z_max = %f",x_pos.z());
}
if ( x_pos.z() < env_dim_min.z() ) {
env_dim_min.SetZ(x_pos.z());
- printout(ALWAYS,"","z_min = %f",x_pos.z());
+ printout(DEBUG,"MiniTel","Envelope z_min = %f",x_pos.z());
}
}
Volume side_vol;
if ( x_det.hasChild(_U(assembly)) ) {
side_vol = Assembly("side_0");
+ printout(DEBUG,"MiniTel","Using assembly envelope");
}
else {
Box side_box(env_dim_max.x(), env_dim_max.y(), (env_dim_max.z()-env_dim_min.z())/2.0+sensor_box.z() + epsilon);
- printout(ALWAYS,"","Box = %f",side_box.z());
side_vol = Volume("side_0", side_box, description.air());
+ printout(DEBUG,"MiniTel","Envelope Box = %f",side_box.z());
}
side_det = DetElement(sdet,"side_0", x_det.id());
if ( x_det.hasChild(_U(side_position)) ) {
--
GitLab