geospacelab 0.10.2__tar.gz → 0.10.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geospacelab
-Version: 0.10.2
+Version: 0.10.4
 Summary: Collect, manage, and visualize geospace data.
 Home-page: https://github.com/JouleCai/geospacelab
 Author: Lei Cai
@@ -64,7 +64,6 @@ Dynamic: summary
 [![DOI](https://zenodo.org/badge/347315860.svg)](https://zenodo.org/badge/latestdoi/347315860)
 [![Downloads](https://pepy.tech/badge/geospacelab)](https://pepy.tech/project/geospacelab)
 ![](https://tokei.rs/b1/github/JouleCai/geospacelab)
-[![PyPI version fury.io](https://badge.fury.io/py/ansicolortags.svg)](https://pypi.python.org/pypi/geospacelab/)
 
 
 GeospaceLAB provides a framework of data access, analysis, and visualization for the researchers in space physics and space weather. The documentation can be found 

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

@@ -8,7 +8,6 @@
 [![DOI](https://zenodo.org/badge/347315860.svg)](https://zenodo.org/badge/latestdoi/347315860)
 [![Downloads](https://pepy.tech/badge/geospacelab)](https://pepy.tech/project/geospacelab)
 ![](https://tokei.rs/b1/github/JouleCai/geospacelab)
-[![PyPI version fury.io](https://badge.fury.io/py/ansicolortags.svg)](https://pypi.python.org/pypi/geospacelab/)
 
 
 GeospaceLAB provides a framework of data access, analysis, and visualization for the researchers in space physics and space weather. The documentation can be found 

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

{geospacelab-0.10.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → geospacelab-0.10.4}/geospacelab/datahub/sources/madrigal/isr/millstonehill/basic/__init__.py

@@ -43,7 +43,7 @@ default_dataset_attrs = {
 }
 
 default_variable_names = [
-    'DATETIME', 'AZ', 'AZ1', 'AZ2', 'EL', 'EL1', 'EL2', 'PULSE_LENGTH',
+    'DATETIME', 'DATETIME_1', 'DATETIME_2', 'AZ', 'AZ1', 'AZ2', 'EL', 'EL1', 'EL2', 'PULSE_LENGTH',
     'T_SYS', 'POWER_NORM', 'P_Tx', 'MODE_TYPE', 'POWER_LENGTH_F',
     'LAG_SPACING', 'IPP', 'f_Tx', 'v_PHASE_Tx', 'v_PHASE_Tx_err',
     'SCAN_TYPE', 'CYCN', 'POSN', 'RANGE_RES', 'RANGE',
@@ -52,7 +52,7 @@ default_variable_names = [
     'n_e_err', 'T_i', 'T_i_err', 'T_r', 'T_r_err', 'T_e', 'T_e_err',
     'nu_i', 'nu_i_err', 'v_i_los', 'v_i_los_err', 'comp_H_p',
     'comp_H_p_err', 'comp_mix', 'comp_mix_err', 'v_DOP_los', 'v_DOP_los_err',
-    'HEIGHT'
+    'HEIGHT', 
 ]
 
 # default_data_search_recursive = True