nullptr

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! "