From 8520dbf7257a68aca550e548fd2b187610dc2944 Mon Sep 17 00:00:00 2001 From: arm-25 Date: Fri, 6 Mar 2026 14:33:21 -0500 Subject: [PATCH] Changed make_config to use environment variable for filter config location instead of data directory, updated logic branch in add_wf_filter to catch iir2 case --- src/spinqick/helper_functions/dac_pulses.py | 2 +- src/spinqick/make_config.py | 2 +- src/spinqick/settings.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/spinqick/helper_functions/dac_pulses.py b/src/spinqick/helper_functions/dac_pulses.py index dec352e..3d2ba86 100644 --- a/src/spinqick/helper_functions/dac_pulses.py +++ b/src/spinqick/helper_functions/dac_pulses.py @@ -304,7 +304,7 @@ def add_wf_filter( wf_filt = signal.filtfilt(b, a, wf_filt_1) if filter_settings.fir_taps is not None: wf_filt = signal.convolve(wf_filt_1, filter_settings.fir_taps, mode="same") - elif filter_mode == "both": + elif filter_mode == "iir_2": if filter_settings.iir_2_taps is not None: iir_b, iir_a = filter_settings.iir_2_taps else: diff --git a/src/spinqick/make_config.py b/src/spinqick/make_config.py index bd1c7be..5dd14b7 100644 --- a/src/spinqick/make_config.py +++ b/src/spinqick/make_config.py @@ -17,7 +17,7 @@ def make_default_configs( exp_path = os.environ["SPINQICK_DOT_EXPERIMENT_CONFIG"] data_dir = os.environ["SPINQICK_DATA_DIRECTORY"] if os.environ["SPINQICK_FILTER_CONFIG"]: - filter_path = os.environ["SPINQICK_DATA_DIRECTORY"] + filter_path = os.environ["SPINQICK_FILTER_CONFIG"] else: filter_path = None ### copy the default files into the specified config directory diff --git a/src/spinqick/settings.py b/src/spinqick/settings.py index 5329d45..04cee8a 100644 --- a/src/spinqick/settings.py +++ b/src/spinqick/settings.py @@ -28,7 +28,7 @@ class FilterSettings(pydantic_settings.BaseSettings): iir_taps: Tuple[List[float], List[float]] | None = None iir_2_taps: Tuple[List[float], List[float]] | None = None fir_taps: np.ndarray | None = None - apply_filter: Literal["both", "iir_1", "fir"] | None = None + apply_filter: Literal["both", "iir_1", "iir_2", "fir"] | None = None file_settings = FileSettings()