local namespace -> top of source file

Sample/Scattering/IFormFactor.cpp

@@ -22,12 +22,35 @@
 
 namespace
 {
-bool ShapeIsContainedInLimits(const IFormFactor& formfactor, ZLimits limits, const IRotation& rot,
-                              kvector_t translation);
-bool ShapeOutsideLimits(const IFormFactor& formfactor, ZLimits limits, const IRotation& rot,
-                        kvector_t translation);
+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.lowerLimit();
+    OneSidedLimit upper_limit = limits.upperLimit();
+    if (!upper_limit.m_limitless && ztop > upper_limit.m_value)
+        return false;
+    if (!lower_limit.m_limitless && zbottom < lower_limit.m_value)
+        return false;
+    return true;
+}
+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.lowerLimit();
+    OneSidedLimit upper_limit = limits.upperLimit();
+    if (!upper_limit.m_limitless && zbottom >= upper_limit.m_value)
+        return true;
+    if (!lower_limit.m_limitless && ztop <= lower_limit.m_value)
+        return true;
+    return false;
+}
 } // namespace
 
+
 IFormFactor::IFormFactor(const NodeMeta& meta, const std::vector<double>& PValues)
     : ISample(meta, PValues)
 {
@@ -36,9 +59,9 @@ IFormFactor::IFormFactor(const NodeMeta& meta, const std::vector<double>& PValue
 IFormFactor* IFormFactor::createSlicedFormFactor(ZLimits limits, const IRotation& rot,
                                                  kvector_t translation) const
 {
-    if (ShapeIsContainedInLimits(*this, limits, rot, translation))
+    if (shapeIsContainedInLimits(*this, limits, rot, translation))
         return createTransformedFormFactor(*this, rot, translation);
-    if (ShapeOutsideLimits(*this, limits, rot, translation))
+    if (shapeOutsideLimits(*this, limits, rot, translation))
         return nullptr;
     if (canSliceAnalytically(rot))
         return sliceFormFactor(limits, rot, translation);
@@ -89,33 +112,3 @@ IFormFactor* createTransformedFormFactor(const IFormFactor& formfactor, const IR
         std::swap(P_fftemp, P_result);
     return P_result.release();
 }
-
-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.lowerLimit();
-    OneSidedLimit upper_limit = limits.upperLimit();
-    if (!upper_limit.m_limitless && ztop > upper_limit.m_value)
-        return false;
-    if (!lower_limit.m_limitless && zbottom < lower_limit.m_value)
-        return false;
-    return true;
-}
-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.lowerLimit();
-    OneSidedLimit upper_limit = limits.upperLimit();
-    if (!upper_limit.m_limitless && zbottom >= upper_limit.m_value)
-        return true;
-    if (!lower_limit.m_limitless && ztop <= lower_limit.m_value)
-        return true;
-    return false;
-}
-} // namespace