Merge 6fc581a into c7d46cd

pysat · Dec 16, 2020 · 823bc14 · 823bc14
2 parents c7d46cd + 6fc581a
commit 823bc14
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 57 deletions.
diff --git a/pysatMissions/instruments/pysat_ephem.py b/pysatMissions/instruments/pysat_ephem.py
@@ -186,31 +186,29 @@ def load(fnames, tag=None, inst_id=None, obs_long=0., obs_lat=0., obs_alt=0.,
 # create metadata corresponding to variables in load routine just above
 # made once here rather than regenerate every load call
 meta = pysat.Meta()
-meta['Epoch'] = {'units': 'Milliseconds since 1970-1-1',
-                 'Bin_Location': 0.5,
-                 'notes': 'UTC time at middle of geophysical measurement.',
-                 'desc': 'UTC seconds',
-                 'long_name': 'Time index in milliseconds'}
-meta['glong'] = {'units': 'degrees',
-                 'long_name': 'Geodetic longitude',
-                 'desc': 'WGS84 geodetic longitude'}
-meta['glat'] = {'units': 'degrees',
-                'long_name': 'Geodetic latitude',
-                'desc': 'WGS84 geodetic latitude'}
-meta['alt'] = {'units': 'km',
-               'long_name': 'Geodetic height',
-               'desc': "WGS84 height above Earth's surface"}
-meta['position_ecef_x'] = {'units': 'km',
-                           'desc': 'ECEF x co-ordinate of satellite'}
-meta['position_ecef_y'] = {'units': 'km',
-                           'desc': 'ECEF y co-ordinate of satellite'}
-meta['position_ecef_z'] = {'units': 'km',
-                           'desc': 'ECEF z co-ordinate of satellite'}
-meta['obs_sat_az_angle'] = {'units': 'degrees',
-                            'desc': 'Azimuth of satellite from ground station'}
-meta['obs_sat_el_angle'] = {'units': 'degrees',
-                            'desc': ' '.join(('Elevation of satellite from',
-                                              'ground station'))}
-meta['obs_sat_slant_range'] = {'units': 'km',
-                               'desc': ' '.join(('Distance of satellite from',
-                                                 'ground station'))}
+meta['Epoch'] = {
+    meta.labels.units: 'Milliseconds since 1970-1-1',
+    meta.labels.notes: 'UTC time at middle of geophysical measurement.',
+    meta.labels.desc: 'UTC seconds',
+    meta.labels.name: 'Time index in milliseconds'}
+meta['glong'] = {meta.labels.units: 'degrees',
+                 meta.labels.desc: 'WGS84 geodetic longitude'}
+meta['glat'] = {meta.labels.units: 'degrees',
+                meta.labels.desc: 'WGS84 geodetic latitude'}
+meta['alt'] = {meta.labels.units: 'km',
+               meta.labels.desc: "WGS84 height above Earth's surface"}
+meta['position_ecef_x'] = {meta.labels.units: 'km',
+                           meta.labels.desc: 'ECEF x co-ordinate of satellite'}
+meta['position_ecef_y'] = {meta.labels.units: 'km',
+                           meta.labels.desc: 'ECEF y co-ordinate of satellite'}
+meta['position_ecef_z'] = {meta.labels.units: 'km',
+                           meta.labels.desc: 'ECEF z co-ordinate of satellite'}
+meta['obs_sat_az_angle'] = {
+    meta.labels.units: 'degrees',
+    meta.labels.desc: 'Azimuth of satellite from ground station'}
+meta['obs_sat_el_angle'] = {
+    meta.labels.units: 'degrees',
+    meta.labels.desc: 'Elevation of satellite from ground station'}
+meta['obs_sat_slant_range'] = {
+    meta.labels.units: 'km',
+    meta.labels.desc: 'Distance of satellite from ground station'}
diff --git a/pysatMissions/instruments/pysat_sgp4.py b/pysatMissions/instruments/pysat_sgp4.py
@@ -151,32 +151,32 @@ def load(fnames, tag=None, inst_id=None, obs_long=0., obs_lat=0., obs_alt=0.,
 # create metadata corresponding to variables in load routine just above
 # made once here rather than regenerate every load call
 meta = pysat.Meta()
-meta['Epoch'] = {'units': 'Milliseconds since 1970-1-1',
-                 'Bin_Location': 0.5,
-                 'notes': 'UTC time at middle of geophysical measurement.',
-                 'desc': 'UTC seconds',
-                 'long_name': 'Time index in milliseconds'}
-meta['position_eci_x'] = {'units': 'km',
-                          'long_name': 'ECI x-position',
-                          'desc': ' '.join(('Earth Centered Inertial',
-                                            'x-position of satellite.')),
-                          'label': 'ECI-X'}
-meta['position_eci_y'] = {'units': 'km',
-                          'long_name': 'ECI y-position',
-                          'desc': ' '.join(('Earth Centered Inertial',
-                                            'y-position of satellite.')),
-                          'label': 'ECI-Y'}
-meta['position_eci_z'] = {'units': 'km',
-                          'long_name': 'ECI z-position',
-                          'desc': ' '.join(('Earth Centered Inertial',
-                                            'z-position of satellite.')),
-                          'label': 'ECI-Z'}
-meta['velocity_eci_x'] = {'units': 'km/s',
-                          'desc': 'Satellite velocity along ECI-x',
-                          'long_name': 'Satellite velocity ECI-x'}
-meta['velocity_eci_y'] = {'units': 'km/s',
-                          'desc': 'Satellite velocity along ECI-y',
-                          'long_name': 'Satellite velocity ECI-y'}
-meta['velocity_eci_z'] = {'units': 'km/s',
-                          'desc': 'Satellite velocity along ECI-z',
-                          'long_name': 'Satellite velocity ECI-z'}
+meta['Epoch'] = {
+    meta.labels.units: 'Milliseconds since 1970-1-1',
+    meta.labels.notes: 'UTC time at middle of geophysical measurement.',
+    meta.labels.desc: 'UTC seconds',
+    meta.labels.name: 'Time index in milliseconds'}
+meta['position_eci_x'] = {
+    meta.labels.units: 'km',
+    meta.labels.name: 'ECI x-position',
+    meta.labels.desc: 'Earth Centered Inertial x-position of satellite.'}
+meta['position_eci_y'] = {
+    meta.labels.units: 'km',
+    meta.labels.name: 'ECI y-position',
+    meta.labels.desc: 'Earth Centered Inertial y-position of satellite.'}
+meta['position_eci_z'] = {
+    meta.labels.units: 'km',
+    meta.labels.name: 'ECI z-position',
+    meta.labels.desc: 'Earth Centered Inertial z-position of satellite.'}
+meta['velocity_eci_x'] = {
+    meta.labels.units: 'km/s',
+    meta.labels.desc: 'Satellite velocity along ECI-x',
+    meta.labels.name: 'Satellite velocity ECI-x'}
+meta['velocity_eci_y'] = {
+    meta.labels.units: 'km/s',
+    meta.labels.desc: 'Satellite velocity along ECI-y',
+    meta.labels.name: 'Satellite velocity ECI-y'}
+meta['velocity_eci_z'] = {
+    meta.labels.units: 'km/s',
+    meta.labels.desc: 'Satellite velocity along ECI-z',
+    meta.labels.name: 'Satellite velocity ECI-z'}