From c8c95f4768d4909e0eace99e13298a6e1b815868 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Tue, 25 Jul 2023 14:16:14 +0200
Subject: [PATCH] Bump geometry and parameter repo hashes for setups fix and
TRD-day1 geometry
- Introduce the TRD-day1 geometry + related parameters
- Remove rejected and broken SIS18 setups
- Fix mCBM 2019 03 setup
- Remove corresponding temporary filters in macro/geometry CI (Refs #2926)
---
external/InstallGeometry.cmake | 2 +-
external/InstallParameter.cmake | 2 +-
macro/geometry/CMakeLists.txt | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index e7f579648d..1263138c09 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 660b319c938208fd7d65c7fb5b1da8ef5cb954c8)
+set(GEOMETRY_VERSION 094a4d3da7ec28cf9c6cbee77c2353c4272a141c)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 497d8dc97d..fc5ed96a4f 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 32c218ce98201a79ce3492107194b758f6e8ee65)
+set(PARAMETER_VERSION 7c7a7c3df40a0ca69d576986249b2976e58d5168)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/geometry/CMakeLists.txt b/macro/geometry/CMakeLists.txt
index 2ea4f734d5..c9ac2f44e9 100644
--- a/macro/geometry/CMakeLists.txt
+++ b/macro/geometry/CMakeLists.txt
@@ -30,10 +30,6 @@ file(GLOB setup_files
${CBMROOT_SOURCE_DIR}/geometry/setup/setup_*.C
)
-list(FILTER setup_files EXCLUDE REGEX sis18)
-list(FILTER setup_files EXCLUDE REGEX sis19)
-list(FILTER setup_files EXCLUDE REGEX mcbm_beam_2019_03)
-
foreach(setup IN LISTS setup_files)
string(REPLACE ${CBMROOT_SOURCE_DIR}/geometry/setup/setup_ "" setup ${setup})
string(REPLACE .C "" setup ${setup})
--
GitLab