From 02345f9ddaa57f049aaca39711d0275ed58e88e0 Mon Sep 17 00:00:00 2001 From: owinter Date: Wed, 4 Dec 2024 11:36:08 +0000 Subject: [PATCH] ruff --- src/iblphotometry/loaders.py | 4 ++-- src/iblphotometry/pipelines.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/iblphotometry/loaders.py b/src/iblphotometry/loaders.py index ce683a4..15b6158 100644 --- a/src/iblphotometry/loaders.py +++ b/src/iblphotometry/loaders.py @@ -12,7 +12,7 @@ def __init__(self, one, verbose=False): self.one = one self.verbose = verbose - def load_photometry_data(self, eid=None, pid=None, rename=True) -> nap.TsdFrame: + def load_photometry_data(self, eid=None, pid=None, rename=True) -> pd.DataFrame: if pid is not None: raise NotImplementedError # return self._load_data_from_pid(pid) @@ -20,7 +20,7 @@ def load_photometry_data(self, eid=None, pid=None, rename=True) -> nap.TsdFrame: if eid is not None: return self._load_data_from_eid(eid, rename=rename) - def _load_data_from_eid(self, eid, rename=True) -> nap.TsdFrame: + def _load_data_from_eid(self, eid, rename=True) -> pd.DataFrame: raw_photometry_df = self.one.load_dataset(eid, 'photometry.signal.pqt') locations_df = self.one.load_dataset(eid, 'photometryROI.locations.pqt') read_config = dict( diff --git a/src/iblphotometry/pipelines.py b/src/iblphotometry/pipelines.py index 72bcfa4..85cf9b9 100644 --- a/src/iblphotometry/pipelines.py +++ b/src/iblphotometry/pipelines.py @@ -2,11 +2,8 @@ import numpy as np import pandas as pd -from iblphotometry.helpers import z, filt # from ibldsp.utils import WindowGenerator -from iblphotometry import sliding_operations -from iblphotometry import bleach_corrections from iblphotometry.outlier_detection import remove_spikes from iblphotometry.bleach_corrections import lowpass_bleachcorrect, isosbestic_correct from iblphotometry.sliding_operations import sliding_mad @@ -15,7 +12,6 @@ from iblphotometry.helpers import zscore import logging -from copy import copy logger = logging.getLogger()