geospacelab 0.10.3__tar.gz → 0.10.4__tar.gz

{geospacelab-0.10.3/geospacelab.egg-info → geospacelab-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geospacelab
-Version: 0.10.3
+Version: 0.10.4
 Summary: Collect, manage, and visualize geospace data.
 Home-page: https://github.com/JouleCai/geospacelab
 Author: Lei Cai

{geospacelab-0.10.3 → geospacelab-0.10.4}/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.3"
+__version__ = "0.10.4"
 __maintainer__ = "Lei Cai"
 __email__ = "lei.cai@oulu.fi"
 __status__ = "Developing"

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/config/__init__.py

@@ -9,9 +9,8 @@ __email__ = "lei.cai@oulu.fi"
 __docformat__ = "reStructureText"
 
 
-from geospacelab.config._preferences import Preferences
+from geospacelab.config._preferences import prf, pref
 
-prf = pref = Preferences()
 
 try:
     opt = pref.user_config['visualization']
@@ -20,3 +19,5 @@ except KeyError:
     uc['visualization'] = dict()
     uc['visualization']['mpl'] = dict()
     pref.set_user_config(user_config=uc, set_as_default=True)
+
+from geospacelab.config.__mpl__ import mpl, plt

geospacelab-0.10.4/geospacelab/config/__mpl__.py

@@ -0,0 +1,98 @@
+import matplotlib as mpl
+import matplotlib.pyplot as plt
+
+from geospacelab.config._preferences import pref
+
+
+from cycler import cycler
+
+try:
+    mpl_style = pref.user_config['visualization']['mpl']['style']
+except KeyError:
+    uc = pref.user_config
+    uc['visualization']['mpl']['style'] = 'light'
+    pref.set_user_config(user_config=uc, set_as_default=True)
+
+
+# plt.rcParams['font.serif'] = 'Ubuntu'
+# plt.rcParams['font.monospace'] = 'Ubuntu Mono'
+plt.rcParams['font.size'] = 10
+plt.rcParams['axes.labelsize'] = 10
+plt.rcParams['axes.labelweight'] = 'book'
+plt.rcParams['axes.titlesize'] = 10
+plt.rcParams['xtick.labelsize'] = 10
+plt.rcParams['ytick.labelsize'] = 10
+plt.rcParams['legend.fontsize'] = 10
+plt.rcParams['figure.titlesize'] = 12
+
+# plt.style.use('https://github.com/dhaitz/matplotlib-stylesheets/raw/master/pacoty.mplstyle')
+mpl_style = pref.user_config['visualization']['mpl']['style']
+
+if mpl_style == 'light':
+    plt.rcParams['axes.facecolor'] = '#FCFCFC'
+    plt.rcParams['text.color'] = 'k'
+    default_cycler = (cycler(color=['tab:blue', 'tab:red', 'tab:green', 'tab:purple',  'tab:orange', 'tab:brown', 'tab:pink', 'tab:gray', 'tab:olive', 'tab:cyan']))
+    default_cycler = (cycler(color=['#1f77b4DD', '#ff7f0eDD', '#2ca02cDD', '#d62728DD', '#9467bdDD', '#8c564bDD', '#e377c2DD', '#7f7f7fDD', '#bcbd22DD', '#17becfDD']))
+    # colors = [
+    #     (0.8980392156862745, 0.5254901960784314, 0.023529411764705882),
+    #     (0.36470588235294116, 0.4117647058823529, 0.6941176470588235),
+    #     (0.3215686274509804, 0.7372549019607844, 0.6392156862745098),
+    #     (0.6, 0.788235294117647, 0.27058823529411763),
+    #     (0.8, 0.3803921568627451, 0.6901960784313725),
+    #     (0.1411764705882353, 0.4745098039215686, 0.4235294117647059),
+    #     (0.8549019607843137, 0.6470588235294118, 0.10588235294117647),
+    #     (0.1843137254901961, 0.5411764705882353, 0.7686274509803922),
+    #     (0.4627450980392157, 0.3058823529411765, 0.6235294117647059),
+    #     (0.9294117647058824, 0.39215686274509803, 0.35294117647058826),
+    # ]
+    colors = [
+        (0.36470588235294116, 0.4117647058823529, 0.6941176470588235),
+        (0.9294117647058824, 0.39215686274509803, 0.35294117647058826),
+        (0.3215686274509804, 0.7372549019607844, 0.6392156862745098),
+        (0.8980392156862745, 0.5254901960784314, 0.023529411764705882),
+        (0.6, 0.788235294117647, 0.27058823529411763),
+        (0.8, 0.3803921568627451, 0.6901960784313725),
+        (0.1411764705882353, 0.4745098039215686, 0.4235294117647059),
+        (0.8549019607843137, 0.6470588235294118, 0.10588235294117647),
+        (0.1843137254901961, 0.5411764705882353, 0.7686274509803922),
+        (0.4627450980392157, 0.3058823529411765, 0.6235294117647059),
+
+    ]
+    default_cycler = (cycler(color=colors))
+    plt.rc('axes', prop_cycle=default_cycler)
+elif mpl_style == 'dark':
+    plt.rcParams['figure.facecolor'] = '#0C1C23'
+    plt.rcParams['savefig.facecolor'] = '#0C1C23'
+
+    plt.rcParams['axes.facecolor'] = '#FFFFFF20'
+    plt.rcParams['axes.edgecolor'] = '#FFFFFF3D'
+    plt.rcParams['axes.labelcolor'] = '#FFFFFFD9'
+
+    plt.rcParams['xtick.color'] = '#FFFFFFD9'
+    plt.rcParams['ytick.color'] = '#FFFFFFD9'
+    plt.rcParams['text.color'] = 'white'
+
+    plt.rcParams['grid.color'] = '#FFFFFF'
+    plt.rcParams['legend.facecolor'] = plt.rcParams['axes.facecolor']
+    plt.rcParams['legend.edgecolor'] = '#FFFFFFD9'
+
+    # seaborn dark:['#001c7f', '#b1400d', '#12711c', '#8c0800', '#591e71', '#592f0d', '#a23582', '#3c3c3c', '#b8850a', '#006374']
+    # seaborn pastel '#a1c9f4', '#ffb482', '#8de5a1', '#ff9f9b', '#d0bbff', '#debb9b', '#fab0e4', '#cfcfcf', '#fffea3', '#b9f2f0'
+    default_cycler = (cycler(color=['#F5EE33', '#33FF99', 'r', '#9467bd', '#08C7FE', '#FE66BB', ]))
+    colors = [
+        (0.1843137254901961, 0.5411764705882353, 0.7686274509803922),
+        (0.9294117647058824, 0.39215686274509803, 0.35294117647058826),
+        (0.3215686274509804, 0.7372549019607844, 0.6392156862745098),
+        (0.8980392156862745, 0.5254901960784314, 0.023529411764705882),
+        (0.6, 0.788235294117647, 0.27058823529411763),
+        (0.8, 0.3803921568627451, 0.6901960784313725),
+        (0.1411764705882353, 0.4745098039215686, 0.4235294117647059),
+        (0.8549019607843137, 0.6470588235294118, 0.10588235294117647),
+        (0.36470588235294116, 0.4117647058823529, 0.6941176470588235),
+        (0.4627450980392157, 0.3058823529411765, 0.6235294117647059),
+    ]
+    default_cycler = (cycler(color=colors))
+    # default_cycler = (cycler(color=palettable.cartocolors.qualitative.Safe_10.mpl_colors))
+    plt.rc('axes', prop_cycle=default_cycler)
+else:
+    plt.style.use(mpl_style)

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/config/_preferences.py

@@ -126,3 +126,6 @@ data_root_dir = \"\"
             user_config_dict = toml.load(config_file_path)
         self.user_config = user_config_dict
         return user_config_dict
+
+
+prf = pref = Preferences()

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/datahub/sources/cdaweb/dmsp/ssusi/edr_aur/__init__.py

@@ -34,6 +34,7 @@ default_dataset_attrs = {
 
 default_variable_names = [
     'DATETIME', 'STARTING_TIME', 'STOPPING_TIME',
+    'ORBIT_ID',
     'GRID_MLAT', 'GRID_MLON', 'GRID_MLT', 'GRID_UT',
     'GRID_AUR_1216', 'GRID_AUR_1304', 'GRID_AUR_1356', 'GRID_AUR_LBHS', 'GRID_AUR_LBHL',
 ]
@@ -93,6 +94,8 @@ class Dataset(datahub.DatasetSourced):
             default_variable_names,
             configured_variables=var_config.configured_variables
         )
+        if self.orbit_id is None:
+            self.orbit_id = []
         for file_path in self.data_file_paths:
             try:
                 load_obj = self.loader(file_path, file_type=self.product.lower(), pole=self.pole)
@@ -105,14 +108,17 @@ class Dataset(datahub.DatasetSourced):
                     continue
                 if var_name in ['DATETIME', 'STARTING_TIME', 'STOPPING_TIME']:
                     value = np.array([load_obj.variables[var_name]])[np.newaxis, :]
+                elif var_name == 'ORBIT_ID':
+                    value = np.array([load_obj.metadata['ORBIT_ID']], dtype=str) 
                 else:
                     value = np.empty((1, ), dtype=object)
                     value[0] = load_obj.variables[var_name]
                     # value = load_obj.variables[var_name][np.newaxis, ::]
                 self._variables[var_name].join(value)
 
-            self.orbit_id = load_obj.metadata['ORBIT_ID']
-            # self.select_beams(field_aligned=True)
+        self.orbit_id = self['ORBIT_ID'].value
+        if len(self.orbit_id):
+            self.orbit_id = self.orbit_id[0]
         if self.time_clip:
             self.time_filter_by_range()
 
@@ -178,6 +184,7 @@ class Dataset(datahub.DatasetSourced):
         download_obj = self.downloader(
             dt_fr, dt_to,
             orbit_id=self.orbit_id, sat_id=self.sat_id,
+            data_file_root_dir=self.data_root_dir
         )
         return download_obj.done
 

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/datahub/sources/cdaweb/dmsp/ssusi/edr_aur/downloader.py

@@ -22,7 +22,7 @@ class Downloader(DownloaderBase):
         ):
         product = 'EDR_AUR'
         if data_file_root_dir is None:
