Updated observation load to choose HDF files if the extension is righ…

…t. Refers to Issue #40

software/python_modules/tart/tart/operation/observation.py

@@ -1,5 +1,8 @@
 import numpy as np
 import datetime
+
+import os
+
 try:
    import cPickle as pickle
 except:
@@ -126,22 +129,27 @@ def from_hdf5(self, filename):
         return ret
 
 def Observation_Load(filename):
+    _, file_extension = os.path.splitext(filename)
+
+    if ('.pkl' == file_extension):
+        try:
+            load_data = gzip.open(filename, 'rb')
+            d = pickle.load(load_data)
+        except:
+            print('not gzipped')
+            load_data = open(filename, 'rb')
+            d = pickle.load(load_data)
+        finally:
+            load_data.close()
+
+        unipolar_data = []
+        for i in d['data']:
+            unpacked_ints = np.asarray(np.unpackbits(i), dtype=np.uint8)
+            unipolar_data.append(unpacked_ints)
+            # this is an array of unipolar 0,1 radio signals.
+
+        return Observation(timestamp=d['timestamp'], config=settings.from_dict(d['config']), data=unipolar_data)
+    if ('.hdf' == file_extension):
+        return Observation.from_hdf5(filename)
 
-    try:
-        load_data = gzip.open(filename, 'rb')
-        d = pickle.load(load_data)
-    except:
-        print('not gzipped')
-        load_data = open(filename, 'rb')
-        d = pickle.load(load_data)
-    finally:
-        load_data.close()
-
-    unipolar_data = []
-    for i in d['data']:
-        unpacked_ints = np.asarray(np.unpackbits(i), dtype=np.uint8)
-        unipolar_data.append(unpacked_ints)
-        # this is an array of unipolar 0,1 radio signals.
-
-    ret = Observation(timestamp=d['timestamp'], config=settings.from_dict(d['config']), data=unipolar_data)
-    return ret
+    raise RuntimeError("Unknown file extension {}".format(file_extension))

software/python_modules/tart_hardware_interface/tart_hardware_interface/highlevel_modes_api.py

@@ -194,7 +194,6 @@ def run_acquire_raw(tart, runtime_config):
         filename = path + t_stmp.strftime('%H_%M_%S.%f') + '_data.hdf'
         print('create observation object')
         obs = observation.Observation(t_stmp, config, savedata=ant_data)
-        print(('obs: ', dir(obs)))
         obs.to_hdf5(filename)
         print(('saved to: ', filename))
         return {'filename':filename, 'sha256':sha256_checksum(filename)}

software/python_modules/tart_tools/setup.py

@@ -4,7 +4,7 @@
     readme = f.read()
 
 setup(name='tart_tools',
-    version='0.1.8',
+    version='0.2.0b2',
     description='Transient Array Radio Telescope Command Line Tools',
     long_description=readme,
     long_description_content_type="text/markdown",
@@ -24,8 +24,6 @@
         "Topic :: Scientific/Engineering",
         "Topic :: Communications :: Ham Radio",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
         "Intended Audience :: Science/Research"])

software/python_modules/tart_web_api/setup.py

@@ -8,7 +8,7 @@
     description='Transient Array Radio Telescope High-level HTTP Interface',
     long_description=readme,
     long_description_content_type="text/markdown",
-    version='0.2.0b0',
+    version='0.2.0b1',
     packages=['tart_web_api'],
     include_package_data=True,
     install_requires=[