DASPy-toolbox 1.1.1__tar.gz → 1.1.3__tar.gz

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/DASPy_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: DASPy-toolbox
-Version: 1.1.1
+Version: 1.1.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
@@ -22,14 +22,25 @@ Requires-Dist: h5py
 Requires-Dist: segyio
 Requires-Dist: nptdms
 Requires-Dist: tqdm
-
-<img src="./website/USTC.svg" height="170" />&emsp;<img src="./website/DAMS.png" height="150" />
-
-# DASPy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+<img src="https://raw.github.com/hmz-03/daspy/main/website/logo.png" height="200" />
 
 [![Supported Python versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue)](https://pypi.org/project/DASPy-toolbox/)
 [![License](https://img.shields.io/pypi/l/daspy-toolbox.svg)](https://opensource.org/license/mit)
 [![PyPI Version](https://img.shields.io/pypi/v/daspy-toolbox.svg)](https://pypi.org/project/DASPy-toolbox/)
+
 [![DOI](https://img.shields.io/badge/DOI-10.1785/0220240124-blue.svg)](https://doi.org/10.1785/0220240124)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/daspy-toolbox.svg?label=pypi)](https://pypi.org/project/DASPy-toolbox/)
 [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/daspy-toolbox?label=conda)](https://anaconda.org/conda-forge/daspy-toolbox)

daspy_toolbox-1.1.3/DASPy_toolbox.egg-info/SOURCES.txt

@@ -0,0 +1,28 @@
+LICENSE
+README.md
+setup.py
+DASPy_toolbox.egg-info/PKG-INFO
+DASPy_toolbox.egg-info/SOURCES.txt
+DASPy_toolbox.egg-info/dependency_links.txt
+DASPy_toolbox.egg-info/entry_points.txt
+DASPy_toolbox.egg-info/requires.txt
+DASPy_toolbox.egg-info/top_level.txt
+daspy/__init__.py
+daspy/advanced_tools/__init__.py
+daspy/advanced_tools/channel.py
+daspy/advanced_tools/decomposition.py
+daspy/advanced_tools/denoising.py
+daspy/advanced_tools/fdct.py
+daspy/advanced_tools/strain2vel.py
+daspy/basic_tools/__init__.py
+daspy/basic_tools/filter.py
+daspy/basic_tools/freqattributes.py
+daspy/basic_tools/preprocessing.py
+daspy/basic_tools/visualization.py
+daspy/core/__init__.py
+daspy/core/collection.py
+daspy/core/dasdatetime.py
+daspy/core/example.pkl
+daspy/core/read.py
+daspy/core/section.py
+daspy/core/write.py

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: DASPy-toolbox
-Version: 1.1.1
+Version: 1.1.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
@@ -22,14 +22,25 @@ Requires-Dist: h5py
 Requires-Dist: segyio
 Requires-Dist: nptdms
 Requires-Dist: tqdm
-
-<img src="./website/USTC.svg" height="170" />&emsp;<img src="./website/DAMS.png" height="150" />
-
-# DASPy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+<img src="https://raw.github.com/hmz-03/daspy/main/website/logo.png" height="200" />
 
 [![Supported Python versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue)](https://pypi.org/project/DASPy-toolbox/)
 [![License](https://img.shields.io/pypi/l/daspy-toolbox.svg)](https://opensource.org/license/mit)
 [![PyPI Version](https://img.shields.io/pypi/v/daspy-toolbox.svg)](https://pypi.org/project/DASPy-toolbox/)
+
 [![DOI](https://img.shields.io/badge/DOI-10.1785/0220240124-blue.svg)](https://doi.org/10.1785/0220240124)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/daspy-toolbox.svg?label=pypi)](https://pypi.org/project/DASPy-toolbox/)
 [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/daspy-toolbox?label=conda)](https://anaconda.org/conda-forge/daspy-toolbox)

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/README.md

@@ -1,10 +1,9 @@
-<img src="./website/USTC.svg" height="170" />&emsp;<img src="./website/DAMS.png" height="150" />
-
-# DASPy
+<img src="https://raw.github.com/hmz-03/daspy/main/website/logo.png" height="200" />
 
 [![Supported Python versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%20|%203.12-blue)](https://pypi.org/project/DASPy-toolbox/)
 [![License](https://img.shields.io/pypi/l/daspy-toolbox.svg)](https://opensource.org/license/mit)
 [![PyPI Version](https://img.shields.io/pypi/v/daspy-toolbox.svg)](https://pypi.org/project/DASPy-toolbox/)
+
 [![DOI](https://img.shields.io/badge/DOI-10.1785/0220240124-blue.svg)](https://doi.org/10.1785/0220240124)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/daspy-toolbox.svg?label=pypi)](https://pypi.org/project/DASPy-toolbox/)
 [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/daspy-toolbox?label=conda)](https://anaconda.org/conda-forge/daspy-toolbox)

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/daspy/advanced_tools/channel.py

@@ -1,6 +1,6 @@
 # Purpose: Several functions for analysis data quality and geometry of channels
 # Author: Minzhe Hu, Zefeng Li
-# Date: 2024.11.18
+# Date: 2025.3.31
 # Email: hmz2018@mail.ustc.edu.cn
 import numpy as np
 from copy import deepcopy
@@ -84,7 +84,7 @@ def channel_checking(data, deg=10, thresh=5, continuity=True, adjacent=2,
         bad_chn = np.argwhere(deviation < -thresh * mad).ravel().tolist()
     elif mode == 'high':
         bad_chn = np.argwhere(deviation > thresh * mad).ravel().tolist()
-    elif mode == 'high':
+    elif mode == 'both':
         bad_chn = np.argwhere(deviation < -thresh * mad).ravel().tolist() + \
                 np.argwhere(deviation > thresh * mad).ravel().tolist()
     good_chn = list(set(range(nch)) - set(bad_chn))
@@ -365,62 +365,62 @@ def turning_points(data, data_type='coordinate', thresh=5, depth_info=False,
         raise ValueError('Data_type should be \'coordinate\' or \'waveform\'.')
 
 
-def _equally_spacing(channels, dist, dx):
-    if len(channels) > 20:
-        return _equally_spacing_2(channels, dist, dx)
-    else:
-        return _equally_spacing_1(channels, dist, dx)
-
-
-def _equally_spacing_1(channels, dist, dx):
-    nch = len(channels)
-    residual = np.inf
-    for i in range(2 ** (nch - 2)):
-        state = bin(i)[2:].rjust(nch - 2, '0')
-        dist_new = [dist[0]]
-        channels_new = [channels[0]]
-        idx = 0
-        for j, s in enumerate(state):
-            if s == '0':
-                dist_new[idx] += dist[j+1]
-            else:
-                dist_new.append(dist[j+1])
-                channels_new.append(channels[j+1])
-                idx += 1
-        res = sum([abs(d - dx) for d in dist_new])    
-        if res < residual:
-            residual = res
-            dist_equal = dist_new
-            channels_equal = channels_new
-    channels_equal.append(channels[-1])
-    return channels_equal, dist_equal
-
-
-def _equally_spacing_2(channels, dist, dx):
-    channels_equal = [channels[0]]
-    dist_equal = []
-    i = 0
-    while i < len(dist):
-        d = dist[i]
-        if d < dx and i < len(dist) - 1:
-            d1 = d + dist[i + 1]
-            while d1 < dx and i < len(dist) - 2:
-                d = d1
-                i += 1
-                d1 += dist[i + 1]
-            if abs(d - dx) <= abs(d1 - dx):
-                channels_equal.append(channels[i + 1])
-                dist_equal.append(d)
-            else:
-                i += 1
-                channels_equal.append(channels[i + 1])
-                dist_equal.append(d1)
+def _equally_spacing(dist, dx):
+    index = [[], []]
+    residual = [0, abs(dist[0]-dx)]
+    for i in range(2, len(dist)+1):
+        res = []
+        for j in range(i):
+            res.append(residual[j] + abs(dx - sum(dist[j:i])))
+        residual.append(min(res))
+        k = np.argmin(res)
+        if k > 0:
+            index.append(index[k] + [k])
         else:
-            channels_equal.append(channels[i + 1])
-            dist_equal.append(d)
-        i += 1
+            index.append(index[k])
+        # print(index, residual)
+    
+    return index[-1]
+
+
+def channel_spacing(geometry, depth_info=False):
+    nch = len(geometry)
+    dist = np.zeros(nch - 1)
+    for i in range(nch - 1):
+        lon0, lat0 = geometry[i, :2]
+        lon1, lat1 = geometry[i+1, :2]
+        d = Geodesic.WGS84.Inverse(lat0, lon0, lat1, lon1)['s12']
+        if depth_info:
+            dist[i] = np.sqrt(d**2 + (geometry[i+1, 2] - geometry[i, 2]) ** 2)
+        else:
+            dist[i] = d
+
+    return dist
+
+
+def closest_channel_to_point(geometry, point):
+    """
+    Find the channel number closest to a given point.
+
+    :param geometry: numpy.ndarray. It needs to consist of longitude, latitude
+        or channel number, longitude, latitude.
+    :param point: tuple or numpy.ndarray. A tuple consisting of latitude and longitude.
+    :return: int. The channel number closest to the given point.
+    """
+    if geometry.shape[1] == 2:
+        channels = np.arange(len(geometry)).astype(int)
+    else:
+        geometry = geometry[geometry[:, 0].argsort()]
+        channels = geometry[:, 0].astype(int)
+        geometry = geometry[:, 1:]
 
-    return channels_equal, dist_equal
+    lat, lon = point
+    distances = np.array([
+        Geodesic.WGS84.Inverse(lat, lon, geometry[i, 0], geometry[i, 1])['s12']
+        for i in range(len(geometry))
+    ])
+    closest_index = np.argmin(distances)
+    return int(channels[closest_index])
 
 
 def equally_spaced_channels(geometry, dx, depth_info=False, verbose=False):
@@ -446,53 +446,36 @@ def equally_spaced_channels(geometry, dx, depth_info=False, verbose=False):
         channels = geometry[:, 0].astype(int)
         geometry = geometry[:, 1:]
 
-    dist = np.zeros(nch - 1)
-    for i in range(nch - 1):
-        lon0, lat0 = geometry[i, :2]
-        lon1, lat1 = geometry[i+1, :2]
-        d = Geodesic.WGS84.Inverse(lat0, lon0, lat1, lon1)['s12']
-        if depth_info:
-            dist[i] = np.sqrt(d**2 + (geometry[i+1, 2] - geometry[i, 2]) ** 2)
-        else:
-            dist[i] = d
-
-    channels_equal = [channels[0]]
-    dist_equal = []
-    channels_seg = []
-    dist_seg = []
-    flag = False
-    for i in range(1, nch-1):
-        if dist[i-1] + dist[i] <= dx * 1.5:
-            channels_seg.append(channels[i-1])
-            dist_seg.append(dist[i-1])
-        else:
-            if len(channels_seg):
-                channels_seg.extend(channels[i-1:i+1])
-                dist_seg.append(dist[i-1])
-                channels_seg, dist_seg = _equally_spacing(channels_seg,
-                                                          dist_seg, dx)
-                dist_equal.extend(dist_seg)
-                channels_equal.extend(channels_seg[1:])
-                channels_seg = []
-                dist_seg = []
-                flag = False
-            else:
-                if flag:
-                    channels_equal.append(channels[i-1])
-                    dist_equal.append(dist[i-1])
-                else:
-                    flag = True
-
-    if len(channels_seg):
-        channels_seg.extend(channels[i:i+2])
-        dist_seg.append(dist[i])
-        channels_seg, dist_seg = _equally_spacing(channels_seg, dist_seg, dx)
-        dist_equal.extend(dist_seg)
-        channels_equal.extend(channels_seg[1:])
-    else:
-        channels_equal.extend(channels[-2:])
-        dist_equal.extend(dist[-2:])
-
-    if verbose:
-        return channels_equal, dist_equal
-    return channels_equal
+    dist = channel_spacing(geometry, depth_info=False)
+
+    s = 0
+    idx_equal = [0]
+    for i in range(nch-2):
+        if dist[i] > dx * 2:
+            e = i
+            if e == s + 1:
+                idx_equal.append(e)
+            elif e >= s + 2:
+                idx_equal.extend([idx + s for idx in
+                                  _equally_spacing(dist[s:e], dx)])
+                idx_equal.append(e)
+            s = e + 1
+            idx_equal.append(s)
+        elif dist[i] + dist[i+1] > dx * 1.5:
+            e = i + 1
+            if e == s + 1:
+                idx_equal.append(e)
+            elif e >= s + 2:
+                idx_equal.extend([idx + s for idx in
+                                  _equally_spacing(dist[s:e], dx)])
+                idx_equal.append(e)
+            s = e
+    e = nch - 1
+    if e == s + 1:
+        idx_equal.append(e)
+    elif e >= s + 2:
+        idx_equal.extend([idx + s for idx in
+                        _equally_spacing(dist[s:e], dx)])
+        idx_equal.append(e)
+
+    return channels[idx_equal]

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/daspy/advanced_tools/strain2vel.py

@@ -1,6 +1,6 @@
 # Purpose: Convert strain rate data to velocity
 # Author: Minzhe Hu
-# Date: 2024.6.8
+# Date: 2024.3.10
 # Email: hmz2018@mail.ustc.edu.cn
 import numpy as np
 from numpy.fft import irfft2, ifftshift
@@ -103,7 +103,6 @@ def curvelet_conversion(data, dx, fs, pad=0.3, scale_begin=2, nbscales=None,
     :return: numpy.ndarray. Converted data.
     """
     if turning is not None:
-        print(1)
         data_vel = np.zeros_like(data)
         start_ch = [0, *turning]
         end_ch = [*turning, len(data)]

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/daspy/basic_tools/preprocessing.py

@@ -1,6 +1,6 @@
 # Purpose: Some preprocess methods
 # Author: Minzhe Hu
-# Date: 2024.10.25
+# Date: 2025.3.10
 # Email: hmz2018@mail.ustc.edu.cn
 import numpy as np
 from scipy.signal import detrend
@@ -23,13 +23,13 @@ def phase2strain(data, lam, e, n, gl):
     return data * (lam * 1e-9) / (e * 4 * np.pi * n * gl)
 
 
-def normalization(data, method='z-score', **kwargs):
+def normalization(data, method='z-score'):
     """
     Normalize for each individual channel using Z-score method.
 
     :param data: numpy.ndarray. Data to normalize.
     :param method: str. Method for normalization, should be one of 'max',
-        'z-score', or 'one-bit'.
+        'z-score', 'MAD' or 'one-bit'.
     :return: Normalized data.
     """
     if data.ndim == 1:
@@ -37,21 +37,21 @@ def normalization(data, method='z-score', **kwargs):
     elif data.ndim != 2:
         raise ValueError("Data should be 1-D or 2-D array")
 
-    if method == 'max':
+    if method.lower() == 'max':
         amp = np.max(abs(data), 1, keepdims=True)
         amp[amp == 0] = amp[amp > 0].min()
         return data / amp
-
-    if method == 'z-score':
+    elif method.lower() == 'z-score':
         mean = np.mean(data, axis=1, keepdims=True)
         std = np.std(data, axis=1, keepdims=True)
         std[std == 0] = std[std > 0].min()
-        if 'p' in kwargs.keys():
-            thresh = np.percentile(std, kwargs['p'])
-            std[std > thresh] = thresh
         return (data - mean) / std
-
-    if method == 'one-bit':
+    elif method.lower() == 'mad':
+        median = np.median(data, axis=1, keepdims=True)
+        mad = np.median(abs(data - median), axis=1, keepdims=True)
+        mad[mad == 0] = mad[mad > 0].min()
+        return (data - median) / mad
+    elif method.lower() == 'one-bit':
         return np.sign(data)
 
 

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/daspy/basic_tools/visualization.py

@@ -1,13 +1,13 @@
 # Purpose: Plot data
 # Author: Minzhe Hu
-# Date: 2024.11.8
+# Date: 2025.1.6
 # Email: hmz2018@mail.ustc.edu.cn
 import numpy as np
 import matplotlib.pyplot as plt
 from collections.abc import Sequence
 
 
-def plot(data: np.ndarray, dx=None, fs=None, ax=None, obj='waveform', dpi=150,
+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, vmax=None, dB=False,
          xmode='distance', tmode='time', xlim=None, ylim=None, xlog=False,
@@ -29,7 +29,9 @@ def plot(data: np.ndarray, dx=None, fs=None, ax=None, obj='waveform', dpi=150,
     :param title: str. The title of this axes.
     :param transpose: bool. Transpose the figure or not.
     :param t0, x0: The beginning of time and space.
-    :param pick: Sequence of picked phases. Required if obj=='phasepick'.
+    :param pick: dictionary of sequence of picked phases. Key should be 'P' for
+        P phase, 'S' for S phase and 'N' for unknown phase type. Required if
+        obj=='phasepick'.
     :param f: Sequence of frequency. Required if obj is one of 'spectrum',
         'spectrogram', 'fk' or 'dispersion'.
     :param k: Wavenumber sequence. Required if obj=='fk'.
@@ -82,14 +84,18 @@ def plot(data: np.ndarray, dx=None, fs=None, ax=None, obj='waveform', dpi=150,
             extent = [x0 * 1e-3, (x0 + nch * dx) * 1e-3, t0 + nt / fs, t0]
 
         if obj == 'phasepick' and len(pick):
-            pck = np.array(pick).astype(float)
-            if xmode.lower() == 'distance':
-                pck[:, 0] = (x0 + pck[:, 0] * dx) * 1e-3
-            elif xmode.lower() == 'channel':
-                pck[:, 0] = x0 + pck[:, 0]
-            if tmode.lower() == 'sampling':
-                pck[:, 1] = pck[:, 1] / fs
-            ax.scatter(pck[:,0], t0 + pck[:,1], marker=',', s=0.1, c='black')
+            pick_color = {'P': 'r', 'S': 'b', 'N': 'k'}
+            for phase, pck in pick.items():
+                if len(pck):
+                    pck = np.array(pck).astype(float)
+                    if xmode.lower() == 'distance':
+                        pck[:, 0] = (x0 + pck[:, 0] * dx) * 1e-3
+                    elif xmode.lower() == 'channel':
+                        pck[:, 0] = x0 + pck[:, 0]
+                    if tmode.lower() == 'sampling':
+                        pck[:, 1] = pck[:, 1] / fs
+                    ax.scatter(pck[:,0], t0 + pck[:,1], marker=',', s=0.1,
+                            c=pick_color[phase])
 
     elif obj in ['spectrum', 'spectrogram', 'fk', 'dispersion']:
         if isinstance(data[0,0], (complex, np.complex64)):

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/daspy/core/collection.py

@@ -1,6 +1,6 @@
 # Purpose: Module for handling Collection objects.
 # Author: Minzhe Hu
-# Date: 2025.1.1
+# Date: 2025.3.30
 # Email: hmz2018@mail.ustc.edu.cn
 import os
 import warnings
@@ -18,7 +18,8 @@ cascade_method = ['time_integration', 'time_differential', 'downsampling',
 
 class Collection(object):
     def __init__(self, fpath, ftype=None, flength=None, meta_from_file=True,
-                 timeinfo_format=None, timeinfo_from_basename=True, **kwargs):
+                 timeinfo_slice=slice(None), timeinfo_format=None, 
+                 timeinfo_tz=None, timeinfo_from_basename=True, **kwargs):
         """
         :param fpath: str or Sequence of str. File path(s) containing data.
         :param ftype: None or str. None for automatic detection, or 'pkl',
@@ -28,7 +29,11 @@ class Collection(object):
             and gauge_length. True for extracting dt, dx, fs and gauge_length
             from first 2 file. 'all' for exracting and checking these metadata
             from all file.
-        :param timeinfo_format: str or (slice, str). Format for extracting start
+        :param timeinfo_slice: slice. Slice for extracting start time from file
+            name.
+        :param timeinfo_format: str. Format for extracting start time from file
+            name.
+        :param timeinfo_tz: datetime.timezone. Time zone for extracting start
             time from file name.
         :param timeinfo_from_basename: bool. If True, timeinfo_format will use
             DASDateTime.strptime to basename of fpath.
@@ -63,7 +68,7 @@ class Collection(object):
                     sec.gauge_length = None
                 ftime.append(sec.start_time)
                 metadata_list.append((sec.nch, sec.nt, sec.dx, sec.fs,
-                                      sec.gauge_length))
+                                      sec.gauge_length, sec.duration))
 
             if len(set(metadata_list)) > 1:
                 warnings.warn('More than one kind of setting detected.')
@@ -71,6 +76,8 @@ class Collection(object):
             for i, key in enumerate(['nch', 'nt', 'dx', 'fs', 'gauge_length']):
                 if not hasattr(self, key):
                     setattr(self, key, metadata[i])
+                if flength is None:
+                    flength = metadata[-1]
             self.ftime = ftime
         elif meta_from_file:
             i = int(len(self.flist) > 1)
@@ -88,17 +95,22 @@ class Collection(object):
                     setattr(self, key, metadata[i])
 
         if not hasattr(self, 'ftime'):
-            if isinstance(timeinfo_format, tuple):
-                timeinfo_slice, timeinfo_format = timeinfo_format
-            else:
-                timeinfo_slice = slice(None)
             if timeinfo_from_basename:
-                self.ftime = [DASDateTime.strptime(
-                    os.path.basename(f)[timeinfo_slice], timeinfo_format)
-                    for f in self.flist]
+                flist_use = [os.path.basename(f) for f in self.flist]
             else:
+                flist_use = self.flist
+            if timeinfo_tz is None:
                 self.ftime = [DASDateTime.strptime(f[timeinfo_slice],
-                    timeinfo_format) for f in self.flist]
+                    timeinfo_format) for f in flist_use]
+            else:
+                if '%z' in timeinfo_format.lower():
+                    self.ftime = [DASDateTime.strptime(f[timeinfo_slice],
+                        timeinfo_format).astimezone(timeinfo_tz) for f in
+                        flist_use]
+                else:
+                    self.ftime = [DASDateTime.strptime(f[timeinfo_slice],
+                        timeinfo_format).replace(tzinfo=timeinfo_tz) for f in
+                        flist_use]
 
         self._sort()
         if flength is None:
@@ -211,6 +223,9 @@ class Collection(object):
                 flist.append(self.flist[i])
                 ftime.append(self.ftime[i])
 
+        if len(flist) == 0:
+            warnings.warn('Out of collection time range.')
+            return None
         if readsec:
             sec = read(flist[0], **kwargs)
             for f in flist[1:]:
@@ -218,10 +233,9 @@ class Collection(object):
             sec.trimming(tmin=stime, tmax=etime)
             return sec
         else:
-            coll = self.copy()
-            coll.flist = flist
-            coll.ftime = ftime
-            return coll
+            self.flist = flist
+            self.ftime = ftime
+            return self
 
     def _optimize_for_continuity(self, operations):
         method_list = []
@@ -231,8 +245,8 @@ class Collection(object):
         for opera in operations:
             method, kwargs = opera
             if method == 'downsampling':
-                if hasattr(kwargs, 'lowpass_filter') and not\
-                        kwargs['lowpass_filter']:
+                if (hasattr(kwargs, 'lowpass_filter') and not\
+                    kwargs['lowpass_filter']) or not hasattr(kwargs, 'tint'):
                     method_list.append('downsampling')
                     kwargs_list.append(kwargs)
                 else:
@@ -271,6 +285,16 @@ class Collection(object):
             merge = len(self)
         for i in tqdm(range(0, len(self))):
             f = self[i]
+            if os.path.getsize(f) == 0:
+                for j, method in enumerate(method_list):
+                    if method == 'time_integration':
+                        kwargs_list[j]['c'] = 0
+                    elif method == 'time_differential':
+                        kwargs_list[j]['prepend'] = 0
+                    elif method in ['bandpass', 'bandstop', 'lowpass',
+                                    'highpass', 'lowpass_cheby_2']:
+                        kwargs_list[j]['zi'] = 0
+                continue
             sec = read(f, ftype=self.ftype, **read_kwargs)
             for j, method in enumerate(method_list):
                 if method in ['taper', 'cosine_taper']:

{DASPy-toolbox-1.1.1 → daspy_toolbox-1.1.3}/daspy/core/dasdatetime.py

@@ -1,6 +1,6 @@
 # Purpose: Module for handling DASDateTime objects.
 # Author: Minzhe Hu
-# Date: 2024.11.18
+# Date: 2025.3.29
 # Email: hmz2018@mail.ustc.edu.cn
 import time
 from typing import Iterable
@@ -48,10 +48,10 @@ class DASDateTime(datetime):
     def __gt__(self, other):
         return datetime.__gt__(*self._unify_tz(other))
 
-    def _unify_tz(self, other):
-        if self.tzinfo and not other.tzinfo:
+    def _unify_tz(self, other: datetime):
+        if self.tzinfo and (not other.tzinfo):
             return self, other.replace(tzinfo=self.tzinfo)
-        elif not self.tzinfo and other.tzinfo:
+        elif (not self.tzinfo) and other.tzinfo:
             return self.replace(tzinfo=other.tzinfo), other
         return self, other
 
@@ -77,4 +77,26 @@ class DASDateTime(datetime):
 
     def to_obspy_UTCDateTime(self):
         from obspy import UTCDateTime
-        return UTCDateTime(UTCDateTime(self.to_datetime()))
+        return UTCDateTime(UTCDateTime(self.to_datetime()))
+
+    @classmethod
+    def strptime(cls, date_string, format):
+        """
+        string, format -> new datetime parsed from a string
+        (like time.strptime()).
+        """
+        from _strptime import _strptime
+        tt, fraction, gmtoff_fraction = _strptime(date_string, format)
+        tzname, gmtoff = tt[-2:]
+        args = tt[:6] + (fraction,)
+        if gmtoff is not None:
+            tzdelta = timedelta(seconds=gmtoff, microseconds=gmtoff_fraction)
+            if tzname:
+                tz = timezone(tzdelta, tzname)
+            else:
+                tz = timezone(tzdelta)
+            args += (tz,)
+        elif tt[-3] == 0:
+            args += (utc,)
+
+        return cls(*args)