Small cleanups

Author: ryanvolz

python/examples/beacon/beacon_record.py

@@ -13,6 +13,7 @@
 Example configurations are included along with this script.
 
 """
+
 from __future__ import absolute_import, division, print_function
 
 import datetime
@@ -29,7 +30,6 @@
 import ephem
 import numpy as np
 from digital_rf import DigitalMetadataWriter
-
 from six.moves import configparser
 
 
@@ -580,7 +580,7 @@ def ephemeris_passes(opt, st0, et0):
 
                 if opt.el_mask:
                     el_val = np.rad2deg(el)
-                    el_mask = np.float(opt.el_mask)
+                    el_mask = np.float64(opt.el_mask)
 
                     if opt.debug:
                         print("# el_val ", el_val, " el_mask ", el_mask)

python/examples/benchmark_rf_read_hdf5.py

@@ -11,6 +11,7 @@
 Assumes the benchmark write script has already been run.
 
 """
+
 from __future__ import absolute_import, division, print_function
 
 import os

python/examples/benchmark_rf_write_hdf5.py

@@ -38,8 +38,8 @@
 for i in range(WRITE_BLOCK_SIZE):
     j = i * 2
     k = i * 2 + 1
-    data_int16[i][0] = (j % 32768) * (j + 8192) * (j % 13)
-    data_int16[i][1] = (k % 32768) * (k + 8192) * (k % 13)
+    data_int16[i][0] = np.array((j % 32768) * (j + 8192) * (j % 13)).astype("i2")
+    data_int16[i][1] = np.array((k % 32768) * (k + 8192) * (k % 13)).astype("i2")
 
 datadir = os.path.join(tempfile.gettempdir(), "benchmark_digital_rf")
 print("creating top level dir {0}".format(datadir))

python/tools/drf_cross_sti.py

@@ -70,7 +70,7 @@ def __init__(self, control):
 
         elif self.control.xtype == "pairs":
             args = [iter(pl)] * 2
-            self.xlist = list(it.izip_longest(*args))
+            self.xlist = list(it.zip_longest(*args))
 
         elif self.control.xtype == "combo":
             self.xlist = list(it.combinations(pl, 2))
@@ -226,10 +226,10 @@ def plot(self):
 
             for p in np.arange(0, self.control.frames * 2, 2):
                 sti_csd_data_coherence = np.zeros(
-                    [self.control.num_fft, self.control.bins], np.float
+                    [self.control.num_fft, self.control.bins], np.float64
                 )
                 sti_csd_data_phase = np.zeros(
-                    [self.control.num_fft, self.control.bins], np.float
+                    [self.control.num_fft, self.control.bins], np.float64
                 )
 
                 sti_times = np.zeros([self.control.bins], np.complex128)
@@ -383,7 +383,7 @@ def plot(self):
                 print("last ", start_sample)
 
             # create a time stamp
-            start_time, picoseconds = drf.util.sample_to_time_floor(st0, self.sr)
+            start_time, picoseconds = drf.util.sample_to_time_floor(st0, sr)
             srt_time = time.gmtime(start_time)
             sub_second = int(round(picoseconds / 1e10))
 

python/tools/drf_plot.py

@@ -1182,15 +1182,16 @@ def usage():
             print("loading metadata")
 
             drf_properties = drf.get_properties(chans[chidx])
-            sfreq = drf_properties["sample_rate"]
+            sample_rate = drf_properties["sample_rate"]
+            sfreq = float(sample_rate)
             toffset = start_sample
 
             print(toffset)
 
             if atime == 0:
                 atime = ustart
             else:
-                atime = drf.util.time_to_sample_ceil(atime, sfreq)
+                atime = drf.util.time_to_sample_ceil(atime, sample_rate)
 
             sstart = atime + int(toffset)
             dlen = stop_sample - start_sample

python/tools/drf_sound.py

@@ -107,7 +107,7 @@ def makeasound(self):
 
         print("first ", start_sample)
 
-        audiostuff = np.zeros((blocks, reads_per_block * dsamps), dtype=np.float)
+        audiostuff = np.zeros((blocks, reads_per_block * dsamps), dtype=np.float64)
         if self.control.verbose:
             print(
                 "processing info : ",
@@ -129,7 +129,9 @@ def makeasound(self):
                 )
 
                 if self.control.freqshift:
-                    tvec = np.arange(len(data), dtype=np.float) / sr + start_sample / sr
+                    tvec = np.arange(len(data), dtype=np.float64) / float(sr) + float(
+                        start_sample / sr
+                    )
                     f_osc = np.exp(1j * 2 * np.pi * self.control.freqshift * tvec)
                     data_fs = data * f_osc
                 else:
@@ -143,7 +145,7 @@ def makeasound(self):
                 start_sample += samples_per_stripe
         audiostuff_cent = audiostuff - audiostuff.flatten().mean()
         audiostuff_norm = audiostuff_cent / np.abs(audiostuff_cent.flatten()).max()
-        audiostuff_norm = audiostuff_norm.astype(float)
+        audiostuff_norm = audiostuff_norm.astype(np.float64)
         if self.control.outname:
             fname = os.path.splitext(self.control.outname)[0]
             ext = ".wav"