Renamed master -> main

BSchilperoort · BSchilperoort · commit a56019753d69 · 2022-09-25T18:01:24.000+02:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.1
+current_version = 1.1.2
 commit = True
 tag = True
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 
 Changelog
 =========
+1.1.2 (2022-09-25)
+------------------
+
+* Added support for Sensornet Sentinel v5 files.
+
+
 1.1.1 (2022-09-25)
 ------------------
 
diff --git a/CITATION.cff b/CITATION.cff
@@ -22,5 +22,5 @@ doi: "10.5281/zenodo.1410097"
 license: "BSD-3-Clause"
 repository-code: "https://github.com/dtscalibration/python-dts-calibration"
 title: "Python distributed temperature sensing calibration"
-version: "v1.1.1"
+version: "v1.1.2"
 url: "https://python-dts-calibration.readthedocs.io"
diff --git a/README.rst b/README.rst
@@ -29,7 +29,7 @@ Overview
     :alt: PyPI Package latest release
     :target: https://pypi.python.org/pypi/dtscalibration
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/dtscalibration/python-dts-calibration/v1.1.1.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/dtscalibration/python-dts-calibration/v1.1.2.svg
     :alt: Commits since latest release
     :target: https://github.com/dtscalibration/python-dts-calibration/compare/v1.1.1...main
 
@@ -86,7 +86,7 @@ Package features
 Devices currently supported
 ===========================
 * Silixa Ltd.: **Ultima** & **XT-DTS** .xml files *(up to version 8.1)*
-* Sensornet Ltd.: **Oryx** & **Halo** .ddf files
+* Sensornet Ltd.: **Oryx**, **Halo** & **Sentinel** .ddf files
 * AP Sensing: **CP320** .xml files *(single ended only)*
 * SensorTran: **SensorTran 5100** .dat binary files *(single ended only)*
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -41,7 +41,7 @@
 year = str(date.today().year)
 author = 'Bas des Tombe and Bart Schilperoort'
 copyright = '{0}, {1}'.format(year, author)
-version = release = '1.1.1'
+version = release = '1.1.2'
 
 pygments_style = 'trac'
 templates_path = ['.']
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@ def get_authors(file='AUTHORS.rst'):
 
 setup(
     name='dtscalibration',
-    version='1.1.1',
+    version='1.1.2',
     license='BSD 3-Clause License',
     description='A Python package to load raw DTS files, perform a '
     'calibration, and plot the result',
diff --git a/src/dtscalibration/__init__.py b/src/dtscalibration/__init__.py
@@ -18,7 +18,7 @@
 from .plot import plot_residuals_reference_sections_single
 from .plot import plot_sigma_report
 
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 __all__ = [
     "DataStore", "open_datastore", "open_mf_datastore", "read_apsensing_files",
     "read_sensornet_files", "read_sensortran_files", "read_silixa_files",
diff --git a/src/dtscalibration/datastore.py b/src/dtscalibration/datastore.py
@@ -5743,13 +5743,15 @@ def read_sensornet_files(
 
     valid_versions = [
         'Halo DTS v1*', 'ORYX F/W v1.02 Oryx Data Collector v3*',
-        'ORYX F/W v4.00 Oryx Data Collector v3*']
+        'ORYX F/W v4.00 Oryx Data Collector v3*', "Sentinel DTS v5*"]
 
     valid = any([fnmatch.fnmatch(ddf_version, v_) for v_ in valid_versions])
 
     if valid:
         if fnmatch.fnmatch(ddf_version, 'Halo DTS v1*'):
             flip_reverse_measurements = True
+        elif fnmatch.fnmatch(ddf_version, "Sentinel DTS v5*"):
+            flip_reverse_measurements = True
         else:
             flip_reverse_measurements = False
 
diff --git a/tests/data/sensornet_sentinel_v5.1_double/channel 7 20180101 001 00001.ddf b/tests/data/sensornet_sentinel_v5.1_double/channel 7 20180101 001 00001.ddf
diff --git a/tests/data/sensornet_sentinel_v5.1_double/channel 7 20180101 001 00002.ddf b/tests/data/sensornet_sentinel_v5.1_double/channel 7 20180101 001 00002.ddf
diff --git a/tests/test_datastore.py b/tests/test_datastore.py
@@ -42,6 +42,8 @@
     wd, 'data', 'sensornet_halo_v1.0')
 data_dir_sensornet_oryx_double_ended = os.path.join(
     wd, 'data', 'sensornet_oryx_v3.7_double')
+data_dir_sensornet_sentinel_double_ended = os.path.join(
+    wd, 'data', 'sensornet_sentinel_v5.1_double')
 data_dir_single_silixa_v45 = os.path.join(wd, 'data', 'silixa_v4.5')
 data_dir_single_silixa_v7 = os.path.join(wd, 'data', 'silixa_v7.0')
 data_dir_single_silixa_v8 = os.path.join(wd, 'data', 'silixa_v8.1')
@@ -423,6 +425,20 @@ def test_read_sensornet_oryx_files_double_ended():
     np.testing.assert_almost_equal(ds.rst.sum(), 1835770.651, decimal=2)
 
 
+def test_read_sensornet_sentinel_files_double_ended():
+    filepath = data_dir_sensornet_sentinel_double_ended
+    ds = read_sensornet_files(
+        directory=filepath,
+        timezone_netcdf='UTC',
+        timezone_input_files='UTC',
+        add_internal_fiber_length=50.,
+        fiber_length=2100.,
+        file_ext='*.ddf')
+
+    np.testing.assert_almost_equal(ds.st.sum(), 16531426.023, decimal=2)
+    np.testing.assert_almost_equal(ds.rst.sum(), 15545880.215, decimal=2)
+
+
 def test_read_apsensing_files():
     filepath = data_dir_ap_sensing
     ds = read_apsensing_files(
