From 4006c8710ad86902c1d20ae71313ec2a2b66a607 Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Wed, 9 Dec 2020 14:06:59 -0500 Subject: [PATCH 1/4] STY: updated meta class Updated Meta class to use MetaLabels. --- pysatMadrigal/instruments/methods/madrigal.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pysatMadrigal/instruments/methods/madrigal.py b/pysatMadrigal/instruments/methods/madrigal.py index 613069a..700a996 100644 --- a/pysatMadrigal/instruments/methods/madrigal.py +++ b/pysatMadrigal/instruments/methods/madrigal.py @@ -71,7 +71,7 @@ def load(fnames, tag=None, inst_id=None, xarray_coords=[], file_type='hdf5'): data : pds.DataFrame or xr.Dataset A pandas DataFrame or xarray Dataset holding the data from the HDF5 file - metadata : pysat.Meta + meta : pysat.Meta Metadata from the HDF5 file, as well as default values from pysat Note @@ -103,10 +103,11 @@ def load(fnames, tag=None, inst_id=None, xarray_coords=[], file_type='hdf5'): unit_string = file_data[item].attrs['units'] desc_string = file_data[item].attrs['description'] labels.append(name_string) - meta[name_string.lower()] = {'long_name': name_string, - 'units': unit_string, - 'desc': desc_string} - # remove any metadata from xarray + meta[name_string.lower()] = {meta.labels.name: name_string, + meta.labels.units: unit_string, + meta.labels.desc: desc_string} + + # Remove any metadata from xarray file_data[item].attrs = {} # Reset UNIX timestamp as datetime and set it as an index @@ -136,9 +137,9 @@ def load(fnames, tag=None, inst_id=None, xarray_coords=[], file_type='hdf5'): unit_string = item[3].decode('UTF-8') desc_string = item[1].decode('UTF-8') labels.append(name_string) - meta[name_string.lower()] = {'long_name': name_string, - 'units': unit_string, - 'desc': desc_string} + meta[name_string.lower()] = {meta.labels.name: name_string, + meta.labels.units: unit_string, + meta.labels.desc: desc_string} # Add additional metadata notes. Custom attributes attached to meta # are attached to corresponding Instrument object when pysat From 80a0791d24faa7347b1d8e1ca3225c76fe2a5fc3 Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Wed, 9 Dec 2020 14:09:52 -0500 Subject: [PATCH 2/4] STY: JRO ISR meta class updated Updated the use of Meta in the JRO ISR instrument. --- pysatMadrigal/instruments/jro_isr.py | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pysatMadrigal/instruments/jro_isr.py b/pysatMadrigal/instruments/jro_isr.py index d38de9f..d931a9c 100644 --- a/pysatMadrigal/instruments/jro_isr.py +++ b/pysatMadrigal/instruments/jro_isr.py @@ -407,21 +407,21 @@ def calc_measurement_loc(inst): # Add metadata for the new data values bm_label = "Beam {:d} ".format(dd) - inst.meta[lat_key] = {inst.meta.units_label: 'degrees', - inst.meta.name_label: bm_label + 'latitude', - inst.meta.desc_label: bm_label + 'latitude', - inst.meta.plot_label: bm_label + 'Latitude', - inst.meta.axis_label: bm_label + 'Latitude', - inst.meta.scale_label: 'linear', - inst.meta.min_label: -90.0, - inst.meta.max_label: 90.0, - inst.meta.fill_label: np.nan} - inst.meta[lon_key] = {inst.meta.units_label: 'degrees', - inst.meta.name_label: bm_label + 'longitude', - inst.meta.desc_label: bm_label + 'longitude', - inst.meta.plot_label: bm_label + 'Longitude', - inst.meta.axis_label: bm_label + 'Longitude', - inst.meta.scale_label: 'linear', - inst.meta.fill_label: np.nan} + inst.meta[lat_key] = {inst.meta.labels.units: 'degrees', + inst.meta.labels.name: bm_label + 'latitude', + inst.meta.labels.desc: bm_label + 'latitude', + inst.meta.labels.plot: bm_label + 'Latitude', + inst.meta.labels.axis: bm_label + 'Latitude', + inst.meta.labels.scale: 'linear', + inst.meta.labels.min_val: -90.0, + inst.meta.labels.max_val: 90.0, + inst.meta.labels.fill_val: np.nan} + inst.meta[lon_key] = {inst.meta.labels.units: 'degrees', + inst.meta.labels.name: bm_label + 'longitude', + inst.meta.labels.desc: bm_label + 'longitude', + inst.meta.labels.plot: bm_label + 'Longitude', + inst.meta.labels.axis: bm_label + 'Longitude', + inst.meta.labels.scale: 'linear', + inst.meta.labels.fill_val: np.nan} return From 94b662d5017f3f3b45ce5b083d76458e70363933 Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Wed, 9 Dec 2020 14:11:07 -0500 Subject: [PATCH 3/4] ENH: udated GNSS TEC meta class Updated the use of labels in the GNSS TEC instrument. --- pysatMadrigal/instruments/gnss_tec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pysatMadrigal/instruments/gnss_tec.py b/pysatMadrigal/instruments/gnss_tec.py index 424776e..f083f48 100644 --- a/pysatMadrigal/instruments/gnss_tec.py +++ b/pysatMadrigal/instruments/gnss_tec.py @@ -296,7 +296,7 @@ def load(fnames, tag=None, inst_id=None, file_type='netCDF4'): # Fix the units for tec and dtec if tag == 'vtec': - meta['tec'] = {meta.units_label: 'TECU'} - meta['dtec'] = {meta.units_label: 'TECU'} + meta['tec'] = {meta.labels.units: 'TECU'} + meta['dtec'] = {meta.labels.units: 'TECU'} return data, meta From 737c81af9c5982b903e7655ba906dae37a3ea672 Mon Sep 17 00:00:00 2001 From: Angeline Burrell Date: Wed, 9 Dec 2020 14:13:30 -0500 Subject: [PATCH 4/4] DOC: updated changelog Updated changelog with general description of many of the recent pulls. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fe624a..e91e69a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [0.?.?] - 2020-07-03 - Added coords from pysat.utils +- Made changes to structure to comply with updates in pysat 3.0.0 - Bug Fix - Updated madrigal methods to simplify compound data types and enable creation of netCDF4 files using `Instrument.to_netcdf4()`.