From ffac4694c19c2a960bb228186b81e5f11e4d749d Mon Sep 17 00:00:00 2001 From: P-A Loizeau <p.-a.loizeau@gsi.de> Date: Tue, 25 Feb 2025 10:55:13 +0100 Subject: [PATCH 1/2] Bump geo hash to bring mCBM25 stand with nCAL dummy + setup update --- external/InstallGeometry.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake index 6faa180e2a..7829d9ed58 100644 --- a/external/InstallGeometry.cmake +++ b/external/InstallGeometry.cmake @@ -1,4 +1,4 @@ -set(GEOMETRY_VERSION 624f1e7e6931686d5689ed52900961f31c1f12ab) +set(GEOMETRY_VERSION 7e7beacb56b71677446e824d66b0228637e113aa) set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git") download_project_if_needed(PROJECT Geometry_source -- GitLab From 3f90f942d967da18b6978119ad1ded5b5dc0e13f Mon Sep 17 00:00:00 2001 From: P-A Loizeau <p.-a.loizeau@gsi.de> Date: Tue, 25 Feb 2025 10:57:44 +0100 Subject: [PATCH 2/2] Add mTOF v24f BMON to list of pipevac overlap ignores --- macro/geometry/check_overlaps.C | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/macro/geometry/check_overlaps.C b/macro/geometry/check_overlaps.C index 264c5ed19d..637457d7c5 100644 --- a/macro/geometry/check_overlaps.C +++ b/macro/geometry/check_overlaps.C @@ -161,7 +161,8 @@ std::vector<std::string> mcbm_pipevac_bmon_overlaps = { "cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v22a_mcbm_0/tof_v22a_mcbmStand_1/module_5_0", "cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v24a_mcbm_0/tof_v24a_mcbmStand_1/module_5_0", "cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v24b_mcbm_0/tof_v24b_mcbmStand_1/module_5_0", - "cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v24d_mcbm_0/tof_v24d_mcbmStand_1/module_5_0" + "cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v24d_mcbm_0/tof_v24d_mcbmStand_1/module_5_0", + "cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v24f_mcbm_0/tof_v24f_mcbmStand_1/module_5_0" }; std::vector<std::pair<std::string, std::string>> mcbm_dets_overlaps = { -- GitLab