geospacelab 0.11.0__tar.gz → 0.11.2__tar.gz

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

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

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

{geospacelab-0.11.0 → geospacelab-0.11.2}/geospacelab/cs/_cs_base.py

@@ -215,13 +215,14 @@ class SpaceCartesianCS(SpaceCSBase):
 
         # phi: longitude, theta: co-latitude, r: radial distance
         r = np.sqrt(self.coords.x ** 2 + self.coords.y ** 2 + self.coords.z ** 2)
+        r_unit = self.coords.x_unit
         theta = np.arccos(self.coords.z / r)
         phi = npmath.trig_arctan_to_sph_lon(self.coords.x, self.coords.y)
         vector = None
         if self.vector is not None:
             mylog.StreamLogger.warning("The tranformation for vectors have not been implemented!")
 
-        coords = {'theta': theta, 'phi': phi, 'r': r}
+        coords = {'theta': theta, 'phi': phi, 'r': r, 'r_unit': r_unit}
         cs_new = set_cs(name=self.name, coords=coords,  vector=vector, kind='sph', ut=self.ut, **kwargs)
 
         return cs_new

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

@@ -159,47 +159,51 @@ class Dataset(datahub.DatasetSourced):
 
     def fix_geo_lon(self):
         from geospacelab.observatory.orbit.sc_orbit import OrbitPosition_SSCWS
-        from scipy.interpolate import interp1d
+        from scipy.interpolate import CubicSpline
+
+        dts_1 = self['SC_DATETIME'].value.flatten()
+        dt0 = dttool.get_start_of_the_day(self.dt_fr)
+        sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
+        glat_1 = self['SC_GEO_LAT'].flatten()
+        glon_1 = self['SC_GEO_LON'].flatten()
+        alt_1 = self['SC_GEO_ALT'].flatten()
+        
         # check outliers
         orbit_obj = OrbitPosition_SSCWS(
             dt_fr=self.dt_fr - datetime.timedelta(minutes=30),
             dt_to=self.dt_to + datetime.timedelta(minutes=30),
             sat_id='dmsp' + self.sat_id.lower()
         )
-
-        glat_1 = self['SC_GEO_LAT'].value.flatten()
-        glon_1 = self['SC_GEO_LON'].value.flatten()
-        if glat_1.size < 2:
-            return
-
-        dts_1 = self['SC_DATETIME'].value.flatten()
-        dt0 = dttool.get_start_of_the_day(self.dt_fr)
-        sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
-
-        glat_2 = orbit_obj['SC_GEO_LAT'].value.flatten()
-        glon_2 = orbit_obj['SC_GEO_LON'].value.flatten()
-        dts_2 = orbit_obj['SC_DATETIME'].value.flatten()
-        sectime_2 = [(dt - dt0).total_seconds() for dt in dts_2]
-
-        factor = np.pi / 180.
-        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')
-        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))
-        glon_new = rad / factor
-        # rad = np.where((rad >= 0), rad, rad + 2 * numpy.pi)
-
-        ind_outliers = np.where(np.abs(sin_glon_1 - sin_glon_2_i) > 0.03)[0]
-
+        dts = orbit_obj['SC_DATETIME'].flatten()
+        sectimes, _ = dttool.convert_datetime_to_sectime(dts, dt0=dt0)
+        x = orbit_obj['SC_GEO_X'].flatten()
+        y = orbit_obj['SC_GEO_Y'].flatten()
+        z = orbit_obj['SC_GEO_Z'].flatten()
+        f_x = CubicSpline(sectimes, x)
+        x_i = f_x(sectime_1)
+        f_y = CubicSpline(sectimes, y)
+        y_i = f_y(sectime_1)
+        f_z = CubicSpline(sectimes, z)
+        z_i = f_z(sectime_1)
+        
+        
+        cs = geo_cs.GEOCCartesian(
+            coords={'x': x_i, 'y': y_i, 'z': z_i, 'x_unit': 'km', 'y_unit': 'km', 'z_unit': 'km'}
+        )
+        cs_new = cs.to_spherical()
+        
+        # glat_2 = cs_new['lat']
+        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.)
+        
         if self.replace_orbit:
