in convolution context, throw -> assert

Device/Resolution/ConvolutionDetectorResolution.cpp

@@ -71,7 +71,7 @@ void ConvolutionDetectorResolution::setResolutionFunction(const IResolutionFunct
 
 void ConvolutionDetectorResolution::apply1dConvolution(Datafield* intensity_map) const
 {
-    ASSERT(m_res_function_1d == nullptr);
+    ASSERT(m_res_function_1d);
     ASSERT(intensity_map->rank() == 1);
 
     const Scale& axis = intensity_map->axis(0);
@@ -101,7 +101,7 @@ void ConvolutionDetectorResolution::apply1dConvolution(Datafield* intensity_map)
 void ConvolutionDetectorResolution::apply2dConvolution(Datafield* intensity_map) const
 {
     ASSERT(m_res_function_2d);
-    ASSERT(intensity_map->rank() != 2);
+    ASSERT(intensity_map->rank() == 2);
     const Scale& axis_1 = intensity_map->axis(0);
     const Scale& axis_2 = intensity_map->axis(1);
     size_t axis_size_1 = axis_1.size();