Skip to content

Fix: make_config bug, unused logic branch in wf filtering #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arm-25 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: make_config bug, unused logic branch in wf filtering #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/spinqick/helper_functions/dac_pulses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/spinqick/make_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/spinqick/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down