diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake index 49f0a411dfecc5ad75427121e61ab4e94990eec6..7f3bddf699e1f8e808ee1a845508c55c6d7999b0 100644 --- a/external/InstallGeometry.cmake +++ b/external/InstallGeometry.cmake @@ -1,4 +1,4 @@ -set(GEOMETRY_VERSION 77882bafc2e89f8b1355b72a0de3345f8d3e1e04) +set(GEOMETRY_VERSION 702533fb5d67d58242f26768eb52a6175113a337) set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git") download_project_if_needed(PROJECT Geometry_source diff --git a/macro/geometry/check_overlaps.C b/macro/geometry/check_overlaps.C index eeabc758c83924bf43e96d29a6f294f0f2f20055..264c5ed19d4e3b19deaac62f09825d758235eb76 100644 --- a/macro/geometry/check_overlaps.C +++ b/macro/geometry/check_overlaps.C @@ -196,9 +196,9 @@ std::vector<std::pair<std::string, std::string>> cbm_dets_overlaps = { {"cave/magnet_container_0 overlapping cave/rich_v17a_3e_0/rich_container_288", "between rich v17a_3e and magnet"}, {"cave/magnet_container_0 overlapping cave/rich_v17a_1e_0/rich_container_290", "between rich v17a_1e and magnet"}, {"cave/magnet_container_0 overlapping cave/rich_v21a_0/rich_container_1", "between rich v21a & magnet v21a, DEC21"}, - {"cave/pipe_v21i_0/conical_beam_pipe_1/conus_volume_1 overlapping cave/rich_v23a_0/rich_v23a_1/rich_cont_1", + {"cave/pipe_v24i_0/conical_beam_pipe_1/conus_volume_1 overlapping cave/rich_v23a_0/rich_v23a_1/rich_cont_1", "between rich v23_a and cone, known beampipe fix pending"}, - {"cave/pipe_v21i_0/vacuum_conical_beam_pipe_1/vacuum_conus_volume_1 overlapping cave/rich_v23a_0/rich_v23a_1/rich_cont_1", + {"cave/pipe_v24i_0/vacuum_conical_beam_pipe_1/vacuum_conus_volume_1 overlapping cave/rich_v23a_0/rich_v23a_1/rich_cont_1", "between rich v23_a and cone, known beamtime fix pending"} };