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

{daspy_toolbox-1.1.3 → daspy_toolbox-1.1.4}/DASPy_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DASPy-toolbox
-Version: 1.1.3
+Version: 1.1.4
 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.1.3 → daspy_toolbox-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DASPy-toolbox
-Version: 1.1.3
+Version: 1.1.4
 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.1.3 → daspy_toolbox-1.1.4}/daspy/advanced_tools/channel.py

@@ -398,29 +398,62 @@ def channel_spacing(geometry, depth_info=False):
     return dist
 
 
-def closest_channel_to_point(geometry, point):
+def distance_to_channels(geometry, points):
+    """
+    Calculate the distance from a point to each channel.
+
+    :param geometry: numpy.ndarray. It needs to consist of two columns (
+        longitude, latitude), three columns (longitude, latitude and depth).
+    :param points: numpy.ndarray. A array consisting of longitude and
+        latitude or longitude, latitude and depth.
+    :return: numpy.ndarray. The distance from the given point to each channel.
+    """
+    if geometry.shape[1] == 3:
+        depth_info = True
+    else:
+        depth_info = False
+
+    nch = len(geometry)
+    points = np.array(points)
+    if points.ndim == 1:
+        points = points.reshape(1, -1)
+    npt = len(points)
+    dist = np.zeros((npt, nch))
+    for i, pt in enumerate(points):
+        for j, geo in enumerate(geometry):
+            d = Geodesic.WGS84.Inverse(pt[1], pt[0], geo[1], geo[0])['s12']
+            if depth_info:
+                dist[i, j] = np.sqrt(d**2 + (pt[2] - geo[2]) ** 2)
+            else:
+                dist[i, j] = d
+    return dist
+
+
+def closest_channel_to_point(geometry, points, verbose=False):
     """
     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.
+        (and depth) or channel number, longitude, latitude (and depth).
+    :param points: numpy.ndarray. A tuple consisting of longitude and
+        latitude (and depth).
+    :param verbose: bool. Return the channel and the distance to the closest
+        channel if True.
     :return: int. The channel number closest to the given point.
     """
-    if geometry.shape[1] == 2:
-        channels = np.arange(len(geometry)).astype(int)
+    nch = len(geometry)
+    if points.shape[1] == geometry.shape[1]:
+        channels = np.arange(nch).astype(int)
     else:
         geometry = geometry[geometry[:, 0].argsort()]
         channels = geometry[:, 0].astype(int)
         geometry = geometry[:, 1:]
 
-    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])
+    dist = distance_to_channels(points, geometry)
+    closest_index = np.argmin(dist, axis=1)
+    if verbose:
+        return channels[closest_index], np.min(dist, axis=1)
+    return channels[closest_index]
 
 
 def equally_spaced_channels(geometry, dx, depth_info=False, verbose=False):

{daspy_toolbox-1.1.3 → daspy_toolbox-1.1.4}/daspy/core/dasdatetime.py

@@ -12,8 +12,6 @@ local_tz = timezone(timedelta(seconds=-time.altzone))
 
 
 class DASDateTime(datetime):
-
-
     def __add__(self, other):
         if isinstance(other, Iterable):
             out = []

{daspy_toolbox-1.1.3 → daspy_toolbox-1.1.4}/daspy/core/section.py

@@ -1,6 +1,6 @@
 # Purpose: Module for handling Section objects.
 # Author: Minzhe Hu
-# Date: 2025.3.10
+# Date: 2025.4.2
 # Email: hmz2018@mail.ustc.edu.cn
 import warnings
 import os

{daspy_toolbox-1.1.3 → daspy_toolbox-1.1.4}/setup.py

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