From 84728de66fff327c07217b8ac59bc4aa9a0301a0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 11 Nov 2021 21:20:40 +0100
Subject: [PATCH] nullptr
---
Device/Resolution/ConvolutionDetectorResolution.cpp | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/Device/Resolution/ConvolutionDetectorResolution.cpp b/Device/Resolution/ConvolutionDetectorResolution.cpp
index 2d98610ec3a..d992fd4ee06 100644
--- a/Device/Resolution/ConvolutionDetectorResolution.cpp
+++ b/Device/Resolution/ConvolutionDetectorResolution.cpp
@@ -22,7 +22,7 @@ ConvolutionDetectorResolution::ConvolutionDetectorResolution(cumulative_DF_1d re
ConvolutionDetectorResolution::ConvolutionDetectorResolution(
const IResolutionFunction2D& p_res_function_2d)
- : m_dimension(2), m_res_function_1d(0)
+ : m_dimension(2), m_res_function_1d(nullptr)
{
setResolutionFunction(p_res_function_2d);
}
@@ -77,9 +77,7 @@ void ConvolutionDetectorResolution::setResolutionFunction(const IResolutionFunct
void ConvolutionDetectorResolution::apply1dConvolution(OutputData<double>* p_intensity_map) const
{
- if (m_res_function_1d == 0)
- throw std::runtime_error("ConvolutionDetectorResolution::apply1dConvolution() -> Error! "
- "No 1d resolution function present for convolution of 1d data.");
+ ASSERT(m_res_function_1d == 0);
if (p_intensity_map->rank() != 1)
throw std::runtime_error(
"ConvolutionDetectorResolution::apply1dConvolution() -> Error! "
@@ -112,9 +110,7 @@ void ConvolutionDetectorResolution::apply1dConvolution(OutputData<double>* p_int
void ConvolutionDetectorResolution::apply2dConvolution(OutputData<double>* p_intensity_map) const
{
- if (m_res_function_2d == 0)
- throw std::runtime_error("ConvolutionDetectorResolution::apply2dConvolution() -> Error! "
- "No 2d resolution function present for convolution of 2d data.");
+ ASSERT(m_res_function_2d);
if (p_intensity_map->rank() != 2)
throw std::runtime_error(
"ConvolutionDetectorResolution::apply2dConvolution() -> Error! "
--
GitLab