Skip to content

Commit 49e7376

Browse files
sergey-tominsergey-tomin
committed
minor update of tutorials
1 parent 6529690 commit 49e7376

File tree

5 files changed

+52
-89
lines changed

5 files changed

+52
-89
lines changed

‎demos/ipython_tutorials/10_thz_source.ipynb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"cell_type": "code",
52-
"execution_count": 2,
52+
"execution_count": 1,
5353
"metadata": {},
5454
"outputs": [
5555
{
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"cell_type": "code",
71-
"execution_count": 3,
71+
"execution_count": 2,
7272
"metadata": {},
7373
"outputs": [],
7474
"source": [
@@ -143,7 +143,7 @@
143143
},
144144
{
145145
"cell_type": "code",
146-
"execution_count": 4,
146+
"execution_count": 3,
147147
"metadata": {},
148148
"outputs": [
149149
{
@@ -174,7 +174,7 @@
174174
},
175175
{
176176
"cell_type": "code",
177-
"execution_count": 7,
177+
"execution_count": 4,
178178
"metadata": {},
179179
"outputs": [
180180
{
@@ -306,7 +306,7 @@
306306
},
307307
{
308308
"cell_type": "code",
309-
"execution_count": 8,
309+
"execution_count": 5,
310310
"metadata": {},
311311
"outputs": [
312312
{
@@ -361,16 +361,16 @@
361361
},
362362
{
363363
"cell_type": "code",
364-
"execution_count": 9,
364+
"execution_count": 6,
365365
"metadata": {},
366366
"outputs": [
367367
{
368368
"data": {
369369
"text/plain": [
370-
"<ocelot.cpbd.magnetic_lattice.MagneticLattice at 0x1c21453208>"
370+
"<ocelot.cpbd.magnetic_lattice.MagneticLattice at 0x1c20e9c5f8>"
371371
]
372372
},
373-
"execution_count": 9,
373+
"execution_count": 6,
374374
"metadata": {},
375375
"output_type": "execute_result"
376376
}
@@ -397,7 +397,7 @@
397397
},
398398
{
399399
"cell_type": "code",
400-
"execution_count": 10,
400+
"execution_count": 7,
401401
"metadata": {},
402402
"outputs": [
403403
{
@@ -430,7 +430,7 @@
430430
},
431431
{
432432
"cell_type": "code",
433-
"execution_count": 11,
433+
"execution_count": 8,
434434
"metadata": {},
435435
"outputs": [
436436
{
@@ -460,7 +460,7 @@
460460
},
461461
{
462462
"cell_type": "code",
463-
"execution_count": 12,
463+
"execution_count": 9,
464464
"metadata": {},
465465
"outputs": [
466466
{
@@ -469,7 +469,7 @@
469469
"0.13000000268772674"
470470
]
471471
},
472-
"execution_count": 12,
472+
"execution_count": 9,
473473
"metadata": {},
474474
"output_type": "execute_result"
475475
}
@@ -488,7 +488,7 @@
488488
},
489489
{
490490
"cell_type": "code",
491-
"execution_count": 13,
491+
"execution_count": 10,
492492
"metadata": {},
493493
"outputs": [
494494
{
@@ -544,15 +544,15 @@
544544
},
545545
{
546546
"cell_type": "code",
547-
"execution_count": 14,
547+
"execution_count": 11,
548548
"metadata": {},
549549
"outputs": [
550550
{
551551
"name": "stdout",
552552
"output_type": "stream",
553553
"text": [
554554
"n: 299 / 299\n",
555-
"time exec: 364.53862977027893 s\n"
555+
"time exec: 386.6375322341919 s\n"
556556
]
557557
},
558558
{
@@ -584,7 +584,7 @@
584584
},
585585
{
586586
"cell_type": "code",
587-
"execution_count": 15,
587+
"execution_count": 12,
588588
"metadata": {},
589589
"outputs": [
590590
{

‎demos/ipython_tutorials/12_imperfect_mirror.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cell_type": "markdown",
1212
"metadata": {},
1313
"source": [
14-
"## Tutorial N3. Reflection from imperfect highly polished mirror.\n",
14+
"## Tutorial N12. Reflection from imperfect highly polished mirror.\n",
1515
"\n",
1616
"In this tutorial we will illustrate generation of imperfect surface and reflection of the radiation fields from it"
1717
]
@@ -455,7 +455,7 @@
455455
"name": "python",
456456
"nbconvert_exporter": "python",
457457
"pygments_lexer": "ipython3",
458-
"version": "3.6.2"
458+
"version": "3.6.8"
459459
},
460460
"pycharm": {
461461
"stem_cell": {

‎demos/ipython_tutorials/13_synchrotron_radiation_visualization.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cell_type": "markdown",
1212
"metadata": {},
1313
"source": [
14-
"## Tutorial N4. Converting synchrotron radiation `Screen` object to `RadiationField` object for viewing and propagation\n",
14+
"## Tutorial N13. Converting synchrotron radiation `Screen` object to `RadiationField` object for viewing and propagation\n",
1515
"\n",
1616
"`ocelot.optics.wave.RadiationField` is used for a lot of ocelot optics features (propagation, mirror reflection, \n",
1717
"diffraction etc.)\n",
@@ -522,7 +522,7 @@
522522
"name": "python",
523523
"nbconvert_exporter": "python",
524524
"pygments_lexer": "ipython3",
525-
"version": "3.6.2"
525+
"version": "3.6.8"
526526
},
527527
"pycharm": {
528528
"stem_cell": {

‎demos/ipython_tutorials/1_introduction.ipynb

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"## Tutorials\n",
6262
"* Preliminaries: Setup & introduction\n",
6363
"* Beam dynamics\n",
64-
"* [Tutorial N1. Linear optics.](#tutorial1). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/master/demos/ipython_tutorials/1_introduction.ipynb).\n",
64+
"* [Introduction. Tutorial N1. Linear optics.](#tutorial1). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/master/demos/ipython_tutorials/1_introduction.ipynb).\n",
6565
" - Linear optics. Double Bend Achromat (DBA). Simple example of usage OCELOT functions to get periodic solution for a storage ring cell. \n",
6666
"* [Tutorial N2. Tracking.](2_tracking.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/master/demos/ipython_tutorials/2_tracking.ipynb).\n",
6767
" - Linear optics of the European XFEL Injector. \n",
@@ -79,16 +79,22 @@
7979
" - Lattice design, twiss matching, twiss backtracking \n",
8080
"* [Tutorial N8. Physics process addition. Laser heater](8_laser_heater.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/dev/demos/ipython_tutorials/8_laser_heater.ipynb).\n",
8181
" - Theory of Laser Heater, implementation of new Physics Process, track particles w/o laser heater effect. \n",
82-
"* #### Synchrotron radiation module\n",
82+
"\n",
83+
"#### Synchrotron radiation module\n",
84+
"\n",
8385
"* [Tutorial N9. Synchrotron radiation module](9_synchrotron_radiation.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/dev/demos/ipython_tutorials/9_synchrotron_radiation.ipynb).\n",
8486
" - Simple examples how to calculate synchrotron radiation with OCELOT.\n",
8587
"* [Tutorial N10. Simple accelerator based THz source](10_thz_source.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/dev/demos/ipython_tutorials/10_thz_source.ipynb).\n",
8688
" - A simple accelerator with the electron beam formation system and an undulator to generate THz radiation. \n",
87-
" \n",
89+
"\n",
90+
"#### Wavefront propagation\n",
91+
"\n",
92+
"* [Tutorial N12. Reflection from imperfect highly polished mirror](12_imperfect_mirror.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/dev/demos/ipython_tutorials/12_imperfect_mirror.ipynb).\n",
93+
"* [Tutorial N13. Converting synchrotron radiation Screen object to RadiationField object for viewing and propagation](13_synchrotron_radiation_visualization.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/dev/demos/ipython_tutorials/13_synchrotron_radiation_visualization.ipynb).\n",
8894
"\n",
8995
"### Appendixes\n",
9096
"* [Undulator matching](undulator_matching.ipynb). [Web version](http://nbviewer.jupyter.org/github/ocelot-collab/ocelot/blob/dev/demos/ipython_tutorials/undulator_matching.ipynb).\n",
91-
" - brief theory and example in OCE"
97+
" - brief theory and example in OCELOT"
9298
]
9399
},
94100
{

0 commit comments

Comments
 (0)