geospacelab 0.11.2__tar.gz → 0.11.4__tar.gz

{geospacelab-0.11.2/geospacelab.egg-info → geospacelab-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geospacelab
-Version: 0.11.2
+Version: 0.11.4
 Summary: Collect, manage, and visualize geospace data.
 Home-page: https://github.com/JouleCai/geospacelab
 Author: Lei Cai
@@ -340,7 +340,7 @@ dashboard.save_figure()
 dashboard.show()
 ```
 Output:
-> ![alt text](https://github.com/JouleCai/geospacelab/blob/master/examples/EISCAT_UHF_beata_cp1_60_20201209-180000-20201210-060000.png?raw=true)
+> ![alt text](https://github.com/JouleCai/geospacelab/blob/master/examples/EISCAT_UHF_beata__60_20201209-180000-20201210-060000.png?raw=true)
 
 ### Example 3: OMNI data and geomagnetic indices (WDC + GFZ):
 

{geospacelab-0.11.2 → geospacelab-0.11.4}/README.md

@@ -284,7 +284,7 @@ dashboard.save_figure()
 dashboard.show()
 ```
 Output:
-> ![alt text](https://github.com/JouleCai/geospacelab/blob/master/examples/EISCAT_UHF_beata_cp1_60_20201209-180000-20201210-060000.png?raw=true)
+> ![alt text](https://github.com/JouleCai/geospacelab/blob/master/examples/EISCAT_UHF_beata__60_20201209-180000-20201210-060000.png?raw=true)
 
 ### Example 3: OMNI data and geomagnetic indices (WDC + GFZ):
 

{geospacelab-0.11.2 → geospacelab-0.11.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.11.2"
+__version__ = "0.11.4"
 __maintainer__ = "Lei Cai"
 __email__ = "lei.cai@oulu.fi"
 __status__ = "Developing"

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/esa_eo/swarm/l2daily/fac_tms/__init__.py

@@ -45,6 +45,7 @@ default_variable_names = [
     'SC_GEO_LAT',
     'SC_GEO_LON',
     'SC_GEO_r',
+    'SC_GEO_ALT',
     'j_r', 'j_r_err',
     'j_FA', 'j_FA_err',
     'FLAG_B',

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/esa_eo/swarm/l2daily/fac_tms/loader.py

@@ -42,3 +42,4 @@ class Loader(LoaderModel):
     def load_data(self, **kwargs):
         super(Loader, self).load_data(**kwargs)
         self.variables['SC_GEO_r'] = self.variables['SC_GEO_r'] * 1e-3
+        self.variables['SC_GEO_ALT'] = self.variables['SC_GEO_r'] - 6371

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/jhuapl/ampere/__init__.py

@@ -14,6 +14,7 @@ from geospacelab.config import pref
 import geospacelab.datahub.sources.madrigal.utilities as utilities
 
 from geospacelab.datahub import DatabaseModel
+import geospacelab.toolbox.utilities.pylogging as mylog
 
 
 class AMPEREDatabase(DatabaseModel):
@@ -35,6 +36,7 @@ except KeyError:
         default_user_name = 'GeospaceLAB'
         save = 'y'
     else:
+        mylog.StreamLogger.info("A username is needed to download the AMPERE data. If you don't have one, register as a new user on the webpage: https://ampere.jhuapl.edu/browse/!")
         default_user_name = input("Set the username: ")
         save = input("Save as default? [y]/n: ")
     if save.lower() in ['', 'y', 'yes']:

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/jhuapl/ampere/grd/__init__.py

@@ -174,7 +174,7 @@ class Dataset(datahub.DatasetSourced):
                 )
                 # Validate file paths
         
-                if not done and self.allow_download:
+                if (not done and self.allow_download) or self.force_download:
                     done = self.download_data(dt_fr=start_hour, dt_to=end_hour+datetime.timedelta(seconds=3600))
                     if done:
                         done = super().search_data_files(

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/madrigal/satellites/dmsp/e/__init__.py

@@ -19,6 +19,7 @@ from geospacelab.config import prf
 import geospacelab.toolbox.utilities.pybasic as basic
 import geospacelab.toolbox.utilities.pylogging as mylog
 import geospacelab.toolbox.utilities.pydatetime as dttool
+import geospacelab.cs as geo_cs
 from geospacelab.datahub.sources.madrigal.satellites.dmsp.e.loader import Loader as default_Loader
 from geospacelab.datahub.sources.madrigal.satellites.dmsp.downloader import Downloader as default_Downloader
 import geospacelab.datahub.sources.madrigal.satellites.dmsp.e.variable_config as var_config
@@ -201,7 +202,7 @@ class Dataset(datahub.DatasetSourced):
         if self.replace_orbit:
             glon_1 = glon_2
         else:
-            glon_1[np.abs(delta)>0.05] = glon_2[np.abs(delta)>0.05]
+            glon_1[np.abs(delta)>0.001] = glon_2[np.abs(delta)>0.001]
             
         self['SC_GEO_LON'].value = glon_1[:, np.newaxis]
 

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/madrigal/satellites/dmsp/s1/__init__.py

@@ -217,12 +217,12 @@ class Dataset(datahub.DatasetSourced):
         glon_2 = cs_new['lon']
         # alt_2 = cs_new['height']
         
-        delta = np.sin(glon_2 * np.pi / 180.) - np.sin(glon_2 * np.pi / 180.)
+        delta = np.sin(glon_2 * np.pi / 180.) - np.sin(glon_1 * np.pi / 180.)
         
         if self.replace_orbit:
             glon_1 = glon_2
         else:
-            glon_1[np.abs(delta)>0.05] = glon_2[np.abs(delta)>0.05]
+            glon_1[np.abs(delta)>0.001] = glon_2[np.abs(delta)>0.001]
             
         self['SC_GEO_LON'].value = glon_1[:, np.newaxis]
 

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/madrigal/satellites/dmsp/s4/__init__.py

@@ -19,6 +19,7 @@ from geospacelab.config import prf
 import geospacelab.toolbox.utilities.pybasic as basic
 import geospacelab.toolbox.utilities.pylogging as mylog
 import geospacelab.toolbox.utilities.pydatetime as dttool
+import geospacelab.cs as geo_cs
 from geospacelab.datahub.sources.madrigal.satellites.dmsp.s4.loader import Loader as default_Loader
 from geospacelab.datahub.sources.madrigal.satellites.dmsp.downloader import Downloader as default_Downloader
 import geospacelab.datahub.sources.madrigal.satellites.dmsp.s4.variable_config as var_config
@@ -193,7 +194,7 @@ class Dataset(datahub.DatasetSourced):
         if self.replace_orbit:
             glon_1 = glon_2
         else:
-            glon_1[np.abs(delta)>0.05] = glon_2[np.abs(delta)>0.05]
+            glon_1[np.abs(delta)>0.001] = glon_2[np.abs(delta)>0.001]
             
         self['SC_GEO_LON'].value = glon_1[:, np.newaxis]
         

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/supermag/__init__.py

@@ -13,6 +13,7 @@ from geospacelab.config import pref
 import geospacelab.datahub.sources.madrigal.utilities as utilities
 
 from geospacelab.datahub import DatabaseModel
+import geospacelab.toolbox.utilities.pylogging as mylog
 
 
 class SuperMAGDatabase(DatabaseModel):
@@ -38,6 +39,8 @@ except KeyError:
         # default_user_affiliation = 'GeospaceLab'
         save = 'y'
     else:
+        mylog.StreamLogger.info(
+            "A username is needed to download the SuperMAG data. If you don't have one, register as a new user on the webpage: https://supermag.jhuapl.edu/!")
         default_username = input("Username: ")
         # default_user_email = input("User's email: ")
         # default_user_affiliation = input("User's affiliation: ")

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/supermag/indices/__init__.py

@@ -148,7 +148,7 @@ class Dataset(datahub.DatasetSourced):
 
             # Validate file paths
 
-            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(

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/datahub/sources/supermag/magnetometer/__init__.py

@@ -130,7 +130,7 @@ class Dataset(datahub.DatasetSourced):
 
             # Validate file paths
 
-            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(

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/visualization/mpl/dashboards.py

@@ -16,6 +16,7 @@ import numpy as np
 import datetime
 import matplotlib as mpl
 import matplotlib.dates as mdates
+import cftime
 
 from geospacelab.datahub import DataHub
 
@@ -246,7 +247,7 @@ class TSDashboard(Dashboard):
 
     def add_vertical_line(self, dt_in, panel_index=-1,
                           label=None, label_position=None, top_extend=0., bottom_extend=0., **kwargs):
-        if type(dt_in) is not datetime.datetime:
+        if type(dt_in) not in [datetime.datetime, cftime.real_datetime]:
             return
 
         if label_position is None:

{geospacelab-0.11.2 → geospacelab-0.11.4}/geospacelab/visualization/mpl/geomap/geopanels.py

@@ -790,7 +790,7 @@ class PolarMapPanel(GeoPanel):
                           time_tick_label_fontweight='normal',
                           time_major_ticks=None,
                           time_minor_tick=True, time_minor_tick_res=60,
-                          time_tick_width=1, **kwargs):
+                          time_tick_width=1, show_start_point=False, **kwargs):
         default_trajectory_config = {
             'linewidth': 1,
             'linestyle': '-',
@@ -801,6 +801,15 @@ class PolarMapPanel(GeoPanel):
         default_trajectory_config.update(**kwargs.setdefault('trajectory_config', {}))
         default_trajectory_config.update(color=color)
         kwargs['trajectory_config'] = default_trajectory_config
+        
+        default_start_point_config = {
+            'clip_on': False,
+            'alpha': 0.6,
+            'marker': 's', 'markersize': 2, 
+            'markerfacecolor': kwargs['trajectory_config']['color'], 
+            'markeredgecolor': kwargs['trajectory_config']['color']}
+        default_start_point_config.update(**kwargs.setdefault('start_point_config', {}))
+        kwargs['start_point_config'] = default_start_point_config
 
         #
         # kwargs.setdefault('trajectory_config', {
@@ -836,9 +845,13 @@ class PolarMapPanel(GeoPanel):
             dts_in = sc_ut[i_st:i_ed+1]
 
             if self.ut is None:
-                self.ut = sc_ut[0]
+                self.ut = dts_in[int(len(dts_in) / 2)]
             if show_trajectory:
                 self.major_ax.plot(lon_in, lat_in, transform=ccrs.Geodetic(), **kwargs['trajectory_config'])
+                
+                if show_start_point:
+                    
+                    self.major_ax.plot(lon_in[0], lat_in[0], transform=ccrs.Geodetic(), **kwargs['start_point_config'])
 
             if time_tick:
                 data = self.projection.transform_points(ccrs.PlateCarree(), lon_in, lat_in)

{geospacelab-0.11.2 → geospacelab-0.11.4/geospacelab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geospacelab
-Version: 0.11.2
+Version: 0.11.4
 Summary: Collect, manage, and visualize geospace data.
 Home-page: https://github.com/JouleCai/geospacelab
 Author: Lei Cai
@@ -340,7 +340,7 @@ dashboard.save_figure()
 dashboard.show()
 ```
 Output:
-> ![alt text](https://github.com/JouleCai/geospacelab/blob/master/examples/EISCAT_UHF_beata_cp1_60_20201209-180000-20201210-060000.png?raw=true)
+> ![alt text](https://github.com/JouleCai/geospacelab/blob/master/examples/EISCAT_UHF_beata__60_20201209-180000-20201210-060000.png?raw=true)
 
 ### Example 3: OMNI data and geomagnetic indices (WDC + GFZ):