Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accessor #204

Merged
merged 67 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
2e8a680
User-friendly error when setting manually ds.sections
bdestombe Aug 14, 2023
07270e3
User-friendly error when setting manually ds.sections
bdestombe Aug 14, 2023
66aa9f0
Revert accidental double implementation of sections.setter
bdestombe Aug 14, 2023
10dfbb4
Update documentation of datastore class
bdestombe Aug 17, 2023
77d9ede
Removed numbagg from dependencies
bdestombe Aug 18, 2023
c18f8ea
Explicitly pass sections to more functions
bdestombe Aug 18, 2023
bb1b477
Format
bdestombe Aug 18, 2023
b453f59
Moving away from calibrate_double_ended() inplace
bdestombe Aug 18, 2023
e884f94
Refactored calibrate_double_ended covariance calculation
bdestombe Aug 18, 2023
a4a1675
Parallel testing
bdestombe Aug 18, 2023
f363413
refactored variance functions
bdestombe Aug 18, 2023
7f795b9
Include pyupgrade flag of ruff
bdestombe Aug 18, 2023
7f3dcad
Refactored single ended routine p_val to params and moved averaging r…
bdestombe Aug 20, 2023
0c427d8
Update .gitignore
bdestombe Aug 21, 2023
43f42c8
Refactored calibration routines
bdestombe Aug 22, 2023
e0db37c
Please ruff
bdestombe Aug 22, 2023
49bbae3
Refactored Datastore class
bdestombe Sep 3, 2023
a515f8b
Updated sections example notebook
bdestombe Sep 3, 2023
39f71c9
Updated example notebooks
bdestombe Sep 3, 2023
a40c810
Add api to docs
bdestombe Sep 3, 2023
cfc4c1b
Unfortenate formatting of notebooks
bdestombe Sep 3, 2023
ac0ef5f
Estimate variance of stokes refactored
bdestombe Sep 21, 2023
d0a745d
single_ended_calibration and single_conf_ints working
bdestombe Oct 9, 2023
89a5c8d
renamed conf_ints_single_ended to monte_carlo_single_ended
bdestombe Oct 9, 2023
ec2a49a
Removed DataStore from being used
bdestombe Oct 9, 2023
5e123b7
removed renaming_labels test
bdestombe Oct 9, 2023
c18dd68
conf_int_single renamed to monte_carlo_single
bdestombe Oct 13, 2023
9286a01
Initial commit monte_carlo_double_ended
bdestombe Oct 13, 2023
98ce96f
Single and double ended calibration working and tested, including the…
bdestombe Oct 15, 2023
068305e
Got several variance_tests working
bdestombe Oct 15, 2023
1825050
Passing all variance tests
bdestombe Oct 16, 2023
74a0a8b
Passing all tests except lint and examples
bdestombe Oct 16, 2023
c7d01ba
Merge branch 'main' into accessor
bdestombe Oct 16, 2023
68e0d46
Undo certain merge changes
bdestombe Oct 16, 2023
c207897
Minor cleanup
bdestombe Oct 16, 2023
fdea611
Circumventing circular import DTSaccessor
bdestombe Oct 16, 2023
3906555
Update 03Define_sections.ipynb
bdestombe Oct 16, 2023
6a0f7ff
Update 04Calculate_variance_Stokes.ipynb
bdestombe Oct 16, 2023
1d348e3
Update 07Calibrate_single_ended.ipynb
bdestombe Oct 16, 2023
8737e85
Update 08Calibrate_double_ended.ipynb
bdestombe Oct 16, 2023
b42110d
calibration_double_ended to calibrate_double_ended
bdestombe Oct 16, 2023
42c4324
Update 12Datastore_from_numpy_arrays.ipynb
bdestombe Oct 16, 2023
70c0cd4
Update 13Fixed_parameter_calibration.ipynb
bdestombe Oct 16, 2023
a4b0f40
Update 14Lossy_splices.ipynb
bdestombe Oct 16, 2023
70abdd7
Update 16Averaging_temperatures.ipynb
bdestombe Oct 16, 2023
3ff015b
Update 17Temperature_uncertainty_single_ended.ipynb
bdestombe Oct 16, 2023
7d05394
Formatting of the entire repository
bdestombe Oct 16, 2023
635d29d
Docs cleanup
bdestombe Oct 18, 2023
c15d2d0
Fixed variance test
bdestombe Oct 18, 2023
0ba5804
Update test_variance_stokes.py
bdestombe Oct 18, 2023
6e97a0e
Update 15Matching_sections.ipynb
bdestombe Oct 18, 2023
a97988d
Updated 16Averaging notebook
bdestombe Oct 19, 2023
6ab648a
Update test_examples.py
bdestombe Oct 20, 2023
c70b2d0
Update test_examples.py
bdestombe Oct 20, 2023
1245571
Fixing weirdly failing notebooks
bdestombe Oct 20, 2023
975466a
Update test_examples.py
bdestombe Oct 20, 2023
21ecdf9
Rewritten test_notebooks routine
bdestombe Oct 21, 2023
59fd0fd
Removed unused variable
bdestombe Oct 21, 2023
bca953d
Remove metadata from notebook 12
bdestombe Oct 21, 2023
19d5044
Delete 02Common_DataStore_functions_slice_mean_max_std_resample.ipynb
bdestombe Oct 27, 2023
4b86bdb
Remove old reference to DataStore in notebooks
bdestombe Oct 27, 2023
cba03b6
Removed references to ds.variance_*() from docs
bdestombe Oct 27, 2023
98636ea
Update src/dtscalibration/dts_accessor.py
bdestombe Oct 27, 2023
4da18d7
Update test_examples.py
bdestombe Oct 27, 2023
1f40022
Update docs
bdestombe Oct 27, 2023
b56918b
Minimal attempt to fix docs
bdestombe Oct 27, 2023
2cf247c
Update README.rst
bdestombe Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ output/*/index.html

# Sphinx
docs/_build
**/generated/**/*