-            glon_1 = glon_new
+            glon_1 = glon_2
         else:
-            glon_1[ind_outliers] = glon_new[ind_outliers]
-        self['SC_GEO_LON'].value = glon_1.reshape((glon_1.size, 1))
+            glon_1[np.abs(delta)>0.05] = glon_2[np.abs(delta)>0.05]
+            
+        self['SC_GEO_LON'].value = glon_1[:, np.newaxis]
 
     def search_data_files(self, **kwargs):
 

{geospacelab-0.11.0 → geospacelab-0.11.2}/geospacelab/datahub/sources/madrigal/satellites/dmsp/s1/__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.s1.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.s1.variable_config as var_config
@@ -179,53 +180,51 @@ class Dataset(datahub.DatasetSourced):
 
     def fix_geo_lon(self):
         from geospacelab.observatory.orbit.sc_orbit import OrbitPosition_SSCWS
-        from scipy.interpolate import interp1d
+        from scipy.interpolate import CubicSpline
+
+        dts_1 = self['SC_DATETIME'].value.flatten()
+        dt0 = dttool.get_start_of_the_day(self.dt_fr)
+        sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
+        glat_1 = self['SC_GEO_LAT'].flatten()
+        glon_1 = self['SC_GEO_LON'].flatten()
+        alt_1 = self['SC_GEO_ALT'].flatten()
+        
         # check outliers
         orbit_obj = OrbitPosition_SSCWS(
             dt_fr=self.dt_fr - datetime.timedelta(minutes=30),
             dt_to=self.dt_to + datetime.timedelta(minutes=30),
             sat_id='dmsp' + self.sat_id.lower()
         )
-
-        glat_1 = self['SC_GEO_LAT'].value.flatten()
-        glon_1 = self['SC_GEO_LON'].value.flatten()
-        if glat_1.size < 2:
-            return
-
-        dts_1 = self['SC_DATETIME'].value.flatten()
-        dt0 = dttool.get_start_of_the_day(self.dt_fr)
-        sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
-
-        glat_2 = orbit_obj['SC_GEO_LAT'].value.flatten()
-        glon_2 = orbit_obj['SC_GEO_LON'].value.flatten()
-        dts_2 = orbit_obj['SC_DATETIME'].value.flatten()
-        sectime_2 = [(dt - dt0).total_seconds() for dt in dts_2]
-
-        factor = np.pi / 180.
-        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='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)
+        dts = orbit_obj['SC_DATETIME'].flatten()
+        sectimes, _ = dttool.convert_datetime_to_sectime(dts, dt0=dt0)
+        x = orbit_obj['SC_GEO_X'].flatten()
+        y = orbit_obj['SC_GEO_Y'].flatten()
+        z = orbit_obj['SC_GEO_Z'].flatten()
+        f_x = CubicSpline(sectimes, x)
+        x_i = f_x(sectime_1)
+        f_y = CubicSpline(sectimes, y)
+        y_i = f_y(sectime_1)
+        f_z = CubicSpline(sectimes, z)
+        z_i = f_z(sectime_1)
         
-        cos_glon_2_i = itpf_cos(sectime_1)
-        cos_glon_2_i = np.where(cos_glon_2_i > 1., 1., cos_glon_2_i)
-        cos_glon_2_i = np.where(cos_glon_2_i < -1., -1., cos_glon_2_i)
         
-        rad = np.sign(sin_glon_2_i) * (np.pi / 2 - np.arcsin(cos_glon_2_i))
-        glon_new = rad / factor
-        # rad = np.where((rad >= 0), rad, rad + 2 * numpy.pi)
-
-        ind_outliers = np.where(np.abs(sin_glon_1 - sin_glon_2_i) > 0.03)[0]
-
+        cs = geo_cs.GEOCCartesian(
+            coords={'x': x_i, 'y': y_i, 'z': z_i, 'x_unit': 'km', 'y_unit': 'km', 'z_unit': 'km'}
+        )
+        cs_new = cs.to_spherical()
+        
+        # glat_2 = cs_new['lat']
+        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.)
+        
         if self.replace_orbit:
