Comments verwerkt

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=0, dm=None):
+def dedisperse(samples, highest_x=None, max_delay=0, disperion_measure=None):
     '''
     This method performs dedispersion on the filterbank data
     The maximum_delay specifies between the currently considered pulsar signal and the next pulsar
@@ -13,14 +13,14 @@ def dedisperse(samples, highest_x=None, max_delay=0, dm=None):
     pulsar intensity
     '''
 
-    # Check if parameters contain a DM, if not, estimate one
-    if dm is None:
+    # Check if parameters contain a Dispersion Measure, if not, estimate one
+    if disperion_measure is None:
         # Estimates the minimum for an intensity to be considered a pulsar
         pulsar_intensity = find_estimation_intensity(samples, highest_x)
-        dm = find_dm(samples, pulsar_intensity, max_delay)
+        disperion_measure = 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)
+    # Distribute the Dispersion Measure over the amount of samples
+    delays_per_sample = np.round(np.linspace(disperion_measure, 0, samples.shape[1])).astype(int)
 
     # Loop over the frequencies
     for i, _ in enumerate(delays_per_sample):
@@ -54,8 +54,8 @@ def find_dm(samples, pulsar_intensity, max_delay):
 
             # If a line is found, calculate and return the dispersion measure
             if line_coordinates is not None:
-                dm = line_coordinates[1] - line_coordinates[0]
-                return dm
+                disperion_measure = line_coordinates[1] - line_coordinates[0]
+                return disperion_measure
 
     return None
 

examples/dedisperse_stream.py

@@ -23,21 +23,6 @@
 highest_x=10
 max_delay=10
 
-# Files with low signal to noise ratio
-# special_pspm = fb.Filterbank(filename = "../data/my_uber_pspm.fil")
-# highest_x=10
-# max_delay=10
-
-# File with 10000 samples
-# special_pspm = fb.Filterbank(filename = "../data/pspm_4_2.fil")
-# highest_x=10
-# max_delay=100
-
-# File with 10000 samples with low signal to noise ratio
-# special_pspm = fb.Filterbank(filename = "../data/pspm_4_1.fil")
-# highest_x=10
-# max_delay=100
-
 special_pspm.read_filterbank()
 
 frequencies, samples = special_pspm.select_data()

pipeline/pipeline.py

@@ -112,13 +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=DM)
+        fil_data = dedisperse.dedisperse(fil_data, disperion_measure=DM)
         stopwatch['time_dedisp'] = timer() - time_dedisp
         # timeseries
         time_t_series = timer()

tests/test_dedisperse.py

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