diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake index 1263138c09eee8b06107bb200b0eff896a5343fc..3cc67eb4257c0af4527c002393e1c63db823693c 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 43b64db7531ab59554597bebb0014891fc95a76b..be988e22f421b5a0d7e9b78f9dac30f042d55d9f 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 fa99f838e147e324925554c15afac41e3677a548..141861d22c195d230b8c1bf9de1be11c7c5b5340 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;