prepare auto_slicing for more tests

Tests/Py/Functional/auto_slicing.py

@@ -16,40 +16,42 @@ R = 10.0
 dz = 4.0  # shift beneath interface
 
 
+def get_sample(particle, sliced):
+    """
+    Returns a sample, with given particles attached to substrate or vacuum layer.
+    """
+
+    layout = ba.ParticleLayout()
+    layout.addParticle(particle)
+
+    sample = ba.MultiLayer()
+    sample.addLayer(ba.Layer(matVacuum))
+    if sliced:
+        decorated = ba.Layer(matSubstrate, 2)
+        decorated.addLayout(layout)
+        sample.addLayer(decorated)
+        sample.addLayer(ba.Layer(matSubstrate, 3))
+        sample.addLayer(ba.Layer(matSubstrate, 5))
+    else:
+        decorated = ba.Layer(matSubstrate, 10)
+        decorated.addLayout(layout)
+        sample.addLayer(decorated)
+    sample.addLayer(ba.Layer(matSubstrate))
+
+    return sample
+
+
 class SlicedSpheresTest(unittest.TestCase):
 
-    def get_sample(self, particle, sliced):
-        """
-        Returns a sample, with given particles attached to substrate or vacuum layer.
-        """
-
-        layout = ba.ParticleLayout()
-        layout.addParticle(particle)
-
-        sample = ba.MultiLayer()
-        sample.addLayer(ba.Layer(matVacuum))
-        if sliced:
-            decorated = ba.Layer(matSubstrate, 2)
-            decorated.addLayout(layout)
-            sample.addLayer(decorated)
-            sample.addLayer(ba.Layer(matSubstrate, 3))
-            sample.addLayer(ba.Layer(matSubstrate, 5))
-        else:
-            decorated = ba.Layer(matSubstrate, 10)
-            decorated.addLayout(layout)
-            sample.addLayer(decorated)
-        sample.addLayer(ba.Layer(matSubstrate))
-
-        return sample
-
-    def testSlicingPyramid(self):
-        ff = ba.Pyramid3(8., 10., 80*ba.deg)
+    def runPlainFF(self, ff):
         particle = ba.Particle(matSubstrate, ff)
-
-        diff = infrastruct.diff_MiniGISAS(self.get_sample(particle, False),
-                                          self.get_sample(particle, True))
+        diff = infrastruct.diff_MiniGISAS(get_sample(particle, False),
+                                          get_sample(particle, True))
         self.assertLess(diff, 1e-13)
 
+    def testSlicingPlainFF(self):
+        self.runPlainFF(ba.Pyramid3(8., 10., 80*ba.deg))
+
 
 if __name__ == '__main__':
     unittest.main()