Change the adaptive hfilt test to make Travis happy.

dlilien · Oct 23, 2020 · 0542f4f · 0542f4f
1 parent 8145a60
commit 0542f4f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/impdar/bin/impproc.py b/impdar/bin/impproc.py
@@ -417,7 +417,7 @@ def hfilt(dat, start_trace=0, end_trace=-1, **kwargs):
 
 def ahfilt(dat, window_size=1000, **kwargs):
     """Adaptive horizontal filter."""
-    dat.hfilt(ftype='adaptive', window_size=1000)
+    dat.hfilt(ftype='adaptive', window_size=window_size)
 
 
 def rev(dat, **kwargs):

diff --git a/impdar/lib/RadarData/_RadarDataFiltering.py b/impdar/lib/RadarData/_RadarDataFiltering.py
@@ -14,7 +14,7 @@
 from ..ImpdarError import ImpdarError
 
 
-def adaptivehfilt(self, window_size=1000, *args, **kwargs):
+def adaptivehfilt(self, window_size, *args, **kwargs):
     """Adaptively filter to reduce noise in upper layers
 
     This subtracts the average of traces around an individual trace in order to filter it.

diff --git a/impdar/lib/process.py b/impdar/lib/process.py
@@ -81,7 +81,7 @@ def process_and_exit(fn, cat=False, filetype='mat', **kwargs):
 
 
 def process(RadarDataList, interp=None, rev=False, vbp=None, hfilt=None,
-            ahfilt=False, nmo=None, crop=None, hcrop=None, restack=None,
+            ahfilt=None, nmo=None, crop=None, hcrop=None, restack=None,
             denoise=None, migrate=None, **kwargs):
     """Perform one or more processing steps on a list of RadarData .
 
@@ -158,7 +158,7 @@ def process(RadarDataList, interp=None, rev=False, vbp=None, hfilt=None,
 
     if ahfilt:
         for dat in RadarDataList:
-            dat.hfilt(ftype='adaptive')
+            dat.hfilt(ftype='adaptive',window_size=ahfilt)
         done_stuff = True
 
     if nmo is not None:

diff --git a/impdar/tests/test_RadarDataFiltering.py b/impdar/tests/test_RadarDataFiltering.py
@@ -251,8 +251,8 @@ class TestRadarDataHfiltWrapper(unittest.TestCase):
     def test_adaptive(self):
         radardata = NoInitRadarData()
         radardata.adaptivehfilt = MagicMock()
-        radardata.hfilt(ftype='adaptive')
-        radardata.adaptivehfilt.assert_called_with()
+        radardata.hfilt(ftype='adaptive', window_size=1000)
+        radardata.adaptivehfilt.assert_called_with(window_size=1000)
 
     def test_horizontalfilt(self):
         radardata = NoInitRadarData()
@@ -267,11 +267,12 @@ def test_badfilter(self):
 
 
 class TestProcessWrapper(unittest.TestCase):
+
     def test_process_ahfilt(self):
         radardata = NoInitRadarData()
         radardata.adaptivehfilt = MagicMock()
-        process.process([radardata], ahfilt=True)
-        radardata.adaptivehfilt.assert_called_with()
+        process.process([radardata], ahfilt=1000)
+        radardata.adaptivehfilt.assert_called_with(window_size=1000)
 
     def test_process_hfilt(self):
         radardata = NoInitRadarData()

diff --git a/impdar/tests/test_impproc.py b/impdar/tests/test_impproc.py
@@ -179,7 +179,7 @@ def test_rev(self, load_patch, rev_patch):
     @patch('impdar.bin.impproc.load')
     def test_ahfilt(self, load_patch, ahfilt_patch):
         load_patch.return_value = [MagicMock()]
-        impproc.sys.argv = ['dummy', 'ahfilt', 'dummy.mat']
+        impproc.sys.argv = ['dummy', 'ahfilt', '1000', 'dummy.mat']
         impproc.main()
         self.assertTrue(ahfilt_patch.called)