PyCore tests: configure path in CMake, not in Py

Tests/Functional/Python/PyCore/CMakeLists.txt

@@ -5,18 +5,17 @@
 set(OUTPUT_DIR ${TEST_OUTPUT_DIR_PY_CORE})
 file(MAKE_DIRECTORY ${OUTPUT_DIR})
 
-file(GLOB sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.py")
+file(GLOB tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.py")
+list(REMOVE_ITEM tests utils.py)
 if(NOT BORNAGAIN_TIFF_SUPPORT)
-    list(REMOVE_ITEM sources "intensitydata_io_tiff.py")
+    list(REMOVE_ITEM tests "intensitydata_io_tiff.py")
 endif()
 
-foreach(_src ${sources})
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_src} ${OUTPUT_DIR}/${_src} @ONLY)
-endforeach()
-
-set(tests ${sources})
-list(REMOVE_ITEM tests utils.py)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/utils.py ${OUTPUT_DIR}/utils.py)
 
 foreach(_test ${tests})
-    add_test(PyCore.${_test} ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
+    add_test(PyCore.${_test}
+        env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Functional/Python/PyCore/histogram2d.py

 import numpy, os, sys, unittest
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 
 

Tests/Functional/Python/PyCore/intensitydata.py

 # Functional test: tests of IntensityData object
 
 import numpy, os, sys, unittest
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 
 

Tests/Functional/Python/PyCore/intensitydata_io.py

 # Functional test: tests of IO operations with the IntensityData object
 
 import math, numpy, os, sys, time, unittest
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 from bornagain import deg, deg2rad, rad2deg
 

Tests/Functional/Python/PyCore/intensitydata_io_tiff.py

 # Functional test: tests of IO operations with the IntensityData object
 
 import math, numpy, os, sys, time, unittest
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 
 

Tests/Functional/Python/PyCore/parameterpool.py

 import numpy, os, sys, unittest
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 from bornagain import nm
 

Tests/Functional/Python/PyCore/samplebuilder.py

 import sys, unittest, ctypes
 import inspect
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 
 initial_width = 42

Tests/Functional/Python/PyCore/shape2d.py

 import numpy, os, sys, unittest
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 
 

Tests/Functional/Python/PyCore/utils.py

@@ -3,8 +3,6 @@ Collection of utils for testing
 """
 
 import gzip, numpy, sys, os
-
-sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 import bornagain as ba
 from bornagain import deg, angstrom
 
@@ -42,39 +40,7 @@ def get_reference_data(filename):
         os.path.join(REFERENCE_DIR, filename))
 
 
-def get_simulation_MiniGISAS(sample=None):
-    simulation = ba.GISASSimulation()
-    simulation.setDetectorParameters(25, -2.0*deg, 2.0*deg, 25, 0.0*deg,
-                                     2.0*deg)
-    simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
-    if sample:
-        simulation.setSample(sample)
-    return simulation
-
-
-def get_simulation_BasicGISAS(sample=None):
-    simulation = ba.GISASSimulation()
-    simulation.setDetectorParameters(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
-                                     2.0*deg)
-    simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
-    if sample:
-        simulation.setSample(sample)
-    return simulation
-
-
-def plot_int(intensity):
-    import matplotlib, pylab
-    data = intensity.getArray() + 1
-    # data = numpy.abs(intensity.getArray())
-    phi_min = rad2deg(intensity.axis(0).lowerBound())
-    phi_max = rad2deg(intensity.axis(0).upperBound())
-    alpha_min = rad2deg(intensity.axis(1).lowerBound())
-    alpha_max = rad2deg(intensity.axis(1).upperBound())
-    im = pylab.imshow(data,
-                      norm=matplotlib.colors.LogNorm(),
-                      extent=[phi_min, phi_max, alpha_min, alpha_max])
-    cb = pylab.colorbar(im)
-    cb.set_label(r'Intensity (arb. u.)', size=16)
-    pylab.xlabel(r'$\phi_f (^{\circ})$', fontsize=16)
-    pylab.ylabel(r'$\alpha_f (^{\circ})$', fontsize=16)
-    pylab.show()
+def get_simulation_MiniGISAS(sample):
+    detector = ba.SphericalDetector(25, -2*deg, 2*deg, 25, 0*deg, 2*deg)
+    beam = ba.Beam(1., 1*angstrom, ba.Direction(0.2*deg, 0))
+    return ba.GISASSimulation(beam, sample, detector)