ZLimits preferred API: zBottom, zTop

Sample/Scattering/IFormFactor.cpp

@@ -24,34 +24,28 @@
 #include <utility>
 
 namespace {
+
 bool shapeIsContainedInLimits(const IFormFactor& formfactor, ZLimits limits, const IRotation& rot,
                               kvector_t translation)
 {
     double zbottom = formfactor.bottomZ(rot) + translation.z();
     double ztop = formfactor.topZ(rot) + translation.z();
-    OneSidedLimit lower_limit = limits.lowerZLimit();
-    OneSidedLimit upper_limit = limits.upperZLimit();
-    if (!upper_limit.m_limitless && ztop > upper_limit.m_limit_z)
-        return false;
-    if (!lower_limit.m_limitless && zbottom < lower_limit.m_limit_z)
-        return false;
-    return true;
+
+    return limits.zBottom() <= zbottom && ztop <= limits.zTop();
 }
+
 bool shapeOutsideLimits(const IFormFactor& formfactor, ZLimits limits, const IRotation& rot,
                         kvector_t translation)
 {
     double zbottom = formfactor.bottomZ(rot) + translation.z();
     double ztop = formfactor.topZ(rot) + translation.z();
-    OneSidedLimit lower_limit = limits.lowerZLimit();
-    OneSidedLimit upper_limit = limits.upperZLimit();
-    if (!upper_limit.m_limitless && zbottom >= upper_limit.m_limit_z)
-        return true;
-    if (!lower_limit.m_limitless && ztop <= lower_limit.m_limit_z)
-        return true;
-    return false;
+
+    return ztop <= limits.zBottom() || zbottom >= limits.zTop();
 }
+
 } // namespace
 
+
 IFormFactor::IFormFactor(const NodeMeta& meta, const std::vector<double>& PValues)
     : ISampleNode(meta, PValues), m_nodeMeta(meta)
 {

Sample/Scattering/ZLimits.h

@@ -51,6 +51,9 @@ public:
 
     bool isFinite() const;
 
+    double zBottom() const { return m_zmin; }
+    double zTop() const { return m_zmax; }
+
     OneSidedLimit lowerZLimit() const;
     OneSidedLimit upperZLimit() const;