-            data_file_root_dir = prf.datahub_data_root_dir / 'CDAWeb' / 'DMSP' / 'SSUSI' /product / sat_id.upper()
+            data_file_root_dir = prf.datahub_data_root_dir / 'CDAWeb' / 'DMSP' / 'SSUSI' / product
         self.sat_id = sat_id
         self.orbit_id = orbit_id
         self.source_subdirs = ['dmsp', 'dmsp'+self.sat_id.lower(), 'ssusi', 'data', 'edr-aurora']
@@ -78,7 +78,7 @@ class Downloader(DownloaderBase):
         year = int(sy)
         this_day = dttool.convert_doy_to_datetime(year, int(sdoy))
         if file_dir is None:
-            file_dir = self.data_file_root_dir / sy / this_day.strftime("%Y%m%d")
+            file_dir = self.data_file_root_dir /  self.sat_id.upper() / sy / this_day.strftime("%Y%m%d")
         super().save_file_from_http(url, file_dir=file_dir)
 
 

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/datahub/sources/madrigal/downloader.py

@@ -331,7 +331,7 @@ class Downloader(object):
             exclude_exp_name_patterns=None,
             include_exp_ids=None,
             exclude_exp_ids=None,
-            icodes=None, madrigal_url=None, display=True,
+            icodes=None, madrigal_url=None, display=True, level=0,
     ): 
         
         def try_to_get_database(max=3, interval=30):
