merged in 1.5 hotfix version

tobac-project · Sep 8, 2023 · 0fab557 · 0fab557
2 parents 5a2a148 + a23a220
commit 0fab557
Show file tree

Hide file tree

Showing 15 changed files with 847 additions and 618 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ _**Version 1.5.1:**_
 **Bug fixes**
 
 - Fix to readthedocs building after system packages no longer imported [#336](https://github.com/tobac-project/tobac/pull/336)
+- The `strict_thresholding` option in feature detection now works correctly for detecting minima, and produces the same results as without strict thresholding if the `n_min_threshold` is a scalar value [#316](https://github.com/tobac-project/tobac/pull/316)
 
 
 _**Version 1.5.0:**_

diff --git a/doc/feature_detection/notebooks/feature_detection_filtering.ipynb b/doc/feature_detection/notebooks/feature_detection_filtering.ipynb
@@ -26,10 +26,10 @@
    "execution_count": 1,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:47.195347Z",
-     "iopub.status.busy": "2023-07-11T00:01:47.195069Z",
-     "iopub.status.idle": "2023-07-11T00:01:51.687071Z",
-     "shell.execute_reply": "2023-07-11T00:01:51.686080Z"
+     "iopub.execute_input": "2023-08-15T16:14:07.185005Z",
+     "iopub.status.busy": "2023-08-15T16:14:07.184289Z",
+     "iopub.status.idle": "2023-08-15T16:14:13.774664Z",
+     "shell.execute_reply": "2023-08-15T16:14:13.773916Z"
     }
    },
    "outputs": [],
@@ -62,10 +62,10 @@
    "execution_count": 2,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:51.691723Z",
-     "iopub.status.busy": "2023-07-11T00:01:51.691275Z",
-     "iopub.status.idle": "2023-07-11T00:01:51.919529Z",
-     "shell.execute_reply": "2023-07-11T00:01:51.918566Z"
+     "iopub.execute_input": "2023-08-15T16:14:13.779200Z",
+     "iopub.status.busy": "2023-08-15T16:14:13.778801Z",
+     "iopub.status.idle": "2023-08-15T16:14:14.029386Z",
+     "shell.execute_reply": "2023-08-15T16:14:14.028577Z"
     }
    },
    "outputs": [
@@ -101,10 +101,10 @@
    "execution_count": 3,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:51.958983Z",
-     "iopub.status.busy": "2023-07-11T00:01:51.958706Z",
-     "iopub.status.idle": "2023-07-11T00:01:52.324795Z",
-     "shell.execute_reply": "2023-07-11T00:01:52.323887Z"
+     "iopub.execute_input": "2023-08-15T16:14:14.072818Z",
+     "iopub.status.busy": "2023-08-15T16:14:14.072541Z",
+     "iopub.status.idle": "2023-08-15T16:14:15.125350Z",
+     "shell.execute_reply": "2023-08-15T16:14:15.123554Z"
     }
    },
    "outputs": [],
@@ -135,10 +135,10 @@
    "execution_count": 4,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:52.329156Z",
-     "iopub.status.busy": "2023-07-11T00:01:52.328875Z",
-     "iopub.status.idle": "2023-07-11T00:01:56.341645Z",
-     "shell.execute_reply": "2023-07-11T00:01:56.335837Z"
+     "iopub.execute_input": "2023-08-15T16:14:15.129205Z",
+     "iopub.status.busy": "2023-08-15T16:14:15.128939Z",
+     "iopub.status.idle": "2023-08-15T16:14:16.832504Z",
+     "shell.execute_reply": "2023-08-15T16:14:16.828647Z"
     }
    },
    "outputs": [
@@ -196,10 +196,10 @@
    "execution_count": 5,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:56.348391Z",
-     "iopub.status.busy": "2023-07-11T00:01:56.346681Z",
-     "iopub.status.idle": "2023-07-11T00:01:57.961544Z",
-     "shell.execute_reply": "2023-07-11T00:01:57.960460Z"
+     "iopub.execute_input": "2023-08-15T16:14:16.838887Z",
+     "iopub.status.busy": "2023-08-15T16:14:16.838617Z",
+     "iopub.status.idle": "2023-08-15T16:14:18.821986Z",
+     "shell.execute_reply": "2023-08-15T16:14:18.821111Z"
     }
    },
    "outputs": [

diff --git a/doc/feature_detection/notebooks/multiple_thresholds_example.ipynb b/doc/feature_detection/notebooks/multiple_thresholds_example.ipynb
@@ -19,10 +19,10 @@
    "execution_count": 1,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:04.454435Z",
-     "iopub.status.busy": "2023-07-11T00:02:04.453782Z",
-     "iopub.status.idle": "2023-07-11T00:02:09.305142Z",
-     "shell.execute_reply": "2023-07-11T00:02:09.303956Z"
+     "iopub.execute_input": "2023-08-15T16:14:27.894065Z",
+     "iopub.status.busy": "2023-08-15T16:14:27.893581Z",
+     "iopub.status.idle": "2023-08-15T16:14:38.976596Z",
+     "shell.execute_reply": "2023-08-15T16:14:38.975681Z"
     }
    },
    "outputs": [],
