Skip to content

Commit

Permalink
update templates
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoalopez committed Jun 6, 2024
1 parent ad446cc commit 6c09255
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 19 deletions.
2 changes: 1 addition & 1 deletion grain_size_tools/grain_size_analysis_template.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand Down
62 changes: 45 additions & 17 deletions grain_size_tools/paleopizometry_template.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand All @@ -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"
]
},
{
Expand Down Expand Up @@ -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": [
Expand All @@ -259,24 +268,41 @@
}
],
"source": [
"_ = averages.conf_interval(estimates)"
"_ = conf_interval(estimates)"
]
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 10,
"id": "e5f174dc",
"metadata": {},
"outputs": [
{
"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": [
Expand All @@ -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"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion grain_size_tools/stereology_analysis_template.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand Down

0 comments on commit 6c09255

Please sign in to comment.