revert using next_fast_len to nextpow2, more stable

ROBelgium · Jan 26, 2018 · 40c3801 · 40c3801
1 parent 1ad6c9c
commit 40c3801
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/msnoise/move2obspy.py b/msnoise/move2obspy.py
@@ -270,12 +270,13 @@ def mwcs(current, reference, freqmin, freqmax, df, tmin, window_length, step,
     time_axis = []
 
     window_length_samples = np.int(window_length * df)
-    try:
-        from scipy.fftpack.helper import next_fast_len
-    except ImportError:
-        from obspy.signal.util import next_pow_2 as next_fast_len
-
-    padd = next_fast_len(window_length_samples)
+    # try:
+    #     from scipy.fftpack.helper import next_fast_len
+    # except ImportError:
+    #     from obspy.signal.util import next_pow_2 as next_fast_len
+    from msnoise.api import nextpow2
+    padd = int(2 ** (nextpow2(window_length_samples) + 2))
+    # padd = next_fast_len(window_length_samples)
     count = 0
     tp = cosine_taper(window_length_samples, 0.85)
     minind = 0

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-setup(version="1.5",
+setup(version="1.5.1",
       name='msnoise',
       packages=find_packages(),
       include_package_data=True,