ad-hoc repair for polmagcylinders2.py

Tests/Functional/PyCore/legacy/polmagcylinders2.py

@@ -5,7 +5,6 @@ import os
 import numpy
 import gzip
 from utils import get_difference
-from utils import get_reference_data
 
 from libBornAgainCore import *
 
@@ -51,6 +50,13 @@ def getSimulationIntensity(rho_beam, efficiency):
     return simulation.getIntensityData()
 
 
+# TODO: revert to some standard solution. For other tests, get_reference_data comes from utils.py.
+def get_reference_data(filename):
+    """
+    read and return reference data from file
+    """
+    return IntensityDataIOFactory.readIntensityData("@REFERENCE_DIR@/Special/"+filename)
+
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
@@ -63,10 +69,14 @@ def run_test():
     # IntensityDataIOFactory.writeIntensityData(getSimulationIntensity(zmin, 1.0), 'polmagcylinders2_reference_10.int')
     # IntensityDataIOFactory.writeIntensityData(getSimulationIntensity(zmin, -1.0), 'polmagcylinders2_reference_11.int')
     diff = 0.0
-    diff += get_difference(getSimulationIntensity(zplus, 1.0).getArray(), get_reference_data('polmagcylinders2_reference_00.int.gz').getArray())
-    diff += get_difference(getSimulationIntensity(zplus, -1.0).getArray(), get_reference_data('polmagcylinders2_reference_01.int.gz').getArray())
-    diff += get_difference(getSimulationIntensity(zmin, 1.0).getArray(), get_reference_data('polmagcylinders2_reference_10.int.gz').getArray())
-    diff += get_difference(getSimulationIntensity(zmin, -1.0).getArray(), get_reference_data('polmagcylinders2_reference_11.int.gz').getArray())
+    diff += get_difference(getSimulationIntensity(zplus, 1.0).getArray(),
+                           get_reference_data('polmagcylinders2_reference_00.int.gz').getArray())
+    diff += get_difference(getSimulationIntensity(zplus, -1.0).getArray(),
+                           get_reference_data('polmagcylinders2_reference_01.int.gz').getArray())
+    diff += get_difference(getSimulationIntensity(zmin, 1.0).getArray(),
+                           get_reference_data('polmagcylinders2_reference_10.int.gz').getArray())
+    diff += get_difference(getSimulationIntensity(zmin, -1.0).getArray(),
+                           get_reference_data('polmagcylinders2_reference_11.int.gz').getArray())
 
     diff /= 4.0
     status = "OK"

Tests/Functional/PyCore/legacy/utils.py

@@ -36,8 +36,7 @@ def get_reference_data(filename):
     """
     read and return reference data from file
     """
-    return IntensityDataIOFactory.readIntensityData(
-        "@REFERENCE_DIR@/legacy/"+filename)
+    return IntensityDataIOFactory.readIntensityData("@REFERENCE_DIR@/legacy/"+filename)
 
 
 def get_simulation_MiniGISAS(sample = None):