@@ -383,8 +383,9 @@ class Downloader(object):
 
         exps_new = []
         another_madrigal_url = ''
+        
         for exp in exps:
-            if exp.id == -1:
+            if exp.id == -1 and level==0:
                 if another_madrigal_url != exp.madrigalUrl:
                     mylog.StreamLogger.warning(
                         f'Another Madrigal site detected: {exp.madrigalUrl}!'
@@ -400,12 +401,21 @@ class Downloader(object):
   
         exps = np.array(exps_new, dtype=object)
 
-        if not list(exps):
+        if not list(exps) and not str(another_madrigal_url):
             raise ValueError('Cannot find available experiments from the current database! Check the input values!')
-        elif str(another_madrigal_url):
+        elif str(another_madrigal_url) and level==0:
             mylog.StreamLogger.warning(
-                'Some data are located in another Madrigal site and will not be processed!'
+                'Some data are located in another Madrigal site: {}.'.format(another_madrigal_url)
             )
+            
+            exps, database = Downloader.get_exp_list(
+                    dt_fr=dt_fr, dt_to=dt_to,
+                    include_exp_name_patterns=include_exp_name_patterns,
+                    exclude_exp_name_patterns=exclude_exp_name_patterns,
+                    include_exp_ids=include_exp_ids,
+                    exclude_exp_ids=exclude_exp_ids,
+                    icodes=icodes, madrigal_url=another_madrigal_url, display=display, level=level+1
+            ) 
         else:
             pass
         

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/datahub/sources/madrigal/gnss/tecmap/variable_config.py

@@ -45,7 +45,7 @@ var = Var(name=var_name, ndim=3, variable_type='scalar', visual=visual)
 var.fullname = 'GNSS TEC MAP'
 var.label = r'TEC'
 var.group = r'TEC'
-var.unit = 'TECu'
+var.unit = 'TECU'
 var.depends = {0: depend_0, 1: depend_1}
 # set plot attrs
 plot_config = var.visual.plot_config
@@ -53,6 +53,7 @@ plot_config.config(**default_plot_config)
 plot_config.style = '2P'
 # set axis attrs
 axis = var.visual.axis
-
+axis[2].label = '@v.label'
+axis[2].unit = '@v.unit'
 
 configured_variables[var_name] = var

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/datahub/sources/madrigal/isr/eiscat/__init__.py

@@ -134,16 +134,17 @@ class Dataset(datahub.DatasetSourced):
             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)
         if self.time_clip:
             self.time_filter_by_range()
