From 1e3c88809a3096247616b8179545f9c1b1bbb1ea Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 15 Aug 2023 08:17:03 +0200
Subject: [PATCH] SimDataPair: ASSERT -> throw
---
Sim/Fitting/SimDataPair.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/Sim/Fitting/SimDataPair.cpp b/Sim/Fitting/SimDataPair.cpp
index fda76323f78..51465004a0f 100644
--- a/Sim/Fitting/SimDataPair.cpp
+++ b/Sim/Fitting/SimDataPair.cpp
@@ -140,21 +140,25 @@ bool SimDataPair::containsUncertainties() const
Datafield SimDataPair::simulationResult() const
{
- ASSERT(m_sim_data);
+ if (!m_sim_data)
+ throw std::runtime_error("SimDataPair::simulationResult() called before sim_data were set");
ASSERT(!m_sim_data->empty());
return *m_sim_data;
}
Datafield SimDataPair::experimentalData() const
{
- ASSERT(m_exp_data);
+ if (!m_exp_data)
+ throw std::runtime_error("SimDataPair::experimentalData() called before exp_data were set");
ASSERT(!m_exp_data->empty());
return *m_exp_data;
}
Datafield SimDataPair::uncertainties() const
{
- ASSERT(m_uncertainties);
+ if (!m_uncertainties)
+ throw std::runtime_error(
+ "SimDataPair::uncertainties() called before uncertainties were set");
ASSERT(!m_uncertainties->empty());
return *m_uncertainties;
}
@@ -162,7 +166,8 @@ Datafield SimDataPair::uncertainties() const
//! Returns the user uncertainties cut to the ROI area.
Datafield SimDataPair::userWeights() const
{
- ASSERT(m_user_weights);
+ if (!m_user_weights)
+ throw std::runtime_error("SimDataPair::userWeights() called before user_weights were set");
ASSERT(!m_user_weights->empty());
return *m_user_weights;
}
--
GitLab