Merge remote-tracking branch 'kif/2644_automatic_dynamic_mask' into 2644_automatic_dynamic_mask

Author: kif

src/pyFAI/test/test_azimuthal_integrator.py

@@ -400,8 +400,8 @@ def test_detector_dynamic_mask(self):
         ai1 = AzimuthalIntegrator.sload(config)
         img1 = det.mask.astype("uint16")*(65535-1)+1
         img1[300:400, 300:400] = 65535
-        result = ai1.integrate1d(img1, 100, unit="r_mm", 
-                                 method=("no", "histogram", "cython"), 
+        result = ai1.integrate1d(img1, 100, unit="r_mm",
+                                 method=("no", "histogram", "cython"),
                                  correctSolidAngle=False)
         self.assertTrue(numpy.allclose(result.intensity, numpy.ones_like(result.radial)))
 

src/pyFAI/test/test_geometry.py

@@ -562,7 +562,7 @@ def test_calcfrom12d(self):
         img0 = UtilsTest.get_rng().random(det.shape)
         prof_1d = ai.integrate1d_ng(img0, 200, unit="2th_deg")
         sig = 1e6*numpy.sinc(prof_1d.radial / 10) ** 2
-        img1 = ai.calcfrom1d(prof_1d.radial, sig, dim1_unit="2th_deg", 
+        img1 = ai.calcfrom1d(prof_1d.radial, sig, dim1_unit="2th_deg",
                             mask=det.mask, dummy=-1)
         new_prof_1d = ai.integrate1d_ng(img1, 200, unit="2th_deg")
         delta = abs((new_prof_1d.intensity - sig)).max()

src/pyFAI/test/test_integrate.py

@@ -76,7 +76,7 @@ def setUpClass(self):
         self.npt = 1000
         self.img = UtilsTest.getimage("Pilatus1M.edf")
         with fabio.open(self.img) as fimg:
-            self.data = fimg.data        
+            self.data = fimg.data
         self.ai = AzimuthalIntegrator(1.58323111834, 0.0334170169115, 0.0412277798782, 0.00648735642526, 0.00755810191106, 0.0, detector=Pilatus1M())
         self.ai.wavelength = 1e-10
         self.Rmax = 3
@@ -194,7 +194,7 @@ class DummyLessPilatus(Pilatus1M):
             DUMMY = None
             DELTA_DUMMY = None
 
-        cls.ai = AzimuthalIntegrator(1.58323111834, 0.0334170169115, 0.0412277798782, 0.00648735642526, 0.00755810191106, 0.0, 
+        cls.ai = AzimuthalIntegrator(1.58323111834, 0.0334170169115, 0.0412277798782, 0.00648735642526, 0.00755810191106, 0.0,
                                      detector=DummyLessPilatus())
         cls.ai.wavelength = 1e-10
         cls.Rmax = 30