backscattermeter_analyzer 3.0.2__tar.gz → 3.0.4__tar.gz

{backscattermeter_analyzer-3.0.2 → backscattermeter_analyzer-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: backscattermeter_analyzer
-Version: 3.0.2
+Version: 3.0.4
 Summary: Tool to work on the backscattermeter at LAPP
 Project-URL: Documentation, https://git.linarphy.net/linarphy/backscattermeter_analyzer/wiki
 Project-URL: Homepage, https://git.linarphy.net/linarphy/backscattermeter_analyzer

{backscattermeter_analyzer-3.0.2 → backscattermeter_analyzer-3.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "backscattermeter_analyzer"
-version = "3.0.2"
+version = "3.0.4"
 description = "Tool to work on the backscattermeter at LAPP"
 authors = [{ name = "linarphy", email = "linarphy@linarphy.net" }]
 readme = "README.md"

{backscattermeter_analyzer-3.0.2 → backscattermeter_analyzer-3.0.4}/src/backscattermeter_analyzer/experiment/analysis/visibility/model.py

@@ -1,7 +1,15 @@
 """Fringes class."""
 
 from astropy.modeling import Fittable1DModel, Parameter
-from astropy.units import Hz, IrreducibleUnit, Quantity, Unit, s
+from astropy.units import (
+    CompositeUnit,
+    Hz,
+    IrreducibleUnit,
+    Quantity,
+    Unit,
+    dimensionless_unscaled,
+    s,
+)
 from numpy import pi, sin
 
 
@@ -9,16 +17,22 @@ class Fringes(Fittable1DModel):
     """Fit of A(t) when frequency is scanned. Keeps units."""
 
     offset = Parameter(
-        description="Offset of A(t)", unit=None, bounds=(None, None)
+        description="Offset of A(t)",
+        unit=dimensionless_unscaled,
+        bounds=(None, None),
     )
     amplitude = Parameter(
-        description="Fringes amplitude", unit=None, bounds=(0, None)
+        description="Fringes amplitude",
+        unit=dimensionless_unscaled,
+        bounds=(0, None),
     )
     frequency = Parameter(
         description="Fringes frequency", unit=Hz, bounds=(0, None)
     )
     phase = Parameter(
-        description="Fringes phase", unit=None, bounds=(-pi, pi)
+        description="Fringes phase",
+        unit=dimensionless_unscaled,
+        bounds=(-pi, pi),
     )
 
     @staticmethod
@@ -48,7 +62,7 @@ class Fringes(Fittable1DModel):
         }
 
     @property
-    def return_units(self) -> dict[str, Unit | None]:
+    def return_units(self) -> dict[str, Unit | CompositeUnit]:
         """
         Check output units.
 
@@ -56,17 +70,17 @@ class Fringes(Fittable1DModel):
         """
 
         return {
-            self.outputs[0]: None,
+            self.outputs[0]: dimensionless_unscaled,
         }
 
     def _parameter_units_for_data_units(
         self,
         inputs_unit: dict[str, Unit | IrreducibleUnit],  # noqa: ARG002
-        outputs_unit: dict[str, Unit | None],  # noqa: ARG002
-    ) -> dict[str, Unit | IrreducibleUnit | None]:
+        outputs_unit: dict[str, Unit | CompositeUnit],  # noqa: ARG002
+    ) -> dict[str, Unit | IrreducibleUnit | CompositeUnit]:
         return {
-            "offset": None,
-            "amplitude": None,
+            "offset": dimensionless_unscaled,
+            "amplitude": dimensionless_unscaled,
             "frequency": Hz,
-            "phase": None,
+            "phase": dimensionless_unscaled,
         }

{backscattermeter_analyzer-3.0.2 → backscattermeter_analyzer-3.0.4}/src/backscattermeter_analyzer/experiment/analysis/visibility/yes.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
 from astropy.modeling.fitting import TRFLSQFitter
 from astropy.uncertainty import Distribution
 from astropy.units import Quantity
-from numpy import concatenate, empty, floor, mean, pi, sqrt
+from numpy import ceil, concatenate, empty, floor, mean, pi, sqrt
 from numpy.random import default_rng
 from scipy.signal import find_peaks
 
@@ -323,7 +323,7 @@ class With(State):
 
         a: TimeSeries = (dc_1 - dc_2) / (dc_1 + dc_2)
 
-        a_fft = (a - a.mean()).fft(nfft=Quantity(1, "sec") / a.dt)
+        a_fft = (a - a.mean()).fft(nfft=int(Quantity(1, "sec") / a.dt))
         index_max = a_fft.abs().argmax()
         f0 = a_fft.frequencies[index_max]
 
@@ -338,21 +338,21 @@ class With(State):
 
         fitted_model = fitter(
             initial_model,
-            a,
             a.times - a.t0,
+            a,
         )
         fitted_model.frequency.fixed = True
 
         # pd1 and pd2 do not share the same phases, amplitude and offset
         fitted_pd1 = fitter(
             fitted_model.copy(),
-            dc_1,
             dc_1.times - dc_1.t0,
+            dc_1,
         )
         fitted_pd2 = fitter(
             fitted_model.copy(),
-            dc_2,
             dc_2.times - dc_2.t0,
+            dc_2,
         )
 
         fitted_model.phase.fixed = True
@@ -405,24 +405,24 @@ class With(State):
 
             cropped_fit_a = fitter(
                 fitted_model.copy(),
-                cropped_a,
                 cropped_a.times - a.t0,
+                cropped_a,
             )
 
             fit_data.add_a(fitter=fitter, model=cropped_fit_a, i=i)
 
             cropped_fit_1 = fitter(
                 fitted_pd1.copy(),
-                cropped_1,
                 cropped_1.times - dc_1.t0,
+                cropped_1,
             )
 
             fit_data.add_1(fitter=fitter, model=cropped_fit_1, i=i)
 
             cropped_fit_2 = fitter(
                 fitted_pd2.copy(),
-                cropped_2,
                 cropped_2.times - dc_2.t0,
+                cropped_2,
             )
 
             fit_data.add_2(fitter=fitter, model=cropped_fit_2, i=i)
@@ -433,7 +433,7 @@ class With(State):
         """Find transition time between monotonic scan."""
 
         # minimum distance between two transitions
-        distance = Quantity(1, "s", self.frequency_scan.dt)
+        distance = ceil(Quantity(1, "s") / self.frequency_scan.dt)
 
         peaks_index, _ = find_peaks(
             abs(self.frequency_scan.value), distance=distance

{backscattermeter_analyzer-3.0.2 → backscattermeter_analyzer-3.0.4}/src/backscattermeter_analyzer/experiment/acquisition/acquisition.py

@@ -22,8 +22,8 @@ class Acquisition:
 
     representation: Representation = field(init=False)
 
-    data: InitVar[TimeSeriesDict]  # type: ignore[ty:invalid-type-form]
     protocol: InitVar[Protocol]
+    data: InitVar[TimeSeriesDict]  # type: ignore[ty:invalid-type-form]
 
     def __post_init__(
         self,