.DS_Store
*~
Expand Down
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ Devices currently supported
Documentation
=============

* A full calibration procedure for single-ended setups is presented in notebook `07Calibrate_single_ended.ipynb <https://github.com/dtscalibration/python-dts-calibration/blob/main/docs/notebooks/07Calibrate_single_ended.ipynb>`_ and for double-ended setups in `08Calibrate_double_ended.ipynb <https://github.com/dtscalibration/python-dts-calibration/blob/main/docs/notebooks/08Calibrate_double_ended.ipynb>`_.
* Documentation at https://python-dts-calibration.readthedocs.io/ .
* Example notebooks that work within the browser can be viewed `here <https://python-dts-calibration.readthedocs.io/en/latest/learn_by_examples.html>`_.

Expand Down
7 changes: 0 additions & 7 deletions docs/api/dtscalibration.DataStore.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.check_dims.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.check_timestep_allclose.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.get_netcdf_encoding.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.merge_double_ended.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.open_datastore.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.open_mf_datastore.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.plot_accuracy.rst

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.plot_residuals_reference_sections.rst

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.plot_sigma_report.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.read_apsensing_files.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.read_sensornet_files.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.read_sensortran_files.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.read_silixa_files.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.shift_double_ended.rst

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api/dtscalibration.suggest_cable_shift_double_ended.rst

This file was deleted.

15 changes: 10 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# -*- coding: utf-8 -*-
from datetime import date
import os
from datetime import date

from xarray import Dataset # noqa: E402
import sphinx_autosummary_accessors

import dtscalibration # noqa: E402
from dtscalibration.dts_accessor import DtsAccessor # noqa: E402

extensions = [
"sphinx_rtd_theme",
Expand All @@ -15,6 +19,7 @@
"sphinx.ext.todo",
"sphinx.ext.viewcode",
"sphinx.ext.autosectionlabel",
"sphinx_autosummary_accessors",
"nbsphinx",
"sphinx.ext.mathjax",
"sphinx.ext.intersphinx",
Expand All @@ -41,11 +46,11 @@
project = "dtscalibration"
year = str(date.today().year)
author = "Bas des Tombe and Bart Schilperoort"
copyright = "{0}, {1}".format(year, author)
copyright = f"{year}, {author}"
version = release = "2.0.0"

pygments_style = "trac"
templates_path = ["."]
templates_path = [".", sphinx_autosummary_accessors.templates_path]
extlinks = {
"issue": (
"https://github.com/dtscalibration/python-dts-calibration/issues" "/%s",
Expand All @@ -63,7 +68,7 @@
html_sidebars = {
"**": ["searchbox.html", "globaltoc.html", "sourcelink.html"],
}
html_short_title = "%s-%s" % (project, version)
html_short_title = f"{project}-{version}"

napoleon_use_ivar = True
napoleon_use_rtype = False
Expand Down
24 changes: 5 additions & 19 deletions docs/notebooks/01Load_xml_measurement_files.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"source": [
"# 1. Load your first measurement files\n",
"\n",
"The goal of this notebook is to show the different options of loading measurements from raw DTS files. These files are loaded into a `DataStore` object. This object has various methods for calibration, plotting. The current supported devices are:\n",
"The goal of this notebook is to show the different options of loading measurements from raw DTS files. These files are loaded into a `xarray.Dataset` object. This object has various methods for calibration, plotting. Both single-ended and double-ended measurements are supported. The current supported devices are:\n",
"- Silixa\n",
"- Sensornet\n",
"- AP Sensing\n",
"- Sensortran\n",
"\n",
"This example loads Silixa files. Both single-ended and double-ended measurements are supported. The first step is to load the correct read routine from `dtscalibration`.\n",
"- Silixa -> `dtscalibration.read_silixa_files`\n",
"- Sensornet -> `dtscalibration.read_sensornet_files`"
"See notebooks A2, A3, and A4."
]
},
{
Expand Down Expand Up @@ -125,20 +125,6 @@
"source": [
"print(ds)"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand All @@ -157,7 +143,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.5"
"version": "3.10.10"
}
},
"nbformat": 4,
Expand Down
Loading
Loading