From 5490a831cb5c3c908f701a3680a57a09a3b8dc3f Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Wed, 29 Jan 2025 14:41:30 +0100
Subject: [PATCH 1/3] Bring in pipe_v24 geometries
Improved macro for generation for arbitary angles. Reduction of material
budget. pipe_v24[e,f,h,i] geometries are provided.
---
external/InstallGeometry.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 581025be7..5770b1280 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 6ce5fd03c7d8cde2fa83ae72bff4d51916508c85)
+set(GEOMETRY_VERSION ab18ec5719595755fcb04a354d79e0b093f8221e)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
download_project_if_needed(PROJECT Geometry_source
--
GitLab
From 3d77cb68f9da0ffe35a1fe2ef9a2b0c3c520637c Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Wed, 29 Jan 2025 17:25:56 +0100
Subject: [PATCH 2/3] provide fsd_v25
Update geometry and parameter hashes.
Compatiable geometries with new v24 beampipe due to shifts.
---
external/InstallGeometry.cmake | 2 +-
external/InstallParameter.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 5770b1280..49f0a411d 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION ab18ec5719595755fcb04a354d79e0b093f8221e)
+set(GEOMETRY_VERSION 77882bafc2e89f8b1355b72a0de3345f8d3e1e04)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
download_project_if_needed(PROJECT Geometry_source
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index cf8bece02..1bc6b2096 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 6c2a42c01b2f21b02d65755ca2cc41319aacce15) # 2025-01-29
+set(PARAMETER_VERSION 7dab1e63dd63d5f9344e0b7b8faf7b3a8ede245d)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
download_project_if_needed(PROJECT Parameter_source
--
GitLab
From 18f7d1fa76bd456f50fb4472f11484ed0c26b864 Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Wed, 29 Jan 2025 21:12:28 +0100
Subject: [PATCH 3/3] Make beampipe default
Realise recent bpipe and fsd in hadron, electron, jspi, lmvm, and cfv setups.
Switch known overlap with rich geometry to the new beampipe.
---
external/InstallGeometry.cmake | 2 +-
macro/geometry/check_overlaps.C | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 49f0a411d..7f3bddf69 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 eeabc758c..264c5ed19 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"}
};
--
GitLab