-            glon_1 = glon_new
+            glon_1 = glon_2
         else:
-            glon_1[ind_outliers] = glon_new[ind_outliers]
-        self['SC_GEO_LON'].value = glon_1.reshape((glon_1.size, 1))
+            glon_1[np.abs(delta)>0.05] = glon_2[np.abs(delta)>0.05]
+            
+        self['SC_GEO_LON'].value = glon_1[:, np.newaxis]
 
     def search_data_files(self, **kwargs):
 

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

@@ -151,47 +151,94 @@ class Dataset(datahub.DatasetSourced):
 
     def fix_geo_lon(self):
         from geospacelab.observatory.orbit.sc_orbit import OrbitPosition_SSCWS
-        from scipy.interpolate import interp1d
+        from scipy.interpolate import CubicSpline
+
+        dts_1 = self['SC_DATETIME'].value.flatten()
+        dt0 = dttool.get_start_of_the_day(self.dt_fr)
+        sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
+        glat_1 = self['SC_GEO_LAT'].flatten()
+        glon_1 = self['SC_GEO_LON'].flatten()
+        alt_1 = self['SC_GEO_ALT'].flatten()
+        
         # check outliers
         orbit_obj = OrbitPosition_SSCWS(
             dt_fr=self.dt_fr - datetime.timedelta(minutes=30),
             dt_to=self.dt_to + datetime.timedelta(minutes=30),
             sat_id='dmsp' + self.sat_id.lower()
         )
-
-        glat_1 = self['SC_GEO_LAT'].value.flatten()
-        glon_1 = self['SC_GEO_LON'].value.flatten()
-        if glat_1.size < 2:
-            return
-
-        dts_1 = self['SC_DATETIME'].value.flatten()
-        dt0 = dttool.get_start_of_the_day(self.dt_fr)
-        sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
-
-        glat_2 = orbit_obj['SC_GEO_LAT'].value.flatten()
-        glon_2 = orbit_obj['SC_GEO_LON'].value.flatten()
-        dts_2 = orbit_obj['SC_DATETIME'].value.flatten()
-        sectime_2 = [(dt - dt0).total_seconds() for dt in dts_2]
-
-        factor = np.pi / 180.
-        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='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))
-        glon_new = rad / factor
-        # rad = np.where((rad >= 0), rad, rad + 2 * numpy.pi)
-
-        ind_outliers = np.where(np.abs(sin_glon_1 - sin_glon_2_i) > 0.03)[0]
-
+        dts = orbit_obj['SC_DATETIME'].flatten()
+        sectimes, _ = dttool.convert_datetime_to_sectime(dts, dt0=dt0)
+        x = orbit_obj['SC_GEO_X'].flatten()
+        y = orbit_obj['SC_GEO_Y'].flatten()
+        z = orbit_obj['SC_GEO_Z'].flatten()
+        f_x = CubicSpline(sectimes, x)
+        x_i = f_x(sectime_1)
+        f_y = CubicSpline(sectimes, y)
+        y_i = f_y(sectime_1)
+        f_z = CubicSpline(sectimes, z)
+        z_i = f_z(sectime_1)
+        
+        
+        cs = geo_cs.GEOCCartesian(
+            coords={'x': x_i, 'y': y_i, 'z': z_i, 'x_unit': 'km', 'y_unit': 'km', 'z_unit': 'km'}
+        )
+        cs_new = cs.to_spherical()
+        
+        # glat_2 = cs_new['lat']
+        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.)
+        
         if self.replace_orbit:
-            glon_1 = glon_new
+            glon_1 = glon_2
         else:
