[pre-commit.ci lite] apply automatic fixes for ruff linting errors

Author: pre-commit-ci-lite[bot]

sasdata/data_util/averaging.py

@@ -575,7 +575,7 @@ def __init__(self, r_min: float, r_max: float,
     # Forward to WedgePhi using the tuple-based it expects.
 
         super().__init__(r_range=(self.r_min, self.r_max),phi_range=(self.phi_min, self.phi_max), center=center,nbins=self.nbins)
-        
+
         # Ensure legacy attribute names exist on the instance (defensive).
         self.r_min = float(r_min)
         self.r_max = float(r_max)

sasdata/data_util/manipulations.py

@@ -19,7 +19,6 @@
 
 # TODO: copy the meta data from the 2D object to the resulting 1D object
 import math
-from sasdata.quantities.constants import Pi, TwoPi
 from warnings import warn
 
 import numpy as np
@@ -53,9 +52,6 @@
 from sasdata.data_util.averaging import (
     Sectorcut as AvgSectorcut,
 )
-from sasdata.data_util.averaging import (
-    WedgePhi as AvgSectorPhi,
-)
 from sasdata.data_util.averaging import (
     SectorQ as AvgSectorQ,
 )
@@ -65,13 +61,17 @@
 from sasdata.data_util.averaging import (
     SlabY as AvgSlabY,
 )
+from sasdata.data_util.averaging import (
+    WedgePhi as AvgSectorPhi,
+)
 from sasdata.data_util.averaging import (
     WedgePhi as AvgWedgePhi,
 )
 from sasdata.data_util.averaging import (
     WedgeQ as AvgWedgeQ,
 )
 from sasdata.dataloader.data_info import Data2D
+from sasdata.quantities.constants import Pi, TwoPi
 
 warn("sasdata.data_util.manipulations is deprecated. Unless otherwise noted, update your import to "
      "sasdata.data_util.averaging.", DeprecationWarning, stacklevel=2)

sasdata/data_util/roi.py

@@ -49,7 +49,7 @@ def validate_and_assign_data(self, data2d: Data2D = None) -> None:
         # during data processing.
         self.data = data2d.data[valid_data]
         self.err_data = data2d.err_data[valid_data]
-        
+
         self.qx_data = data2d.qx_data[valid_data]-self.center_x
         self.qy_data = data2d.qy_data[valid_data]-self.center_y
         self.q_data = np.sqrt(self.qx_data * self.qx_data + self.qy_data * self.qy_data)

test/sasmanipulations/helper.py

@@ -3,8 +3,9 @@
 """
 import numpy as np
 from scipy import integrate
-from sasdata.quantities.constants import TwoPi
+
 from sasdata.dataloader import data_info
+from sasdata.quantities.constants import TwoPi
 
 
 def make_dd_from_func(func, matrix_size=201):

test/sasmanipulations/utest_averaging.py

@@ -1,9 +1,8 @@
-import math
 import os
 import unittest
 
 import numpy as np
-from sasdata.quantities.constants import Pi, TwoPi
+
 import sasdata.dataloader.data_info as data_info
 from sasdata.data_util.manipulations import (
     Boxavg,
@@ -18,6 +17,7 @@
     reader2D_converter,
 )
 from sasdata.dataloader.loader import Loader
+from sasdata.quantities.constants import Pi, TwoPi
 
 
 def find(filename):

test/sasmanipulations/utest_averaging_circle.py

@@ -5,8 +5,9 @@
 
 import numpy as np
 from scipy import integrate
-from sasdata.quantities.constants import Pi, TwoPi
+
 from sasdata.data_util.averaging import CircularAverage, Ring, SectorQ, WedgePhi, WedgeQ
+from sasdata.quantities.constants import Pi
 from test.sasmanipulations.helper import CircularTestingMatrix, MatrixToData2D
 
 # TODO - also check the errors are being calculated correctly