From 2c6c0b48cfdfa80f58beba076eec7b36a445b516 Mon Sep 17 00:00:00 2001 From: Matthew Hasselfield Date: Thu, 30 Apr 2020 08:49:23 -0400 Subject: [PATCH] Fix imports so all tests pass This includes a bug-fix in axisman that would only activate with old numpy. --- sotodlib/core/axisman.py | 1 + sotodlib/g3_condition.py | 4 ++-- sotodlib/g3_filter.py | 2 +- sotodlib/g3_sim.py | 2 +- tests/test_data.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sotodlib/core/axisman.py b/sotodlib/core/axisman.py index 23a91ec16..580b95af1 100644 --- a/sotodlib/core/axisman.py +++ b/sotodlib/core/axisman.py @@ -641,6 +641,7 @@ def get_coindices(v0, v1): pass # The old fashioned way + v0 = np.asarray(v0) w0 = sorted([(j, i) for i, j in enumerate(v0)]) w1 = sorted([(j, i) for i, j in enumerate(v1)]) i0, i1 = 0, 0 diff --git a/sotodlib/g3_condition.py b/sotodlib/g3_condition.py index 8f75d4070..01a765041 100644 --- a/sotodlib/g3_condition.py +++ b/sotodlib/g3_condition.py @@ -12,7 +12,7 @@ import scipy.signal as signal from spt3g import core -from sotodlib.g3_core import DataG3Module +from sotodlib.core.g3_core import DataG3Module class MeanSubtract(DataG3Module): def process(self, data, det_name): @@ -102,7 +102,7 @@ def __init__(self, input='signal', output=None, q=5, **kwargs): kwargs: can include any of the optional parameters for scipy.signal.decimate """ - self.decimate_params = {'q':q} + self.decimate_params = {'q': q, 'zero_phase': True} self.decimate_params.update(kwargs) super().__init__(input, output) diff --git a/sotodlib/g3_filter.py b/sotodlib/g3_filter.py index 4695c17e9..862963f5c 100644 --- a/sotodlib/g3_filter.py +++ b/sotodlib/g3_filter.py @@ -9,7 +9,7 @@ import scipy.signal as signal from spt3g import core -from sotodlib.g3_core import DataG3Module +from sotodlib.core.g3_core import DataG3Module class Filter(DataG3Module): """ diff --git a/sotodlib/g3_sim.py b/sotodlib/g3_sim.py index ecd3f7c44..8d8ef984c 100644 --- a/sotodlib/g3_sim.py +++ b/sotodlib/g3_sim.py @@ -9,7 +9,7 @@ import numpy as np from spt3g import core -from sotodlib.g3_core import DataG3Module +from sotodlib.core.g3_core import DataG3Module class PipelineSeeder(list): diff --git a/tests/test_data.py b/tests/test_data.py index eb52db816..7b8ef48ac 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -9,7 +9,7 @@ import numpy as np from spt3g import core -from sotodlib.g3_core import DataG3Module +from sotodlib.core.g3_core import DataG3Module from sotodlib.g3_filter import Filter, LowPassButterworth from sotodlib.g3_condition import (Detrend, Retrend, MeanSubtract, MedianSubtract, Decimate, Resample)