test slicing more compact

Tests/Py/Functional/PyFuTestInfrastructure.py

@@ -5,9 +5,22 @@ Collection of utils for testing
 import bornagain as ba
 from bornagain import deg, angstrom
 
-# same as test::makeSimulation::MiniGISAS
+
 def get_simulation_MiniGISAS(sample):
     n = 25
     detector = ba.SphericalDetector(n, -2 * deg, 2 * deg, n, 0, 2 * deg)
     beam = ba.Beam(1., 1 * angstrom, ba.Direction(0.2 * deg, 0))
     return ba.ScatteringSimulation(beam, sample, detector)
+
+def diff_MiniGISAS(sample1, sample2):
+    """
+    Run standard GISAS simulation for two sample models, and return diff of results.
+    """
+    n = 11
+    detector = ba.SphericalDetector(n, 0, 5 * deg, n, 0, 4 * deg)
+    beam = ba.Beam(1., 1 * angstrom, ba.Direction(0.2 * deg, 0))
+
+    data1 = ba.ScatteringSimulation(beam, sample1, detector).simulate()
+    data2 = ba.ScatteringSimulation(beam, sample2, detector).simulate()
+
+    return ba.meanRelativeDifference(data1, data2)

Tests/Py/Functional/slicing.py

@@ -42,18 +42,12 @@ class SlicedSpheresTest(unittest.TestCase):
 
         return sample
 
-    def get_result(self, particle, sliced):
-        sample = self.get_sample(particle, sliced)
-        simulation = infrastruct.get_simulation_MiniGISAS(sample)
-        return simulation.simulate()
-
     def testSlicingPyramid(self):
         ff = ba.Pyramid3(8., 10., 80*ba.deg)
         particle = ba.Particle(matSubstrate, ff)
-        dataA = self.get_result(particle, False)
-        dataB = self.get_result(particle, True)
 
-        diff = ba.meanRelativeDifference(dataA, dataB)
+        diff = infrastruct.diff_MiniGISAS(self.get_sample(particle, False),
+                                          self.get_sample(particle, True))
         self.assertLess(diff, 1e-13)