Skip to content

Commit

Permalink
Merge pull request #542 from aleonau/typo_things
Browse files Browse the repository at this point in the history
Typo removed
  • Loading branch information
takluyver authored Aug 16, 2024
2 parents 1bf8fad + d8f3a68 commit c228ed3
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions docs/iterate_trains.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,30 @@
"First train ID: 79726751\n",
"Last train ID: 79730142\n",
"\n",
"16 detector modules (SPB_DET_AGIPD1M-1)\n",
"16 XTDF detector modules (SPB_DET_AGIPD1M-1)\n",
" e.g. module SPB_DET_AGIPD1M-1 0 : 512 x 128 pixels\n",
" SPB_DET_AGIPD1M-1/DET/0CH0:xtdf\n",
" 64 frames per train, up to 217088 frames total\n",
"\n",
"3 instrument sources (excluding detectors):\n",
" - SA1_XTD2_XGM/XGM/DOOCS:output\n",
" - SPB_IRU_SIDEMIC_CAM:daqOutput\n",
" - SPB_XTD9_XGM/XGM/DOOCS:output\n",
"3 instrument sources (excluding XTDF detectors):\n",
" - SA1_XTD2_XGM/XGM/DOOCS:output \n",
" - SPB_IRU_SIDEMIC_CAM:daqOutput \n",
" - SPB_XTD9_XGM/XGM/DOOCS:output \n",
"\n",
"13 control sources:\n",
" - ACC_SYS_DOOCS/CTRL/BEAMCONDITIONS\n",
" - SA1_XTD2_XGM/XGM/DOOCS\n",
" - SPB_IRU_AGIPD1M/PSC/HV\n",
" - SPB_IRU_AGIPD1M/TSENS/H1_T_EXTHOUS\n",
" - SPB_IRU_AGIPD1M/TSENS/H2_T_EXTHOUS\n",
" - SPB_IRU_AGIPD1M/TSENS/Q1_T_BLOCK\n",
" - SPB_IRU_AGIPD1M/TSENS/Q2_T_BLOCK\n",
" - SPB_IRU_AGIPD1M/TSENS/Q3_T_BLOCK\n",
" - SPB_IRU_AGIPD1M/TSENS/Q4_T_BLOCK\n",
" - SPB_IRU_AGIPD1M1/CTRL/MC1\n",
" - SPB_IRU_AGIPD1M1/CTRL/MC2\n",
" - SPB_IRU_VAC/GAUGE/GAUGE_FR_6\n",
" - SPB_XTD9_XGM/XGM/DOOCS\n",
" - ACC_SYS_DOOCS/CTRL/BEAMCONDITIONS \n",
" - SA1_XTD2_XGM/XGM/DOOCS \n",
" - SPB_IRU_AGIPD1M/PSC/HV \n",
" - SPB_IRU_AGIPD1M/TSENS/H1_T_EXTHOUS \n",
" - SPB_IRU_AGIPD1M/TSENS/H2_T_EXTHOUS \n",
" - SPB_IRU_AGIPD1M/TSENS/Q1_T_BLOCK \n",
" - SPB_IRU_AGIPD1M/TSENS/Q2_T_BLOCK \n",
" - SPB_IRU_AGIPD1M/TSENS/Q3_T_BLOCK \n",
" - SPB_IRU_AGIPD1M/TSENS/Q4_T_BLOCK \n",
" - SPB_IRU_AGIPD1M1/CTRL/MC1 \n",
" - SPB_IRU_AGIPD1M1/CTRL/MC2 \n",
" - SPB_IRU_VAC/GAUGE/GAUGE_FR_6 \n",
" - SPB_XTD9_XGM/XGM/DOOCS \n",
"\n"
]
}
Expand Down Expand Up @@ -133,7 +133,7 @@
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mKeyError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-3-630f9647c3c0>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mtid\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdata\u001b[0m \u001b[0;32min\u001b[0m \u001b[0msel\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mtrains\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 2\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Processing train\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mtid\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Detector data module 0 shape:\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdata\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'SPB_DET_AGIPD1M-1/DET/0CH0:xtdf'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'image.data'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mshape\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 4\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 5\u001b[0m \u001b[0;32mbreak\u001b[0m \u001b[0;31m# Stop after the first train to keep the demo quick\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
"\u001b[0;32m/tmp/ipykernel_2455694/3854580742.py\u001b[0m in \u001b[0;36m<cell line: 1>\u001b[0;34m()\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mtid\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdata\u001b[0m \u001b[0;32min\u001b[0m \u001b[0msel\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mtrains\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 2\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Processing train\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mtid\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Detector data module 0 shape:\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdata\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'SPB_DET_AGIPD1M-1/DET/0CH0:xtdf'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m'image.data'\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mshape\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 4\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 5\u001b[0m \u001b[0;32mbreak\u001b[0m \u001b[0;31m# Stop after the first train to keep the demo quick\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
"\u001b[0;31mKeyError\u001b[0m: 'image.data'"
]
}
Expand All @@ -156,7 +156,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 6,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -187,14 +187,14 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 7,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Detctor data module 0 shape: (64, 2, 512, 128)\n",
"Detector data module 0 shape: (64, 2, 512, 128)\n",
"Stacked data shape: (64, 2, 16, 512, 128)\n"
]
}
Expand All @@ -203,7 +203,7 @@
"from extra_data import stack_detector_data\n",
"\n",
"for tid, data in sel.trains(require_all=True):\n",
" print(\"Detctor data module 0 shape:\", data['SPB_DET_AGIPD1M-1/DET/0CH0:xtdf']['image.data'].shape)\n",
" print(\"Detector data module 0 shape:\", data['SPB_DET_AGIPD1M-1/DET/0CH0:xtdf']['image.data'].shape)\n",
" stacked = stack_detector_data(data, 'image.data')\n",
" print(\"Stacked data shape:\", stacked.shape)\n",
"\n",
Expand All @@ -219,7 +219,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -230,9 +230,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "xfel (current)",
"language": "python",
"name": "python3"
"name": "xfel-current"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -244,9 +244,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.7"
"version": "3.10.13"
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}

0 comments on commit c228ed3

Please sign in to comment.