From 8ec28961859dcc77a4f9a27c6307271e8cca1dfc Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Tue, 25 Mar 2025 19:07:34 +0100
Subject: [PATCH] Bring in rich_v25a
make defualt for electron setup. Creation macro is moved to geometry repo. Overlap exception added.
Move rich creation macro
To be consistant with other macros, moved to geo repo.x
Rebase to master and simon
Update Geometry hash
after merging rich_v25a
Update geometry hash
Disable codeowners
Revert "Disable codeowners"
This reverts commit 2d9d0603e5ba8d29aee10d2a04b872530cbf3ed4.
---
external/InstallGeometry.cmake | 2 +-
macro/geometry/check_overlaps.C | 1 +
macro/rich/create_rich_geo.C | 17 -----------------
3 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 macro/rich/create_rich_geo.C
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 35d371a1d8..cd4803ed6c 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 2e1b1fa34d0a404938ee37aee94297f6db5ef1a4)
+set(GEOMETRY_VERSION 26dd3073599c5bce731fbb566acec5d691deac4e)
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 637457d7c5..b5f546cd7e 100644
--- a/macro/geometry/check_overlaps.C
+++ b/macro/geometry/check_overlaps.C
@@ -210,6 +210,7 @@ std::vector<std::pair<std::string, std::string>> cbm_dets_overlaps_sampling = {
{"belt_assembly_1: node belt_part3_156 overlapping belt_part4_157", "between parts of belt in RICH (s300e)"},
{"belt: node belt2_1 overlapping belt4_1", "between parts of belt in RICH v23"},
{"shielding_box: node shielding_box_1 overlapping shieling_wing_1", "between shielding box parts (RICH internal)"},
+ {"shielding_box: node shielding_box_part_1 overlapping shieling_wing_1", "shield box parts rich_v25a"},
{"MVDscripted: node station_S0_1/heatsink_S0_1/heatsinkpart_2_2 overlapping top_bottom_plate_2",
"between heatsink and bottom plate (internal to MVD)"},
{"TwoStation: node station_S0_1/heatsink_S0_1/heatsinkpart_2_2 overlapping top_bottom_plate_2",
diff --git a/macro/rich/create_rich_geo.C b/macro/rich/create_rich_geo.C
deleted file mode 100644
index 5f1e47b6e1..0000000000
--- a/macro/rich/create_rich_geo.C
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 2022-2025 UGiessen/GSI, Giessen/Darmstadt
- SPDX-License-Identifier: GPL-3.0-only
- Authors: Semen Lebedev [committer], Simon Neuhaus */
-
-void create_rich_geo()
-{
- RichGeoCreator* geoCreator = new RichGeoCreator();
- //geoCreator->SetGeoName("rich_v25a");
- geoCreator->SetVolumeColors(false);
- geoCreator->Create();
-
- // Add (dummy) translation to geo file
- TFile* geoFile = new TFile((geoCreator->GetGeoName() + ".geo.root?reproducible").c_str(), "UPDATE");
- TGeoTranslation* translation = new TGeoTranslation("rich_trans", 0., 0., 0.);
- translation->Write();
- geoFile->Close();
-}
--
GitLab