Skip to content
Snippets Groups Projects
Commit 2287636c authored by Pierre-Alain Loizeau's avatar Pierre-Alain Loizeau Committed by Pierre-Alain Loizeau
Browse files

Bump geo and par hashes: mCBM geometries and setup for 2024 Ni beamtime

parent a657bfaa
No related branches found
No related tags found
1 merge request!1864Bump Geo and par hashes to bring mcbm ni2024 + some pending changes in geo repository
Hide whitespace changes
Inline Side-by-side
external/InstallGeometry.cmake
+ 1
− 1
View file @ 2287636c
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)
......
external/InstallParameter.cmake
+ 1
− 1
View file @ 2287636c
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")
......
macro/geometry/check_overlaps.C
+ 2
− 1
View file @ 2287636c
......@@ -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 = {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment