From 6bcec48c53a2200ff9caa02535ee05f73142494f Mon Sep 17 00:00:00 2001
From: woutdenolf <woutdenolf@users.sf.net>
Date: Fri, 21 Oct 2022 14:22:25 +0200
Subject: [PATCH 1/2] ewoksdata API change

---
 setup.cfg                        | 4 ++--
 src/ewoksxrpd/tasks/integrate.py | 4 ++--
 src/ewoksxrpd/tests/conftest.py  | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2e11639..8ee3af2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,8 +28,8 @@ install_requires =
     numpy
     scipy
     silx >=1.1.0rc0
-    pyfai @ git+https://github.com/silx-kit/pyFAI.git
-    ewoksdata @ git+https://gitlab.esrf.fr/workflow/ewoksapps/ewoksdata.git
+    pyfai
+    ewoksdata >=0.0.3a0
     pyopencl
     ewoks[orange]
 namespace_packages =
diff --git a/src/ewoksxrpd/tasks/integrate.py b/src/ewoksxrpd/tasks/integrate.py
index a25f978..a3d1a89 100644
--- a/src/ewoksxrpd/tasks/integrate.py
+++ b/src/ewoksxrpd/tasks/integrate.py
@@ -181,8 +181,8 @@ class IntegrateBlissScan(
                 for index, ptdata in bliss.iter_bliss_data(
                     self.inputs.filename,
                     self.inputs.scan,
-                    detector_name,
-                    counter_names,
+                    lima_names=[detector_name],
+                    counter_names=counter_names,
                     retry_timeout=retry_timeout,
                     retry_period=retry_period,
                     subscan=subscan,
diff --git a/src/ewoksxrpd/tests/conftest.py b/src/ewoksxrpd/tests/conftest.py
index 64b6720..9780a4a 100644
--- a/src/ewoksxrpd/tests/conftest.py
+++ b/src/ewoksxrpd/tests/conftest.py
@@ -169,8 +169,6 @@ def bliss_lab6_scan(tmpdir_factory, imageSetup1Calibrant1):
     npoints_per_file = 3
     npoints = 31
     scannr = 2
-    subscannr = 1
-    detector = "p3"
     image = imageSetup1Calibrant1.image
     return save_bliss_scan(
         tmpdir,
@@ -178,7 +176,8 @@ def bliss_lab6_scan(tmpdir_factory, imageSetup1Calibrant1):
         npoints_per_file,
         npoints,
         scannr,
-        subscannr,
-        detector,
+        subscannr=1,
+        lima_names=("p3",),
+        counter_names=("diode1", "diode2"),
         sequence="multiply",
     )
-- 
GitLab


From 353395b8e7251c58de1e64174c925f72400d13ef Mon Sep 17 00:00:00 2001
From: woutdenolf <woutdenolf@users.sf.net>
Date: Fri, 21 Oct 2022 16:06:37 +0200
Subject: [PATCH 2/2] flaky test

---
 src/ewoksxrpd/tests/test_batch_integrate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ewoksxrpd/tests/test_batch_integrate.py b/src/ewoksxrpd/tests/test_batch_integrate.py
index ff3e417..ded7ec0 100644
--- a/src/ewoksxrpd/tests/test_batch_integrate.py
+++ b/src/ewoksxrpd/tests/test_batch_integrate.py
@@ -69,7 +69,7 @@ def assert_batch_integrate(
         assert root["2.1/p3_integrated/integrated"].attrs["axes"].tolist() == axes
         spectrum0 = data[0]
         for spectrum in data:
-            numpy.testing.assert_allclose(spectrum, spectrum0, atol=1e-5)
+            numpy.testing.assert_allclose(spectrum, spectrum0, atol=1)
 
         # Check links to raw data
         root["2.1/measurement/monitor"][()]
-- 
GitLab