-            glon_1[ind_outliers] = glon_new[ind_outliers]
-        self['SC_GEO_LON'].value = glon_1.reshape((glon_1.size, 1))
+            glon_1[np.abs(delta)>0.05] = glon_2[np.abs(delta)>0.05]
+            
+        self['SC_GEO_LON'].value = glon_1[:, np.newaxis]
+        
+        # from geospacelab.observatory.orbit.sc_orbit import OrbitPosition_SSCWS
+        # from scipy.interpolate import interp1d
+        # # check outliers
+        # orbit_obj = OrbitPosition_SSCWS(
+        #     dt_fr=self.dt_fr - datetime.timedelta(minutes=30),
+        #     dt_to=self.dt_to + datetime.timedelta(minutes=30),
+        #     sat_id='dmsp' + self.sat_id.lower()
+        # )
+
+        # glat_1 = self['SC_GEO_LAT'].value.flatten()
+        # glon_1 = self['SC_GEO_LON'].value.flatten()
+        # if glat_1.size < 2:
+        #     return
+
+        # dts_1 = self['SC_DATETIME'].value.flatten()
+        # dt0 = dttool.get_start_of_the_day(self.dt_fr)
+        # sectime_1 = [(dt - dt0).total_seconds() for dt in dts_1]
+
+        # glat_2 = orbit_obj['SC_GEO_LAT'].value.flatten()
+        # glon_2 = orbit_obj['SC_GEO_LON'].value.flatten()
+        # dts_2 = orbit_obj['SC_DATETIME'].value.flatten()
+        # sectime_2 = [(dt - dt0).total_seconds() for dt in dts_2]
+
+        # factor = np.pi / 180.
+        # 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='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))
+        # glon_new = rad / factor
+        # # rad = np.where((rad >= 0), rad, rad + 2 * numpy.pi)
+
+        # ind_outliers = np.where(np.abs(sin_glon_1 - sin_glon_2_i) > 0.03)[0]
+
+        # if self.replace_orbit:
+        #     glon_1 = glon_new
+        # else:
+        #     glon_1[ind_outliers] = glon_new[ind_outliers]
+        # self['SC_GEO_LON'].value = glon_1.reshape((glon_1.size, 1))
 
     def search_data_files(self, **kwargs):
 

{geospacelab-0.11.0 → geospacelab-0.11.2}/geospacelab/toolbox/utilities/numpyarray.py

@@ -270,6 +270,8 @@ def data_resample(
 #             grid_z_1[i, :] = z_i
 
 
+    
+
 def regridding_2d_xgaps(
     x, y, z,
     xtype=None, xres=None):
@@ -281,13 +283,28 @@ def regridding_2d_xgaps(
         x1 = sectime
     
     diff_x = numpy.diff(x1)
+    x_res_md = numpy.median(diff_x)
     if xres is None:
-        xres = numpy.median(diff_x)
+        xres = x_res_md
         
     if xtype == 'datetime' and basic.isnumeric(xres):
         xres = datetime.timedelta(seconds=xres)
+        x_res_md = datetime.timedelta(seconds=x_res_md)
+
+    xx_1 = np.empty_like(x)
+    xx_2 = np.empty_like(x)
+    for i, xxx in enumerate(x):
+        if i == 0:
+            xx_1[0] = xxx - np.min([datetime.timedelta(diff_x[0]), xres, x_res_md]) / 2
+        else:
+            xx_1[i] = xx_2[i-1] if xres > datetime.timedelta(seconds=diff_x[i-1]) else xxx - xres / 2
         
-    xx = numpy.hstack(((x.flatten() - xres / 2)[:, numpy.newaxis], (x.flatten() + xres / 2)[:, numpy.newaxis]))
+        if i == len(x) - 1:
+            xx_2[i] = xxx + np.min([datetime.timedelta(diff_x[i-1]), xres, x_res_md]) / 2 
+        else:
+            xx_2[i] = xxx + np.min([datetime.timedelta(diff_x[i]), xres, x_res_md]) / 2  
+    
+    xx = numpy.hstack((xx_1[:, numpy.newaxis], xx_2[:, numpy.newaxis]))
     xnew = xx.flatten()
     
     if len(y.shape) == 1 or 1 in y.shape:

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

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