@@ -53,10 +53,10 @@
    "execution_count": 2,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:09.308788Z",
-     "iopub.status.busy": "2023-07-11T00:02:09.308421Z",
-     "iopub.status.idle": "2023-07-11T00:02:09.531767Z",
-     "shell.execute_reply": "2023-07-11T00:02:09.531142Z"
+     "iopub.execute_input": "2023-08-15T16:14:38.981371Z",
+     "iopub.status.busy": "2023-08-15T16:14:38.980828Z",
+     "iopub.status.idle": "2023-08-15T16:14:39.374743Z",
+     "shell.execute_reply": "2023-08-15T16:14:39.373872Z"
     }
    },
    "outputs": [
@@ -101,10 +101,10 @@
    "execution_count": 3,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:09.567523Z",
-     "iopub.status.busy": "2023-07-11T00:02:09.567243Z",
-     "iopub.status.idle": "2023-07-11T00:02:10.044018Z",
-     "shell.execute_reply": "2023-07-11T00:02:10.040289Z"
+     "iopub.execute_input": "2023-08-15T16:14:39.462543Z",
+     "iopub.status.busy": "2023-08-15T16:14:39.462138Z",
+     "iopub.status.idle": "2023-08-15T16:14:41.054125Z",
+     "shell.execute_reply": "2023-08-15T16:14:41.053049Z"
     }
    },
    "outputs": [],
@@ -132,10 +132,10 @@
    "execution_count": 4,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:10.049518Z",
