From 6c0925504c1069ea36bbe90f46759cb30cb4c514 Mon Sep 17 00:00:00 2001 From: "Marco A. Lopez-Sanchez" Date: Thu, 6 Jun 2024 10:00:29 +0200 Subject: [PATCH] update templates --- .../grain_size_analysis_template.ipynb | 2 +- .../paleopizometry_template.ipynb | 62 ++++++++++++++----- .../stereology_analysis_template.ipynb | 2 +- 3 files changed, 47 insertions(+), 19 deletions(-) diff --git a/grain_size_tools/grain_size_analysis_template.ipynb b/grain_size_tools/grain_size_analysis_template.ipynb index 3a9cb76..94423a0 100644 --- a/grain_size_tools/grain_size_analysis_template.ipynb +++ b/grain_size_tools/grain_size_analysis_template.ipynb @@ -13,7 +13,7 @@ ">\n", "> The template shows typical examples of grain size population analysis and different strategies for presenting them. Modify, delete and add as necessary to create your own analysis procedure.\n", ">\n", - "> If you find errors, please report them at https://github.com/marcoalopez/GrainSizeTools/issues \n", + "> If you find any error in this template, please report them at https://github.com/marcoalopez/GrainSizeTools/issues \n", "> If you have any questions or suggestions open a discussion at https://github.com/marcoalopez/GrainSizeTools/discussions" ] }, diff --git a/grain_size_tools/paleopizometry_template.ipynb b/grain_size_tools/paleopizometry_template.ipynb index b8f94aa..3e6da16 100644 --- a/grain_size_tools/paleopizometry_template.ipynb +++ b/grain_size_tools/paleopizometry_template.ipynb @@ -13,7 +13,7 @@ ">\n", "> The template shows typical examples of paleopizometrys and different strategies for presenting them. Modify, delete and add as necessary to create your own analysis procedure.\n", ">\n", - "> If you find errors, please report them at https://github.com/marcoalopez/GrainSizeTools/issues \n", + "> If you find any error in this template, please report them at https://github.com/marcoalopez/GrainSizeTools/issues \n", "> If you have any questions or suggestions open a discussion at https://github.com/marcoalopez/GrainSizeTools/discussions" ] }, @@ -22,19 +22,10 @@ "execution_count": 1, "id": "957dcb9f", "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "module averages imported\n" - ] - } - ], + "outputs": [], "source": [ "import pandas as pd\n", - "import numpy as np\n", - "import averages" + "import numpy as np" ] }, { @@ -243,6 +234,24 @@ { "cell_type": "code", "execution_count": 8, + "id": "8b235749-c4f5-467b-bbe0-0ba5c2b82eae", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "module averages imported\n" + ] + } + ], + "source": [ + "from averages import conf_interval" + ] + }, + { + "cell_type": "code", + "execution_count": 9, "id": "045f32ec", "metadata": {}, "outputs": [ @@ -259,12 +268,12 @@ } ], "source": [ - "_ = averages.conf_interval(estimates)" + "_ = conf_interval(estimates)" ] }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 10, "id": "e5f174dc", "metadata": {}, "outputs": [ @@ -272,11 +281,28 @@ "name": "stdout", "output_type": "stream", "text": [ - "Notebook last run in 2024-06-03 using:\n", + "Notebook last run in 2024-06-06 using:\n", "Python 3.10.13 | packaged by Anaconda, Inc. | (main, Sep 11 2023, 13:24:38) [MSC v.1916 64 bit (AMD64)]\n", "Numpy 1.26.4\n", - "Pandas 2.2.1\n" + "Pandas 2.2.1\n", + "Database metadata:\n" ] + }, + { + "data": { + "text/plain": [ + "{'author': 'Marco A. Lopez-Sanchez',\n", + " 'contact_email': 'marcoalopez [to be found at] outlook [dot] com',\n", + " 'description': 'Piezometric database from GrainSizeTools script',\n", + " 'created_at': datetime.date(2024, 5, 21),\n", + " 'license': 'Open Database License (ODbL) - version 1.0',\n", + " 'usage_terms': 'https://opendatacommons.org/licenses/odbl/summary/',\n", + " 'contributors': None}" + ] + }, + "execution_count": 10, + "metadata": {}, + "output_type": "execute_result" } ], "source": [ @@ -288,7 +314,9 @@ "print(f'Notebook last run in {today} using:')\n", "print('Python', sys.version)\n", "print('Numpy', np.__version__)\n", - "print('Pandas', pd.__version__)" + "print('Pandas', pd.__version__)\n", + "print('Database metadata:')\n", + "metadata" ] } ], diff --git a/grain_size_tools/stereology_analysis_template.ipynb b/grain_size_tools/stereology_analysis_template.ipynb index f1c95e5..c37e9a3 100644 --- a/grain_size_tools/stereology_analysis_template.ipynb +++ b/grain_size_tools/stereology_analysis_template.ipynb @@ -13,7 +13,7 @@ ">\n", "> The template shows typical examples of using the stereology module with grain size populations and different strategies for presenting them. Modify, delete and add as necessary to create your own analysis procedure.\n", ">\n", - "> If you find errors, please report them at https://github.com/marcoalopez/GrainSizeTools/issues \n", + "> If you find any error in this template, please report them at https://github.com/marcoalopez/GrainSizeTools/issues \n", "> If you have any questions or suggestions open a discussion at https://github.com/marcoalopez/GrainSizeTools/discussions" ] },