DASPy-toolbox 1.2.2__tar.gz → 1.2.3__tar.gz

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/DASPy_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DASPy-toolbox
-Version: 1.2.2
+Version: 1.2.3
 Summary: DASPy is an open-source project dedicated to provide a python package for DAS (Distributed Acoustic Sensing) data processing, which comprises classic seismic data processing techniques and Specialized algorithms for DAS applications.
 Home-page: https://github.com/HMZ-03/DASPy
 Author: Minzhe Hu, Zefeng Li

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DASPy-toolbox
-Version: 1.2.2
+Version: 1.2.3
 Summary: DASPy is an open-source project dedicated to provide a python package for DAS (Distributed Acoustic Sensing) data processing, which comprises classic seismic data processing techniques and Specialized algorithms for DAS applications.
 Home-page: https://github.com/HMZ-03/DASPy
 Author: Minzhe Hu, Zefeng Li

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/advanced_tools/channel.py

@@ -181,7 +181,7 @@ def _channel_location(track_pt):
     return np.array(seg_interval), np.array(interp_ch)
 
 
-def location_interpolation(known_pt, track_pt=None, dx=2, data_type='lonlat',
+def location_interpolation(known_pt, track_pt=None, dx=1, data_type='lonlat',
                            verbose=False):
     """
     Interpolate to obtain the positions of all channels.
@@ -209,7 +209,8 @@ def location_interpolation(known_pt, track_pt=None, dx=2, data_type='lonlat',
             .astype(int) + 31
         DASProj = Proj(proj='utm', zone=zone, ellps='WGS84',
                        preserve_units=False)
-        known_pt[:, 0], known_pt[:, 1] = DASProj(known_pt[:, 0], known_pt[:, 1])
+        known_pt[:, 0], known_pt[:, 1] = DASProj(known_pt[:, 0],
+                                                 known_pt[:, 1])
     else:
         assert 'xy' in data_type, ('data_type should be \'lonlat\',\''
                                    'lonlatheight\', \'xy\' or \'xyz\'')

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/basic_tools/preprocessing.py

@@ -121,9 +121,9 @@ def cosine_taper(data, p=0.1, side='both'):
     if not isinstance(p, (tuple, list, np.ndarray)):
         win = tukey(nsp, p)
         if side == 'left':
-            win[round(nch/2):] = 1
+            win[round(nsp/2):] = 1
         elif side == 'right':
-            win[:round(len(win)/2)] = 1
+            win[:round(nsp/2)] = 1
         return data * np.tile(win, (nch, 1))
     else:
         if p[0] > 0:

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/basic_tools/visualization.py

@@ -11,9 +11,9 @@ def plot(data: np.ndarray, dx=None, fs=None, ax=None, obj='waveform', dpi=300,
          title=None, transpose=False, t0=0, x0=0, pick=None, f=None, k=None,
          t=None, c=None, cmap=None, vmin=None, vmin_per=None, vmax=None,
          vmax_per=None, dB=False, xmode='distance', tmode='time', xlim=None,
-         ylim=None, xlog=False, ylog=False, xinv=False, yinv=False, xlabel=True,
-         ylabel=True, xticklabels=True, yticklabels=True, colorbar=True,
-         colorbar_label=None, savefig=None):
+         ylim=None, xlog=False, ylog=False, xinv=False, yinv=False,
+         xlabel=True, ylabel=True, xticklabels=True, yticklabels=True,
+         colorbar=True, colorbar_label=None, savefig=None):
     """
     Plot several types of 2-D seismological data.
 
@@ -42,19 +42,20 @@ def plot(data: np.ndarray, dx=None, fs=None, ax=None, obj='waveform', dpi=300,
     :param vmin, vmax: Define the data range that the colormap covers.
     :param vmin_per, vmax_per: float. Define the data range that the colormap
         covers by percentile.
-    :param dB: bool. Transfer data unit to dB and take 1 as the reference value.
+    :param dB: bool. Transfer data unit to dB and take 1 as the reference
+        value.
     :param xmode: str. 'distance' or 'channel'.
     :param tmode: str. 'time' or 'sampling'.
     :param xlim, ylim: Set the x-axis and y-axis view limits.
     :param xlog, ylog: bool. If True, set the x-axis' or y-axis' scale as log.
     :param xlabel, yinv: bool. If True, invert x-axis or y-axis.
-    :param xlabel, ylabel: bool or str. Whether to plot a label or what label to
-        plot for x-axis or y-axis.
+    :param xlabel, ylabel: bool or str. Whether to plot a label or what label
+        to plot for x-axis or y-axis.
     :param xticklabels, yticklabels: bool or sequence of str. Whether to plot
         ticklabels or what ticklabels to plot for x-axis or y-axis.
-    :param colorbar: bool, str or Matplotlib.axes.Axes. Bool means plot colorbar
-        or not. Str means the location of colorbar. Axes means the Axes into
-        which the colorbar will be drawn.
+    :param colorbar: bool, str or Matplotlib.axes.Axes. Bool means plot
+        colorbar or not. Str means the location of colorbar. Axes means the
+        Axes into which the colorbar will be drawn.
     :param savefig: str or bool. Figure name to save if needed. If True,
         it will be set to parameter obj.
     """

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/core/collection.py

@@ -1,6 +1,6 @@
 # Purpose: Module for handling Collection objects.
 # Author: Minzhe Hu
-# Date: 2025.9.18
+# Date: 2025.11.26
 # Email: hmz2018@mail.ustc.edu.cn
 import os
 import warnings
@@ -228,6 +228,8 @@ class Collection(object):
         :param spmin, spmax: int. Sampling point range. Only used when
             readsec=True.
         """
+        if start is None:
+            start = 0
         if end is None:
             end = len(self.flist)
         if 'stime' in kwargs.keys():
@@ -239,10 +241,16 @@ class Collection(object):
             warnings.warn('In future versions, the parameter \'etime\' will be '
                           'replaced by \'end\'.')
 
-        if start is None and 'tmin' in kwargs.keys():
-            start = kwargs['tmin']
-        if end is None and 'tmax' in kwargs.keys():
-            end = kwargs['tmax']
+        if start is None:
+            if 'tmin' in kwargs.keys():
+                start = kwargs['tmin']
+            else:
+                start = 0
+        if end is None:
+            if 'tmax' in kwargs.keys():
+                end = kwargs['tmax']
+            else:
+                end = len(self)
 
         if isinstance(start, datetime):
             for i, ftime in enumerate(self.ftime):
@@ -288,6 +296,18 @@ class Collection(object):
             self.ftime = self.ftime[s:e]
             return self
 
+    def read(self, **kwargs):
+        return self.select(readsec=True, **kwargs)
+
+    def continuous_acquisition(self):
+        index = self.file_interruption()
+        index = [-1] + index.tolist() + [len(self)-1]
+        coll_list = []
+        for i in range(len(index) - 1):
+            coll = self.copy().select(start=index[i]+1, end=index[i+1]+1)
+            coll_list.append(coll)
+        return coll_list
+
     def _optimize_for_continuity(self, operations):
         method_list = []
         kwargs_list = []
@@ -296,8 +316,10 @@ class Collection(object):
         for opera in operations:
             method, kwargs = opera
             if method == 'downsampling':
-                if ('lowpass_filter' in kwargs.keys() and not\
-                    kwargs['lowpass_filter']) or 'tint' not in kwargs.keys():
+                if_filter = ('tint' not in kwargs.keys() and 'fs' not in
+                    kwargs.keys()) or ('lowpass_filter' in kwargs.keys() and
+                    not kwargs['lowpass_filter'])
+                if if_filter:
                     method_list.append('downsampling')
                     kwargs_list.append(kwargs)
                 else:
@@ -356,9 +378,9 @@ class Collection(object):
                 (not os.path.exists(kwargs_file)):
                 raise ValueError('No operations input and no method_list.pkl '
                                  'and kwargs_list.pkl found in savepath.')
-            with open(os.path.join(savepath, 'method_list.pkl'), 'wb') as f:
+            with open(os.path.join(savepath, 'method_list.pkl'), 'rb') as f:
                 method_list = pickle.load(f)
-            with open(os.path.join(savepath, 'kwargs_list.pkl'), 'wb') as f:
+            with open(os.path.join(savepath, 'kwargs_list.pkl'), 'rb') as f:
                 kwargs_list = pickle.load(f)
         else:
             method_list, kwargs_list = self._optimize_for_continuity(operations)

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/core/dasdatetime.py

@@ -9,7 +9,7 @@ from datetime import datetime, timedelta, timezone
 
 
 utc = timezone.utc
-local_tz = timezone(timedelta(seconds=-time.altzone))
+local_tz = timezone(timedelta(seconds=-time.timezone))
 
 
 class DASDateTime(datetime):
@@ -69,7 +69,7 @@ class DASDateTime(datetime):
 
     @classmethod
     def from_obspy_UTCDateTime(cls, dt):
-        return cls.from_datetime(dt.datetime)
+        return cls.from_datetime(dt.datetime).replace(tzinfo=utc)
 
     def to_datetime(self):
         return datetime.fromtimestamp(self.timestamp(), tz=self.tzinfo)

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/core/read.py

@@ -131,6 +131,23 @@ def with_trimming(func):
     return wrapper
 
 
+class DummyObject:
+    def __init__(self, *args, **kwargs):
+        pass
+
+
+class SafeUnpickler(pickle.Unpickler):
+    def find_class(self, module, name):
+        try:
+            return super().find_class(module, name)
+        except ModuleNotFoundError:
+            print(f"Skip missing module: {module}.{name}")
+            return DummyObject
+        except AttributeError:
+            print(f"Skip missing class: {module}.{name}")
+            return DummyObject
+
+
 def _read_pkl(fname, headonly=False, file_format='auto', chmin=None, chmax=None,
               dch=1, xmin=None, xmax=None, tmin=None, tmax=None, spmin=None,
               spmax=None):
@@ -138,7 +155,8 @@ def _read_pkl(fname, headonly=False, file_format='auto', chmin=None, chmax=None,
     Read data and metadata from a pickle file.
     """
     with open(fname, 'rb') as f:
-        pkl_data = pickle.load(f)
+        # pkl_data = pickle.load(f)
+        pkl_data = SafeUnpickler(f).load()
         if isinstance(pkl_data, np.ndarray):
             warnings.warn('This data format doesn\'t include channel interval'
                           'and sampling rate. Please set manually')
@@ -484,7 +502,13 @@ def _read_h5(fname, headonly=False, file_format='auto', chmin=None, chmax=None,
         metadata['headers'] = _read_h5_headers(h5_file)
         shape = dataset.shape
         if len(shape) == 3:
-            shape = (shape[0] * shape[1], shape[2])
+            if headonly:
+                fs = int(metadata['fs'])
+                fs_b = attrs.get('BlockRate', [1000])[0] / 1e3
+                nsp_b = round(fs/fs_b)
+                shape = (shape[0] * nsp_b, shape[2])
+            else:
+                shape = (shape[0] * shape[1], shape[2])
         if transpose:
             shape = shape[::-1]
         si, sj, metadata = _trimming_slice_metadata(shape, metadata=metadata,

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/core/section.py

@@ -196,7 +196,7 @@ class Section(object):
 
     @property
     def end_channel(self):
-        return self.start_channel + self.nch - 1
+        return self.start_channel + self.nch
 
     @property
     def distance(self):
@@ -463,8 +463,8 @@ class Section(object):
         :param ftype: None or str. None for automatic detection), or 'pkl',
             'pickle', 'tdms', 'h5', 'hdf5', 'segy', 'sgy', 'npy'.
         :param keep_format: bool. If True, we will make a copy of the
-            self.source file and make changes to it. This will strictly preserve
-            the original format, but will cost more IO resources.
+            self.source file and make changes to it. This will strictly
+            preserve the original format, but will cost more IO resources.
         :param dtype: str. The data type of the saved data.
         :param file_format: Format in which the file is saved. Only works when
             keep_format == False. 'auto' for raw file format or the most common
@@ -647,9 +647,11 @@ class Section(object):
                 if hasattr(self, 'origin_time'):
                     kwargs['t0'] -= self.origin_time
                     if ('transpose' in kwargs.keys()) and kwargs['transpose']:
-                        kwargs.setdefault('xlabel', 'Times(s) after occurance')
+                        kwargs.setdefault('xlabel',
+                                          'Times after occurance (s)')
                     else:
-                        kwargs.setdefault('ylabel', 'Times(s) after occurance')
+                        kwargs.setdefault('ylabel',
+                                          'Times after occurance (s)')
                 else:
                     tmode == 'start'
             if tmode == 'start':
@@ -1097,12 +1099,13 @@ class Section(object):
         if ('ch1' in kwargs.keys()) or ('ch2' in kwargs.keys()):
             kwargs['chmin'] = kwargs.pop('ch1', 0)
             kwargs['chmax'] = kwargs.pop('ch2', self.nch)
-            warnings.warn("'ch1' and 'ch2' attribute will be renamed to 'chmin'"
-                          " and 'chmax' in a future release.", FutureWarning)
+            warnings.warn("'ch1' and 'ch2' attribute will be renamed to "
+                          "'chmin' and 'chmax' in a future release.",
+                          FutureWarning)
         if 'nch' in kwargs.keys():
             kwargs['dch'] = kwargs.pop('nch', 1)
-            warnings.warn("'nch' attribute will be renamed to 'dch' in a future"
-                          " release.", FutureWarning)
+            warnings.warn("'nch' attribute will be renamed to 'dch' in a "
+                          "future release.", FutureWarning)
 
         if 'chmin' in kwargs.keys():
             chmin = int(kwargs.pop('chmin') - self.start_channel)

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/daspy/core/write.py

@@ -35,8 +35,10 @@ def write(sec, fname, ftype=None, raw_fname=None, dtype=None,
 
 
 def write_pkl(sec, fname):
+    save_dict = sec.__dict__
+    save_dict.pop('source', None)
     with open(fname, 'wb') as f:
-        pickle.dump(sec.__dict__, f)
+        pickle.dump(save_dict, f)
     return None
 
 

{daspy_toolbox-1.2.2 → daspy_toolbox-1.2.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 
 setup(
-    name='DASPy-toolbox', version='1.2.2',
+    name='DASPy-toolbox', version='1.2.3',
     description=(
         'DASPy is an open-source project dedicated to provide a python package '
         'for DAS (Distributed Acoustic Sensing) data processing, which '