-     "iopub.status.busy": "2023-07-11T00:02:10.048756Z",
-     "iopub.status.idle": "2023-07-11T00:02:10.418507Z",
-     "shell.execute_reply": "2023-07-11T00:02:10.417896Z"
+     "iopub.execute_input": "2023-08-15T16:14:41.058529Z",
+     "iopub.status.busy": "2023-08-15T16:14:41.058272Z",
+     "iopub.status.idle": "2023-08-15T16:14:41.603331Z",
+     "shell.execute_reply": "2023-08-15T16:14:41.601089Z"
     }
    },
    "outputs": [
@@ -175,10 +175,10 @@
    "execution_count": 5,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:10.421989Z",
-     "iopub.status.busy": "2023-07-11T00:02:10.421706Z",
-     "iopub.status.idle": "2023-07-11T00:02:10.742500Z",
-     "shell.execute_reply": "2023-07-11T00:02:10.741720Z"
+     "iopub.execute_input": "2023-08-15T16:14:41.615868Z",
+     "iopub.status.busy": "2023-08-15T16:14:41.614704Z",
+     "iopub.status.idle": "2023-08-15T16:14:41.958739Z",
+     "shell.execute_reply": "2023-08-15T16:14:41.958141Z"
     }
    },
    "outputs": [
@@ -233,10 +233,10 @@
    "execution_count": 6,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:10.745804Z",
-     "iopub.status.busy": "2023-07-11T00:02:10.745543Z",
-     "iopub.status.idle": "2023-07-11T00:02:11.050430Z",
-     "shell.execute_reply": "2023-07-11T00:02:11.049631Z"
+     "iopub.execute_input": "2023-08-15T16:14:41.961925Z",
+     "iopub.status.busy": "2023-08-15T16:14:41.961671Z",
+     "iopub.status.idle": "2023-08-15T16:14:42.303716Z",
+     "shell.execute_reply": "2023-08-15T16:14:42.302472Z"
     }
    },
    "outputs": [
@@ -277,10 +277,10 @@
    "execution_count": 7,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:11.054792Z",
-     "iopub.status.busy": "2023-07-11T00:02:11.054513Z",
-     "iopub.status.idle": "2023-07-11T00:02:11.464030Z",
-     "shell.execute_reply": "2023-07-11T00:02:11.463418Z"
+     "iopub.execute_input": "2023-08-15T16:14:42.307032Z",
+     "iopub.status.busy": "2023-08-15T16:14:42.306781Z",
+     "iopub.status.idle": "2023-08-15T16:14:42.846033Z",
+     "shell.execute_reply": "2023-08-15T16:14:42.844862Z"
     }
    },
    "outputs": [
@@ -314,10 +314,10 @@
    "execution_count": 8,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:02:11.466933Z",
-     "iopub.status.busy": "2023-07-11T00:02:11.466636Z",
-     "iopub.status.idle": "2023-07-11T00:02:12.110406Z",
-     "shell.execute_reply": "2023-07-11T00:02:12.109782Z"
+     "iopub.execute_input": "2023-08-15T16:14:42.851702Z",
+     "iopub.status.busy": "2023-08-15T16:14:42.851440Z",
+     "iopub.status.idle": "2023-08-15T16:14:43.299851Z",
+     "shell.execute_reply": "2023-08-15T16:14:43.298918Z"
     }
    },
    "outputs": [

diff --git a/doc/feature_detection/notebooks/n_min_threshold_example.ipynb b/doc/feature_detection/notebooks/n_min_threshold_example.ipynb
@@ -19,10 +19,10 @@
    "execution_count": 1,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:17.198085Z",
-     "iopub.status.busy": "2023-07-11T00:01:17.197646Z",
-     "iopub.status.idle": "2023-07-11T00:01:23.156772Z",
-     "shell.execute_reply": "2023-07-11T00:01:23.155547Z"
+     "iopub.execute_input": "2023-08-15T16:13:29.891899Z",
+     "iopub.status.busy": "2023-08-15T16:13:29.891559Z",
+     "iopub.status.idle": "2023-08-15T16:13:40.669735Z",
+     "shell.execute_reply": "2023-08-15T16:13:40.668454Z"
     }
    },
    "outputs": [],
@@ -53,10 +53,10 @@
    "execution_count": 2,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:23.161526Z",
-     "iopub.status.busy": "2023-07-11T00:01:23.161099Z",
-     "iopub.status.idle": "2023-07-11T00:01:23.461685Z",
-     "shell.execute_reply": "2023-07-11T00:01:23.460771Z"
+     "iopub.execute_input": "2023-08-15T16:13:40.674527Z",
+     "iopub.status.busy": "2023-08-15T16:13:40.674100Z",
+     "iopub.status.idle": "2023-08-15T16:13:41.311564Z",
+     "shell.execute_reply": "2023-08-15T16:13:41.309098Z"
     }
    },
    "outputs": [
@@ -94,10 +94,10 @@
    "execution_count": 3,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:23.505031Z",
-     "iopub.status.busy": "2023-07-11T00:01:23.504758Z",
-     "iopub.status.idle": "2023-07-11T00:01:23.962379Z",
-     "shell.execute_reply": "2023-07-11T00:01:23.961387Z"
+     "iopub.execute_input": "2023-08-15T16:13:41.390889Z",
+     "iopub.status.busy": "2023-08-15T16:13:41.390549Z",
+     "iopub.status.idle": "2023-08-15T16:13:42.553393Z",
+     "shell.execute_reply": "2023-08-15T16:13:42.551799Z"
     }
    },
    "outputs": [],
@@ -132,10 +132,10 @@
    "execution_count": 4,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:23.975020Z",
