Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

Commit

Permalink
fixes #75 lesson 7 revised
Browse files Browse the repository at this point in the history
  • Loading branch information
@prjemian
prjemian committed Dec 16, 2020
1 parent 1880a3e commit f6fb931
Showing 1 changed file with 72 additions and 72 deletions.
144 changes: 72 additions & 72 deletions lessons/lesson7.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,28 @@
"output_type": "stream",
"name": "stderr",
"text": [
"I Fri-14:04:49 - ############################################################ startup\n",
"I Fri-14:04:49 - logging started\n",
"I Fri-14:04:49 - logging level = 10\n",
"I Fri-14:04:49 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/collection.py\n",
"I Fri-14:04:49 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/mpl/notebook.py\n",
"I Wed-17:24:44 - ############################################################ startup\n",
"I Wed-17:24:44 - logging started\n",
"I Wed-17:24:44 - logging level = 10\n",
"I Wed-17:24:44 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/collection.py\n",
"I Wed-17:24:44 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/mpl/notebook.py\n",
"Activating auto-logging. Current session state plus future input saved.\n",
"Filename : /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/.logs/ipython_console.log\n",
"Mode : rotate\n",
"Output logging : True\n",
"Raw input log : False\n",
"Timestamping : True\n",
"State : active\n",
"I Fri-14:04:49 - bluesky framework\n",
"I Fri-14:04:49 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/check_python.py\n",
"I Fri-14:04:49 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/check_bluesky.py\n",
"I Fri-14:04:51 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/initialize.py\n",
"I Fri-14:04:52 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/metadata.py\n",
"I Fri-14:04:52 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/callbacks.py\n",
"I Fri-14:04:52 - writing to SPEC file: /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/20201204-140452.dat\n",
"I Fri-14:04:52 - >>>> Using default SPEC file name <<<<\n",
"I Fri-14:04:52 - file will be created when bluesky ends its next scan\n",
"I Fri-14:04:52 - to change SPEC file, use command: newSpecFile('title')\n"
"I Wed-17:24:45 - bluesky framework\n",
"I Wed-17:24:45 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/check_python.py\n",
"I Wed-17:24:45 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/check_bluesky.py\n",
"I Wed-17:24:46 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/initialize.py\n",
"I Wed-17:24:47 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/metadata.py\n",
"I Wed-17:24:47 - /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/instrument/framework/callbacks.py\n",
"I Wed-17:24:47 - writing to SPEC file: /home/prjemian/Documents/projects/BCDA-APS/use_bluesky/lessons/20201216-172447.dat\n",
"I Wed-17:24:47 - >>>> Using default SPEC file name <<<<\n",
"I Wed-17:24:47 - file will be created when bluesky ends its next scan\n",
"I Wed-17:24:47 - to change SPEC file, use command: newSpecFile('title')\n"
]
}
],
Expand Down Expand Up @@ -273,7 +273,7 @@
"===================== ========= =========\n",
"diffractometer fourc \n",
"sample name main \n",
"energy (keV) 0.80509 \n",
"energy (keV) 8.05092 \n",
"wavelength (angstrom) 1.54000 \n",
"calc engine hkl \n",
"mode bissector \n",
Expand All @@ -292,7 +292,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f15308c1d90>"
"<pyRestTable.rest_table.Table at 0x7f7e640434f0>"
]
},
"metadata": {},
Expand Down Expand Up @@ -1333,7 +1333,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f153088a3a0>"
"<pyRestTable.rest_table.Table at 0x7f7e6403f100>"
]
},
"metadata": {},
Expand Down Expand Up @@ -1427,7 +1427,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f153088ad90>"
"<pyRestTable.rest_table.Table at 0x7f7e57b64a30>"
]
},
"metadata": {},
Expand Down Expand Up @@ -1744,7 +1744,7 @@
"===================== ================== =========\n",
"diffractometer fourc \n",
"sample name LNO_LAO \n",
"energy (keV) 1.00034 \n",
"energy (keV) 10.00337 \n",
"wavelength (angstrom) 1.23942 \n",
"calc engine hkl \n",
"mode bissector \n",
Expand All @@ -1763,7 +1763,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f153002b310>"
"<pyRestTable.rest_table.Table at 0x7f7e640433a0>"
]
},
"metadata": {},
Expand Down Expand Up @@ -1812,7 +1812,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f153002bbe0>"
"<pyRestTable.rest_table.Table at 0x7f7e668bb700>"
]
},
"metadata": {},
Expand Down Expand Up @@ -1875,7 +1875,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Apply constraints such that `omega` and `chi` are not negative, then recompute and show:"
"Apply constraints such that all motors are not negative, then recompute and show:"
]
},
{
Expand Down Expand Up @@ -1904,7 +1904,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f153002b850>"
"<pyRestTable.rest_table.Table at 0x7f7e668c6250>"
]
},
"metadata": {},
Expand Down Expand Up @@ -1946,7 +1946,7 @@
"===================== ================== =========\n",
"diffractometer fourc \n",
"sample name LNO_LAO \n",
"energy (keV) 1.00034 \n",
"energy (keV) 10.00337 \n",
"wavelength (angstrom) 1.23942 \n",
"calc engine hkl \n",
"mode bissector \n",
Expand All @@ -1965,7 +1965,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f1530031f10>"
"<pyRestTable.rest_table.Table at 0x7f7e668bbf70>"
]
},
"metadata": {},
Expand Down Expand Up @@ -2064,30 +2064,30 @@
"text": [
"\n",
"\n",
"Transient Scan ID: 1 Time: 2020-12-04 14:08:20\n",
"Persistent Unique Scan ID: 'cee9d5c8-19ac-449b-9e13-52a923a8e074'\n",
"Transient Scan ID: 1 Time: 2020-12-16 17:24:56\n",
"Persistent Unique Scan ID: '9a48a80e-deaa-4c5f-bd9c-2d4fe8d79c5e'\n",
"New stream: 'primary'\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"| seq_num | time | fourc_k | fourc_h | fourc_l | fourc_omega | fourc_chi | fourc_phi | fourc_tth |\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"| 1 | 14:08:21.0 | 1.800 | 2.000 | 2.000 | 33.274 | 143.277 | 45.204 | 66.547 |\n",
"| 2 | 14:08:21.0 | 1.850 | 2.000 | 2.000 | 33.578 | 143.613 | 45.988 | 67.157 |\n",
"| 3 | 14:08:21.0 | 1.900 | 2.000 | 2.000 | 33.890 | 143.949 | 46.753 | 67.780 |\n",
"| 4 | 14:08:21.0 | 1.950 | 2.000 | 2.000 | 34.208 | 144.284 | 47.499 | 68.417 |\n",
"| 5 | 14:08:21.0 | 2.000 | 2.000 | 2.000 | 34.534 | 144.617 | 48.227 | 69.067 |\n",
"| 6 | 14:08:21.0 | 2.050 | 2.000 | 2.000 | 34.866 | 144.950 | 48.936 | 69.732 |\n",
"| 7 | 14:08:21.0 | 2.100 | 2.000 | 2.000 | 35.205 | 145.281 | 49.628 | 70.409 |\n",
"| 8 | 14:08:21.0 | 2.150 | 2.000 | 2.000 | 35.550 | 145.610 | 50.303 | 71.100 |\n",
"| 9 | 14:08:21.0 | 2.200 | 2.000 | 2.000 | 35.902 | 145.937 | 50.962 | 71.804 |\n",
"| 1 | 17:24:56.4 | 1.800 | 2.000 | 2.000 | 33.274 | 143.277 | 45.204 | 66.547 |\n",
"| 2 | 17:24:56.4 | 1.850 | 2.000 | 2.000 | 33.578 | 143.613 | 45.988 | 67.157 |\n",
"| 3 | 17:24:56.4 | 1.900 | 2.000 | 2.000 | 33.890 | 143.949 | 46.753 | 67.780 |\n",
"| 4 | 17:24:56.4 | 1.950 | 2.000 | 2.000 | 34.208 | 144.284 | 47.499 | 68.417 |\n",
"| 5 | 17:24:56.4 | 2.000 | 2.000 | 2.000 | 34.534 | 144.617 | 48.227 | 69.067 |\n",
"| 6 | 17:24:56.4 | 2.050 | 2.000 | 2.000 | 34.866 | 144.950 | 48.936 | 69.732 |\n",
"| 7 | 17:24:56.5 | 2.100 | 2.000 | 2.000 | 35.205 | 145.281 | 49.628 | 70.409 |\n",
"| 8 | 17:24:56.5 | 2.150 | 2.000 | 2.000 | 35.550 | 145.610 | 50.303 | 71.100 |\n",
"| 9 | 17:24:56.5 | 2.200 | 2.000 | 2.000 | 35.902 | 145.937 | 50.962 | 71.804 |\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"generator rel_scan ['cee9d5c8'] (scan num: 1)\n"
"generator rel_scan ['9a48a80e'] (scan num: 1)\n"
]
},
{
"output_type": "execute_result",
"data": {
"text/plain": [
"('cee9d5c8-19ac-449b-9e13-52a923a8e074',)"
"('9a48a80e-deaa-4c5f-bd9c-2d4fe8d79c5e',)"
]
},
"metadata": {},
Expand Down Expand Up @@ -2179,7 +2179,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f1521fcca00>"
"<pyRestTable.rest_table.Table at 0x7f7e668f2ca0>"
]
},
"metadata": {},
Expand Down Expand Up @@ -2248,7 +2248,7 @@
"===================== =================== =========\n",
"diffractometer fourc \n",
"sample name Mn3O4/MgO thin film \n",
"energy (keV) 0.80400 \n",
"energy (keV) 8.04000 \n",
"wavelength (angstrom) 1.54209 \n",
"calc engine hkl \n",
"mode bissector \n",
Expand All @@ -2267,7 +2267,7 @@
"output_type": "execute_result",
"data": {
"text/plain": [
"<pyRestTable.rest_table.Table at 0x7f1521fccaf0>"
"<pyRestTable.rest_table.Table at 0x7f7e668bb4c0>"
]
},
"metadata": {},
Expand Down Expand Up @@ -2296,32 +2296,32 @@
"text": [
"\n",
"\n",
"Transient Scan ID: 2 Time: 2020-12-04 14:08:45\n",
"Persistent Unique Scan ID: '3abe7e1b-b9be-42d6-b1df-6030af67b420'\n",
"Transient Scan ID: 2 Time: 2020-12-16 17:24:57\n",
"Persistent Unique Scan ID: 'b5cff878-570f-4305-b5a1-db69f171b005'\n",
"New stream: 'primary'\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"| seq_num | time | fourc_k | fourc_l | fourc_h | fourc_omega | fourc_chi | fourc_phi | fourc_tth |\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"| 1 | 14:08:45.6 | 3.200 | 0.500 | 0.000 | 25.675 | 15.144 | -1.961 | 51.349 |\n",
"| 2 | 14:08:45.6 | 3.160 | 0.600 | -0.000 | 25.387 | 14.594 | -3.003 | 50.775 |\n",
"| 3 | 14:08:45.6 | 3.120 | 0.700 | 0.000 | 25.112 | 14.028 | -4.062 | 50.224 |\n",
"| 4 | 14:08:45.6 | 3.080 | 0.800 | -0.000 | 24.849 | 13.446 | -5.136 | 49.698 |\n",
"| 5 | 14:08:45.6 | 3.040 | 0.900 | -0.000 | 24.598 | 12.847 | -6.226 | 49.196 |\n",
"| 6 | 14:08:45.6 | 3.000 | 1.000 | -0.000 | 24.359 | 12.233 | -7.332 | 48.719 |\n",
"| 7 | 14:08:45.6 | 2.960 | 1.100 | 0.000 | 24.134 | 11.603 | -8.452 | 48.268 |\n",
"| 8 | 14:08:45.7 | 2.920 | 1.200 | -0.000 | 23.921 | 10.958 | -9.586 | 47.843 |\n",
"| 9 | 14:08:45.7 | 2.880 | 1.300 | 0.000 | 23.722 | 10.298 | -10.733 | 47.444 |\n",
"| 10 | 14:08:45.7 | 2.840 | 1.400 | -0.000 | 23.537 | 9.624 | -11.893 | 47.073 |\n",
"| 11 | 14:08:45.7 | 2.800 | 1.500 | 0.000 | 23.365 | 8.936 | -13.066 | 46.730 |\n",
"| 1 | 17:24:57.4 | 3.200 | 0.500 | 0.000 | 25.675 | 15.144 | -1.961 | 51.349 |\n",
"| 2 | 17:24:57.4 | 3.160 | 0.600 | -0.000 | 25.387 | 14.594 | -3.003 | 50.775 |\n",
"| 3 | 17:24:57.4 | 3.120 | 0.700 | 0.000 | 25.112 | 14.028 | -4.062 | 50.224 |\n",
"| 4 | 17:24:57.5 | 3.080 | 0.800 | -0.000 | 24.849 | 13.446 | -5.136 | 49.698 |\n",
"| 5 | 17:24:57.5 | 3.040 | 0.900 | -0.000 | 24.598 | 12.847 | -6.226 | 49.196 |\n",
"| 6 | 17:24:57.5 | 3.000 | 1.000 | -0.000 | 24.359 | 12.233 | -7.332 | 48.719 |\n",
"| 7 | 17:24:57.5 | 2.960 | 1.100 | 0.000 | 24.134 | 11.603 | -8.452 | 48.268 |\n",
"| 8 | 17:24:57.5 | 2.920 | 1.200 | -0.000 | 23.921 | 10.958 | -9.586 | 47.843 |\n",
"| 9 | 17:24:57.5 | 2.880 | 1.300 | 0.000 | 23.722 | 10.298 | -10.733 | 47.444 |\n",
"| 10 | 17:24:57.5 | 2.840 | 1.400 | -0.000 | 23.537 | 9.624 | -11.893 | 47.073 |\n",
"| 11 | 17:24:57.5 | 2.800 | 1.500 | 0.000 | 23.365 | 8.936 | -13.066 | 46.730 |\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"generator scan ['3abe7e1b'] (scan num: 2)\n"
"generator scan ['b5cff878'] (scan num: 2)\n"
]
},
{
"output_type": "execute_result",
"data": {
"text/plain": [
"('3abe7e1b-b9be-42d6-b1df-6030af67b420',)"
"('b5cff878-570f-4305-b5a1-db69f171b005',)"
]
},
"metadata": {},
Expand Down Expand Up @@ -2368,32 +2368,32 @@
"\n",
"\n",
"\n",
"Transient Scan ID: 3 Time: 2020-12-04 14:08:53\n",
"Persistent Unique Scan ID: 'dda941f0-9f7a-41a1-9b1a-c80d4820e053'\n",
"Transient Scan ID: 3 Time: 2020-12-16 17:24:58\n",
"Persistent Unique Scan ID: 'dc673022-3c4a-4b78-8a22-72e9a3a15e9c'\n",
"New stream: 'primary'\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"| seq_num | time | fourc_k | fourc_l | fourc_h | fourc_omega | fourc_chi | fourc_phi | fourc_tth |\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"| 1 | 14:08:53.0 | 3.200 | 0.500 | -0.000 | 23.781 | 15.152 | 0.000 | 51.349 |\n",
"| 2 | 14:08:53.0 | 3.160 | 0.600 | 0.000 | 22.481 | 14.613 | 0.000 | 50.775 |\n",
"| 3 | 14:08:53.0 | 3.120 | 0.700 | -0.000 | 21.172 | 14.062 | 0.000 | 50.224 |\n",
"| 4 | 14:08:53.0 | 3.080 | 0.800 | 0.000 | 19.854 | 13.498 | 0.000 | 49.698 |\n",
"| 5 | 14:08:53.0 | 3.040 | 0.900 | -0.000 | 18.528 | 12.921 | 0.000 | 49.196 |\n",
"| 6 | 14:08:53.0 | 3.000 | 1.000 | 0.000 | 17.195 | 12.331 | 0.000 | 48.719 |\n",
"| 7 | 14:08:53.1 | 2.960 | 1.100 | 0.000 | 15.856 | 11.727 | 0.000 | 48.268 |\n",
"| 8 | 14:08:53.1 | 2.920 | 1.200 | -0.000 | 14.512 | 11.110 | 0.000 | 47.843 |\n",
"| 9 | 14:08:53.1 | 2.880 | 1.300 | -0.000 | 13.164 | 10.478 | 0.000 | 47.444 |\n",
"| 10 | 14:08:53.1 | 2.840 | 1.400 | 0.000 | 11.813 | 9.831 | 0.000 | 47.073 |\n",
"| 11 | 14:08:53.1 | 2.800 | 1.500 | -0.000 | 10.461 | 9.170 | 0.000 | 46.730 |\n",
"| 1 | 17:24:58.0 | 3.200 | 0.500 | -0.000 | 23.781 | 15.152 | 0.000 | 51.349 |\n",
"| 2 | 17:24:58.1 | 3.160 | 0.600 | 0.000 | 22.481 | 14.613 | 0.000 | 50.775 |\n",
"| 3 | 17:24:58.1 | 3.120 | 0.700 | -0.000 | 21.172 | 14.062 | 0.000 | 50.224 |\n",
"| 4 | 17:24:58.1 | 3.080 | 0.800 | 0.000 | 19.854 | 13.498 | 0.000 | 49.698 |\n",
"| 5 | 17:24:58.1 | 3.040 | 0.900 | -0.000 | 18.528 | 12.921 | 0.000 | 49.196 |\n",
"| 6 | 17:24:58.1 | 3.000 | 1.000 | 0.000 | 17.195 | 12.331 | 0.000 | 48.719 |\n",
"| 7 | 17:24:58.2 | 2.960 | 1.100 | 0.000 | 15.856 | 11.727 | 0.000 | 48.268 |\n",
"| 8 | 17:24:58.2 | 2.920 | 1.200 | -0.000 | 14.512 | 11.110 | 0.000 | 47.843 |\n",
"| 9 | 17:24:58.2 | 2.880 | 1.300 | -0.000 | 13.164 | 10.478 | 0.000 | 47.444 |\n",
"| 10 | 17:24:58.2 | 2.840 | 1.400 | 0.000 | 11.813 | 9.831 | 0.000 | 47.073 |\n",
"| 11 | 17:24:58.2 | 2.800 | 1.500 | -0.000 | 10.461 | 9.170 | 0.000 | 46.730 |\n",
"+-----------+------------+------------+------------+------------+-------------+------------+------------+------------+\n",
"generator scan ['dda941f0'] (scan num: 3)\n"
"generator scan ['dc673022'] (scan num: 3)\n"
]
},
{
"output_type": "execute_result",
"data": {
"text/plain": [
"('dda941f0-9f7a-41a1-9b1a-c80d4820e053',)"
"('dc673022-3c4a-4b78-8a22-72e9a3a15e9c',)"
]
},
"metadata": {},
Expand Down

0 comments on commit f6fb931

Please sign in to comment.