scnc
/
pyFAI
mirror of https://github.com/silx-kit/pyFAI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistency between integrators

This commit is contained in:
Jerome Kieffer 2019-05-06 18:43:02 +02:00
parent 7540b6a131
commit 4bf1618a41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyFAI/azimuthalIntegrator.py
View File

@ -1639,7 +1639,7 @@ class AzimuthalIntegrator(Geometry):
result = Integrate1dResult(intpl.position,
intpl.intensity,
intpl.error)
result._set_compute_engine(integr.__class__.__name__)
result._set_compute_engine(integr.__module__ + "." + integr.__class__.__name__)
result._set_unit(integr.unit)
result._set_sum_signal(intpl.signal)
result._set_sum_normalization(intpl.normalization)

2
pyFAI/test/test_azimuthal_integrator.py
View File

@ -552,7 +552,7 @@ class TestIntergrationNextGeneration(unittest.TestCase):
reason = "Skipping TestIntergrationNextGeneration.test_histo as OpenCL method not available"
self.skipTest(reason)
opencl = ai._integrate1d_ng(data, 100, method=method, error_model="poisson")
self.assertEqual(opencl.compute_engine, "OCL_Histogram1d")
self.assertEqual(opencl.compute_engine, "pyFAI.opencl.azim_hist.OCL_Histogram1d")
self.assertEqual(str(opencl.unit), "q_nm^-1")
self.assertTrue(numpy.allclose(opencl.radial, python.radial), "opencl position are the same")