diff --git a/openpiv/test/test_tools.ipynb b/openpiv/test/test_tools.ipynb index c0beaafe..5be5253f 100644 --- a/openpiv/test/test_tools.ipynb +++ b/openpiv/test/test_tools.ipynb @@ -2,8 +2,10 @@ "cells": [ { "cell_type": "code", - "execution_count": 4, - "metadata": {}, + "execution_count": 1, + "metadata": { + "tags": [] + }, "outputs": [], "source": [ "# %load test_tools.py\n", @@ -19,26 +21,26 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ "# test settings.pattern_a, b\n", - "from openpiv.windef import Settings\n", + "from openpiv.windef import PIVSettings\n", "from openpiv.tools import Multiprocesser\n", "\n" ] }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 3, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "../data/test2/ 2image_00.tif 2image_01.tif\n" + "../data/test2 2image_00.tif 2image_01.tif\n" ] }, { @@ -47,15 +49,15 @@ "1" ] }, - "execution_count": 6, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } ], "source": [ "\n", - "settings = Settings()\n", - "settings.filepath_images = '../data/test2/'\n", + "settings = PIVSettings()\n", + "settings.filepath_images = pathlib.Path('../data/test2/')\n", "settings.frame_pattern_a = '2image_00.tif'\n", "settings.frame_pattern_b = '2image_01.tif'\n", "print(settings.filepath_images,settings.frame_pattern_a, settings.frame_pattern_b)\n", @@ -66,20 +68,20 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 4, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "../data/test2/ 2image_*.tif (1+2),(3+4)\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_00.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_01.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_10.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_11.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_20.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_21.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_30.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_31.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_40.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_41.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_50.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_51.tif\n" + "../data/test2 2image_*.tif (1+2),(3+4)\n", + "Pair: ../data/test2/2image_00.tif-../data/test2/2image_01.tif\n", + "Pair: ../data/test2/2image_10.tif-../data/test2/2image_11.tif\n", + "Pair: ../data/test2/2image_20.tif-../data/test2/2image_21.tif\n", + "Pair: ../data/test2/2image_30.tif-../data/test2/2image_31.tif\n", + "Pair: ../data/test2/2image_40.tif-../data/test2/2image_41.tif\n", + "Pair: ../data/test2/2image_50.tif-../data/test2/2image_51.tif\n" ] } ], @@ -96,25 +98,25 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 5, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "../data/test2/ 2image_*.tif (1+2),(2+3)\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_00.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_01.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_01.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_10.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_10.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_11.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_11.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_20.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_20.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_21.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_21.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_30.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_30.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_31.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_31.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_40.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_40.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_41.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_41.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_50.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_50.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_51.tif\n" + "../data/test2 2image_*.tif (1+2),(2+3)\n", + "Pair: ../data/test2/2image_00.tif-../data/test2/2image_01.tif\n", + "Pair: ../data/test2/2image_01.tif-../data/test2/2image_10.tif\n", + "Pair: ../data/test2/2image_10.tif-../data/test2/2image_11.tif\n", + "Pair: ../data/test2/2image_11.tif-../data/test2/2image_20.tif\n", + "Pair: ../data/test2/2image_20.tif-../data/test2/2image_21.tif\n", + "Pair: ../data/test2/2image_21.tif-../data/test2/2image_30.tif\n", + "Pair: ../data/test2/2image_30.tif-../data/test2/2image_31.tif\n", + "Pair: ../data/test2/2image_31.tif-../data/test2/2image_40.tif\n", + "Pair: ../data/test2/2image_40.tif-../data/test2/2image_41.tif\n", + "Pair: ../data/test2/2image_41.tif-../data/test2/2image_50.tif\n", + "Pair: ../data/test2/2image_50.tif-../data/test2/2image_51.tif\n" ] } ], @@ -131,24 +133,26 @@ }, { "cell_type": "code", - "execution_count": 22, - "metadata": {}, + "execution_count": 6, + "metadata": { + "tags": [] + }, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "../data/test2/ 2image_*.tif (1+3),(2+4)\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_00.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_10.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_01.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_11.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_10.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_20.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_11.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_21.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_20.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_30.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_21.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_31.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_30.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_40.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_31.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_41.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_40.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_50.tif\n", - "Pair: c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_41.tif-c:\\Users\\alex\\repos\\openpiv-python\\openpiv\\data\\test2\\2image_51.tif\n" + "../data/test2 2image_*.tif (1+3),(2+4)\n", + "Pair: ../data/test2/2image_00.tif-../data/test2/2image_10.tif\n", + "Pair: ../data/test2/2image_01.tif-../data/test2/2image_11.tif\n", + "Pair: ../data/test2/2image_10.tif-../data/test2/2image_20.tif\n", + "Pair: ../data/test2/2image_11.tif-../data/test2/2image_21.tif\n", + "Pair: ../data/test2/2image_20.tif-../data/test2/2image_30.tif\n", + "Pair: ../data/test2/2image_21.tif-../data/test2/2image_31.tif\n", + "Pair: ../data/test2/2image_30.tif-../data/test2/2image_40.tif\n", + "Pair: ../data/test2/2image_31.tif-../data/test2/2image_41.tif\n", + "Pair: ../data/test2/2image_40.tif-../data/test2/2image_50.tif\n", + "Pair: ../data/test2/2image_41.tif-../data/test2/2image_51.tif\n" ] } ], @@ -166,7 +170,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3.9.13 ('openpiv')", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -180,7 +184,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.13" + "version": "3.11.0" }, "vscode": { "interpreter": {