pyglaze 0.2.1__py3-none-any.whl → 0.3.0__py3-none-any.whl

pyglaze/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.3.0"

pyglaze/datamodels/pulse.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from functools import cached_property
-from typing import Literal, cast
+from typing import Callable, Literal, cast
 
 import numpy as np
+from scipy import optimize as opt
 from scipy import signal
+from scipy.stats import linregress
 
-from pyglaze.helpers.types import ComplexArray, FloatArray
+from pyglaze.helpers._types import ComplexArray, FloatArray
 from pyglaze.interpolation import ws_interpolate
 
 __all__ = ["Pulse"]
@@ -20,12 +21,10 @@ class Pulse:
     Args:
         time: The time values recorded by the lock-in amp during the scan.
         signal: The signal values recorded by the lock-in amp during the scan.
-        signal_err: Potential errors on signal
     """
 
     time: FloatArray
     signal: FloatArray
-    signal_err: FloatArray | None = None
 
     def __len__(self: Pulse) -> int:  # noqa: D105
         return len(self.time)
@@ -38,15 +37,14 @@ class Pulse:
         return bool(
             np.array_equal(self.time, obj.time)
             and np.array_equal(self.signal, obj.signal)
-            and np.array_equal(self.signal_err, obj.signal_err)  # type: ignore[arg-type]
         )
 
-    @cached_property
+    @property
     def fft(self: Pulse) -> ComplexArray:
         """Return the Fourier Transform of a signal."""
         return np.fft.rfft(self.signal, norm="forward")
 
-    @cached_property
+    @property
     def frequency(self: Pulse) -> FloatArray:
         """Return the Fourier Transform sample frequencies."""
         return np.fft.rfftfreq(len(self.signal), d=self.time[1] - self.time[0])
@@ -91,6 +89,14 @@ class Pulse:
         """Time delay at the minimum value of the pulse."""
         return float(self.time[np.argmin(self.signal)])
 
+    @property
+    def energy(self: Pulse) -> float:
+        """Energy of the pulse.
+
+        Note that the energy is not the same as the physical energy of the pulse, but rather the integral of the square of the pulse.
+        """
+        return cast(float, np.trapz(self.signal * self.signal, x=self.time))  # noqa: NPY201 - trapz removed in numpy 2.0
+
     @classmethod
     def from_dict(
         cls: type[Pulse], d: dict[str, FloatArray | list[float] | None]
@@ -98,12 +104,9 @@ class Pulse:
         """Create a Pulse object from a dictionary.
 
         Args:
-            d: A dictionary containing the keys 'time', 'signal' and potentially 'signal_err'.
+            d: A dictionary containing the keys 'time', 'signal'.
         """
-        err = np.array(d["signal_err"]) if d.get("signal_err") is not None else None
-        return Pulse(
-            time=np.array(d["time"]), signal=np.array(d["signal"]), signal_err=err
-        )
+        return Pulse(time=np.array(d["time"]), signal=np.array(d["signal"]))
 
     @classmethod
     def from_fft(cls: type[Pulse], time: FloatArray, fft: ComplexArray) -> Pulse:
@@ -129,10 +132,7 @@ class Pulse:
             return scans[0]
         signals = np.array([scan.signal for scan in scans])
         mean_signal = np.mean(signals, axis=0)
-
-        root_n_scans = np.sqrt(len(scans))
-        std_signal = np.std(signals, axis=0, ddof=1) / root_n_scans
-        return Pulse(scans[0].time, mean_signal, signal_err=std_signal)
+        return Pulse(scans[0].time, mean_signal)
 
     @classmethod
     def align(
@@ -142,11 +142,11 @@ class Pulse:
         wrt_max: bool = True,
         translate_to_zero: bool = True,
     ) -> list[Pulse]:
-        """Aligns a list of scan with respect to their individual maxima or minima.
+        """Aligns a list of pulses with respect to the zerocrossings of their main pulse.
 
         Args:
             scans: List of scans
-            wrt_max: Whether to align with respect to maximum. Defaults to True.
+            wrt_max: Whether to perform rough alignment with respect to their maximum (true) or minimum(false). Defaults to True.
             translate_to_zero: Whether to translate all scans to t[0] = 0. Defaults to True.
 
         Returns:
@@ -163,15 +163,17 @@ class Pulse:
         if translate_to_zero:
             for scan in roughly_aligned:
                 scan.time = scan.time - scan.time[0]
+        zerocrossings = [p.estimate_zero_crossing() for p in roughly_aligned]
+        mean_zerocrossing = cast(float, np.mean(zerocrossings))
 
-        ref = roughly_aligned[len(roughly_aligned) // 2]
-        extremum = extrema[len(roughly_aligned) // 2]
-        return _match_templates(extremum, ref, roughly_aligned)
+        return [
+            p.propagate(mean_zerocrossing - zc)
+            for p, zc in zip(roughly_aligned, zerocrossings)
+        ]
 
     @classmethod
     def _from_slice(cls: type[Pulse], scan: Pulse, indices: slice) -> Pulse:
-        err = scan.signal_err[indices] if scan.signal_err is not None else None
-        return cls(scan.time[indices], scan.signal[indices], err)
+        return cls(scan.time[indices], scan.signal[indices])
 
     def cut(self: Pulse, from_time: float, to_time: float) -> Pulse:
         """Create a Pulse object by cutting out a specific section of the scan.
