Merge pull request #921 from rbeerwerth/develop

Provide error checking for invalid input (issue #2441/2442)

Core/Material/MaterialBySLDImpl.cpp

@@ -30,7 +30,9 @@ MaterialBySLDImpl::MaterialBySLDImpl(const std::string& name, double sld_real, d
                                      kvector_t magnetization)
     : MagneticMaterialImpl(name, magnetization)
     , m_sld_real(sld_real)
-    , m_sld_imag(sld_imag)
+    , m_sld_imag(sld_imag < 0. ?
+                 throw std::runtime_error("The imaginary part of the SLD must be greater or equal zero") :
+                 sld_imag)
 {}
 
 MaterialBySLDImpl* MaterialBySLDImpl::clone() const

Core/Material/RefractiveMaterialImpl.cpp

@@ -19,7 +19,9 @@ RefractiveMaterialImpl::RefractiveMaterialImpl(const std::string& name, double d
                                                  kvector_t magnetization)
     : MagneticMaterialImpl(name, magnetization)
     , m_delta(delta)
-    , m_beta(beta)
+    , m_beta(beta < 0. ?
+             throw std::runtime_error("The imaginary part of the refractive index must be greater or equal zero") :
+             beta)
 {}
 
 RefractiveMaterialImpl* RefractiveMaterialImpl::clone() const

Core/Multilayer/MultiLayer.cpp

@@ -76,6 +76,12 @@ void MultiLayer::addLayerWithTopRoughness(const Layer& layer, const LayerRoughne
             throw std::runtime_error(
                 "Invalid call to MultiLayer::addLayer(): the semi-infinite top layer "
                 "must have a pro forma thickness of 0");
+
+        if (roughness.getSigma() != 0.0)
+            throw std::runtime_error(
+                "Invalid call to MultiLayer::addLayer(): the semi-infinite top layer "
+                "cannot have roughness.");
+
     }
     addAndRegisterLayer(p_new_layer);
 }