Test + pipeline changes for dedisperse

Author: robertkleef

dedisperse/dedisperse.py

@@ -4,7 +4,7 @@
 # pylint: disable-msg=C0103
 import numpy as np
 
-def dedisperse(samples, highest_x=None, max_delay=None, dm=None):
+def dedisperse(samples, highest_x=None, max_delay=0, dm=None):
     '''
     This method performs dedispersion on the filterbank data
     The maximum_delay specifies between the currently considered pulsar signal and the next pulsar
@@ -20,7 +20,7 @@ def dedisperse(samples, highest_x=None, max_delay=None, dm=None):
         dm = find_dm(samples, pulsar_intensity, max_delay)
 
     # Distribute the DM over the amount of samples
-    delays_per_sample = np.round(np.linspace(dm, 0, samples.shape[1])).astype(int)
+    delays_per_sample = (np.round(np.linspace(dm, 0, samples.shape[1]))).astype(int)
 
     # Loop over the frequencies
     for i, _ in enumerate(delays_per_sample):

examples/dedisperse_stream.py

@@ -14,8 +14,6 @@
 import dedisperse as dedisperse
 from plot.static_waterfall import waterfall_plot
 
-from timeseries.timeseries import Timeseries
-
 from clipping import clipping
 
 # Read filterbank data,

pipeline/pipeline.py

@@ -112,12 +112,13 @@ def measure_methods(self, stopwatch, fil_data, freqs, DM, scale):
             Run and time all methods/modules
         """
         # clipping
+        
         time_clipping = timer()
         _, _ = clipping.clipping(freqs, fil_data)
         stopwatch['time_clipping'] = timer() - time_clipping
         # dedisperse
         time_dedisp = timer()
-        fil_data = dedisperse.dedisperse(fil_data, DM)
+        fil_data = dedisperse.dedisperse(fil_data, dm=DM)
         stopwatch['time_dedisp'] = timer() - time_dedisp
         # timeseries
         time_t_series = timer()
@@ -131,6 +132,8 @@ def measure_methods(self, stopwatch, fil_data, freqs, DM, scale):
         time_fft_vect = timer()
         fourier.fft_vectorized(time_series)
         stopwatch['time_fft_vect'] = timer() - time_fft_vect
+        print("dft")
+
         # dft
         time_dft = timer()
         fourier.dft_slow(time_series)

tests/test_dedisperse.py

@@ -3,6 +3,7 @@
 """
 
 import unittest
+import numpy as np 
 
 from .context import dedisperse # pylint: disable-msg=E0611
 
@@ -25,5 +26,5 @@ def test_dedisperse(self):
             expect moved frequencies per sample
         """
         disp_measure = 6
-        results = dedisperse.dedisperse(self.samples, disp_measure)
+        results = dedisperse.dedisperse(np.array(self.samples), None, None, disp_measure)
         self.assertListEqual(list(results[len(self.samples)-1]), [10]*7)