From 2287636c5900941a66ac07a1c2ba13a6f0ed1095 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Thu, 20 Jun 2024 10:28:19 +0200
Subject: [PATCH] Bump geo and par hashes: mCBM geometries and setup for 2024
Ni beamtime
---
external/InstallGeometry.cmake | 2 +-
external/InstallParameter.cmake | 2 +-
macro/geometry/check_overlaps.C | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 06c625c4aa..61f207d10c 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION cfbcc4e939bb505f94afd6a64fe68909ec162c80)
+set(GEOMETRY_VERSION 978685b9e8fee29a7e69946bd6e32e933ff012ff)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
if (CBM_MCBM_PARS)
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index c54e03a643..1ae5d92f4e 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 375449ad7081880c3e4432aade69e202290e314c) # 2024-06-05
+set(PARAMETER_VERSION 5cc8f25e8e493f29947416af9b02e700b7653ae0) # 2024-06-20
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/geometry/check_overlaps.C b/macro/geometry/check_overlaps.C
index c836a83ec3..1b691fba00 100644
--- a/macro/geometry/check_overlaps.C
+++ b/macro/geometry/check_overlaps.C
@@ -160,7 +160,8 @@ std::vector<std::string> mcbm_pipevac_bmon_overlaps = {
"cave/pipe_v19f_0/vacu20_1 overlapping cave/tof_v21j_mcbm_0/tof_v21j_mcbmStand_1/module_5_0",
"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_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"
};
std::vector<std::pair<std::string, std::string>> mcbm_dets_overlaps = {
--
GitLab