From c25124a07f85324e4d57c66a9a252a05e30b8dba Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Wed, 26 Apr 2023 18:39:33 +0200
Subject: [PATCH] Remove RICH fake vol
Strange zero size volume were found to cause segfault for MacOS systems. Documented in https://redmine.cbm.gsi.de/issues/2759
and MR https://git.cbm.gsi.de/computing/cbmroot/-/merge_requests/1126. Updates hash with geometry binary.
---
external/InstallGeometry.cmake | 3 ++-
sim/detectors/rich/geo/RichGeoCreator.cxx | 12 ++----------
sim/detectors/rich/geo/RichGeoCreator.h | 2 +-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 1263138c09..3cc67eb425 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,5 @@
-set(GEOMETRY_VERSION 094a4d3da7ec28cf9c6cbee77c2353c4272a141c)
+
+set(GEOMETRY_VERSION d79a333771897924445d1102f68985af4c9d51da)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
diff --git a/sim/detectors/rich/geo/RichGeoCreator.cxx b/sim/detectors/rich/geo/RichGeoCreator.cxx
index 43b64db753..be988e22f4 100644
--- a/sim/detectors/rich/geo/RichGeoCreator.cxx
+++ b/sim/detectors/rich/geo/RichGeoCreator.cxx
@@ -1,6 +1,6 @@
-/* Copyright (C) 2022-2022 UGiessen/GSI, Giessen/Darmstadt
+/* Copyright (C) 2022-2023 UGiessen/GSI, Giessen/Darmstadt
SPDX-License-Identifier: GPL-3.0-only
- Authors: Semen Lebedev [committer] */
+ Authors: Semen Lebedev [committer], Eoin Clerkin*/
#include "RichGeoCreator.h"
@@ -260,14 +260,6 @@ TGeoVolumeAssembly* RichGeoCreator::CreateMirror()
TGeoVolumeAssembly* mHalf = new TGeoVolumeAssembly("mirror_half");
- //TODO: This is a very strange bug, the first volume which is added to mirror_half is not properly read in simulation
- // Workaround: create fake volume wth material RichGlass and add it first.
- // The volume is placed outside of acceptance and has basically 0 volume
- // You can visualize box, just change dimensions to smth like TGeoBBox(20., 20., 20.)
- TGeoBBox* fakeBox = new TGeoBBox("fake_box", 0.0, 0.0, 0.0);
- TGeoVolume* fakeVol = new TGeoVolume("fake_vol", fakeBox, medGlass);
- mHalf->AddNode(fakeVol, 1, MakeTrans(280., 0., 70.));
-
for (int t = 0; t < 4; t++) {
TGeoVolume* mVol = nullptr;
if (t == 1) mVol = mVolType1;
diff --git a/sim/detectors/rich/geo/RichGeoCreator.h b/sim/detectors/rich/geo/RichGeoCreator.h
index fa99f838e1..141861d22c 100644
--- a/sim/detectors/rich/geo/RichGeoCreator.h
+++ b/sim/detectors/rich/geo/RichGeoCreator.h
@@ -35,7 +35,7 @@ public:
private:
RichGeoMaterials fMaterials;
- std::string fGeoName = "rich";
+ std::string fGeoName = "rich_v23a";
bool fAddShieldingBox = true;
bool fSetVolumeColors = false;
--
GitLab