-     "iopub.status.busy": "2023-07-11T00:01:23.974670Z",
-     "iopub.status.idle": "2023-07-11T00:01:24.488125Z",
-     "shell.execute_reply": "2023-07-11T00:01:24.486970Z"
+     "iopub.execute_input": "2023-08-15T16:13:42.559790Z",
+     "iopub.status.busy": "2023-08-15T16:13:42.559023Z",
+     "iopub.status.idle": "2023-08-15T16:13:43.274316Z",
+     "shell.execute_reply": "2023-08-15T16:13:43.272229Z"
     }
    },
    "outputs": [
@@ -196,10 +196,10 @@
    "execution_count": 5,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:24.491977Z",
-     "iopub.status.busy": "2023-07-11T00:01:24.491692Z",
-     "iopub.status.idle": "2023-07-11T00:01:24.762533Z",
-     "shell.execute_reply": "2023-07-11T00:01:24.761829Z"
+     "iopub.execute_input": "2023-08-15T16:13:43.277981Z",
+     "iopub.status.busy": "2023-08-15T16:13:43.277350Z",
+     "iopub.status.idle": "2023-08-15T16:13:43.655653Z",
+     "shell.execute_reply": "2023-08-15T16:13:43.654872Z"
     }
    },
    "outputs": [
@@ -254,10 +254,10 @@
    "execution_count": 6,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:24.765546Z",
-     "iopub.status.busy": "2023-07-11T00:01:24.765298Z",
-     "iopub.status.idle": "2023-07-11T00:01:25.031369Z",
-     "shell.execute_reply": "2023-07-11T00:01:25.029177Z"
+     "iopub.execute_input": "2023-08-15T16:13:43.658838Z",
+     "iopub.status.busy": "2023-08-15T16:13:43.658468Z",
+     "iopub.status.idle": "2023-08-15T16:13:44.274706Z",
+     "shell.execute_reply": "2023-08-15T16:13:44.273804Z"
     }
    },
    "outputs": [
@@ -312,10 +312,10 @@
    "execution_count": 7,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:25.039594Z",
-     "iopub.status.busy": "2023-07-11T00:01:25.039160Z",
-     "iopub.status.idle": "2023-07-11T00:01:25.475666Z",
-     "shell.execute_reply": "2023-07-11T00:01:25.474359Z"
+     "iopub.execute_input": "2023-08-15T16:13:44.278747Z",
+     "iopub.status.busy": "2023-08-15T16:13:44.278223Z",
+     "iopub.status.idle": "2023-08-15T16:13:44.734689Z",
+     "shell.execute_reply": "2023-08-15T16:13:44.731120Z"
     }
    },
    "outputs": [
@@ -379,10 +379,10 @@
    "execution_count": 8,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:25.478990Z",
-     "iopub.status.busy": "2023-07-11T00:01:25.478726Z",
-     "iopub.status.idle": "2023-07-11T00:01:25.744010Z",
-     "shell.execute_reply": "2023-07-11T00:01:25.743426Z"
+     "iopub.execute_input": "2023-08-15T16:13:44.738138Z",
+     "iopub.status.busy": "2023-08-15T16:13:44.737691Z",
+     "iopub.status.idle": "2023-08-15T16:13:45.070090Z",
+     "shell.execute_reply": "2023-08-15T16:13:45.069528Z"
     }
    },
    "outputs": [
@@ -453,10 +453,10 @@
    "execution_count": 9,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:25.747104Z",
-     "iopub.status.busy": "2023-07-11T00:01:25.746853Z",
-     "iopub.status.idle": "2023-07-11T00:01:26.214434Z",
-     "shell.execute_reply": "2023-07-11T00:01:26.213506Z"
+     "iopub.execute_input": "2023-08-15T16:13:45.073250Z",
+     "iopub.status.busy": "2023-08-15T16:13:45.073013Z",
+     "iopub.status.idle": "2023-08-15T16:13:45.295177Z",
+     "shell.execute_reply": "2023-08-15T16:13:45.294558Z"
     }
    },
    "outputs": [
@@ -501,10 +501,10 @@
    "execution_count": 10,
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2023-07-11T00:01:26.219922Z",
-     "iopub.status.busy": "2023-07-11T00:01:26.218859Z",
-     "iopub.status.idle": "2023-07-11T00:01:26.916666Z",
-     "shell.execute_reply": "2023-07-11T00:01:26.915852Z"
+     "iopub.execute_input": "2023-08-15T16:13:45.298170Z",
+     "iopub.status.busy": "2023-08-15T16:13:45.297930Z",
+     "iopub.status.idle": "2023-08-15T16:13:45.783115Z",
+     "shell.execute_reply": "2023-08-15T16:13:45.782440Z"
     }
    },
    "outputs": [