@@ -182,11 +184,18 @@ class Pulse:
         """
         from_idx = int(np.searchsorted(self.time, from_time))
         to_idx = int(np.searchsorted(self.time, to_time, side="right"))
-        return Pulse(
-            self.time[from_idx:to_idx],
-            self.signal[from_idx:to_idx],
-            None if self.signal_err is None else self.signal_err[from_idx:to_idx],
-        )
+        return Pulse(self.time[from_idx:to_idx], self.signal[from_idx:to_idx])
+
+    def fft_at_f(self: Pulse, f: float) -> complex:
+        """Returns the Fourier Transform at a specific frequency.
+
+        Args:
+            f: Frequency in Hz
+
+        Returns:
+            complex: Fourier Transform at the given frequency
+        """
+        return cast(complex, self.fft[np.searchsorted(self.frequency, f)])
 
     def timeshift(self: Pulse, scale: float, offset: float = 0) -> Pulse:
         """Rescales and offsets the time axis as.
@@ -200,11 +209,7 @@ class Pulse:
         Returns:
             Timeshifted pulse
         """
-        return Pulse(
-            time=scale * (self.time + offset),
-            signal=self.signal,
-            signal_err=self.signal_err,
-        )
+        return Pulse(time=scale * (self.time + offset), signal=self.signal)
 
     def add_white_noise(
         self: Pulse, noise_std: float, seed: int | None = None
@@ -224,7 +229,6 @@ class Pulse:
             + np.random.default_rng(seed).normal(
                 loc=0, scale=noise_std, size=len(self)
             ),
-            signal_err=np.ones(len(self)) * noise_std,
         )
 
     def zeropadded(self: Pulse, n_zeros: int) -> Pulse:
@@ -242,6 +246,28 @@ class Pulse:
         )
         return Pulse(time=zeropadded_time, signal=zeropadded_signal)
 
+    def signal_at_t(self: Pulse, t: float) -> float:
+        """Returns the signal at a specific time using Whittaker Shannon interpolation.
+
+        Args:
+            t: Time in seconds
+
+        Returns:
+            Signal at the given time
+        """
+        return cast(float, ws_interpolate(self.time, self.signal, np.array([t]))[0])
+
+    def subtract_mean(self: Pulse, fraction: float = 0.99) -> Pulse:
+        """Subtracts the mean of the pulse.
+
+        Args:
+            fraction: Fraction of the mean to subtract. Defaults to 0.99.
+
+        Returns:
+            Pulse with the mean subtracted
+        """
+        return Pulse(self.time, self.signal - fraction * np.mean(self.signal))
+
     def tukey(
         self: Pulse,
         taper_length: float,
@@ -338,53 +364,52 @@ class Pulse:
             20 * np.log10((abs_spectrum + offset) / ref), dtype=np.float64
         )
 
-    def estimate_bandwidth(self: Pulse, omega_power: int = 3) -> float:
+    def estimate_bandwidth(self: Pulse, linear_segments: int = 1) -> float:
         """Estimates the bandwidth of the pulse.
 
