From 15c065f0921a8b0dd067f026ecd360ef95719ab4 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Tue, 20 Apr 2021 17:41:15 +0200
Subject: [PATCH] Updates cmake tags to include geometry and parameter files
for tof_v20b.
The commit add the geometry and parameter files for tof_v20b from the
external parameter and geometry repositories.
The commit as well changes the tof version in the json config file to tof_v20b.
The geometry tof_v20b fixes an issue with tof_v20a and tof_v16e found on
18.04.21.
The number of channels per module and some module types were incorrect.
For consistency the existing geometry tof_v20a wasn't changed but a new fixed
one tof_v20b was created.
The macro used for the generation of the tof_v20 geometries was commited
with 0a48b9fc.
The complete disscusions about the new geometry are at
https://git.cbm.gsi.de/computing/cbmroot/-/merge_requests/314
https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry/-/merge_requests/83
---
external/InstallGeometry.cmake | 2 +-
external/InstallParameter.cmake | 2 +-
macro/run/config.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 96770e0479..dfd000a3a7 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 53574909ed0120471a9be47dfc8c0d669e0f021b)
+set(GEOMETRY_VERSION fec96a5edc68763373d81c5eb2b1ff9dcf3d4208)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 3856e065b9..3b6e65c4e2 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION b64e694ca04e76d80413c1091c69f03e2691baeb)
+set(PARAMETER_VERSION 2e47707c9ee054d7ab9dffcfe968be8f85c41f30)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/run/config.json b/macro/run/config.json
index 63d6d4dc23..373b69fe6d 100644
--- a/macro/run/config.json
+++ b/macro/run/config.json
@@ -68,7 +68,7 @@
"sts": "v19a",
"rich": "v17a_1e",
"trd": "v20b_1e",
- "tof": "v20a_1e",
+ "tof": "v20b_1e",
"psd": "v20a",
"platform": "v13a"
}
--
GitLab