diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake index 06c625c4aa5949eb41da08c8355b6d2ba19f974c..61f207d10c840769bc42b44596e0595d0285d706 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 c54e03a64391ad4aeec8db6b969dcbc5f588ffcb..1ae5d92f4e7e63d0ec862af6115b08f03fc19a0d 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 c836a83ec37dcf471b0d4bddd3516e500504d571..1b691fba005e36c80a0e738ebee3956973d9a1b5 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 = {