+
+        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.status_control:
             self.status_mask()
         if self.residual_control:

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/datahub/sources/madrigal/isr/pfisr/fitted/__init__.py

@@ -33,6 +33,7 @@ default_dataset_attrs = {
     'exp_check': False,
     'data_file_ext': ['h5', 'hdf5'],
     'data_root_dir': prf.datahub_data_root_dir / 'Madrigal' / 'PFISR',
+    'force_download': False,
     'allow_download': True,
     'status_control': False,
     'residual_control': False,
@@ -76,6 +77,8 @@ class Dataset(datahub.DatasetSourced):
         self.affiliation = kwargs.pop('affiliation', '')
         self.pulse_code = kwargs.pop('pulse_code', 'alternating code')
         self.allow_download = kwargs.pop('allow_download', True)
+        self.force_download = kwargs.pop('force_download', False)
+        self.gate_num = kwargs.pop('gate_num', None)
         self.beam_id = kwargs.pop('beam_id', None)
         self.beam_az = kwargs.pop('beam_az', None)
         self.beam_el = kwargs.pop('beam_el', None)
@@ -124,15 +127,29 @@ class Dataset(datahub.DatasetSourced):
     def load_data(self, **kwargs):
         self.check_data_files(**kwargs)
 
+        load_objs = []
+        gate_nums = []
         for file_path in self.data_file_paths:
-            load_obj = self.loader(file_path, beam_az=self.beam_az, beam_el=self.beam_el, beam_id=self.beam_id)
-
+            load_obj = self.loader(file_path, beam_az=self.beam_az, beam_el=self.beam_el, beam_id=self.beam_id, gate_num=self.gate_num)
+            load_objs.append(load_obj)
+            gate_nums.append(load_obj.gate_num)
+
+        if len(np.unique(gate_nums)) > 1:
+            mylog.StreamLogger.warning(
+                "Multiple types of experiments detected with different gate" +
+                "numbers (maximum: {})! Set 'gate_num' to this number!".format(np.max(gate_nums)))
+            self.gate_num = np.max(gate_nums)
+            load_objs = []
+            for file_path in self.data_file_paths:
+                load_obj = self.loader(file_path, beam_az=self.beam_az, beam_el=self.beam_el, beam_id=self.beam_id,
+                                       gate_num=self.gate_num)
+                load_objs.append(load_obj)
+
+        for load_obj in load_objs:
             for var_name in self._variables.keys():
                 self._variables[var_name].join(load_obj.variables[var_name])
             self.metadata = load_obj.metadata
 
-        if self.show_beams:
-            load_obj.list_beams()
         self.beams = load_obj.beams
         self.beam_id = load_obj.beam_id
         self.beam_az = load_obj.beam_az
@@ -147,6 +164,23 @@ class Dataset(datahub.DatasetSourced):
         if self.time_clip:
             self.time_filter_by_range()
 
+        inds_cmb = np.argsort(self['DATETIME'].flatten())
+        if any(np.diff(np.array(inds_cmb))<0):
+            mylog.StreamLogger.warning("Multiple types of experiments detected! The times are re-sorted and data are combined!")
+            multi_experiments = True
+            for var_name in self.keys():
+                self[var_name].value = self[var_name].value[inds_cmb, :]
+        else:
+            multi_experiments = False
+
+
+        if self.show_beams:
+            if multi_experiments:
+                for load_obj  in load_objs:
+                    load_obj.list_beams()
+            else:
+                load_objs[0].list_beams()
+
     def calc_lat_lon(self):
         from geospacelab.cs import LENUSpherical
         az = self['AZ'].value
@@ -205,7 +239,7 @@ class Dataset(datahub.DatasetSourced):
                     search_pattern=search_pattern, recursive=True, allow_multiple_files=True
                 )
 