-        Uses the approach described in [Algorithm for Determination of Cutoff Frequency of Noise Floor Level for Terahertz Time-Domain Signals](https://doi.org/10.1007/s10762-022-00886-y).
+        The bandwidth is estimated by modelling the log of the pulse's spectrum above the center frequency as a constant noisefloor and n linear segments of equal size. The bandwidth is then defined as the frequency at which the noisefloor is reached.
 
         Args:
-            omega_power: power to raise omega to before estimating the bandwidth. Defaults to 3
+            linear_segments: Number of linear segments to fit to the spectrum. Defaults to 1.
 
         Returns:
             float: Estimated bandwidth in Hz
         """
-        return self._estimate_pulse_properties(omega_power)[0]
+        return self._estimate_pulse_properties(linear_segments)[0]
 
-    def estimate_dynamic_range(self: Pulse, omega_power: int = 3) -> float:
+    def estimate_dynamic_range(self: Pulse, linear_segments: int = 1) -> float:
         """Estimates the dynamic range of the pulse.
 
-        Uses the approach described in [Algorithm for Determination of Cutoff Frequency of Noise Floor Level for Terahertz Time-Domain Signals](https://doi.org/10.1007/s10762-022-00886-y).
+        The dynamic range is estimated by modelling the log of the pulse's spectrum above the center frequency as a constant noisefloor and n linear segments of equal size. The dynamic range is then calculated as the maximum of the spectrum minus the noisefloor.
 
         Args:
-            omega_power: power to raise omega to before estimating the dynamic range. Defaults to 3
+            linear_segments: Number of linear segments to fit to the spectrum. Defaults to 1.
 
         Returns:
             float: Estimated dynamic range in dB
         """
-        return self._estimate_pulse_properties(omega_power)[1]
+        return self._estimate_pulse_properties(linear_segments)[1]
 
-    def estimate_avg_noise_power(self: Pulse, omega_power: int = 3) -> float:
+    def estimate_avg_noise_power(self: Pulse, linear_segments: int = 1) -> float:
         """Estimates the noise power.
 
-        Noise power is defined as the mean of the absolute square of the noise floor.
-        Uses the approach described in [Algorithm for Determination of Cutoff Frequency of Noise Floor Level for Terahertz Time-Domain Signals](https://doi.org/10.1007/s10762-022-00886-y).
+        The noise power is estimated by modelling the the log of pulse's spectrum above the center frequency as a constant noisefloor and n linear segments of equal size. Noise power is then calculated as the mean of the absolute square of the spectral bins above the frequency at which the noise floor is reached.
 
         Args:
-            omega_power: power to raise omega to before estimating the noisepower. Defaults to 3
+            linear_segments: Number of linear segments to fit to the spectrum. Defaults to 1.
 
         Returns:
             float: Estimated noise power.
         """
-        return self._estimate_pulse_properties(omega_power)[2]
+        return self._estimate_pulse_properties(linear_segments)[2]
 
-    def estimate_SNR(self: Pulse, omega_power: int = 3) -> FloatArray:
+    def estimate_SNR(self: Pulse, linear_segments: int = 1) -> FloatArray:
         """Estimates the signal-to-noise ratio.
 
-        Estimates the SNR, assuming white noise. Uses the approach described in [Algorithm for Determination of Cutoff Frequency of Noise Floor Level for Terahertz Time-Domain Signals](https://doi.org/10.1007/s10762-022-00886-y) to estimate the noise power. The signal power is then extrapolated above the bandwidth by fitting a second order polynomial to the spectrum above the noisefloor.
+        Estimates the SNR, assuming white noise. The noisefloor is estimated by modelling the log of the pulse's spectrum above the center frequency as a constant noisefloor and n linear segments of equal size. Noise power is then calculated as the mean of the absolute square of the spectral bins above the frequency at which the noise floor is reached. The signal power is then extrapolated above the bandwidth by fitting a second order polynomial to the spectrum above the noisefloor.
 
         Args:
-            omega_power: power to raise omega to before estimating the signal-to-noise ratio. Defaults to 3
+            linear_segments: Number of linear segments to fit to the spectrum. Defaults to 1.
 
         Returns:
             float: Estimated signal-to-noise ratio.
@@ -392,7 +417,7 @@ class Pulse:
         # Get spectrum between maximum and noisefloor
         _from = np.argmax(self.spectrum_dB())
         _to = np.searchsorted(
-            self.frequency, self.estimate_bandwidth(omega_power=omega_power)
+            self.frequency, self.estimate_bandwidth(linear_segments=linear_segments)
         )
         x = self.frequency[_from:_to]
         y = self.spectrum_dB()[_from:_to]
@@ -411,10 +436,16 @@ class Pulse:
             ),
         )
         signal_power = 10 ** (y_values / 10) * self.maximum_spectral_density**2
-        return signal_power / self.estimate_avg_noise_power(omega_power=omega_power)
+        return signal_power / self.estimate_avg_noise_power(
+            linear_segments=linear_segments
+        )
 
     def estimate_peak_to_peak(
-        self: Pulse, delay_tolerance: float | None = None
+        self: Pulse,
+        delay_tolerance: float | None = None,
+        strategy: Callable[
+            [FloatArray, FloatArray, FloatArray], FloatArray
+        ] = ws_interpolate,
     ) -> float:
         """Estimates the peak-to-peak value of the pulse.
 
@@ -422,6 +453,7 @@ class Pulse:
 
         Args:
             delay_tolerance: Tolerance for peak detection. Defaults to None.
+            strategy: Interpolation strategy. Defaults to Whittaker-Shannon interpolation
 
         Returns:
             float: Estimated peak-to-peak value.
@@ -433,10 +465,10 @@ class Pulse:
             msg = "Tolerance must be smaller than the time spacing of the pulse."
             raise ValueError(msg)
 
-        max_estimate = ws_interpolate(
-            times=self.time,
-            pulse=self.signal,
-            interp_times=np.linspace(
+        max_estimate = strategy(
+            self.time,
+            self.signal,
+            np.linspace(
                 self.delay_at_max - self.dt,
                 self.delay_at_max + self.dt,
                 num=1 + int(self.dt / delay_tolerance),
@@ -444,10 +476,10 @@ class Pulse:
             ),
         )
 
-        min_estimate = ws_interpolate(
-            times=self.time,
-            pulse=self.signal,
-            interp_times=np.linspace(
+        min_estimate = strategy(
+            self.time,
+            self.signal,
+            np.linspace(
                 self.delay_at_min - self.dt,
                 self.delay_at_min + self.dt,
                 num=1 + int(self.dt / delay_tolerance),
@@ -475,85 +507,102 @@ class Pulse:
         a = (self.signal[idx + 1] - self.signal[idx]) / self.dt
         return cast(float, t1 - s1 / a)
 
+    def propagate(self: Pulse, time: float) -> Pulse:
+        """Propagates the pulse in time by a given amount.
+
+        Args:
+            time: Time in seconds to propagate the pulse by
+
+        Returns:
+            Pulse: Propagated pulse
+        """
+        return Pulse.from_fft(
+            time=self.time,
+            fft=self.fft * np.exp(-1j * 2 * np.pi * self.frequency * time),
+        )
+
     def to_native_dict(self: Pulse) -> dict[str, list[float] | None]:
         """Converts the Pulse object to a native dictionary.
 
         Returns:
             Native dictionary representation of the Pulse object.
         """
-        return {
-            "time": list(self.time),
-            "signal": list(self.signal),
-            "signal_err": None if self.signal_err is None else list(self.signal_err),
-        }
+        return {"time": list(self.time), "signal": list(self.signal)}
 
     def _get_min_or_max_idx(self: Pulse, *, wrt_max: bool) -> int:
         return int(np.argmax(self.signal)) if wrt_max else int(np.argmin(self.signal))
 
     def _estimate_pulse_properties(
-        self: Pulse, omega_power: int
+        self: Pulse, linear_segments: int
     ) -> tuple[float, float, float]:
-        argmax = np.argmax(np.abs(self.fft))
-        freqs = self.frequency[argmax:]
-        abs_spectrum = np.abs(self.fft[argmax:])
-
-        noisefloor_idx_estimate = np.argmin(abs_spectrum * freqs**omega_power)
-        avg_noise_power = np.mean(abs_spectrum[noisefloor_idx_estimate:] ** 2)
+        mean_substracted = self.subtract_mean()
+        argmax = np.argmax(np.abs(mean_substracted.fft))
+        freqs = mean_substracted.frequency[argmax:]
+        abs_spectrum = np.abs(mean_substracted.fft[argmax:])
+        bw_idx_estimate = _estimate_bw_idx(freqs, abs_spectrum, linear_segments)
+        avg_noise_power = np.mean(abs_spectrum[bw_idx_estimate:] ** 2)
         noisefloor = np.sqrt(avg_noise_power)
-
-        # Search for the first index, where the spectrum is above the noise floor
-        # by flipping the spectrum to get a pseudo-increasing array, then convert back
-        # to an index in the original array
-        cutoff_idx = noisefloor_idx_estimate - np.searchsorted(
-            np.flip(abs_spectrum[: noisefloor_idx_estimate + 1]),
-            noisefloor,
-            side="right",
+        bandwidth = freqs[bw_idx_estimate]
+        dynamic_range_dB = 20 * np.log10(
+            mean_substracted.maximum_spectral_density / noisefloor
         )
-        bandwidth = freqs[cutoff_idx]
-        dynamic_range_dB = 20 * np.log10(self.maximum_spectral_density / noisefloor)
         return bandwidth, dynamic_range_dB, avg_noise_power
 
 
-def _match_templates(
-    extremum: int, ref: Pulse, roughly_aligned: list[Pulse]
-) -> list[Pulse]:
-    # corresponds to a template of length 8 - chosen as a compromise between speed and accuracy
-    window_size = 4
-    ref_slice = slice(extremum - window_size, extremum + window_size)
+def _estimate_bw_idx(x: FloatArray, y: FloatArray, segments: int) -> int:
+    """Estimate the noise floor of a spectrum.
 
-    def correlate(x1: FloatArray, x2: FloatArray) -> float:
-        return float(np.sum(x1 * x2 / (np.linalg.norm(x1) * np.linalg.norm(x2))))
+    Args:
+        x: Frequency values
+        y: Spectrum values
+        segments: Number of linear segments to fit
 
-    cut_candidates = [-2, -1, 0, 1, 2]
-    cuts = np.empty(len(roughly_aligned), dtype=int)
-    for i_scan, scan in enumerate(roughly_aligned):
-        slices = [
-            slice(extremum - window_size + i, extremum + window_size + i)
-            for i in cut_candidates
-        ]
-        cuts[i_scan] = cut_candidates[
-            np.argmax(
-                [correlate(scan.signal[s], ref.signal[ref_slice]) for s in slices]
-            )
-        ]
+    Returns:
+        float: Estimated noise floor
+    """
+    target = np.log(y)
 
-    max_cut = np.max(np.abs(cuts))
-    new_length = len(ref) - max_cut
-    aligned = []
-    for scan, cut in zip(roughly_aligned, cuts):
-        if cut >= 0:
-            aligned.append(
-                Pulse(
-                    time=ref.time[:new_length],
-                    signal=scan.signal[cut : cut + new_length],
-                )
-            )
-        else:
-            aligned.append(
-                Pulse(
-                    time=ref.time[:new_length],
-                    signal=scan.signal[cut - new_length : cut],
-                )
-            )
-
-    return aligned
+    def L1(x: FloatArray, y: FloatArray) -> FloatArray:
+        return np.sum(np.abs(y - x))  # type: ignore[no-any-return]
+
+    def model(pars: list[float]) -> FloatArray:
+        idx = np.searchsorted(x, pars[0])
+        x_before = x[:idx]
+        x_after = x[idx:]
+        target_before = target[:idx]
+        target_after = target[idx:]
+        y_fit = _fit_linear_segments(x_before, target_before, segments)
+        noise = np.ones(len(x_after)) * y_fit[-1]
+        return L1(y_fit, target_before) + L1(noise, target_after)
+
+    BW_estimate = opt.minimize(
+        fun=model, x0=[x[len(x) // 2]], bounds=[(x[0], x[-1])], method="Nelder-Mead"
+    ).x[0]
+
+    return cast(int, x.searchsorted(BW_estimate))
+
+
+def _fit_linear_segments(x: FloatArray, y: FloatArray, n_segments: int) -> FloatArray:
+    """Fit a pulse with a piecewise linear function.
+
+    Args:
+        x: Time values
+        y: Signal values
+        n_segments: Number of segments to fit
+
+    Returns:
+        FloatArray: Fitted signal
+    """
+    segment_indices = np.linspace(0, len(x), n_segments + 1, dtype=int)
+    y_fit = np.zeros_like(y)
+
+    for i in range(n_segments):
+        # Get the indices for this segment
+        start, end = segment_indices[i], segment_indices[i + 1]
+        x_segment = x[start:end]
+        y_segment = y[start:end]
+
+        # Fit a linear function to this segment
+        slope, intercept, _, _, _ = linregress(x_segment, y_segment)
+        y_fit[start:end] = slope * x_segment + intercept
+    return y_fit

pyglaze/datamodels/waveform.py

@@ -11,7 +11,7 @@ from .pulse import Pulse
 if TYPE_CHECKING:
     from datetime import datetime
 
-    from pyglaze.helpers.types import FloatArray
+    from pyglaze.helpers._types import FloatArray
 
 __all__ = ["UnprocessedWaveform"]
 

pyglaze/device/__init__.py

@@ -1,7 +1,7 @@
 from .configuration import ForceDeviceConfiguration, Interval, LeDeviceConfiguration
 
 __all__ = [
-    "LeDeviceConfiguration",
     "ForceDeviceConfiguration",
     "Interval",
+    "LeDeviceConfiguration",
 ]

pyglaze/device/ampcom.py

@@ -29,7 +29,7 @@ if TYPE_CHECKING:
         LeMockDevice,
         MockDevice,
     )
-    from pyglaze.helpers.types import FloatArray
+    from pyglaze.helpers._types import FloatArray
 
 
 class DeviceComError(Exception):
@@ -105,9 +105,7 @@ class _ForceAmpCom:
 
     def __del__(self: _ForceAmpCom) -> None:
         """Closes connection when class instance goes out of scope."""
-        with contextlib.suppress(AttributeError):
-            # If the serial device does not exist, self.__ser is never created - hence catch
-            self.__ser.close()
+        self.disconnect()
 
     def write_all(self: _ForceAmpCom) -> list[str]:
         responses = []
@@ -190,6 +188,12 @@ class _ForceAmpCom:
             output_array[iteration, 2] = angle
         return output_array
 
+    def disconnect(self: _ForceAmpCom) -> None:
+        """Closes connection."""
+        with contextlib.suppress(AttributeError):
+            # If the serial device does not exist, self.__ser is never created - hence catch
+            self.__ser.close()
+
     def _encode_send_response(self: _ForceAmpCom, command: str) -> str:
         self._encode_and_send(command)
         return self._get_response()
@@ -264,9 +268,7 @@ class _LeAmpCom:
 
     def __del__(self: _LeAmpCom) -> None:
         """Closes connection when class instance goes out of scope."""
-        with contextlib.suppress(AttributeError):
-            # If the serial device does not exist, self.__ser is never created - hence catch
-            self.__ser.close()
+        self.disconnect()
 
     def write_all(self: _LeAmpCom) -> list[str]:
         responses: list[str] = []
@@ -294,6 +296,12 @@ class _LeAmpCom:
         radii, angles = self._convert_to_r_angle(Xs, Ys)
         return self.START_COMMAND, np.array(times), np.array(radii), np.array(angles)
 
+    def disconnect(self: _LeAmpCom) -> None:
+        """Closes connection when class instance goes out of scope."""
+        with contextlib.suppress(AttributeError):
+            # If the serial device does not exist, self.__ser is never created - hence catch
+            self.__ser.close()
+
     @cached_property
     def _intervals(self: _LeAmpCom) -> list[Interval]:
         """Intervals squished into effective DAC range."""

pyglaze/devtools/mock_device.py

@@ -28,6 +28,7 @@ class MockDevice(ABC):
         n_fails: float = np.inf,
         *,
         empty_responses: bool = False,
+        instant_response: bool = False,
     ) -> None:
         pass
 
@@ -42,6 +43,8 @@ class ForceMockDevice(MockDevice):
         self: ForceMockDevice,
         fail_after: float = np.inf,
         n_fails: float = np.inf,
+        *,
+        instant_response: bool = False,
     ) -> None:
         self.fail_after = fail_after
         self.fails_wanted = n_fails
@@ -50,6 +53,7 @@ class ForceMockDevice(MockDevice):
         self.rng = np.random.default_rng()
         self.valid_input = True
         self.experiment_running = False
+        self.instant_response = instant_response
 
         self._periods = None
         self._frequency = None
@@ -131,7 +135,8 @@ class ForceMockDevice(MockDevice):
         for _ in range(self.in_waiting):
             return_string += self.__create_random_datapoint
         return_string += "!D,DONE\\r"
-        sleep(self.sweep_length * 1e-3)
+        if not self.instant_response:
+            sleep(self.sweep_length * 1e-3)
         self.n_scans += 1
         if self.n_scans > self.fail_after and self.n_failures < self.fails_wanted:
             self.n_failures += 1
@@ -190,6 +195,7 @@ class LeMockDevice(MockDevice):
         n_fails: float = np.inf,
         *,
         empty_responses: bool = False,
+        instant_response: bool = False,
     ) -> None:
         self.fail_after = fail_after
         self.fails_wanted = n_fails
@@ -204,6 +210,7 @@ class LeMockDevice(MockDevice):
         self.scanning_list: list[float] | None = None
         self._scan_start_time: float | None = None
         self.empty_responses = empty_responses
+        self.instant_response = instant_response
 
     def write(self: LeMockDevice, input_bytes: bytes) -> None:
         """Mock-write to the serial connection."""
@@ -365,6 +372,7 @@ def list_mock_devices() -> list[str]:
         "mock_device_scan_should_fail",
         "mock_device_fail_first_scan",
         "mock_device_empty_responses",
+        "mock_device_instant",
     ]
 
 
@@ -374,6 +382,8 @@ def _mock_device_factory(config: DeviceConfiguration) -> MockDevice:
         return mock_class(fail_after=0)
     if config.amp_port == "mock_device":
         return mock_class()
+    if config.amp_port == "mock_device_instant":
+        return mock_class(instant_response=True)
     if config.amp_port == "mock_device_fail_first_scan":
         return mock_class(fail_after=0, n_fails=1)
     if config.amp_port == "mock_device_empty_responses":

pyglaze/devtools/thz_pulse.py

@@ -4,7 +4,7 @@ from typing import cast
 
 import numpy as np
 
-from pyglaze.helpers.types import FloatArray
+from pyglaze.helpers._types import FloatArray
 
 
 def gaussian_derivative_pulse(

pyglaze/helpers/utilities.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Callable, cast
 import serial
 import serial.tools.list_ports
 
-from pyglaze.helpers.types import P, T
+from pyglaze.helpers._types import P, T
 
 if TYPE_CHECKING:
     import logging
@@ -64,11 +64,11 @@ class _BackoffRetry:
                     raise
                 except Exception as e:  # noqa: BLE001
                     self._log(
-                        f"{func.__name__} failed {tries+1} time(s) with: '{e}'. Trying again"
+                        f"{func.__name__} failed {tries + 1} time(s) with: '{e}'. Trying again"
                     )
                 backoff = min(self.backoff_base * 2**tries, self.max_backoff)
                 time.sleep(backoff)
-            self._log(f"{func.__name__}: Last try ({tries+2}).")
+            self._log(f"{func.__name__}: Last try ({tries + 2}).")
             return cast(T, func(*args, **kwargs))
 
         return wrapper

pyglaze/interpolation/__init__.py

@@ -1,3 +1,3 @@
-from .interpolation import ws_interpolate
+from .interpolation import cubic_spline_interpolate, ws_interpolate
 
-__all__ = ["ws_interpolate"]
+__all__ = ["cubic_spline_interpolate", "ws_interpolate"]

pyglaze/interpolation/interpolation.py

@@ -1,6 +1,9 @@
+from typing import cast
+
 import numpy as np
+from scipy.interpolate import CubicSpline
 
-from pyglaze.helpers.types import FloatArray
+from pyglaze.helpers._types import FloatArray
 
 
 def ws_interpolate(
@@ -21,4 +24,21 @@ def ws_interpolate(
     # times must be zero-centered for formula to work
     sinc = np.sinc((interp_times[:, np.newaxis] - times[0] - dt * _range) / dt)
 
-    return np.asarray(np.sum(pulse * sinc, axis=1))
+    return cast(FloatArray, np.sum(pulse * sinc, axis=1))
+
+
+def cubic_spline_interpolate(
+    times: FloatArray, pulse: FloatArray, interp_times: FloatArray
+) -> FloatArray:
+    """Performs cubic spline interpolation at the supplied times given a pulse.
+
+    Args:
+        times: Sampling times
+        pulse: A sampled pulse satisfying the Nyquist criterion
+        interp_times: Array of times at which to interpolate
+
+    Returns:
+        FloatArray: Interpolated values
+    """
+    spline = CubicSpline(times, pulse, bc_type="natural")
+    return cast(FloatArray, spline(interp_times))

pyglaze/scanning/_asyncscanner.py

@@ -87,10 +87,8 @@ class _AsyncScanner:
 
         return [self._get_scan().waveform for _ in range(n_pulses)]
 
-    def get_next(self: _AsyncScanner, averaged_over_n: int = 1) -> UnprocessedWaveform:
-        return UnprocessedWaveform.average(
-            [self._get_scan().waveform for _ in range(averaged_over_n)]
-        )
+    def get_next(self: _AsyncScanner) -> UnprocessedWaveform:
+        return self._get_scan().waveform
 
     def _get_scan(self: _AsyncScanner) -> _TimestampedWaveform:
         try:
@@ -127,6 +125,7 @@ class _AsyncScanner:
                 parent_conn.send(
                     _ScannerHealth(is_alive=False, is_healthy=False, error=e)
                 )
+                scanner.disconnect()
                 break
 
             try:

pyglaze/scanning/_exceptions.py

@@ -0,0 +1,8 @@
+from __future__ import annotations
+
+
+class ScanError(Exception):
+    """Exception raised when an error while scanning occurs."""
+
+    def __init__(self: ScanError, msg: str) -> None:
+        super().__init__(msg)

pyglaze/scanning/scanner.py

@@ -4,6 +4,7 @@ from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Generic, TypeVar
 
 import numpy as np
+from serial import SerialException
 
 from pyglaze.datamodels import UnprocessedWaveform
 from pyglaze.device.ampcom import _ForceAmpCom, _LeAmpCom
@@ -12,9 +13,10 @@ from pyglaze.device.configuration import (
     ForceDeviceConfiguration,
     LeDeviceConfiguration,
 )
+from pyglaze.scanning._exceptions import ScanError
 
 if TYPE_CHECKING:
-    from pyglaze.helpers.types import FloatArray
+    from pyglaze.helpers._types import FloatArray
 
 TConfig = TypeVar("TConfig", bound=DeviceConfiguration)
 
@@ -42,6 +44,10 @@ class _ScannerImplementation(ABC, Generic[TConfig]):
     def update_config(self: _ScannerImplementation, new_config: TConfig) -> None:
         pass
 
+    @abstractmethod
+    def disconnect(self: _ScannerImplementation) -> None:
+        pass
+
 
 class Scanner:
     """A synchronous scanner for Glaze terahertz devices."""
@@ -76,6 +82,10 @@ class Scanner:
         """
         self._scanner_impl.update_config(new_config)
 
+    def disconnect(self: Scanner) -> None:
+        """Close serial connection."""
+        self._scanner_impl.disconnect()
+
 
 class ForceScanner(_ScannerImplementation[ForceDeviceConfiguration]):
     """Perform synchronous terahertz scanning using a given DeviceConfiguration.
@@ -87,7 +97,7 @@ class ForceScanner(_ScannerImplementation[ForceDeviceConfiguration]):
 
     def __init__(self: ForceScanner, config: ForceDeviceConfiguration) -> None:
         self._config: ForceDeviceConfiguration
-        self._ampcom: _ForceAmpCom
+        self._ampcom: _ForceAmpCom | None = None
         self.config = config
         self._phase_estimator = _LockinPhaseEstimator()
 
@@ -133,6 +143,9 @@ class ForceScanner(_ScannerImplementation[ForceDeviceConfiguration]):
         Returns:
             Unprocessed scan.
         """
+        if self._ampcom is None:
+            msg = "Scanner not configured"
+            raise ScanError(msg)
         _, responses = self._ampcom.start_scan()
 
         time = responses[:, 0]
@@ -152,6 +165,14 @@ class ForceScanner(_ScannerImplementation[ForceDeviceConfiguration]):
         """
         self.config = new_config
 
+    def disconnect(self: ForceScanner) -> None:
+        """Close serial connection."""
+        if self._ampcom is None:
+            msg = "Scanner not connected"
+            raise SerialException(msg)
+        self._ampcom.disconnect()
+        self._ampcom = None
+
 
 class LeScanner(_ScannerImplementation[LeDeviceConfiguration]):
     """Perform synchronous terahertz scanning using a given DeviceConfiguration.
@@ -162,7 +183,7 @@ class LeScanner(_ScannerImplementation[LeDeviceConfiguration]):
 
     def __init__(self: LeScanner, config: LeDeviceConfiguration) -> None:
         self._config: LeDeviceConfiguration
-        self._ampcom: _LeAmpCom
+        self._ampcom: _LeAmpCom | None = None
         self.config = config
         self._phase_estimator = _LockinPhaseEstimator()
 
@@ -198,6 +219,9 @@ class LeScanner(_ScannerImplementation[LeDeviceConfiguration]):
         Returns:
             Unprocessed scan.
         """
+        if self._ampcom is None:
+            msg = "Scanner not configured"
+            raise ScanError(msg)
         _, time, radius, theta = self._ampcom.start_scan()
         self._phase_estimator.update_estimate(radius=radius, theta=theta)
 
@@ -213,6 +237,14 @@ class LeScanner(_ScannerImplementation[LeDeviceConfiguration]):
         """
         self.config = new_config
 
+    def disconnect(self: LeScanner) -> None:
+        """Close serial connection."""
+        if self._ampcom is None:
+            msg = "Scanner not connected"
+            raise ScanError(msg)
+        self._ampcom.disconnect()
+        self._ampcom = None
+
 
 def _scanner_factory(config: DeviceConfiguration) -> _ScannerImplementation:
     if isinstance(config, ForceDeviceConfiguration):
@@ -226,10 +258,13 @@ def _scanner_factory(config: DeviceConfiguration) -> _ScannerImplementation:
 
 class _LockinPhaseEstimator:
     def __init__(
-        self: _LockinPhaseEstimator, r_threshold_for_update: float = 2.0
+        self: _LockinPhaseEstimator,
+        r_threshold_for_update: float = 2.0,
+        theta_threshold_for_adjustment: float = 1.0,
     ) -> None:
-        self.phase_estimate: float | None = None
         self.r_threshold_for_update = r_threshold_for_update
+        self.theta_threshold_for_adjustment = theta_threshold_for_adjustment
+        self.phase_estimate: float | None = None
         self._radius_of_est: float | None = None
 
     def update_estimate(
@@ -242,7 +277,11 @@ class _LockinPhaseEstimator:
             self._set_estimates(theta_at_max, r_max)
             return
 
-        if r_max > self.r_threshold_for_update * self._radius_of_est:
+        if r_max > self.r_threshold_for_update * self._radius_of_est or (
+            r_max > self._radius_of_est
+            and abs(theta_at_max - self.phase_estimate)
+            < self.theta_threshold_for_adjustment
+        ):
             self._set_estimates(theta_at_max, r_max)
 
     def _set_estimates(

{pyglaze-0.2.1.dist-info → pyglaze-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pyglaze
-Version: 0.2.1
+Version: 0.3.0
 Summary: Pyglaze is a library used to operate the devices of Glaze Technologies
 Author: GLAZE Technologies ApS
 License: BSD 3-Clause License
@@ -38,11 +38,11 @@ Project-URL: Issues, https://github.com/GlazeTech/pyglaze/issues
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy <2.0.0,>=1.26.4
-Requires-Dist: pyserial >=3.5
-Requires-Dist: scipy >=1.7.3
-Requires-Dist: bitstring >=4.1.2
-Requires-Dist: typing-extensions >=4.12.2
+Requires-Dist: numpy<2.0.0,>=1.26.4
+Requires-Dist: pyserial>=3.5
+Requires-Dist: scipy>=1.7.3
+Requires-Dist: bitstring>=4.1.2
+Requires-Dist: typing_extensions>=4.12.2
 
 # Pyglaze
 Pyglaze is a python library used to operate the devices of [Glaze Technologies](https://www.glazetech.dk/).

pyglaze-0.3.0.dist-info/RECORD

@@ -0,0 +1,26 @@
+pyglaze/__init__.py,sha256=VrXpHDu3erkzwl_WXrqINBm9xWkcyUy53IQOj042dOs,22
+pyglaze/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyglaze/datamodels/__init__.py,sha256=DJLByl2C7pC4RM4Uh6PW-McM5RIGBjcopzGywCKhSlI,111
+pyglaze/datamodels/pulse.py,sha256=YnfwOkTyKUH-HFZAg2qpwe7kh8rb0B4HilZDFDdY36Q,22511
+pyglaze/datamodels/waveform.py,sha256=T0wV7saJNPowwQs518VLypul-p1bg_1REPTflw8UNzM,5810
+pyglaze/device/__init__.py,sha256=Y__HNJTPTAxLB_IpbLD4h2K9mDkI1_l4Ruc9mONH-3A,177
+pyglaze/device/ampcom.py,sha256=FFrxAlLQbkslnlvNhIR5sd3xouMoUlMeodicZhYtgwg,17466
+pyglaze/device/configuration.py,sha256=gh_eerX8TdXx3LnFxHieJqOpfDfE9cV6Xgm5WYVnvO0,7994
+pyglaze/devtools/__init__.py,sha256=9EW20idoaZv_5GuSgDmfpTPjfCZ-Rl27EV3oJebmwnQ,90
+pyglaze/devtools/mock_device.py,sha256=Fz0ZCRIslokBz6gFEztv1-V1UJhdTDqujl7-l8seX7U,14394
+pyglaze/devtools/thz_pulse.py,sha256=C3O7s93rFc9xRC4KIqUwDWYsud8xZDP0FsE7-bNSWbo,924
+pyglaze/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyglaze/helpers/_types.py,sha256=p9xSAP5Trr1FcCWl7ynCWqDOUZKgMQYzMUXSwDpAKHg,599
+pyglaze/helpers/utilities.py,sha256=9JEaD2KzHXO1olFNCECMI6-sdX9bizkN7vvsc1dGlf8,2428
+pyglaze/interpolation/__init__.py,sha256=BZU-mIAO7XxrPGG7tsUks-ghbylOaIANJGIYrtF5Y_Y,126
+pyglaze/interpolation/interpolation.py,sha256=qxcK7zvQmEM2qiOoTs4b2Qs9U_QiGIEe16Z059eu6RA,1341
+pyglaze/scanning/__init__.py,sha256=uCBaeDTufOrC9KWf30ICqcmvFg_YT85olb3M9jkvZRg,99
+pyglaze/scanning/_asyncscanner.py,sha256=pdE4w1QlIzpSxdl5GB7IB0x4FjuhQeqPSs9yIuVQF6E,5203
+pyglaze/scanning/_exceptions.py,sha256=vS28Dijj76jVuF6cSDBKqM9SQIa9rbIyUaHF-RA3PyM,213
+pyglaze/scanning/client.py,sha256=3qrQStkeLQzCeu4yMHJ_ENLGQ7E5GMc4CP9J55rk-ug,1817
+pyglaze/scanning/scanner.py,sha256=0e8jXhzY27BckwT7ii1PdpYE8JK4tD1DZPj3YmQqM7E,9506
+pyglaze-0.3.0.dist-info/LICENSE,sha256=LCP3sGBX7LxuQopcjeug1fW4tngWCHF4zB7QCgB28xM,1504
+pyglaze-0.3.0.dist-info/METADATA,sha256=TbEOazvaA3HP1RE5nUQ5rNQxqVlt_-g7px2B_mItpV0,3493
+pyglaze-0.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyglaze-0.3.0.dist-info/top_level.txt,sha256=X7d5rqVVuWNmtK4-Uh4sgOLlqye8vaHZOr5RYba0REo,8
+pyglaze-0.3.0.dist-info/RECORD,,

{pyglaze-0.2.1.dist-info → pyglaze-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyglaze-0.2.1.dist-info/RECORD

@@ -1,25 +0,0 @@
-pyglaze/__init__.py,sha256=HfjVOrpTnmZ-xVFCYSVmX50EXaBQeJteUHG-PD6iQs8,22
-pyglaze/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyglaze/datamodels/__init__.py,sha256=DJLByl2C7pC4RM4Uh6PW-McM5RIGBjcopzGywCKhSlI,111
-pyglaze/datamodels/pulse.py,sha256=BoW_GDvkwEpn_UYUFPoUfi5E_oCnvv8cU4nZKG7Ph2U,20911
-pyglaze/datamodels/waveform.py,sha256=n31DhJHFeBNZ3hHqQUiCGXssm5Dc8wV6tGPkhmFYB4Q,5809
-pyglaze/device/__init__.py,sha256=5RjCHuFKMi9g2KLUkxixO9hNpAgkUBcOURNTuhAdoUk,177
-pyglaze/device/ampcom.py,sha256=6JXl7PojYr4F1_pdVItO-XbGCp8mpy4wpwaaUn8Loog,17214
-pyglaze/device/configuration.py,sha256=gh_eerX8TdXx3LnFxHieJqOpfDfE9cV6Xgm5WYVnvO0,7994
-pyglaze/devtools/__init__.py,sha256=9EW20idoaZv_5GuSgDmfpTPjfCZ-Rl27EV3oJebmwnQ,90
-pyglaze/devtools/mock_device.py,sha256=3RMa-JAehbbRCmOO74aZzGPdYp2qsP-XE8ulzLXDP6Q,13994
-pyglaze/devtools/thz_pulse.py,sha256=xp-T9psdOrUMtSUFu8HEwQJVu_aMixJdZHtg_BCVu_k,923
-pyglaze/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyglaze/helpers/types.py,sha256=p9xSAP5Trr1FcCWl7ynCWqDOUZKgMQYzMUXSwDpAKHg,599
-pyglaze/helpers/utilities.py,sha256=n_x9Tqm305MUorS29O6CoJM8Mi4apo2bsN_odrRaVAw,2423
-pyglaze/interpolation/__init__.py,sha256=WCxHPsiI7zvJykp-jfytoEbO4Tla-YIF6A7fjDfcDvU,72
-pyglaze/interpolation/interpolation.py,sha256=rQWzPD7W8TXETps7VZI0gcfAOCWO8pGL1HhhBnyxaMw,735
-pyglaze/scanning/__init__.py,sha256=uCBaeDTufOrC9KWf30ICqcmvFg_YT85olb3M9jkvZRg,99
-pyglaze/scanning/_asyncscanner.py,sha256=SldM7XCavfugsDstxMVI_WLL6GUJutLYN0iU__mfY5A,5277
-pyglaze/scanning/client.py,sha256=3qrQStkeLQzCeu4yMHJ_ENLGQ7E5GMc4CP9J55rk-ug,1817
-pyglaze/scanning/scanner.py,sha256=PSjXVpSpHpYIl-sW34pIThocbM9GSHJ_E4gGcsePeTw,8139
-pyglaze-0.2.1.dist-info/LICENSE,sha256=LCP3sGBX7LxuQopcjeug1fW4tngWCHF4zB7QCgB28xM,1504
-pyglaze-0.2.1.dist-info/METADATA,sha256=WETmnm6CF1_eyojd-ahfIFLJ_VCxV2jshcrbSoPLg3Y,3498
-pyglaze-0.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-pyglaze-0.2.1.dist-info/top_level.txt,sha256=X7d5rqVVuWNmtK4-Uh4sgOLlqye8vaHZOr5RYba0REo,8
-pyglaze-0.2.1.dist-info/RECORD,,