geospacelab 0.10.0__tar.gz → 0.10.2__tar.gz

{geospacelab-0.10.0/geospacelab.egg-info → geospacelab-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geospacelab
-Version: 0.10.0
+Version: 0.10.2
 Summary: Collect, manage, and visualize geospace data.
 Home-page: https://github.com/JouleCai/geospacelab
 Author: Lei Cai
@@ -378,14 +378,9 @@ Output:
 From then on, the data source has been switched from JHUAPL to CDAWeb.
  
 ```python
-import datetime
-import matplotlib.pyplot as plt
-
-import geospacelab.visualization.mpl.geomap.geodashboards as geomap
-
 dt_fr = datetime.datetime(2015, 9, 8, 8)
 dt_to = datetime.datetime(2015, 9, 8, 23, 59)
-time1 = datetime.datetime(2015, 9, 8, 20, 21)
+time_c = datetime.datetime(2015, 9, 8, 20, 21)
 pole = 'N'
 sat_id = 'f16'
 band = 'LBHS'
@@ -396,49 +391,51 @@ dashboard = geomap.GeoDashboard(dt_fr=dt_fr, dt_to=dt_to, figure_config={'figsiz
 # If the orbit_id is specified, only one file will be downloaded. This option saves the downloading time.
 # dashboard.dock(datasource_contents=['jhuapl', 'dmsp', 'ssusi', 'edraur'], pole='N', sat_id='f17', orbit_id='46863')
 # If not specified, the data during the whole day will be downloaded.
-dashboard.dock(
-    datasource_contents=dashboard.dock(datasource_contents=['cdaweb', 'dmsp', 'ssusi', 'edr_aur'], 
-    pole=pole, sat_id=sat_id, orbit_id=None
-)
+ds_ssusi = dashboard.dock(datasource_contents=['cdaweb', 'dmsp', 'ssusi', 'edr_aur'], pole=pole, sat_id=sat_id, orbit_id=None)
 ds_s1 = dashboard.dock(
     datasource_contents=['madrigal', 'satellites', 'dmsp', 's1'],
-    dt_fr=time1 - datetime.timedelta(minutes=45),
-    dt_to=time1 + datetime.timedelta(minutes=45),
-    sat_id=sat_id
-)
+    dt_fr=time_c - datetime.timedelta(minutes=45),
+    dt_to=time_c + datetime.timedelta(minutes=45),
+    sat_id=sat_id, replace_orbit=True)
 
 dashboard.set_layout(1, 1)
 
 # Get the variables: LBHS emission intensiy, corresponding times and locations
-lbhs = dashboard.assign_variable('GRID_AUR_' + band, dataset_index=0)
-dts = dashboard.assign_variable('DATETIME', dataset_index=0).value.flatten()
-mlat = dashboard.assign_variable('GRID_MLAT', dataset_index=0).value
-mlon = dashboard.assign_variable('GRID_MLON', dataset_index=0).value
-mlt = dashboard.assign_variable(('GRID_MLT'), dataset_index=0).value
+lbhs = ds_ssusi['GRID_AUR_' + band]
+dts = ds_ssusi['DATETIME'].flatten()
+mlat = ds_ssusi['GRID_MLAT']
+mlon = ds_ssusi['GRID_MLON']
+mlt = ds_ssusi['GRID_MLT']
 
 # Search the index for the time to plot, used as an input to the following polar map
-ind_t = dashboard.datasets[0].get_time_ind(ut=time1)
+ind_t = dashboard.datasets[0].get_time_ind(ut=time_c)
+if (dts[ind_t] - time_c).total_seconds()/60 > 60:     # in minutes
+    raise ValueError("The time does not match any SSUSI data!")
 lbhs_ = lbhs.value[ind_t]
-mlat_ = mlat[ind_t]
-mlon_ = mlon[ind_t]
-mlt_ = mlt[ind_t]
+mlat_ = mlat.value[ind_t]
+mlon_ = mlon.value[ind_t]
+mlt_ = mlt.value[ind_t]
 # Add a polar map panel to the dashboard. Currently the style is the fixed MLT at mlt_c=0. See the keywords below:
-panel1 = dashboard.add_polar_map(row_ind=0, col_ind=0, style='mlt-fixed', cs='AACGM', mlt_c=0., pole=pole, ut=time1, boundary_lat=65., mirror_south=True)
+panel = dashboard.add_polar_map(
+    row_ind=0, col_ind=0, style='mlt-fixed', cs='AACGM',
+    mlt_c=0., pole=pole, ut=time_c, boundary_lat=55., mirror_south=True
+)
 
 # Some settings for plotting.
 pcolormesh_config = lbhs.visual.plot_config.pcolormesh
 # Overlay the SSUSI image in the map.
-ipm = panel1.overlay_pcolormesh(data=lbhs_, coords={'lat': mlat_, 'lon': mlon_, 'mlt': mlt_}, cs='AACGM',
-                                regridding=True, **pcolormesh_config)
+ipc = panel.overlay_pcolormesh(
+    data=lbhs_, coords={'lat': mlat_, 'lon': mlon_, 'mlt': mlt_}, cs='AACGM', 
+    regridding=False, **pcolormesh_config)
 # Add a color bar
-panel1.add_colorbar(ipm, c_label=band + " (R)", c_scale=pcolormesh_config['c_scale'], left=1.1, bottom=0.1,
+panel.add_colorbar(ipc, c_label=band + " (R)", c_scale=pcolormesh_config['c_scale'], left=1.1, bottom=0.1,
                     width=0.05, height=0.7)
 
 # Overlay the gridlines
-panel1.overlay_gridlines(lat_res=5, lon_label_separator=5)
+panel.overlay_gridlines(lat_res=5, lon_label_separator=5)
 
 # Overlay the coastlines in the AACGM coordinate
-panel1.overlay_coastlines()
+panel.overlay_coastlines()
 
 # Overlay cross-track velocity along satellite trajectory
 sc_dt = ds_s1['SC_DATETIME'].value.flatten()
@@ -448,14 +445,22 @@ sc_alt = ds_s1['SC_GEO_ALT'].value.flatten()
 sc_coords = {'lat': sc_lat, 'lon': sc_lon, 'height': sc_alt}
 
 v_H = ds_s1['v_i_H'].value.flatten()
-panel1.overlay_cross_track_vector(vector=v_H, unit_vector=1000, alpha=0.5, color='r', sc_coords=sc_coords, sc_ut=sc_dt, cs='GEOC')
+panel.overlay_cross_track_vector(
+    vector=v_H, unit_vector=1000, vector_unit='m/s', alpha=0.3, color='red',
+    sc_coords=sc_coords, sc_ut=sc_dt, cs='GEO',
+)
 # Overlay the satellite trajectory with ticks
-panel1.overlay_sc_trajectory(sc_ut=sc_dt, sc_coords=sc_coords, cs='GEOC')
+panel.overlay_sc_trajectory(sc_ut=sc_dt, sc_coords=sc_coords, cs='GEO')
+
+# Overlay sites
+panel.overlay_sites(
+    site_ids=['TRO', 'ESR'], coords={'lat': [69.58, 78.15], 'lon': [19.23, 16.02], 'height': 0.}, 
+    cs='GEO', marker='^', markersize=2)
 
 # Add the title and save the figure
 polestr = 'North' if pole == 'N' else 'South'
-panel1.add_title(title='DMSP/SSUSI, ' + band + ', ' + sat_id.upper() + ', ' + polestr + ', ' + time1.strftime('%Y-%m-%d %H%M UT'))
-plt.savefig('DMSP_SSUSI_' + time1.strftime('%Y%m%d-%H%M') + '_' + band + '_' + sat_id.upper() + '_' + pole, dpi=300)
+panel.add_title(title='DMSP/SSUSI, ' + band + ', ' + sat_id.upper() + ', ' + polestr + ', ' + time_c.strftime('%Y-%m-%d %H%M UT'))
+plt.savefig('DMSP_SSUSI_' + time_c.strftime('%Y%m%d-%H%M') + '_' + band + '_' + sat_id.upper() + '_' + pole, dpi=300)
 
 # show the figure
 plt.show()

{geospacelab-0.10.0 → geospacelab-0.10.2}/README.md

@@ -322,14 +322,9 @@ Output:
 From then on, the data source has been switched from JHUAPL to CDAWeb.
  
 ```python
-import datetime
-import matplotlib.pyplot as plt
-
-import geospacelab.visualization.mpl.geomap.geodashboards as geomap
-
 dt_fr = datetime.datetime(2015, 9, 8, 8)
 dt_to = datetime.datetime(2015, 9, 8, 23, 59)
-time1 = datetime.datetime(2015, 9, 8, 20, 21)
+time_c = datetime.datetime(2015, 9, 8, 20, 21)
 pole = 'N'
 sat_id = 'f16'
 band = 'LBHS'
@@ -340,49 +335,51 @@ dashboard = geomap.GeoDashboard(dt_fr=dt_fr, dt_to=dt_to, figure_config={'figsiz
 # If the orbit_id is specified, only one file will be downloaded. This option saves the downloading time.
 # dashboard.dock(datasource_contents=['jhuapl', 'dmsp', 'ssusi', 'edraur'], pole='N', sat_id='f17', orbit_id='46863')
 # If not specified, the data during the whole day will be downloaded.
-dashboard.dock(
-    datasource_contents=dashboard.dock(datasource_contents=['cdaweb', 'dmsp', 'ssusi', 'edr_aur'], 
-    pole=pole, sat_id=sat_id, orbit_id=None
-)
+ds_ssusi = dashboard.dock(datasource_contents=['cdaweb', 'dmsp', 'ssusi', 'edr_aur'], pole=pole, sat_id=sat_id, orbit_id=None)
 ds_s1 = dashboard.dock(
     datasource_contents=['madrigal', 'satellites', 'dmsp', 's1'],
-    dt_fr=time1 - datetime.timedelta(minutes=45),
-    dt_to=time1 + datetime.timedelta(minutes=45),
-    sat_id=sat_id
-)
+    dt_fr=time_c - datetime.timedelta(minutes=45),
+    dt_to=time_c + datetime.timedelta(minutes=45),
+    sat_id=sat_id, replace_orbit=True)
 
 dashboard.set_layout(1, 1)
 
 # Get the variables: LBHS emission intensiy, corresponding times and locations
-lbhs = dashboard.assign_variable('GRID_AUR_' + band, dataset_index=0)
-dts = dashboard.assign_variable('DATETIME', dataset_index=0).value.flatten()
-mlat = dashboard.assign_variable('GRID_MLAT', dataset_index=0).value
-mlon = dashboard.assign_variable('GRID_MLON', dataset_index=0).value
-mlt = dashboard.assign_variable(('GRID_MLT'), dataset_index=0).value
+lbhs = ds_ssusi['GRID_AUR_' + band]
+dts = ds_ssusi['DATETIME'].flatten()
+mlat = ds_ssusi['GRID_MLAT']
+mlon = ds_ssusi['GRID_MLON']
+mlt = ds_ssusi['GRID_MLT']
 
 # Search the index for the time to plot, used as an input to the following polar map
-ind_t = dashboard.datasets[0].get_time_ind(ut=time1)
+ind_t = dashboard.datasets[0].get_time_ind(ut=time_c)
+if (dts[ind_t] - time_c).total_seconds()/60 > 60:     # in minutes
+    raise ValueError("The time does not match any SSUSI data!")
 lbhs_ = lbhs.value[ind_t]
-mlat_ = mlat[ind_t]
-mlon_ = mlon[ind_t]
-mlt_ = mlt[ind_t]
+mlat_ = mlat.value[ind_t]
+mlon_ = mlon.value[ind_t]
+mlt_ = mlt.value[ind_t]
 # Add a polar map panel to the dashboard. Currently the style is the fixed MLT at mlt_c=0. See the keywords below:
-panel1 = dashboard.add_polar_map(row_ind=0, col_ind=0, style='mlt-fixed', cs='AACGM', mlt_c=0., pole=pole, ut=time1, boundary_lat=65., mirror_south=True)
+panel = dashboard.add_polar_map(
+    row_ind=0, col_ind=0, style='mlt-fixed', cs='AACGM',
+    mlt_c=0., pole=pole, ut=time_c, boundary_lat=55., mirror_south=True
+)
 
 # Some settings for plotting.
 pcolormesh_config = lbhs.visual.plot_config.pcolormesh
 # Overlay the SSUSI image in the map.
-ipm = panel1.overlay_pcolormesh(data=lbhs_, coords={'lat': mlat_, 'lon': mlon_, 'mlt': mlt_}, cs='AACGM',
-                                regridding=True, **pcolormesh_config)
+ipc = panel.overlay_pcolormesh(
+    data=lbhs_, coords={'lat': mlat_, 'lon': mlon_, 'mlt': mlt_}, cs='AACGM', 
+    regridding=False, **pcolormesh_config)
 # Add a color bar
-panel1.add_colorbar(ipm, c_label=band + " (R)", c_scale=pcolormesh_config['c_scale'], left=1.1, bottom=0.1,
+panel.add_colorbar(ipc, c_label=band + " (R)", c_scale=pcolormesh_config['c_scale'], left=1.1, bottom=0.1,
                     width=0.05, height=0.7)
 
 # Overlay the gridlines
-panel1.overlay_gridlines(lat_res=5, lon_label_separator=5)
+panel.overlay_gridlines(lat_res=5, lon_label_separator=5)
 
 # Overlay the coastlines in the AACGM coordinate
-panel1.overlay_coastlines()
+panel.overlay_coastlines()
 
 # Overlay cross-track velocity along satellite trajectory
 sc_dt = ds_s1['SC_DATETIME'].value.flatten()
@@ -392,14 +389,22 @@ sc_alt = ds_s1['SC_GEO_ALT'].value.flatten()
 sc_coords = {'lat': sc_lat, 'lon': sc_lon, 'height': sc_alt}
 
 v_H = ds_s1['v_i_H'].value.flatten()
-panel1.overlay_cross_track_vector(vector=v_H, unit_vector=1000, alpha=0.5, color='r', sc_coords=sc_coords, sc_ut=sc_dt, cs='GEOC')
+panel.overlay_cross_track_vector(
+    vector=v_H, unit_vector=1000, vector_unit='m/s', alpha=0.3, color='red',
+    sc_coords=sc_coords, sc_ut=sc_dt, cs='GEO',
+)
 # Overlay the satellite trajectory with ticks
-panel1.overlay_sc_trajectory(sc_ut=sc_dt, sc_coords=sc_coords, cs='GEOC')
+panel.overlay_sc_trajectory(sc_ut=sc_dt, sc_coords=sc_coords, cs='GEO')
+
+# Overlay sites
+panel.overlay_sites(
+    site_ids=['TRO', 'ESR'], coords={'lat': [69.58, 78.15], 'lon': [19.23, 16.02], 'height': 0.}, 
+    cs='GEO', marker='^', markersize=2)
 
 # Add the title and save the figure
 polestr = 'North' if pole == 'N' else 'South'
-panel1.add_title(title='DMSP/SSUSI, ' + band + ', ' + sat_id.upper() + ', ' + polestr + ', ' + time1.strftime('%Y-%m-%d %H%M UT'))
-plt.savefig('DMSP_SSUSI_' + time1.strftime('%Y%m%d-%H%M') + '_' + band + '_' + sat_id.upper() + '_' + pole, dpi=300)
+panel.add_title(title='DMSP/SSUSI, ' + band + ', ' + sat_id.upper() + ', ' + polestr + ', ' + time_c.strftime('%Y-%m-%d %H%M UT'))
+plt.savefig('DMSP_SSUSI_' + time_c.strftime('%Y%m%d-%H%M') + '_' + band + '_' + sat_id.upper() + '_' + pole, dpi=300)
 
 # show the figure
 plt.show()

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/__init__.py

@@ -6,7 +6,7 @@ __author__ = "Lei Cai"
 __copyright__ = "Copyright 2021, GeospaceLAB"
 __credits__ = ["Lei Cai"]
 __license__ = "BSD-3-Clause License"
-__version__ = "0.10.0"
+__version__ = "0.10.2"
 __maintainer__ = "Lei Cai"
 __email__ = "lei.cai@oulu.fi"
 __status__ = "Developing"

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/isr/eiscat/__init__.py

@@ -72,7 +72,8 @@ class Dataset(datahub.DatasetSourced):
         self.data_file_type = kwargs.pop('data_file_type', '')
         self.affiliation = kwargs.pop('affiliation', '')
         self.allow_download = kwargs.pop('allow_download', True)
-        self.metadata = None
+        self.gate_num = kwargs.pop('gate_num', None)
+        self.metadata = {}
         self.add_AACGM = kwargs.pop('add_AACGM', True)
         self.add_APEX = kwargs.pop('add_APEX', False)
 
@@ -116,7 +117,9 @@ class Dataset(datahub.DatasetSourced):
         self.check_data_files(**kwargs)
 
         for file_path in self.data_file_paths:
-            load_obj = self.loader(file_path, file_type=self.data_file_type)
+            load_obj = self.loader(file_path, file_type=self.data_file_type, gate_num=self.gate_num)
+            if self.gate_num is None:
+                self.gate_num = load_obj.gate_num
 
             for var_name in self._variables.keys():
                 self._variables[var_name].join(load_obj.variables[var_name])
@@ -130,6 +133,12 @@ class Dataset(datahub.DatasetSourced):
             self.experiment = rawdata_path.split('/')[-1].split('@')[0]
             self.affiliation = load_obj.metadata['affiliation']
             self.metadata = load_obj.metadata
+
+        inds_cmb = np.argsort(self['DATETIME'].flatten())
+        if any(np.diff(np.array(inds_cmb))<0):
+            for var_name in self.keys():
+                self[var_name].value = self[var_name].value[inds_cmb, :]
+
         if self.add_AACGM or self.add_APEX:
             self.calc_lat_lon()
             # self.select_beams(field_aligned=True)
@@ -357,21 +366,23 @@ class Dataset(datahub.DatasetSourced):
             fps_sub = []
             for ii in inds_id:
                 fp = file_paths[ii]
-                rc = re.compile(r".*_([\d]{8}T[\d]{6}).*_([\d]{8}T[\d]{6}).*[\d]{4}\-[\d]{2}\-[\d]{2}_([\w]+)@.*")
+                rc = re.compile(r".*_([\d]{8}T[\d]{6}).*_([\d]{8}T[\d]{6}).*[\d]{4}\-[\d]{2}\-[\d]{2}_([\w.]+)@.*")
                 res = rc.search(str(fp))
                 dt_0 = datetime.datetime.strptime(res.groups()[0], '%Y%m%dT%H%M%S')
                 dt_1 = datetime.datetime.strptime(res.groups()[1], '%Y%m%dT%H%M%S')
                 if (dt_0 >= self.dt_to) or (dt_1<=self.dt_fr):
                     continue
                 if str(self.pulse_code):
-                    if self.pulse_code not in res.groups()[2]:
+                    if self.pulse_code not in res.groups()[2].lower():
                         continue
                 if str(self.modulation):
-                    if self.modulation not in res.groups()[2]:
+                    if self.modulation not in res.groups()[2].lower():
                         continue
+                if '_v' in res.groups()[2].lower():
+                    continue
                 fps_sub.extend([fp])
             if len(fps_sub) > 1:
-                mylog.StreamLogger.warning("Multiple data files for a single experiment detected! Only the first one is selected.")
+                mylog.StreamLogger.warning("Multiple data files for a single experiment detected!")
                 # for fp in fps_sub:
                 #     mylog.simpleinfo.info(str(fp))
                 # fps_sub = fps_sub[0]

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/isr/eiscat/downloader.py

@@ -207,8 +207,8 @@ class Downloader(DownloaderBase):
             dt_to_exp = datetime.datetime(
                 exp.endyear, exp.endmonth, exp.endday, exp.endhour, exp.endmin, exp.endsec
             )
-            if (dt_fr_exp >= self.dt_to) or (dt_to_exp <= self.dt_fr):
-                continue
+            # if (dt_fr_exp >= self.dt_to) or (dt_to_exp <= self.dt_fr):
+            #     continue
             for file in list(exp.files):
 
                 file_path_remote = pathlib.Path(file.name)

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/isr/eiscat/loader.py

@@ -13,6 +13,7 @@ import h5py
 import numpy as np
 import pathlib
 import re
+import scipy.interpolate as si
 
 from geospacelab.config import pref as prf
 
@@ -32,12 +33,12 @@ default_variable_names = [
 
 
 class Loader:
-    def __init__(self, file_path, file_type="eiscat-hdf5"):
+    def __init__(self, file_path, file_type="eiscat-hdf5", gate_num=None):
         self.variables = {}
         self.metadata = {}
         self.file_path = file_path
         self.file_type = file_type
-
+        self.gate_num = gate_num
         self.load_data()
 
     def load_data(self):
@@ -131,8 +132,20 @@ class Loader:
                         if num_col != nrec[0]:
                             print("Note: the number of range gates doesn't match nrec!")
                         var = var.reshape(num_row, num_col)
+                        if self.gate_num is None:
+                            num_gates=self.gate_num = num_col
+                        else:
+                            num_gates = self.gate_num
+                        var_array = np.empty((num_row, num_gates))
+                        var_array[::] = np.nan
+                        for i in range(num_row):
+                            var_array[i, 0:num_col] = var[i, :]
+                        var = var_array
                     elif nrec_group == 'par1d':
-                        num_gates = int(np.max(nrec))
+                        if self.gate_num is None:
+                            self.gate_num = num_gates = int(np.max(nrec))
+                        else:
+                            num_gates = self.gate_num
                         var_array = np.empty((num_row, num_gates))
                         var_array[:, :] = np.nan
                         rec_ind_1 = 0
@@ -201,21 +214,30 @@ class Loader:
         # check height and range
         vars['HEIGHT'] = vars['HEIGHT'] / 1000.
         vars['RANGE'] = vars['RANGE'] / 1000.
-        inds = np.where(np.isnan(vars['HEIGHT']))
-        for i in range(len(inds[0])):
-            ind_0 = inds[0][i]
-            ind_1 = inds[1][i]
-            x0 = np.arange(vars['HEIGHT'].shape[0])
-            y0 = vars['HEIGHT'][:, ind_1]
-            xp = x0[np.where(np.isfinite(y0))[0]]
-            yp = y0[np.isfinite(y0)]
-            vars['HEIGHT'][ind_0, ind_1] = np.interp(x0[ind_0], xp, yp)
-
-            x0 = np.arange(vars['RANGE'].shape[0])
-            y0 = vars['RANGE'][:, ind_1]
-            xp = x0[np.isfinite(y0)]
-            yp = y0[np.isfinite(y0)]
-            vars['RANGE'][ind_0, ind_1] = np.interp(x0[ind_0], xp, yp)
+
+        inds_nan = np.where(np.isnan(vars['HEIGHT']))
+        if list(inds_nan):
+            m, n = vars['HEIGHT'].shape
+            for i in range(m):
+                yy = vars['HEIGHT'][i, :].flatten()
+                iii = np.where(~np.isfinite(yy))
+                if not list(iii):
+                    continue
+                iii = np.where(np.isfinite(yy))[0]
+                xx = np.arange(0, n)
+                f = si.interp1d(xx[iii], yy[iii], kind='linear', bounds_error=False, fill_value='extrapolate')
+                yy_new = f(xx)
+                vars['HEIGHT'][i, :] = yy_new
+
+                yy = vars['RANGE'][i, :].flatten()
+                iii = np.where(~np.isfinite(yy))
+                if not list(iii):
+                    continue
+                iii = np.where(np.isfinite(yy))[0]
+                xx = np.arange(0, n)
+                f = si.interp1d(xx[iii], yy[iii], kind='linear', bounds_error=False, fill_value='extrapolate')
+                yy_new = f(xx)
+                vars['RANGE'][i, :] = yy_new
 
         if np.isscalar(vars['AZ']):
             az = np.empty((vars['DATETIME_1'].shape[0], 1))
@@ -336,8 +358,12 @@ class Loader:
             inds_ran_max = np.append(inds_ran_max, len(ran)-1)
             inds_ran_max.sort()
 
-            ngates_max = np.max(np.diff(inds_ran_max))
-            data_array = np.empty((nvar_h5, inds_ran_min.shape[0], ngates_max))
+            if self.gate_num is None:
+                self.gate_num = ngates_max = np.max(np.diff(inds_ran_max))
+            else:
+                ngates_max = self.gate_num
+            num_row = inds_ran_min.shape[0]
+            data_array = np.empty((nvar_h5, num_row, ngates_max))
             data_array[::] = np.nan
             for ip in range(nvar_h5):
                 var_tmp = np.array(data[ip])
@@ -345,7 +371,7 @@ class Loader:
                     ind1 = inds_ran_min[i]
                     ind2 = inds_ran_max[i]
                     data_array[ip, i, 0: ind2-ind1+1] = var_tmp[ind1: ind2+1]
-            num_row = inds_ran_min.shape[0]
+
             vars_h5 = {}
             for ip in range(nvar_h5):
 
@@ -382,21 +408,31 @@ class Loader:
             vars['T_e_err'] = vars['T_e'] * np.sqrt((vars['T_i_err'] / vars['T_i']) ** 2
                                                     + (vars['T_r_err'] / vars['T_r']) ** 2)
             vars['AZ'] = vars['AZ'] % 360.
-            inds = np.where(np.isnan(vars['HEIGHT']))
-            for i in range(len(inds[0])):
-                ind_0 = inds[0][i]
-                ind_1 = inds[1][i]
-                x0 = np.arange(vars['HEIGHT'].shape[0])
-                y0 = vars['HEIGHT'][:, ind_1]
-                xp = x0[np.where(np.isfinite(y0))[0]]
-                yp = y0[np.isfinite(y0)]
-                vars['HEIGHT'][ind_0, ind_1] = np.interp(x0[ind_0], xp, yp)
-
-                x0 = np.arange(vars['RANGE'].shape[0])
-                y0 = vars['RANGE'][:, ind_1]
-                xp = x0[np.isfinite(y0)]
-                yp = y0[np.isfinite(y0)]
-                vars['RANGE'][ind_0, ind_1] = np.interp(x0[ind_0], xp, yp)
+
+            inds_nan = np.where(np.isnan(vars['HEIGHT']))
+            if list(inds_nan):
+                m, n = vars['HEIGHT'].shape
+                for i in range(m):
+                    yy = vars['HEIGHT'][i, :].flatten()
+                    iii = np.where(~np.isfinite(yy))
+                    if not list(iii):
+                        continue
+                    iii = np.where(np.isfinite(yy))[0]
+                    xx = np.arange(0, n)
+                    f = si.interp1d(xx[iii], yy[iii], kind='linear', bounds_error=False, fill_value='extrapolate')
+                    yy_new = f(xx)
+                    vars['HEIGHT'][i, :] = yy_new
+
+                    yy = vars['RANGE'][i, :].flatten()
+                    iii = np.where(~np.isfinite(yy))
+                    if not list(iii):
+                        continue
+                    iii = np.where(np.isfinite(yy))[0]
+                    xx = np.arange(0, n)
+                    f = si.interp1d(xx[iii], yy[iii], kind='linear', bounds_error=False, fill_value='extrapolate')
+                    yy_new = f(xx)
+                    vars['RANGE'][i, :] = yy_new
+
 
             self.variables = vars
             self.metadata = metadata

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/isr/pfisr/fitted/__init__.py

@@ -46,7 +46,7 @@ default_variable_names = [
     'DATETIME', 'AZ', 'EL', 'PULSE_LENGTH',
     'P_Tx', 'n_e', 'n_e_err', 'T_i', 'T_i_err', 'T_e', 'T_e_err',
     'v_i_los', 'v_i_los_err', 'comp_mix', 'comp_mix_err',
-    'HEIGHT', 'RANGE', 'CGM_LAT', 'CGM_LON'
+    'HEIGHT', 'RANGE', 'CGM_LAT', 'CGM_LON', 'BEAM_ID', 'CHISQ'
 ]
 
 # default_data_search_recursive = True
@@ -55,7 +55,7 @@ default_attrs_required = []
 
 pulse_code_dict = {
     'alternating code': 'AC',
-    'long pulse': 'PL',
+    'long pulse': 'LP',
 }
 
 
@@ -138,8 +138,8 @@ class Dataset(datahub.DatasetSourced):
         self.beam_az = load_obj.beam_az
         self.beam_el = load_obj.beam_el
 
-        if self.add_APEX or self.add_AACGM:
-            self.calc_lat_lon()
+        # if self.add_APEX or self.add_AACGM:
+        self.calc_lat_lon()
 
         if self['HEIGHT'].value is None:
             self['HEIGHT'] = self['GEO_ALT']
@@ -353,7 +353,7 @@ class Dataset(datahub.DatasetSourced):
             pulse_code=self.pulse_code,
             dry_run=dry_run,
             data_file_root_dir=self.data_root_dir,
-            include_exp_ids=self.exp_ids,
+            include_exp_ids=self.experiment_ids,
             include_exp_name_patterns=include_exp_name_patterns)
         return download_obj.data_file_paths
 

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/isr/pfisr/fitted/downloader.py

@@ -15,7 +15,7 @@ EXCLUDE_FILE_TYPE_PATTERNS = [['from power'], ['velocity'], ['uncorrected']]
 
 pulse_code_dict = {
     'alternating code': 'AC',
-    'long pulse': 'PL',
+    'long pulse': 'LP',
 }
 
 

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/isr/pfisr/fitted/loader.py

@@ -37,6 +37,8 @@ var_name_dict = {
     'CGM_LAT': 'cgm_lat',
     'CGM_LON': 'cgm_long',
     'HEIGHT': 'gdalt',
+    'BEAM_ID': 'beamid',
+    'CHISQ': 'chisq',
 }
 
 

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/satellites/dmsp/s1/__init__.py

@@ -205,8 +205,8 @@ class Dataset(datahub.DatasetSourced):
         sin_glon_1 = np.sin(glon_1 * factor)
         sin_glon_2 = np.sin(glon_2 * factor)
         cos_glon_2 = np.cos(glon_2 * factor)
-        itpf_sin = interp1d(sectime_2, sin_glon_2, kind='cubic', bounds_error=False, fill_value='extrapolate')
-        itpf_cos = interp1d(sectime_2, cos_glon_2, kind='cubic', bounds_error=False, fill_value='extrapolate')
+        itpf_sin = interp1d(sectime_2, sin_glon_2, kind='linear', bounds_error=False, fill_value='extrapolate')
+        itpf_cos = interp1d(sectime_2, cos_glon_2, kind='linear', bounds_error=False, fill_value='extrapolate')
         sin_glon_2_i = itpf_sin(sectime_1)
         sin_glon_2_i = np.where(sin_glon_2_i > 1., 1., sin_glon_2_i)
         sin_glon_2_i = np.where(sin_glon_2_i < -1., -1., sin_glon_2_i)

{geospacelab-0.10.0 → geospacelab-0.10.2}/geospacelab/datahub/sources/madrigal/satellites/dmsp/s4/__init__.py

@@ -177,8 +177,8 @@ class Dataset(datahub.DatasetSourced):
         sin_glon_1 = np.sin(glon_1 * factor)
         sin_glon_2 = np.sin(glon_2 * factor)
         cos_glon_2 = np.cos(glon_2 * factor)
-        itpf_sin = interp1d(sectime_2, sin_glon_2, kind='cubic', bounds_error=False, fill_value='extrapolate')
-        itpf_cos = interp1d(sectime_2, cos_glon_2, kind='cubic', bounds_error=False, fill_value='extrapolate')
+        itpf_sin = interp1d(sectime_2, sin_glon_2, kind='linear', bounds_error=False, fill_value='extrapolate')
+        itpf_cos = interp1d(sectime_2, cos_glon_2, kind='linear', bounds_error=False, fill_value='extrapolate')
         sin_glon_2_i = itpf_sin(sectime_1)
         cos_glon_2_i = itpf_cos(sectime_1)
         rad = np.sign(sin_glon_2_i) * (np.pi / 2 - np.arcsin(cos_glon_2_i))