misleep 0.3.2__tar.gz → 0.3.4__tar.gz

{misleep-0.3.2 → misleep-0.3.4}/CHANGELOG.md

@@ -5,6 +5,40 @@ All notable changes to MiSleep are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- **Regular spectral export frequency grid**: State Spectral and the spectrum
+  window interpolate power onto the nominal frequency spacing selected by the
+  FFT duration (e.g. 0.1 Hz for 10 s), including exact band endpoints.
+  Fractional sample rates no longer produce drifting frequency labels or
+  duplicate near-boundary rows. Excel contains the regular numeric values,
+  rather than merely displaying rounded labels.
+
+## [0.3.4] — 2026-09-30
+
+### Fixed
+
+- **Spectral export frequency boundaries**: retain the true FFT frequency
+  precision and interpolate power at the exact requested band endpoints.
+  Fractional sample rates no longer drop the 30 Hz endpoint because a nearby
+  FFT bin rounds to 30.01 Hz. Applies to State Spectral, spectrum and
+  spectrogram exports. CSV frequency axes retain full precision, and power
+  integration uses the actual frequency coordinates.
+
+## [0.3.3] — 2026-09-22
+
+### Fixed
+
+- **Auto-staging model compatibility**: benchmark models serialized with
+  NumPy 2.x now load under NumPy 1.x as well. This fixes
+  `No module named 'numpy._core'` for users installing MiSleep into an
+  environment with an older supported NumPy release.
+- **Hourly State Spectral export**: columns stay aligned to `ZT0`, `ZT1`,
+  ... from the selected start time. Hours in which a state is absent remain
+  empty instead of shifting later spectra into earlier columns.
+
 ## [0.3.2] — 2026-08-24
 
 ### Fixed

