From 86015c02b7f0fe277535e5dc10ee350866442781 Mon Sep 17 00:00:00 2001
From: FaserMC <fasermc@cern.ch>
Date: Sun, 24 Dec 2023 22:20:21 +0100
Subject: [PATCH] Fix TB geometry
---
.../src/WaveformDigitisationTool.cxx | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/Waveform/WaveDigiTools/src/WaveformDigitisationTool.cxx b/Waveform/WaveDigiTools/src/WaveformDigitisationTool.cxx
index 9e9500d07..41a662575 100644
--- a/Waveform/WaveDigiTools/src/WaveformDigitisationTool.cxx
+++ b/Waveform/WaveDigiTools/src/WaveformDigitisationTool.cxx
@@ -32,11 +32,18 @@ WaveformDigitisationTool::initialize() {
ATH_CHECK(detStore()->retrieve(m_ecalID, "EcalID"));
// Setup detector managers
- ATH_CHECK(detStore()->retrieve(m_vetoDetMan, "Veto"));
- ATH_CHECK(detStore()->retrieve(m_vetoNuDetMan, "VetoNu"));
- ATH_CHECK(detStore()->retrieve(m_triggerDetMan, "Trigger"));
- ATH_CHECK(detStore()->retrieve(m_preshowerDetMan, "Preshower"));
- ATH_CHECK(detStore()->retrieve(m_caloDetMan, "Ecal"));
+ // These don't necessarily all exist depending on the geometry
+ // so don't use ATH_CHECK
+ if (StatusCode::SUCCESS != detStore()->retrieve(m_vetoDetMan, "Veto"))
+ ATH_MSG_WARNING("Couldn't load Veto detector manager!");
+ if (StatusCode::SUCCESS != detStore()->retrieve(m_vetoNuDetMan, "VetoNu"))
+ ATH_MSG_WARNING("Couldn't load VetoNu detector manager!");
+ if (StatusCode::SUCCESS != detStore()->retrieve(m_triggerDetMan, "Trigger"))
+ ATH_MSG_WARNING("Couldn't load Trigger detector manager!");
+ if (StatusCode::SUCCESS != detStore()->retrieve(m_preshowerDetMan, "Preshower"))
+ ATH_MSG_WARNING("Couldn't load Preshower detector manager!");
+ if (StatusCode::SUCCESS != detStore()->retrieve(m_caloDetMan, "Ecal"))
+ ATH_MSG_WARNING("Couldn't load Calo detector manager!");
// Show our parameters (for debugging for now)
ATH_MSG_INFO(m_digitizerPeriod);
--
GitLab