Merge remote-tracking branch 'edgar/mg_fiber' into mg_fiber

silx-kit · Dec 6, 2024 · 6666d07 · 6666d07
2 parents a0bddbc + 9301810
commit 6666d07
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/pyFAI/multi_geometry.py b/src/pyFAI/multi_geometry.py
@@ -399,7 +399,7 @@ def __init__(self, fis, unit=("qip_nm^-1", "qoop_nm^-1"),
                                                    tilt_angle=self.ip_unit.tilt_angle,
                                                    sample_orientation=self.ip_unit.sample_orientation,
                                                    )
-            
+
         self.unit = (self.ip_unit, self.oop_unit)
         self.ip_range = ip_range
         self.oop_range = oop_range
@@ -431,9 +431,9 @@ def _guess_outofplane_range(self):
         logger.info(f"Calculating the out-of-plane range of MultiGeometry...")
         oop = numpy.array([fi.array_from_unit(unit=self.oop_unit) for fi in self.fis])
         return (oop.min(), oop.max())
-    
+
     def integrate_fiber(self, lst_data,
-                          npt_ip=1000, npt_oop=1000, 
+                          npt_ip=1000, npt_oop=1000,
                           correctSolidAngle=True,
                           vertical_integration = True,
                           lst_mask=None, dummy=None, delta_dummy=None,
@@ -495,7 +495,7 @@ def integrate_fiber(self, lst_data,
         elif isinstance(lst_flat, numpy.ndarray):
             lst_flat = [lst_flat] * len(self.fis)
 
-        method = IntegrationMethod.select_one_available(method, dim=1)            
+        method = IntegrationMethod.select_one_available(method, dim=1)
         signal = numpy.zeros(npt_oop, dtype=numpy.float64)
         normalization = numpy.zeros_like(signal)
         count = numpy.zeros_like(signal)
@@ -557,7 +557,7 @@ def _integrate(args):
     integrate1d = integrate1d_fiber
 
     def integrate2d_fiber(self, lst_data,
-                          npt_ip=1000, npt_oop=1000, 
+                          npt_ip=1000, npt_oop=1000,
                           correctSolidAngle=True,
                           lst_mask=None, dummy=None, delta_dummy=None,
                           lst_variance=None,
@@ -674,4 +674,4 @@ def _integrate(args):
         return result
 
     integrate2d_grazing_incidence = integrate2d_fiber
-    integrate2d = integrate2d_fiber
+    integrate2d = integrate2d_fiber