From 586b499c8b23bc12406ad4bcd81cd30bbd44ed74 Mon Sep 17 00:00:00 2001 From: rskoupy Date: Fri, 20 Dec 2024 12:45:27 +0100 Subject: [PATCH] v1.0 --- .../ptychoScopy-checkpoint.ipynb | 41 ++----------------- ...v1.0-checkpoint.ipynb => ptychoScopy.ipynb | 23 +++++------ 2 files changed, 13 insertions(+), 51 deletions(-) rename ptychoScopy_v1.0.ipynb => .ipynb_checkpoints/ptychoScopy-checkpoint.ipynb (98%) rename .ipynb_checkpoints/ptychoScopy_v1.0-checkpoint.ipynb => ptychoScopy.ipynb (99%) diff --git a/ptychoScopy_v1.0.ipynb b/.ipynb_checkpoints/ptychoScopy-checkpoint.ipynb similarity index 98% rename from ptychoScopy_v1.0.ipynb rename to .ipynb_checkpoints/ptychoScopy-checkpoint.ipynb index a2abade..c06e8aa 100644 --- a/ptychoScopy_v1.0.ipynb +++ b/.ipynb_checkpoints/ptychoScopy-checkpoint.ipynb @@ -38,32 +38,6 @@ "Skoupy R., Mueller E., Pennycook T., Guizar-Sicairos M., Fabbri E., Poghosyan E. ptychoScopy: Users Guide for Optimal Acquisition Design with Electron Ptychography, xxxx, xx, [DOI](https://doi.org)" ] }, - { - "cell_type": "code", - "execution_count": 3, - "id": "14cb064d-a91a-4d44-954f-c7ff36435786", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "3.10.13 | packaged by Anaconda, Inc. | (main, Sep 11 2023, 13:24:38) [MSC v.1916 64 bit (AMD64)]\n", - "Openpyxl version 3.1.5\n", - "Numpy version 1.26.2\n", - "Scipy version 1.10.1\n", - "Plotly version 5.18.0\n", - "Pandas version 2.1.4\n", - "IPython version 8.15.0\n", - "Ipywidgets version 8.0.4\n", - "abTEM version 1.0.6\n" - ] - } - ], - "source": [ - "pty.get_versions() # run before \"display(ptychoscopy)\" field" - ] - }, { "cell_type": "code", "execution_count": 2, @@ -79,7 +53,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "aac473c7796d44cea247b93ae124a142", + "model_id": "6f68906dad084c0ba37e2488c9eec7b6", "version_major": 2, "version_minor": 0 }, @@ -108,16 +82,7 @@ "execution_count": 1, "id": "fecbecdb-0fac-4ac8-a2b3-1ccb3f869a77", "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "C:\\Users\\skoupy_r\\AppData\\Local\\anaconda3\\envs\\all\\lib\\site-packages\\pandas\\core\\computation\\expressions.py:21: UserWarning: Pandas requires version '2.8.0' or newer of 'numexpr' (version '2.7.3' currently installed).\n", - " from pandas.core.computation.check import NUMEXPR_INSTALLED\n" - ] - } - ], + "outputs": [], "source": [ "### Initial packages import\n", "import io\n", @@ -764,7 +729,7 @@ " check_descr_width = '120px'\n", " check1_ssb = widg.Valid(value= bool(step_size_corr*10 < dRssb), description='Real-space sampling', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", " check2_ssb = widg.Valid(value= bool(1 < covered_alfas) , description='Detector coverage', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", - " check3_ssb = widg.Valid(value= bool(3 < beam_diameter_pix) , description='Minimal BF size', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", + " check3_ssb = widg.Valid(value= bool(4 < beam_diameter_pix) , description='Minimal BF size', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", " checks_ssb = widg.VBox([check1_ssb, check2_ssb,check3_ssb]) # Label('Final checks')\n", " checks_ssb.layout = widg.Layout(margin='100px 0px 0px 30px', padding='0px 0px 0px 0px', border='solid 0px gray') # border='dashed 1px gray'\n", " right = widg.VBox([go.FigureWidget(fig1), widg.HBox([go.FigureWidget(fig4), checks_ssb]) ])\n", diff --git a/.ipynb_checkpoints/ptychoScopy_v1.0-checkpoint.ipynb b/ptychoScopy.ipynb similarity index 99% rename from .ipynb_checkpoints/ptychoScopy_v1.0-checkpoint.ipynb rename to ptychoScopy.ipynb index bf7548b..3eda76d 100644 --- a/.ipynb_checkpoints/ptychoScopy_v1.0-checkpoint.ipynb +++ b/ptychoScopy.ipynb @@ -3,7 +3,13 @@ { "cell_type": "markdown", "id": "cfe429ad-a3da-4b34-a78d-2828fcfe5f49", - "metadata": {}, + "metadata": { + "editable": true, + "slideshow": { + "slide_type": "" + }, + "tags": [] + }, "source": [ "" ] @@ -53,7 +59,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "aac473c7796d44cea247b93ae124a142", + "model_id": "6f68906dad084c0ba37e2488c9eec7b6", "version_major": 2, "version_minor": 0 }, @@ -82,16 +88,7 @@ "execution_count": 1, "id": "fecbecdb-0fac-4ac8-a2b3-1ccb3f869a77", "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "C:\\Users\\skoupy_r\\AppData\\Local\\anaconda3\\envs\\all\\lib\\site-packages\\pandas\\core\\computation\\expressions.py:21: UserWarning: Pandas requires version '2.8.0' or newer of 'numexpr' (version '2.7.3' currently installed).\n", - " from pandas.core.computation.check import NUMEXPR_INSTALLED\n" - ] - } - ], + "outputs": [], "source": [ "### Initial packages import\n", "import io\n", @@ -738,7 +735,7 @@ " check_descr_width = '120px'\n", " check1_ssb = widg.Valid(value= bool(step_size_corr*10 < dRssb), description='Real-space sampling', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", " check2_ssb = widg.Valid(value= bool(1 < covered_alfas) , description='Detector coverage', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", - " check3_ssb = widg.Valid(value= bool(3 < beam_diameter_pix) , description='Minimal BF size', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", + " check3_ssb = widg.Valid(value= bool(4 < beam_diameter_pix) , description='Minimal BF size', layout=widg.Layout(width=check_width), style = {'description_width': check_descr_width}, disabled=True)\n", " checks_ssb = widg.VBox([check1_ssb, check2_ssb,check3_ssb]) # Label('Final checks')\n", " checks_ssb.layout = widg.Layout(margin='100px 0px 0px 30px', padding='0px 0px 0px 0px', border='solid 0px gray') # border='dashed 1px gray'\n", " right = widg.VBox([go.FigureWidget(fig1), widg.HBox([go.FigureWidget(fig4), checks_ssb]) ])\n",