Merge pull request #31 from jmfee-usgs/iaga-sampling-rate

Iaga sampling rate

bin/geomag.py

@@ -224,9 +224,6 @@ def parse_args():
             help='Write to stdout.')
     output_group.add_argument('--output-pcdcp-url',
             help='Example: file://./%%(obs)s%%(Y)s%%(j)s.%%(i)s')
-    output_group.add_argument('--output-edge', nargs=2,
-            metavar=('HOST', 'PORT'),
-            help='Requires Host IP # and Port #')
     output_group.add_argument('--output-edge', nargs=3,
             metavar=('HOST', 'PORT', 'TAG'),
             help='Requires Host IP #, Port # and ID TAG')

geomagio/iaga2002/IAGA2002Parser.py

@@ -99,7 +99,10 @@ class IAGA2002Parser(object):
             key = 'sensor_orientation'
         elif key_upper == 'DIGITAL SAMPLING':
             key = 'sensor_sampling_rate'
-            value = 1 / float(value.replace('second', '').strip())
+            if value.find('second') != -1:
+                value = 1 / float(value.replace('second', '').strip())
+            elif value.find('Hz') != -1:
+                value = float(value.replace('Hz', '').strip())
         elif key_upper == 'DATA INTERVAL TYPE':
             key = 'data_interval_type'
         elif key_upper == 'DATA TYPE':