-                if not done and self.allow_download:
+                if (not done and self.allow_download) or self.force_download:
                     done = self.download_data()
                     if done:
                         done = super().search_data_files(
@@ -227,13 +261,16 @@ class Dataset(datahub.DatasetSourced):
 
         else:
             diff_years = dt_to.year - dt_fr.year
+            download_check = 0
             for ny in range(diff_years + 1):
                 initial_file_dir = self.data_root_dir / str(dt_to.year + ny)
                 search_pattern = "*EID-*/"
                 exp_dirs = list(initial_file_dir.glob(search_pattern))
 
-                if not list(exp_dirs) and self.allow_download:
-                    self.download_data()
+                if (not list(exp_dirs) and self.allow_download) or self.force_download:
+                    self.download_data() 
+                    download_check = 1
+                    exp_dirs = list(initial_file_dir.glob(search_pattern))
 
                 def dir_parser(dirs):
                     dirs_out = []
@@ -251,8 +288,8 @@ class Dataset(datahub.DatasetSourced):
                     return dirs_out
                 file_dirs = dir_parser(exp_dirs)
 
-                if not list(file_dirs) and self.allow_download:
-                    self.download_data() 
+                # if not list(file_dirs) and self.allow_download and download_check:
+                #    self.download_data() 
 
                 for fd in file_dirs:
                     if isinstance(self.exp_name_pattern, list):
@@ -281,7 +318,7 @@ class Dataset(datahub.DatasetSourced):
 
                     # Validate file paths
 
-                    if not done and self.allow_download:
+                    if not done and self.allow_download and download_check:
                         done = self.download_data()
                         if done:
                             done = super().search_data_files(
@@ -349,6 +386,7 @@ class Dataset(datahub.DatasetSourced):
         download_obj = self.downloader(
             dt_fr=self.dt_fr, dt_to=self.dt_to,
             pulse_code=self.pulse_code,
+            force_download=self.force_download,
             dry_run=dry_run,
             data_file_root_dir=self.data_root_dir,
             include_exp_ids=self.experiment_ids,

{geospacelab-0.10.3/geospacelab/datahub/sources/madrigal/isr/risr_n → geospacelab-0.10.4/geospacelab/datahub/sources/madrigal/isr/pfisr}/fitted/loader.py

@@ -51,7 +51,7 @@ class Loader:
     :param load_data: True, load without calling the method "load_data" separately.
     :type load_data: bool
     """
-    def __init__(self, file_path, beam_id=None, beam_az=None, beam_el=None, direct_load=True):
+    def __init__(self, file_path, beam_id=None, beam_az=None, beam_el=None, direct_load=True, gate_num=None):
         self.file_path = file_path
         self.beam_id = beam_id
         self.beam_az = beam_az
@@ -59,6 +59,7 @@ class Loader:
         self.beams = None
         self.variables = {}
         self.metadata = {}
+        self.gate_num = gate_num
 
         self.done = False
         if direct_load:
@@ -184,9 +185,27 @@ class Loader:
                 elif var_name == 'dnel':
                     vars_fh5['dne'] = 10 ** np.array(fh5_vars_2d[var_name]).T
                 else:
-                    vars_fh5[var_name] = np.array(fh5_vars_2d[var_name]).T
+                    arr = np.array(fh5_vars_2d[var_name]).T
+
+                    if self.gate_num is None:
+                        vars_fh5[var_name] = arr
+
+                    else:
+                        arr_new = np.empty((arr.shape[0], self.gate_num))
+                        arr_new[::] = np.nan
+                        for ii in range(arr.shape[0]):
+                            arr_new[ii, 0: arr.shape[1]] = arr[ii, :]
+                        vars_fh5[var_name] = arr_new
+            self.gate_num = vars_fh5['ne'].shape[1]
+
             vars_fh5['range'] = np.array(data_fh5['Array Layout'][array_layout_str]['range'])[np.newaxis, :]
-            if np.median(vars_fh5['range'].flatten()) > 1e5:
+            if vars_fh5['range'].shape[1] < self.gate_num:
+                arr = np.empty((1, self.gate_num))
+                arr[::] = np.nan
+                arr[0, 0:vars_fh5['range'].shape[1]] = vars_fh5['range'].flatten()
+                vars_fh5['range'] = arr
+
+            if np.nanmedian(vars_fh5['range'].flatten()) > 1e5:
                 mylog.StreamLogger.warning(f"The variable range is detected in [m]. It is converted into [km].")
                 vars_fh5['range'] = vars_fh5['range'] * 1e-3
             vars_fh5['timestamps'] = np.array(data_fh5['Array Layout'][array_layout_str]['timestamps'])[:, np.newaxis]

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/observatory/orbit/utilities.py

@@ -47,7 +47,9 @@ class LEOToolbox(DatasetUser):
             if list(inds_abnormal):
                 iiii = np.array(inds_abnormal) + 1
                 nodes['INDEX'] = np.delete(nodes['INDEX'], iiii)
+                nodes['GEO_LAT'] = np.delete(nodes['GEO_LAT'], iiii)
                 nodes['GEO_LON'] = np.delete(nodes['GEO_LON'], iiii)
+                nodes['GEO_ALT'] = np.delete(nodes['GEO_ALT'], iiii)
                 nodes['GEO_LST'] = np.delete(nodes['GEO_LST'], iiii)
                 nodes['DATETIME'] = np.delete(nodes['DATETIME'], iiii)
 
@@ -55,6 +57,7 @@ class LEOToolbox(DatasetUser):
         glat = self['SC_GEO_LAT'].value.flatten()
         glat_ = glat[0::data_interval]
         glon = self['SC_GEO_LON'].value.flatten()
+        alt = self['SC_GEO_ALT'].flatten()
         lst = self['SC_GEO_LST'].value.flatten()
         dts = self['SC_DATETIME'].value.flatten()
         ind_1 = argrelextrema(np.abs(glat_), np.less, )[0]
@@ -74,26 +77,34 @@ class LEOToolbox(DatasetUser):
                 ind_between = np.where(ind_1 > ind_N)[0]
                 inds_asc.append(ind_1[ind_between[0]-1])
                 inds_dsc.append(ind_1[ind_between[0]])
-        self.ascending_nodes['INDEX'] = inds_asc
-        self.ascending_nodes['GEO_LON'] = glon[inds_asc]
+        self.ascending_nodes['INDEX'] = np.array(inds_asc)
+        self.ascending_nodes['GEO_LON'] = glon[inds_asc] 
+        self.ascending_nodes['GEO_LAT'] = glat[inds_asc] 
+        self.ascending_nodes['GEO_ALT'] = alt[inds_asc]  
         self.ascending_nodes['GEO_LST'] = lst[inds_asc]
         self.ascending_nodes['DATETIME'] = dts[inds_asc]
         check_nodes(self.ascending_nodes)
 
-        self.descending_nodes['INDEX']= inds_dsc
+        self.descending_nodes['INDEX']= np.array(inds_dsc)
         self.descending_nodes['GEO_LON'] = glon[inds_dsc]
+        self.descending_nodes['GEO_LAT'] = glat[inds_dsc]
+        self.descending_nodes['GEO_ALT'] = alt[inds_dsc]
         self.descending_nodes['GEO_LST'] = lst[inds_dsc]
         self.descending_nodes['DATETIME'] = dts[inds_dsc]
         check_nodes(self.descending_nodes)
 
         self.northern_nodes['INDEX'] = ind_2
         self.northern_nodes['GEO_LON'] = glon[ind_2]
+        self.northern_nodes['GEO_LAT'] = glat[ind_2]
+        self.northern_nodes['GEO_ALT'] = alt[ind_2]
         self.northern_nodes['GEO_LST'] = lst[ind_2]
         self.northern_nodes['DATETIME'] = dts[ind_2]
         check_nodes(self.northern_nodes)
 
         self.southern_nodes['INDEX'] = ind_3
         self.southern_nodes['GEO_LON'] = glon[ind_3]
+        self.southern_nodes['GEO_LAT'] = glat[ind_3]
+        self.southern_nodes['GEO_ALT'] = alt[ind_3]
         self.southern_nodes['GEO_LST'] = lst[ind_3]
         self.southern_nodes['DATETIME'] = dts[ind_3]
         check_nodes(self.southern_nodes)

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/visualization/mpl/__base__.py

@@ -2,8 +2,6 @@ import copy
 import weakref
 import string
 import numpy as np
-import matplotlib.pyplot as plt
-import matplotlib as mpl
 import pathlib
 from matplotlib.axes import Axes
 from typing import Dict
@@ -12,9 +10,7 @@ from typing import Dict
 from matplotlib.gridspec import GridSpec, SubplotSpec
 from matplotlib.figure import Figure
 
-from cycler import cycler
-
-from geospacelab.config import pref
+from geospacelab.config import pref, mpl, plt
 from geospacelab.toolbox.utilities.pyclass import StrBase
 import geospacelab.toolbox.utilities.pybasic as pybasic
 from geospacelab.visualization.mpl._helpers import check_panel_ax
@@ -22,98 +18,6 @@ import geospacelab.toolbox.utilities.pylogging as mylog
 # from geospacelab.visualization.mpl.dashboards import Dashboard
 
 
-try:
-    mpl_style = pref.user_config['visualization']['mpl']['style']
-except KeyError:
-    uc = pref.user_config
-    uc['visualization']['mpl']['style'] = 'light'
-    pref.set_user_config(user_config=uc, set_as_default=True)
-
-
-# plt.rcParams['font.serif'] = 'Ubuntu'
-# plt.rcParams['font.monospace'] = 'Ubuntu Mono'
-plt.rcParams['font.size'] = 10
-plt.rcParams['axes.labelsize'] = 10
-plt.rcParams['axes.labelweight'] = 'book'
-plt.rcParams['axes.titlesize'] = 10
-plt.rcParams['xtick.labelsize'] = 10
-plt.rcParams['ytick.labelsize'] = 10
-plt.rcParams['legend.fontsize'] = 10
-plt.rcParams['figure.titlesize'] = 12
-
-# plt.style.use('https://github.com/dhaitz/matplotlib-stylesheets/raw/master/pacoty.mplstyle')
-mpl_style = pref.user_config['visualization']['mpl']['style']
-
-if mpl_style == 'light':
-    plt.rcParams['axes.facecolor'] = '#FCFCFC'
-    plt.rcParams['text.color'] = 'k'
-    default_cycler = (cycler(color=['tab:blue', 'tab:red', 'tab:green', 'tab:purple',  'tab:orange', 'tab:brown', 'tab:pink', 'tab:gray', 'tab:olive', 'tab:cyan']))
-    default_cycler = (cycler(color=['#1f77b4DD', '#ff7f0eDD', '#2ca02cDD', '#d62728DD', '#9467bdDD', '#8c564bDD', '#e377c2DD', '#7f7f7fDD', '#bcbd22DD', '#17becfDD']))
-    # colors = [
-    #     (0.8980392156862745, 0.5254901960784314, 0.023529411764705882),
-    #     (0.36470588235294116, 0.4117647058823529, 0.6941176470588235),
-    #     (0.3215686274509804, 0.7372549019607844, 0.6392156862745098),
-    #     (0.6, 0.788235294117647, 0.27058823529411763),
-    #     (0.8, 0.3803921568627451, 0.6901960784313725),
-    #     (0.1411764705882353, 0.4745098039215686, 0.4235294117647059),
-    #     (0.8549019607843137, 0.6470588235294118, 0.10588235294117647),
-    #     (0.1843137254901961, 0.5411764705882353, 0.7686274509803922),
-    #     (0.4627450980392157, 0.3058823529411765, 0.6235294117647059),
-    #     (0.9294117647058824, 0.39215686274509803, 0.35294117647058826),
-    # ]
-    colors = [
-        (0.36470588235294116, 0.4117647058823529, 0.6941176470588235),
-        (0.9294117647058824, 0.39215686274509803, 0.35294117647058826),
-        (0.3215686274509804, 0.7372549019607844, 0.6392156862745098),
-        (0.8980392156862745, 0.5254901960784314, 0.023529411764705882),
-        (0.6, 0.788235294117647, 0.27058823529411763),
-        (0.8, 0.3803921568627451, 0.6901960784313725),
-        (0.1411764705882353, 0.4745098039215686, 0.4235294117647059),
-        (0.8549019607843137, 0.6470588235294118, 0.10588235294117647),
-        (0.1843137254901961, 0.5411764705882353, 0.7686274509803922),
-        (0.4627450980392157, 0.3058823529411765, 0.6235294117647059),
-
-    ]
-    default_cycler = (cycler(color=colors))
-    plt.rc('axes', prop_cycle=default_cycler)
-elif mpl_style == 'dark':
-    plt.rcParams['figure.facecolor'] = '#0C1C23'
-    plt.rcParams['savefig.facecolor'] = '#0C1C23'
-
-    plt.rcParams['axes.facecolor'] = '#FFFFFF20'
-    plt.rcParams['axes.edgecolor'] = '#FFFFFF3D'
-    plt.rcParams['axes.labelcolor'] = '#FFFFFFD9'
-
-    plt.rcParams['xtick.color'] = '#FFFFFFD9'
-    plt.rcParams['ytick.color'] = '#FFFFFFD9'
-    plt.rcParams['text.color'] = 'white'
-
-    plt.rcParams['grid.color'] = '#FFFFFF'
-    plt.rcParams['legend.facecolor'] = plt.rcParams['axes.facecolor']
-    plt.rcParams['legend.edgecolor'] = '#FFFFFFD9'
-
-    # seaborn dark:['#001c7f', '#b1400d', '#12711c', '#8c0800', '#591e71', '#592f0d', '#a23582', '#3c3c3c', '#b8850a', '#006374']
-    # seaborn pastel '#a1c9f4', '#ffb482', '#8de5a1', '#ff9f9b', '#d0bbff', '#debb9b', '#fab0e4', '#cfcfcf', '#fffea3', '#b9f2f0'
-    default_cycler = (cycler(color=['#F5EE33', '#33FF99', 'r', '#9467bd', '#08C7FE', '#FE66BB', ]))
-    colors = [
-        (0.1843137254901961, 0.5411764705882353, 0.7686274509803922),
-        (0.9294117647058824, 0.39215686274509803, 0.35294117647058826),
-        (0.3215686274509804, 0.7372549019607844, 0.6392156862745098),
-        (0.8980392156862745, 0.5254901960784314, 0.023529411764705882),
-        (0.6, 0.788235294117647, 0.27058823529411763),
-        (0.8, 0.3803921568627451, 0.6901960784313725),
-        (0.1411764705882353, 0.4745098039215686, 0.4235294117647059),
-        (0.8549019607843137, 0.6470588235294118, 0.10588235294117647),
-        (0.36470588235294116, 0.4117647058823529, 0.6941176470588235),
-        (0.4627450980392157, 0.3058823529411765, 0.6235294117647059),
-    ]
-    default_cycler = (cycler(color=colors))
-    # default_cycler = (cycler(color=palettable.cartocolors.qualitative.Safe_10.mpl_colors))
-    plt.rc('axes', prop_cycle=default_cycler)
-else:
-    plt.style.use(mpl_style)
-
-
 class FigureBase(Figure):
     """
     GeospaceLab canvas inherits from ``matplotlib.figure.Figure`` with additional functions and settings.

{geospacelab-0.10.3 → geospacelab-0.10.4}/geospacelab/visualization/mpl/colormaps.py

@@ -54,6 +54,16 @@ def cmap_jhuapl_ssj_like():
     return mycmap
 
 
+def cmap_jhuapl_ssusi_like():
+    c1 = ['#000000', "#330066",
+          '#0000CC', '#0080FF',
+          "#00CC00", '#80FF00',
+          '#FFFF00', '#FF8000',
+          '#FF0000', '#FF6666']
+    mycmap = colors.LinearSegmentedColormap.from_list("jhuapl_ssusi_like", c1, N=500)
+    return mycmap
+
+
 def cmap_aurora():
     c1 = ['#848F9E', '#6A4CA1', '#4035A3', '#395EA6', '#003300', '#006600', '#009900', '#00BB00', '#00DD00', '#00FF00', '#80FF80', '#B3FFB3']
     c1 = ['#AEAAB0', '#78519A', '#51227B', '#310073',