das2numpy 0.0.1__tar.gz → 0.0.2__tar.gz

{das2numpy-0.0.1/src/das2numpy.egg-info → das2numpy-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: das2numpy
-Version: 0.0.1
+Version: 0.0.2
 Summary: A simple and universal package for loading large amounts of distributed acoustic sensing (DAS) data.
 Author-email: Erik Genthe <erik.genthe@desy.de>
 Project-URL: Homepage, https://git.physnet.uni-hamburg.de/wave/das2numpy
@@ -13,12 +13,17 @@ License-File: LICENSE
 
 # Module for loading Distributed Acoustic Sensing (DAS) data. SILIXA / OPTASENSE
 
-Python: If you want to get started quickly, have a look at the [examples](#example-python-script).
+Python: If you want to get started quickly, have a look at the [example.py](src/example.py).
 
 
-## Install dependencies
-If you want to use pip for installing, you can just execute *install_dependencies.sh*.
-Otherwise, have a look into install_dependencies.sh and install the listed packages yourself.
+## Install
+
+You can install via PIP.
+```
+python -m pip install das2numpy
+```
+
+If you want to run the source have a look at *install_dependencies.sh*.
 
 
 ## Use as python module
@@ -73,17 +78,14 @@ There are also lower level interfaces in the module.
 For example, the above interfaces also exist with POSIX timestamps in milliseconds instead of datetime objects. These timestamps have exactly the same resolution as the time axis of the resulting array.
 
 
-### Example python-script
-
-[example.py](example.py)
-
-
 ## Use as command line interface
 
 Example call (make sure that the current working directory is not inside idas2numpy):
-```python -m idas2numpy "SILIXA" ~/iDAS/work/2024-05-10-desy/ 2024-05-10T10:01:00 2024-05-10T10:02:00 10 0 1000 10 default
+```
+python -m idas2numpy "SILIXA" ~/iDAS/work/2024-05-10-desy/ 2024-05-10T10:01:00 2024-05-10T10:02:00 10 0 1000 10 default
 ```
 
 For more information:
-```python -m idas2numpy -h
+```
+python -m idas2numpy -h
 ```

{das2numpy-0.0.1 → das2numpy-0.0.2}/README.md

@@ -1,11 +1,16 @@
 # Module for loading Distributed Acoustic Sensing (DAS) data. SILIXA / OPTASENSE
 
-Python: If you want to get started quickly, have a look at the [examples](#example-python-script).
+Python: If you want to get started quickly, have a look at the [example.py](src/example.py).
 
 
-## Install dependencies
-If you want to use pip for installing, you can just execute *install_dependencies.sh*.
-Otherwise, have a look into install_dependencies.sh and install the listed packages yourself.
+## Install
+
+You can install via PIP.
+```
+python -m pip install das2numpy
+```
+
+If you want to run the source have a look at *install_dependencies.sh*.
 
 
 ## Use as python module
@@ -60,17 +65,14 @@ There are also lower level interfaces in the module.
 For example, the above interfaces also exist with POSIX timestamps in milliseconds instead of datetime objects. These timestamps have exactly the same resolution as the time axis of the resulting array.
 
 
-### Example python-script
-
-[example.py](example.py)
-
-
 ## Use as command line interface
 
 Example call (make sure that the current working directory is not inside idas2numpy):
-```python -m idas2numpy "SILIXA" ~/iDAS/work/2024-05-10-desy/ 2024-05-10T10:01:00 2024-05-10T10:02:00 10 0 1000 10 default
+```
+python -m idas2numpy "SILIXA" ~/iDAS/work/2024-05-10-desy/ 2024-05-10T10:01:00 2024-05-10T10:02:00 10 0 1000 10 default
 ```
 
 For more information:
-```python -m idas2numpy -h
+```
+python -m idas2numpy -h
 ```

{das2numpy-0.0.1 → das2numpy-0.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "das2numpy"
-version = "0.0.1"
+version = "0.0.2"
 authors = [
   { name="Erik Genthe", email="erik.genthe@desy.de" },
 ]

{das2numpy-0.0.1 → das2numpy-0.0.2}/src/das2numpy/setups/silixa.py

@@ -9,7 +9,7 @@ import numpy as NP
 from ..filefinder import FileFinder, to_posix_timestamp_ms
 from ..chunk import Chunk
 from .light_tdms_reader import TdmsReader
-
+from ..utils import bin
 
 CALIBRATE = True
 
@@ -53,10 +53,12 @@ def load_file(file_path, rel_t_start, rel_t_end, t_step, channel_start, channel_
     tdms = TdmsReader(file_path)
     data = tdms.get_mmap()
     data = data[rel_t_start:rel_t_end, channel_start:channel_end]
-    if t_step != 1:
-        data = data[::t_step]
-    if channel_step != 1:
-        data = data[:, ::channel_step]
+    if t_step != 1 or channel_step != 1:
+        data = bin(data, (t_step, channel_step))
+    #if t_step != 1:
+    #    data = data[::t_step]
+    #if channel_step != 1:
+    #    data = data[:, ::channel_step]
     assert len(data) > 0
 
     if CALIBRATE:

{das2numpy-0.0.1 → das2numpy-0.0.2}/src/das2numpy/utils.py

@@ -3,6 +3,7 @@ Everything, that modifies the signal.
 author: Erik Genthe
 """
 
+import math as M
 import numpy as NP
 from numba import njit
 import scipy.signal as SS
@@ -102,7 +103,9 @@ def bin(arr: NP.ndarray, bin_factors:tuple):
     if bin_factors[0] == 1 and bin_factors[1] == 1:
         return arr
 
-    newshape = NP.array(arr.shape) // NP.array(bin_factors)
+    #newshape = NP.array(arr.shape) // NP.array(bin_factors)
+    newshape = NP.array(arr.shape).astype(NP.float32) / NP.array(bin_factors)
+    newshape = NP.ceil(newshape).astype(NP.int32)
     newarr = NP.empty(newshape, dtype=arr.dtype)
     _bin_helper(arr, newarr, bin_factors)
     return newarr

{das2numpy-0.0.1 → das2numpy-0.0.2/src/das2numpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: das2numpy
-Version: 0.0.1
+Version: 0.0.2
 Summary: A simple and universal package for loading large amounts of distributed acoustic sensing (DAS) data.
 Author-email: Erik Genthe <erik.genthe@desy.de>
 Project-URL: Homepage, https://git.physnet.uni-hamburg.de/wave/das2numpy
@@ -13,12 +13,17 @@ License-File: LICENSE
 
 # Module for loading Distributed Acoustic Sensing (DAS) data. SILIXA / OPTASENSE
 
-Python: If you want to get started quickly, have a look at the [examples](#example-python-script).
+Python: If you want to get started quickly, have a look at the [example.py](src/example.py).
 
 
-## Install dependencies
-If you want to use pip for installing, you can just execute *install_dependencies.sh*.
-Otherwise, have a look into install_dependencies.sh and install the listed packages yourself.
+## Install
+
+You can install via PIP.
+```
+python -m pip install das2numpy
+```
+
+If you want to run the source have a look at *install_dependencies.sh*.
 
 
 ## Use as python module
@@ -73,17 +78,14 @@ There are also lower level interfaces in the module.
 For example, the above interfaces also exist with POSIX timestamps in milliseconds instead of datetime objects. These timestamps have exactly the same resolution as the time axis of the resulting array.
 
 
-### Example python-script
-
-[example.py](example.py)
-
-
 ## Use as command line interface
 
 Example call (make sure that the current working directory is not inside idas2numpy):
-```python -m idas2numpy "SILIXA" ~/iDAS/work/2024-05-10-desy/ 2024-05-10T10:01:00 2024-05-10T10:02:00 10 0 1000 10 default
+```
+python -m idas2numpy "SILIXA" ~/iDAS/work/2024-05-10-desy/ 2024-05-10T10:01:00 2024-05-10T10:02:00 10 0 1000 10 default
 ```
 
 For more information:
-```python -m idas2numpy -h
+```
+python -m idas2numpy -h
 ```