Skip to content

Commit

Permalink
Merge pull request #150 from EasyScience/hotfix_0.1.6
Browse files Browse the repository at this point in the history 
Fix 'Change-minimizer' Jupyter Notebook
  • Loading branch information
@AndrewSazonov
AndrewSazonov authored Nov 13, 2024
2 parents c8ebbc2 + c8aa979 commit 8309c08
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 57 deletions.
159 changes: 103 additions & 56 deletions examples/Change-minimizer.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"id": "18c434a9",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:41.119018Z",
"start_time": "2024-11-11T21:06:41.114862Z"
"end_time": "2024-11-13T14:10:05.582057Z",
"start_time": "2024-11-13T14:10:05.577858Z"
},
"tags": [
"hide_in_docs"
Expand Down Expand Up @@ -51,8 +51,8 @@
"id": "49645165",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:43.462453Z",
"start_time": "2024-11-11T21:06:41.120739Z"
"end_time": "2024-11-13T14:10:16.383947Z",
"start_time": "2024-11-13T14:10:05.598255Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -82,8 +82,8 @@
"id": "4e60acbd",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:43.588431Z",
"start_time": "2024-11-11T21:06:43.578124Z"
"end_time": "2024-11-13T14:10:16.579926Z",
"start_time": "2024-11-13T14:10:16.568856Z"
}
},
"outputs": [],
Expand All @@ -107,8 +107,8 @@
"id": "24986ea0",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:43.693754Z",
"start_time": "2024-11-11T21:06:43.691969Z"
"end_time": "2024-11-13T14:10:16.867160Z",
"start_time": "2024-11-13T14:10:16.865112Z"
}
},
"outputs": [],
Expand All @@ -130,8 +130,8 @@
"id": "fa85e088",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:43.977210Z",
"start_time": "2024-11-11T21:06:43.697182Z"
"end_time": "2024-11-13T14:10:17.176205Z",
"start_time": "2024-11-13T14:10:16.871438Z"
}
},
"outputs": [],
Expand All @@ -154,8 +154,8 @@
"id": "b81b8f7b",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:43.987503Z",
"start_time": "2024-11-11T21:06:43.981188Z"
"end_time": "2024-11-13T14:10:17.194580Z",
"start_time": "2024-11-13T14:10:17.187924Z"
}
},
"outputs": [],
Expand All @@ -178,8 +178,8 @@
"id": "6f0bed76",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:43.997974Z",
"start_time": "2024-11-11T21:06:43.991057Z"
"end_time": "2024-11-13T14:10:17.297025Z",
"start_time": "2024-11-13T14:10:17.288934Z"
}
},
"outputs": [],
Expand All @@ -194,6 +194,53 @@
"source": [
"## Define an experiment\n",
"\n",
"Download the data file from the EasyDiffraction repository on GitHub"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "22c4a4f89a00aab",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-13T14:10:17.309425Z",
"start_time": "2024-11-13T14:10:17.307632Z"
}
},
"outputs": [],
"source": [
"ed.download_from_repository('hrpt.xye', destination='data')"
]
},
{
"cell_type": "markdown",
"id": "40fa8c065d51f67a",
"metadata": {},
"source": [
"Show content of the downloaded file (first 6 lines)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "eb740ee1d3affd95",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-13T14:10:17.330106Z",
"start_time": "2024-11-13T14:10:17.320694Z"
}
},
"outputs": [],
"source": [
"with open('data/hrpt.xye') as f:\n",
" print(''.join(f.readlines()[:6]))"
]
},
{
"cell_type": "markdown",
"id": "f07900c4c1c03445",
"metadata": {},
"source": [
"Load experimentally measured data from a file in XYE format"
]
},
Expand All @@ -203,8 +250,8 @@
"id": "997f98ef",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.079121Z",
"start_time": "2024-11-11T21:06:44.001661Z"
"end_time": "2024-11-13T14:10:17.476954Z",
"start_time": "2024-11-13T14:10:17.406192Z"
}
},
"outputs": [],
Expand All @@ -226,8 +273,8 @@
"id": "d45c9272",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.256020Z",
"start_time": "2024-11-11T21:06:44.107707Z"
"end_time": "2024-11-13T14:10:17.903805Z",
"start_time": "2024-11-13T14:10:17.481192Z"
}
},
"outputs": [],
Expand All @@ -249,8 +296,8 @@
"id": "5ade4b9b",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.325386Z",
"start_time": "2024-11-11T21:06:44.322510Z"
"end_time": "2024-11-13T14:10:18.083580Z",
"start_time": "2024-11-13T14:10:18.080154Z"
}
},
"outputs": [],
Expand All @@ -275,8 +322,8 @@
"id": "58965e36",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.344551Z",
"start_time": "2024-11-11T21:06:44.329177Z"
"end_time": "2024-11-13T14:10:18.103059Z",
"start_time": "2024-11-13T14:10:18.086242Z"
}
},
"outputs": [],
Expand All @@ -300,8 +347,8 @@
"id": "642f9924",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.421239Z",
"start_time": "2024-11-11T21:06:44.354510Z"
"end_time": "2024-11-13T14:10:18.224508Z",
"start_time": "2024-11-13T14:10:18.122943Z"
}
},
"outputs": [],
Expand All @@ -323,8 +370,8 @@
"id": "fef4d575",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.442116Z",
"start_time": "2024-11-11T21:06:44.440670Z"
"end_time": "2024-11-13T14:10:18.261294Z",
"start_time": "2024-11-13T14:10:18.259426Z"
}
},
"outputs": [],
Expand All @@ -347,8 +394,8 @@
"id": "2445edcf",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.526475Z",
"start_time": "2024-11-11T21:06:44.445947Z"
"end_time": "2024-11-13T14:10:18.342937Z",
"start_time": "2024-11-13T14:10:18.265919Z"
}
},
"outputs": [],
Expand All @@ -371,8 +418,8 @@
"id": "dee18833",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.547956Z",
"start_time": "2024-11-11T21:06:44.545493Z"
"end_time": "2024-11-13T14:10:18.382511Z",
"start_time": "2024-11-13T14:10:18.379542Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -400,8 +447,8 @@
"id": "9825dd71",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.626379Z",
"start_time": "2024-11-11T21:06:44.551719Z"
"end_time": "2024-11-13T14:10:18.463398Z",
"start_time": "2024-11-13T14:10:18.387901Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -430,8 +477,8 @@
"id": "809f4e54",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.651850Z",
"start_time": "2024-11-11T21:06:44.645435Z"
"end_time": "2024-11-13T14:10:18.504003Z",
"start_time": "2024-11-13T14:10:18.494106Z"
}
},
"outputs": [],
Expand All @@ -453,8 +500,8 @@
"id": "a13a50aa",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:44.658021Z",
"start_time": "2024-11-11T21:06:44.656360Z"
"end_time": "2024-11-13T14:10:18.514803Z",
"start_time": "2024-11-13T14:10:18.512657Z"
}
},
"outputs": [],
Expand All @@ -476,8 +523,8 @@
"id": "a6bed955",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.414972Z",
"start_time": "2024-11-11T21:06:44.661763Z"
"end_time": "2024-11-13T14:10:21.906812Z",
"start_time": "2024-11-13T14:10:18.525974Z"
}
},
"outputs": [],
Expand All @@ -499,8 +546,8 @@
"id": "cac61f2f",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.422690Z",
"start_time": "2024-11-11T21:06:48.418943Z"
"end_time": "2024-11-13T14:10:21.916037Z",
"start_time": "2024-11-13T14:10:21.912413Z"
}
},
"outputs": [],
Expand All @@ -522,8 +569,8 @@
"id": "ea035e96",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.496337Z",
"start_time": "2024-11-11T21:06:48.426692Z"
"end_time": "2024-11-13T14:10:21.992757Z",
"start_time": "2024-11-13T14:10:21.923144Z"
}
},
"outputs": [],
Expand All @@ -545,8 +592,8 @@
"id": "17c993e6",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.526513Z",
"start_time": "2024-11-11T21:06:48.524479Z"
"end_time": "2024-11-13T14:10:22.206849Z",
"start_time": "2024-11-13T14:10:22.204734Z"
}
},
"outputs": [],
Expand All @@ -569,8 +616,8 @@
"id": "243b8848",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.534130Z",
"start_time": "2024-11-11T21:06:48.532286Z"
"end_time": "2024-11-13T14:10:22.228843Z",
"start_time": "2024-11-13T14:10:22.226856Z"
}
},
"outputs": [],
Expand All @@ -593,8 +640,8 @@
"id": "9807fc07",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.614789Z",
"start_time": "2024-11-11T21:06:48.537995Z"
"end_time": "2024-11-13T14:10:22.322421Z",
"start_time": "2024-11-13T14:10:22.237935Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -623,8 +670,8 @@
"id": "812b4c41",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:48.636653Z",
"start_time": "2024-11-11T21:06:48.632895Z"
"end_time": "2024-11-13T14:10:22.350487Z",
"start_time": "2024-11-13T14:10:22.346055Z"
}
},
"outputs": [],
Expand All @@ -646,8 +693,8 @@
"id": "6d1d7529",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:52.309206Z",
"start_time": "2024-11-11T21:06:48.640679Z"
"end_time": "2024-11-13T14:10:26.009988Z",
"start_time": "2024-11-13T14:10:22.355089Z"
}
},
"outputs": [],
Expand All @@ -669,8 +716,8 @@
"id": "b1df0bcd",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:52.317609Z",
"start_time": "2024-11-11T21:06:52.314159Z"
"end_time": "2024-11-13T14:10:26.018749Z",
"start_time": "2024-11-13T14:10:26.015170Z"
}
},
"outputs": [],
Expand All @@ -692,8 +739,8 @@
"id": "06b61649",
"metadata": {
"ExecuteTime": {
"end_time": "2024-11-11T21:06:52.392410Z",
"start_time": "2024-11-11T21:06:52.321697Z"
"end_time": "2024-11-13T14:10:26.096158Z",
"start_time": "2024-11-13T14:10:26.024381Z"
}
},
"outputs": [],
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[project]
name = 'easydiffraction'
version = '0.1.5'
version = '0.1.6'
description = 'Making diffraction data analysis and modelling easy'
authors = [{ name = 'EasyDiffraction contributors', email = '[email protected]' }]
readme = 'README.md'
Expand Down

0 comments on commit 8309c08

Please sign in to comment.