{misleep-0.3.2/src/misleep.egg-info → misleep-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: misleep
-Version: 0.3.2
+Version: 0.3.4
 Summary: MiSleep: Mice sleep EEG/EMG visualization, scoring, and analysis
 Author-email: Xueqiang Wang <swang9194@gmail.com>
 Maintainer-email: Xueqiang Wang <swang9194@gmail.com>
@@ -78,6 +78,7 @@ Requires-Dist: lightgbm>=3.3; extra == "full"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Dynamic: license-file
 
 # MiSleep
 

{misleep-0.3.2 → misleep-0.3.4}/docs/config_file.md

@@ -23,8 +23,8 @@ wipe your personal settings. Open the user file from the GUI via
 
 | key | default | meaning |
 |-----|---------|---------|
-| `version` | `v0.3.2` | displayed in the About dialog |
-| `updatetime` | `2026/08/24` | displayed in the About dialog |
+| `version` | `v0.3.4` | displayed in the About dialog |
+| `updatetime` | `2026/09/30` | displayed in the About dialog |
 | `marker` | `['half_signal', 'first REM', ...]` | marker label list (label picker) |
 | `startend` | `['high_theta', 'REM', ...]` | start-end label list (label picker) |
 | `statemap` | `{"1": "NREM", "2": "REM", "3": "Wake", "4": "INIT", ...}` | state code -> name mapping (JSON) |
@@ -48,8 +48,8 @@ wipe your personal settings. Open the user file from the GUI via
 
 ```ini
 [gui]
-version = v0.3.2
-updatetime = 2026/08/24
+version = v0.3.4
+updatetime = 2026/09/30
 marker = ['half_signal', 'first REM', 'WindEEG', 'W-R', 'maker']
 startend = ['high_theta', 'REM', 'Wake', 'Spindle', 'SWA', 'start end label', 'start end label']
 statemap = {"1": "NREM", "2": "REM", "3": "Wake", "4": "INIT", "5": "IS", "6": "MicroArousal"}

{misleep-0.3.2 → misleep-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "misleep"
-version = "0.3.2"
+version = "0.3.4"
 description = "MiSleep: Mice sleep EEG/EMG visualization, scoring, and analysis"
 readme = "README.md"
 requires-python = ">=3.8"

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/__init__.py

@@ -22,7 +22,7 @@ works without PySide6; import ``misleep.gui`` explicitly when needed.
 from importlib import import_module
 
 __author__ = "Xueqiang Wang <swang9194@gmail.com>"
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 # Importing ``misleep`` used to import scipy, pandas, sklearn and matplotlib
 # immediately.  The GUI necessarily imports some of those later, but making

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/analysis/autostage/benchmark.py

@@ -22,6 +22,7 @@ hypnogram.
 
 from __future__ import annotations
 
+from contextlib import contextmanager
 from functools import lru_cache
 from pathlib import Path
 
@@ -48,6 +49,43 @@ STRIDE = 1.0
 COMBO_BASE = {"F": "eegf", "P": "eegp"}
 
 
+@contextmanager
+def _numpy_pickle_compat(joblib_module):
+    """Make NumPy-2-created model pickles readable with NumPy 1.x.
+
+    NumPy 2 renamed its private ``numpy.core`` package to ``numpy._core``.
+    The bundled benchmark was serialized under NumPy 2 and therefore stores
+    the latter module path.  NumPy 1.x cannot import it, even though the
+    referenced scalar implementation is otherwise compatible.  Remap that
+    one private module path inside Joblib's unpickler, without changing the
+    process-wide NumPy module namespace.
+    """
+    try:
+        numpy_major = int(np.__version__.split(".", 1)[0])
+    except (TypeError, ValueError):  # pragma: no cover - non-standard build
+        numpy_major = 2
+
+    if numpy_major >= 2:
+        yield
+        return
+
+    unpickler = joblib_module.numpy_pickle.NumpyUnpickler
+    original_find_class = unpickler.find_class
+
+    def find_class_compat(self, module, name):
+        if module == "numpy._core":
+            module = "numpy.core"
+        elif module.startswith("numpy._core."):
+            module = "numpy.core." + module[len("numpy._core."):]
+        return original_find_class(self, module, name)
+
+    try:
+        unpickler.find_class = find_class_compat
+        yield
+    finally:
+        unpickler.find_class = original_find_class
+
+
 def models_path() -> Path:
     """Return the path of the packaged benchmark models file."""
     return resource_dir("misleep.analysis.models") / "benchmark_models.pkl"
@@ -63,7 +101,8 @@ def load_models(path=None):
         raise FileNotFoundError(
             f"Model file not found: {path}. Make sure the package data is "
             f"installed (pip install misleep).")
-    return joblib.load(path)
+    with _numpy_pickle_compat(joblib):
+        return joblib.load(path)
 
 
 def model_combo(site="F", use_emg=False, use_acc=False):

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/analysis/models/benchmark_models.pkl

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
-name: misleep-0.3.2/src/misleep/analysis/models/benchmark_models.pkl
+name: misleep-0.3.4/src/misleep/analysis/models/benchmark_models.pkl
 size: 50435195 bytes
 sha256: 8390ffa5ef8d45701a09244ec75dea46d2e4bff6a4c8242b0de84da8ea9cd31c

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/config/default_config.ini

@@ -15,8 +15,8 @@
 # overwritten on the next package update.
 
 [gui]
-version = v0.3.2
-updatetime = 2026/08/24
+version = v0.3.4
+updatetime = 2026/09/30
 marker = ['half_signal', 'first REM', 'WindEEG', 'W-R', 'maker']
 startend = ['high_theta', 'REM', 'Wake', 'Spindle', 'SWA', 'start end label', 'start end label']
 statemap = {"1": "NREM", "2": "REM", "3": "Wake", "4": "INIT"}

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/gui/dialogs.py

@@ -7,6 +7,7 @@ the two auto-staging dialogs and the save-data dialog, plus the About box.
 """
 
 import datetime
+import math
 import os
 from copy import deepcopy
 
@@ -50,6 +51,33 @@ from misleep.logger import logger
 from misleep.utils.annotation import lst2group
 
 
+def _split_state_data_by_hour(channel_data, sleep_states, states, sf):
+    """Return per-state signal segments in fixed, time-aligned hour slots.
+
+    Every state receives one entry per elapsed hour.  An entry is ``None``
+    when that state has no usable data in the hour, so later hours never
+    shift left to fill an empty ZT column.
+    """
+    hour_count = int(math.ceil(len(sleep_states) / 3600))
+    result = {state: [None] * hour_count for state in states}
+
+    for hour_idx in range(hour_count):
+        hour_start = hour_idx * 3600
+        hour_stop = min(hour_start + 3600, len(sleep_states))
+        groups = lst2group(enumerate(sleep_states[hour_start:hour_stop]))
+        for state in states:
+            parts = [
+                channel_data[
+                    int((hour_start + group_start) * sf):
+                    int((hour_start + group_stop) * sf)]
+                for group_start, group_stop, value in groups
+                if value == state
+            ]
+            if parts:
+                result[state][hour_idx] = np.concatenate(parts)
+    return result
+
+
 class AboutDialog(QDialog, Ui_AboutDialog):
     """The About box of MiSleep."""
 
@@ -400,11 +428,13 @@ class StateSpectralDialog(QDialog, Ui_StateSpectralDialog):
             end_sec = mianno.anno_length
 
         midata = midata.crop([start_sec, end_sec])
-        sleep_state = mianno.sleep_state[start_sec:end_sec + 1]
+        # ``end_sec`` is exclusive, matching MiData.crop().  Using end+1 here
+        # created a spurious sample at exact hour boundaries.
+        sleep_state_values = mianno.sleep_state[start_sec:end_sec]
 
         channel_idx = self.ChannelSelector.currentIndex()
         channel_data = midata.signals[channel_idx]
-        sleep_state = lst2group([[idx, each] for idx, each in enumerate(sleep_state)])
+        sleep_state = lst2group(enumerate(sleep_state_values))
         sf = midata.sf[channel_idx]
 
         # Band-pass filter if checked
@@ -419,10 +449,12 @@ class StateSpectralDialog(QDialog, Ui_StateSpectralDialog):
         nfft = int(self.nfftSpinBox.value() * sf) if self.nfftCheckBox.isChecked() else None
         if nfft is not None and nfft < nperseg:
             nfft = None
+        frequency_step = 1.0 / (
+            self.nfftSpinBox.value() if nfft is not None else win_length)
 
         gaussian_sigma = self.GaussianSpinBox.value() if self.GaussianCheckBox.isChecked() else None
 
-        state_codes = sorted(set(mianno.sleep_state[start_sec:end_sec + 1]))
+        state_codes = sorted(set(sleep_state_values))
         state_data = {
             state: np.concatenate([
                 channel_data[int(each[0] * sf): int(each[1] * sf)]
@@ -442,7 +474,8 @@ class StateSpectralDialog(QDialog, Ui_StateSpectralDialog):
         spectra = {
             state: cal_draw_spectrum(data=data, sf=sf, nperseg=nperseg,
                                      freq_band=freq_band, relative=relative,
-                                     nfft=nfft, gaussian_sigma=gaussian_sigma)
+                                     nfft=nfft, gaussian_sigma=gaussian_sigma,
+                                     frequency_step=frequency_step)
             for state, data in state_data.items()
         }
 
@@ -451,21 +484,22 @@ class StateSpectralDialog(QDialog, Ui_StateSpectralDialog):
         # Optional per-hour spectral segmentation
         hour_spec = {state: [] for state in spectra}
         if self.HourSegmentCheckBox.isChecked():
-            for sec in range(0, end_sec - start_sec, 3600):
-                hour_states = mianno.sleep_state[start_sec + sec:start_sec + sec + 3600]
-                hour_states = lst2group([[idx + sec, each]
-                                         for idx, each in enumerate(hour_states)])
-                for state in spectra:
-                    data_parts = [channel_data[int(each[0] * sf): int(each[1] * sf)]
-                                  for each in hour_states if each[2] == state]
-                    data = np.concatenate(data_parts) if data_parts else np.array([])
-                    if self.RejectArtifactCheckBox.isChecked() and len(data):
-                        data = reject_artifact(data, sf=sf, threshold=threshold)
-                    if len(data) > sf * 10:
-                        hour_spec[state].append(cal_draw_spectrum(
+            hourly_data = _split_state_data_by_hour(
+                channel_data, sleep_state_values, spectra, sf)
+            for state, state_hours in hourly_data.items():
+                for data in state_hours:
+                    if data is not None and self.RejectArtifactCheckBox.isChecked():
+                        data = reject_artifact(
+                            data, sf=sf, threshold=threshold)
+                    if data is not None and len(data) > sf * 10:
+                        power = cal_draw_spectrum(
                             data=data, sf=sf, nperseg=nperseg,
                             freq_band=freq_band, relative=relative, nfft=nfft,
-                            gaussian_sigma=gaussian_sigma)[0][1])
+                            gaussian_sigma=gaussian_sigma,
+                            frequency_step=frequency_step)[0][1]
+                        hour_spec[state].append(power)
+                    else:
+                        hour_spec[state].append(None)
 
         fd = QFileDialog.getExistingDirectory(self, "Select a folder to save states' data",
                                               f"{config['gui']['openpath']}")
@@ -485,10 +519,10 @@ class StateSpectralDialog(QDialog, Ui_StateSpectralDialog):
                     figure.savefig(fd + "/" + safe_name + "_spectrum.pdf")
                     _df = pd.DataFrame(
                         data=spec.T, columns=["frequency", "power"])
-                    if hour_spec[state]:
-                        _df[[str(each) for each in range(
-                            1, len(hour_spec[state]) + 1)]] = \
-                            pd.DataFrame(hour_spec[state]).T
+                    for hour_idx, hour_power in enumerate(hour_spec[state]):
+                        column = f"ZT{hour_idx}"
+                        _df[column] = np.nan if hour_power is None \
+                            else pd.Series(hour_power)
                     _df.to_excel(
                         excel_writer=writer, sheet_name=safe_name[:31],
                         index=False)

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/gui/main_window.py

@@ -2274,8 +2274,10 @@ class MainWindow(QMainWindow, Ui_MiSleep):
         nfft = int(float(self.config["spec"]["nfft_sec"]) * self.midata.sf[channel])
         if win_sec > (end_ - start_):
             win_sec = end_ - start_
-        if nfft < int(win_sec * self.midata.sf[channel]):
-            nfft = int(win_sec * self.midata.sf[channel])
+        if nfft < int(win_sec * self.midata.sf[channel]):
+            nfft = int(win_sec * self.midata.sf[channel])
+        frequency_step = 1.0 / max(
+            float(self.config["spec"]["nfft_sec"]), win_sec)
 
         try:
             spec_window = self._ensure_dialog("spec_window", SpecWindow)
@@ -2286,14 +2288,16 @@ class MainWindow(QMainWindow, Ui_MiSleep):
                 band=freq_range,
                 nfft=nfft,
                 gaussian_sigma=float(self.config["spec"]["gaussian_sigma"]),
-                win_sec=win_sec,
-                relative=False)
+                win_sec=win_sec,
+                frequency_step=frequency_step,
+                relative=False)
 
             f, t, Sxx = spectrogram(
                 signal=signal_data,
                 sf=self.midata.sf[channel],
                 band=freq_range,
-                step=1, win_sec=win_sec, norm=False, nfft=nfft)
+                step=1, win_sec=win_sec, norm=False, nfft=nfft,
+                frequency_step=frequency_step)
 
             bandPower = band_power(psd=psd, freq=freq,
                                    bands=[[0.5, 4, "delta"], [4, 9, "theta"]])

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/gui/qt_utils.py

@@ -184,7 +184,8 @@ class ChannelListModel(QAbstractListModel):
         self.endResetModel()
 
 
-def cal_draw_spectrum(data, sf, nperseg, freq_band=None, relative=None, nfft=None, gaussian_sigma=None):
+def cal_draw_spectrum(data, sf, nperseg, freq_band=None, relative=None, nfft=None,
+                      gaussian_sigma=None, frequency_step=None):
     """Calculate a power spectrum and return it together with a figure.
 
     Parameters
@@ -203,6 +204,8 @@ def cal_draw_spectrum(data, sf, nperseg, freq_band=None, relative=None, nfft=Non
         Number of FFT points.
     gaussian_sigma : float, optional
         Gaussian smoothing sigma.
+    frequency_step : float, optional
+        Regular frequency spacing derived from the selected FFT duration.
 
     Returns
     -------
@@ -218,19 +221,17 @@ def cal_draw_spectrum(data, sf, nperseg, freq_band=None, relative=None, nfft=Non
     from matplotlib.figure import Figure
     from scipy.ndimage import gaussian_filter1d
     from scipy.signal import welch
+    from misleep.preprocessing.spectral import _select_frequency_band
 
     if freq_band is None:
         freq_band = [0.5, 30]
     F, P = welch(data, sf, nperseg=nperseg, nfft=nfft, scaling="density")
 
-    F = np.array([round(each, 2) for each in F])
     if gaussian_sigma is not None:
         P = gaussian_filter1d(P, sigma=gaussian_sigma)
 
     if freq_band is not None:
-        idx_band = np.logical_and(F >= freq_band[0], F <= freq_band[1])
-        F = F[idx_band]
-        P = P[idx_band]
+        F, P = _select_frequency_band(F, P, freq_band, frequency_step)
 
     if relative:
         total = sum(P)

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/gui/spec_window.py

@@ -136,7 +136,7 @@ class SpecWindow(QMainWindow, Ui_spec_window):
             data_path = fd[:-4]
             fd = data_path + "_data.csv"
             _df = pd.DataFrame(
-                data=np.array([[f"{value:.2f}" for value in self.spectrum[1]], self.spectrum[0]]).T,
+                data=np.array([self.spectrum[1], self.spectrum[0]]).T,
                 columns=["frequency", "power"])
             _df.to_csv(fd, index=False)
         except OSError:
@@ -166,7 +166,7 @@ class SpecWindow(QMainWindow, Ui_spec_window):
             _df = pd.DataFrame(
                 self.spectrogram[2].T,
                 index=[f"{value:.2f}" for value in self.spectrogram[1]],
-                columns=[f"{value:.2f}" for value in self.spectrogram[0]])
+                columns=self.spectrogram[0])
             _df.to_csv(fd, index=True)
         except OSError:
             QMessageBox.about(

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/gui/uis/about.ui

@@ -58,14 +58,14 @@
       <item>
        <widget class="QLabel" name="VersionLabel">
         <property name="text">
-         <string>Version: 0.3.2</string>
+         <string>Version: 0.3.4</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="UpdateLabel">
         <property name="text">
-         <string>Update: 2026/08/24</string>
+         <string>Update: 2026/09/30</string>
         </property>
        </widget>
       </item>

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/gui/uis/about_ui.py

@@ -73,8 +73,8 @@ class Ui_AboutDialog(object):
         AboutDialog.setWindowTitle(QCoreApplication.translate("AboutDialog", u"About", None))
         self.label_4.setText(QCoreApplication.translate("AboutDialog", u"<html><head/><body><p><img src=\":/logo/entire_logo.png\"/></p></body></html>", None))
         self.groupBox.setTitle(QCoreApplication.translate("AboutDialog", u"MiSleep", None))
-        self.VersionLabel.setText(QCoreApplication.translate("AboutDialog", u"Version: 0.3.2", None))
-        self.UpdateLabel.setText(QCoreApplication.translate("AboutDialog", u"Update: 2026/08/24", None))
+        self.VersionLabel.setText(QCoreApplication.translate("AboutDialog", u"Version: 0.3.4", None))
+        self.UpdateLabel.setText(QCoreApplication.translate("AboutDialog", u"Update: 2026/09/30", None))
         self.CopyrightLabel.setText(QCoreApplication.translate("AboutDialog", u"Copyright \u00a9 2023\u20132026 Xueqiang Wang.", None))
     # retranslateUi
 

{misleep-0.3.2 → misleep-0.3.4}/src/misleep/preprocessing/spectral.py

@@ -9,7 +9,58 @@ from scipy.signal import stft, welch
 from misleep.preprocessing.filtering import signal_filter
 
 
-def spectrum(signal, sf, band=None, relative=True, win_sec=1, nfft=None, gaussian_sigma=None):
+def _select_frequency_band(freq, power, band, frequency_step=None):
+    """Crop on the true FFT axis and interpolate exact band endpoints.
+
+    Fractional sample rates and integer FFT lengths need not place a bin
+    exactly on the requested limits. Never round bins before selecting them
+    or relabel an out-of-band bin as the boundary. Interpolate power between
+    the two surrounding bins instead, without extrapolating beyond the axis.
+    The frequency dimension is the first axis of ``power``.
+    With ``frequency_step``, interpolate onto a regular zero-anchored grid
+    (e.g. 0.5, 0.6, ..., 30 Hz for a ten-second FFT setting).
+    """
+    low, high = band
+    if frequency_step is not None:
+        if not np.isfinite(frequency_step) or frequency_step <= 0:
+            raise ValueError("frequency_step must be finite and positive")
+        low, high = max(low, freq[0]), min(high, freq[-1])
+        if low > high:
+            return freq[:0], power[:0]
+        first = int(np.ceil(low / frequency_step))
+        last = int(np.floor(high / frequency_step))
+        grid = np.round(np.arange(first, last + 1) * frequency_step, 12)
+        grid = grid[(grid > low) & (grid < high)]
+        grid = np.unique(np.concatenate(([low], grid, [high])))
+        right = np.clip(np.searchsorted(freq, grid), 1, len(freq) - 1)
+        left = right - 1
+        weight = (grid - freq[left]) / (freq[right] - freq[left])
+        weight = weight.reshape((-1,) + (1,) * (power.ndim - 1))
+        values = power[left] + weight * (power[right] - power[left])
+        return grid, values
+    selected = (freq >= low) & (freq <= high)
+    result_freq = freq[selected]
+    result_power = power[selected]
+    for boundary, prepend in ((low, True), (high, False)):
+        if not freq[0] <= boundary <= freq[-1]:
+            continue
+        if np.any(result_freq == boundary):
+            continue
+        right = np.searchsorted(freq, boundary)
+        left = right - 1
+        weight = (boundary - freq[left]) / (freq[right] - freq[left])
+        value = power[left] + weight * (power[right] - power[left])
+        if prepend:
+            result_freq = np.concatenate(([boundary], result_freq))
+            result_power = np.concatenate((value[np.newaxis], result_power))
+        else:
+            result_freq = np.concatenate((result_freq, [boundary]))
+            result_power = np.concatenate((result_power, value[np.newaxis]))
+    return result_freq, result_power
+
+
+def spectrum(signal, sf, band=None, relative=True, win_sec=1, nfft=None, gaussian_sigma=None,
+             frequency_step=None):
     """Calculate the (Welch) power spectrum of a signal.
 
     The signal is band-pass filtered to ``band`` first, then the power
@@ -31,6 +82,8 @@ def spectrum(signal, sf, band=None, relative=True, win_sec=1, nfft=None, gaussia
         Number of FFT points.
     gaussian_sigma : float, optional
         Sigma for Gaussian smoothing of the PSD.
+    frequency_step : float, optional
+        Interpolate onto this regular frequency grid for display/export.
 
     Returns
     -------
@@ -54,21 +107,19 @@ def spectrum(signal, sf, band=None, relative=True, win_sec=1, nfft=None, gaussia
     signal, _ = signal_filter(data=signal, sf=sf, btype="bandpass", low=band[0], high=band[1])
 
     freq, psd = welch(signal, sf, nperseg=int(sf * win_sec), nfft=nfft, scaling="density")
-    freq = np.array([round(each, 2) for each in freq])
     psd = gaussian_filter1d(psd, sigma=gaussian_sigma) if gaussian_sigma is not None else psd
 
-    idx_freq = np.logical_and(freq >= band[0], freq <= band[1])
-    freq = freq[idx_freq]
-    psd = psd[idx_freq]
+    freq, psd = _select_frequency_band(freq, psd, band, frequency_step)
 
-    total_power = simpson(psd, dx=freq[1] - freq[0])
+    total_power = simpson(psd, x=freq)
     if relative and total_power > 0:
         psd /= total_power
 
     return freq, psd
 
 
-def spectrogram(signal, sf, band=None, step=0.2, win_sec=2, norm=False, nfft=None):
+def spectrogram(signal, sf, band=None, step=0.2, win_sec=2, norm=False, nfft=None,
+                frequency_step=None):
     """Calculate the spectrogram of a signal with the STFT.
 
     Parameters
@@ -87,6 +138,8 @@ def spectrogram(signal, sf, band=None, step=0.2, win_sec=2, norm=False, nfft=Non
         Whether to normalize the power across frequencies at each time point.
     nfft : int, optional
         Number of FFT points.
+    frequency_step : float, optional
+        Interpolate power onto this regular frequency grid for display/export.
 
     Returns
     -------
@@ -120,12 +173,8 @@ def spectrogram(signal, sf, band=None, step=0.2, win_sec=2, norm=False, nfft=Non
     f, t, Sxx = stft(signal, sf, nperseg=nperseg, nfft=nfft,
                      noverlap=noverlap, padded=False, boundary="zeros")
 
-    f = np.array([round(each, 2) for each in f])
-
-    idx_f = np.logical_and(f >= band[0], f <= band[1])
-    f = f[idx_f]
-    Sxx = Sxx[idx_f, :]
     Sxx = np.square(np.abs(Sxx))
+    f, Sxx = _select_frequency_band(f, Sxx, band, frequency_step)
 
     if norm:
         sum_power = Sxx.sum(0).reshape(1, -1)
@@ -153,14 +202,13 @@ def band_power(psd, freq, bands=None, relative=False):
     dict
         Band name -> band power.
     """
-    freq_res = freq[1] - freq[0]
     band_dict = {}
     for each in bands:
-        idx_band = np.logical_and(freq >= each[0], freq <= each[1])
-        bp = simpson(psd[idx_band], dx=freq_res)
+        band_freq, band_psd = _select_frequency_band(freq, psd, each[:2])
+        bp = simpson(band_psd, x=band_freq)
 
         if relative:
-            total = simpson(psd, dx=freq_res)
+            total = simpson(psd, x=freq)
             if total > 0:
                 bp /= total
 

{misleep-0.3.2 → misleep-0.3.4/src/misleep.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: misleep
-Version: 0.3.2
+Version: 0.3.4
 Summary: MiSleep: Mice sleep EEG/EMG visualization, scoring, and analysis
 Author-email: Xueqiang Wang <swang9194@gmail.com>
 Maintainer-email: Xueqiang Wang <swang9194@gmail.com>
@@ -78,6 +78,7 @@ Requires-Dist: lightgbm>=3.3; extra == "full"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Dynamic: license-file
 
 # MiSleep
 

{misleep-0.3.2 → misleep-0.3.4}/tests/test_analysis.py

@@ -96,6 +96,20 @@ def test_model_path():
     assert p.exists()
 
 
+def test_benchmark_model_loads_through_numpy1_compat(monkeypatch):
+    """NumPy 1.x users can read the model serialized under NumPy 2.x."""
+    from misleep.analysis.autostage import benchmark
+
+    benchmark.load_models.cache_clear()
+    monkeypatch.setattr(benchmark.np, "__version__", "1.26.4")
+    models = benchmark.load_models()
+    assert set(models) == {
+        "eegf", "eegp", "eegf_emg", "eegp_emg",
+        "eegf_emg_acc", "eegp_emg_acc",
+    }
+    benchmark.load_models.cache_clear()
+
+
 def test_auto_stage_gbm():
     sf = 256.0
     eeg = make_signal(sf=sf, duration=100, seed=2)