xrt 1.6.0__zip → 1.6.1__zip

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/02_Balder_BL/__init__.py

@@ -16,8 +16,13 @@ Shown are i) intensity downstream of the filter and its energy spectrum and
 ii) absorbed power in the filter with its energy spectrum and power density
 isolines at 85% and 95% of the maximum.
 
-.. animation:: _images/filterThicknessI
-.. animation:: _images/filterThicknessP
++------------+------------+
+|  |filtTI|  |  |filtTP|  |
++------------+------------+
+
+.. |filtTI| animation:: _images/filterThicknessI
+.. |filtTP| animation:: _images/filterThicknessP
+   :loc: upper-right-corner
 
 White-beam collimating mirror at varying pitch angle
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -51,8 +56,13 @@ Bending of collimating mirror
 
 Shown are i) image downstream of the DCM and ii) image at the sample.
 
-.. animation:: _images/vcmR-DCM
-.. animation:: _images/vcmR-Sample
++-----------+-----------+
+|  |vcmR1|  |  |vcmR2|  |
++-----------+-----------+
+
+.. |vcmR1| animation:: _images/vcmR-DCM
+.. |vcmR2| animation:: _images/vcmR-Sample
+   :loc: upper-right-corner
 
 Bending of focusing mirror
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -68,8 +78,12 @@ Both mirrors (collimating + focusing) at varying pitch angle
 The sagittal radius of the focusing toroid mirror is optimal at 2 mrad pitch
 angle.
 
-.. animation:: _images/pitch-Sample-3D
-.. animation:: _images/pitch-Sample
++---------------------+---------------------+
+|  |pitch-Sample-3D|  |  |pitch-Sample-2D|  |
++---------------------+---------------------+
+
+.. |pitch-Sample-3D| animation:: _images/pitch-Sample-3D
+.. |pitch-Sample-2D| animation:: _images/pitch-Sample
 
 .. _dmm:
 
@@ -82,6 +96,7 @@ Scanning of Double Crystal Monochromator
 
 .. |Si111| animation:: _images/Si111
 .. |Si311| animation:: _images/Si311
+   :loc: upper-right-corner
 
 Scanning of Double Multilayer Monochromator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -98,5 +113,6 @@ tungsten layers on top of a silicon substrate.
 
 .. |MLfp| animation:: _images/multilayer_1stML
 .. |MLexit| animation:: _images/multilayer_afterDMM
+   :loc: upper-right-corner
 """
 pass

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/04_Lenses/crl_stack.py

@@ -37,7 +37,8 @@ This graph shows the relative flux in the focused beam at 9 keV after the given
 number of double-sided lenses which give approximately equal focal distance of
 *q* = 5 m. As seen, low absorbing materials are preferred:
 
-.. imagezoom:: _images/CRL-2-Flux.*
+.. imagezoom:: _images/CRL-2-Flux.png
+   :align: center
 
 This graph shows the depth of focus as a function of the on-axis coordinate
 around the nominal focal position. For heavy materials the depth of focus is
@@ -45,12 +46,14 @@ larger due to the higher absorption of the peripherical rays of the incoming
 beam. Such lenses act effectively also as apertures thus reducing the focal
 spot at the expense of flux:
 
-.. imagezoom:: _images/CRL-2-depthOfFocus.*
+.. imagezoom:: _images/CRL-2-depthOfFocus.png
+   :align: center
 
 .. [snigirev] A. Snigirev, V. Kohn, I. Snigireva, A. Souvorov, and B. Lengeler,
    *Focusing High-Energy X Rays by Compound Refractive Lenses*, Applied
    Optics **37** (1998), 653-62.
 """
+
 __author__ = "Konstantin Klementiev, Roman Chernikov"
 __date__ = "08 Mar 2016"
 #import matplotlib as mpl

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/05_QWP/__init__.py

@@ -42,7 +42,7 @@ polarization ellipse becomes close to 1 or -1 and with narrow distribution.
 .. |QWPBTP| animation:: _images/QWP-1BT-PhaseShift
    :loc: upper-right-corner
 .. |QWPBTA| animation:: _images/QWP-1BT-PolAxesRatio
-   :loc: top: -208px; left: -450px;
+   :loc: upper-right-corner
 
 Collimated beam, Laue transmission case
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,7 +62,7 @@ case.
 .. |QWPLTP| animation:: _images/QWP-2LT-PhaseShift
    :loc: upper-right-corner
 .. |QWPLTA| animation:: _images/QWP-2LT-PolAxesRatio
-   :loc: top: -208px; left: -450px;
+   :loc: upper-right-corner
 
 Convergent beam, Laue transmission case
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -91,5 +91,7 @@ polarization plane (horizontal). Watch the circular polarization rate at
 *E* ~ 9 keV, crystal thickness = 500 µm.
 
 .. animation:: _images/QWP-4LT-conv-bent-CircPolRate
+   :align: right
+
 """
 pass

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/06_AnalyzerBent1D/__init__.py

@@ -11,7 +11,8 @@ Rowland circle based analyzers
 This study compares simply bent and ground-bent spectrometers utilizing Bragg
 and Laue analyzing crystals. The bending is cylindrical (one-dimensional).
 
-.. imagezoom:: _images/BraggLaue.*
+.. imagezoom:: _images/BraggLaue.png
+   :align: center
 
 :Conditions: Rowland circle diameter = 1 m, 70v × 200h µm² unpolarized
    fluorescence source, crystal size = 100meridional × 20saggittal mm².
@@ -204,8 +205,13 @@ the sketch.
 Left: the classical setup [vH]_ with 2 translations.
 Right: the setup with an invariant escape direction.
 
-.. imagezoom:: _images/vonHamosPositionsClassic.*
-.. imagezoom:: _images/vonHamosPositionsFixedEscape.*
++---------+---------+
+|  |vHC|  |  |vHF|  |
++---------+---------+
+
+.. |vHC| imagezoom:: _images/vonHamosPositionsClassic.*
+.. |vHF| imagezoom:: _images/vonHamosPositionsFixedEscape.*
+   :loc: upper-right-corner
 
 The geometrical parameters for the von Hamos spectrometer were taken from
 [vH_SLS]_: a diced 100 (sagittal) × 50 (meridional) mm² Si(444) crystal is
@@ -294,6 +300,7 @@ energy band. Here, in the 5-mm-stripe case a bandwidth of ~12 eV uses less than
 1 mm of the crystal!
 
 .. imagezoom:: _images/SivonHamos-5mmDiced60-xtal_E_zoom-7lin.*
+   :align: center
 
 Comparison of Rowland circle based and von Hamos analyzers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -323,8 +330,13 @@ smaller solid angle collected. The left figure is with a narrow energy band
 equal to the 6-fold energy resolution. The right figure is with a wide energy
 band equal to 8·10 :sup:`-4`·E (approximate width of K β lines [Henke]_).
 
-.. imagezoom:: _images/ResolutionEfficiency1D-narrowBand.*
-.. imagezoom:: _images/ResolutionEfficiency1D-8e-4Band.*
++-------------+-------------+
+|  |resMapN|  |  |resMapW|  |
++-------------+-------------+
+
+.. |resMapN| imagezoom:: _images/ResolutionEfficiency1D-narrowBand.*
+.. |resMapW| imagezoom:: _images/ResolutionEfficiency1D-8e-4Band.*
+   :loc: upper-right-corner
 
 Finally, among the compared 1D-bent spectrometers the Johansson type is the
 best in the combination of good energy resolution and high efficiency. It is
@@ -357,11 +369,13 @@ the figure has the magnification 1:1 for the circular crystal (left part) and
 1.5:1 for the elliptical one (right part).
 
 .. imagezoom:: _images/CircularAndElliptical_vonHamos_s.*
+   :align: center
 
 The crystal is diced along the cylinder axis with 1 mm pitch. The difference in
 the circular and elliptical figures is shown below.
 
 .. imagezoom:: _images/Cylinders.*
+   :align: center
 
 The elliptical figure results in some aberrations, as seen by the monochromatic
 images below, which worsens energy resolution.

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/07_AnalyzerBent2D/01BD_SourceZCrystalThetaAlpha.py

@@ -564,16 +564,16 @@ def plot_generator(beamLine, plots=[], plotsAnalyzer=[], plotsDetector=[],
                                 eAxisMin, eAxisMax
                             sourcename = 'flat'
                         elif isource == 1:  # line
-#                            xrtr.set_repeats(0)
+                            # xrtr.set_repeats(0)
                             beamLine.sources[0].distE = 'lines'
                             beamLine.sources[0].energies = E0,
                             sourcename = 'line'
                             for plot in plotsDetector:
                                 plot.yaxis.limits = [-yAxisLine, yAxisLine]
                         else:
-#                            xrtr.set_repeats(0)
+                            # xrtr.set_repeats(0)
                             tt = (r'{0}{1}$\theta = {2:.0f}^\circ${1}$' +
-                                  '\delta E = ${3:.3f} eV').format(
+                                  r'\delta E = ${3:.3f} eV').format(
                                 crystalLabel, '\n', thetaDegree, dELine)
                             for plot in plots:
                                 try:

xrt-1.6.1/examples/withRaycing/08_CLAESS_BL/__init__.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+r"""
+ALBA CLÆSS beamline
+-------------------
+
+Files in ``\examples\withRaycing\08_CLAESS_BL``
+
+This script produces images at various positions along the beamline, see image
+captions in the enlarged figures.
+
++------------+------------+------------+
+| |Claess01| | |Claess02| | |Claess03| |
++------------+------------+------------+
+| |Claess04| | |Claess05| | |Claess06| |
++------------+------------+------------+
+| |Claess07| | |Claess08| | |Claess09| |
++------------+------------+------------+
+| |Claess10| | |Claess11| | |Claess12| |
++------------+------------+------------+
+| |Claess13| |            |            |
++------------+------------+------------+
+
+.. |Claess01| imagezoom:: _images/ClaessBL_N-Rh-01DiamondFSM1+FixedMask-wideE.*
+   :alt:  at fixed FE mask
+.. |Claess02| imagezoom:: _images/ClaessBL_N-Rh-02DiamondFSM1+FEMaskLT-wideE.*
+   :alt:  at upstream half of FE movable mask
+.. |Claess03| imagezoom:: _images/ClaessBL_N-Rh-03DiamondFSM1+FEmaskRB-wideE.*
+   :alt:  at downstream half of FE movable mask
+   :loc: upper-right-corner
+.. |Claess04| imagezoom:: _images/ClaessBL_N-Rh-05VCM_footprintE-wideE.*
+   :alt:  footprint on VCM
+.. |Claess05| imagezoom:: _images/ClaessBL_N-Rh-08Xtal1_footprint-monoE.*
+   :alt:  footprint on first DCM crystal
+.. |Claess06| imagezoom:: _images/ClaessBL_N-Rh-11Xtal2_footprintE-monoE.*
+   :alt:  footprint on second DCM crystal
+   :loc: upper-right-corner
+.. |Claess07| imagezoom:: _images/ClaessBL_N-Rh-12BSBlock-monoE.*
+   :alt:  beam at the Bremsstrahlung block
+.. |Claess08| imagezoom:: _images/ClaessBL_N-Rh-13XBPM4foils-monoE.*
+   :alt:  image at foil holder of 4-diode XBPM
+.. |Claess09| imagezoom:: _images/ClaessBL_N-Rh-16VFM_footprint-monoE.*
+   :alt:  footprint on VFM
+   :loc: upper-right-corner
+.. |Claess10| imagezoom:: _images/ClaessBL_N-Rh-18OH-PS-FrontCollimator-monoE.*
+   :alt:  front collimator of photon shutter
+.. |Claess11| imagezoom:: _images/ClaessBL_N-Rh-19eh100To40Flange-monoE.*
+   :alt:  image at reducer flange 100CF-to-40CF
+.. |Claess12| imagezoom:: _images/ClaessBL_N-Rh-20slitEH-monoE.*
+   :alt:  image at exp 4-blade slit
+   :loc: upper-right-corner
+.. |Claess13| imagezoom:: _images/ClaessBL_N-Rh-22FocusAtSampleE-monoE.*
+   :alt:  image at focus (sample)
+
+The script also exemplifies the usage of
+:func:`~xrt.backends.raycing.apertures.RectangularAperture.touch_beam` for
+finding the optimal size of slits.
+"""
+pass

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/09_Gratings/FZP.py

@@ -16,6 +16,7 @@ import xrt.backends.raycing.screens as rsc
 
 showIn3D = False
 
+# transmittivity of FZP material is ignored, the only used propery is 'kind':
 mGold = rm.Material('Au', rho=19.3, kind='FZP')
 E0, dE = 400, 5
 
@@ -34,10 +35,11 @@ def build_beamline(nrays=1e5):
         distE='flat', energies=(E0-dE, E0+dE), polarization='horizontal')
 
     beamLine.fsm1 = rsc.Screen(beamLine, 'DiamondFSM1', (0, 10., 0))
-#    beamLine.fzp = roe.NormalFZP(beamLine, 'FZP', [0, 10., 0], pitch=np.pi/2,
-#      material=mGold, f=2., E=E0, N=50)
+    # beamLine.fzp = roe.NormalFZP(
+    #     beamLine, 'FZP', [0, 10., 0], pitch=np.pi/2, shape='round',
+    #     material=mGold, f=2., E=E0, N=50)
     beamLine.fzp = roe.GeneralFZPin0YZ(
-        beamLine, 'FZP', [0, 10., 0], pitch=np.pi/2,
+        beamLine, 'FZP', [0, 10., 0], pitch=np.pi/2, shape='round',
         material=mGold, f1='inf', f2=(0, 0, 2.), E=E0, N=500, phaseShift=np.pi)
 
 #    source.dx = 2 * beamLine.fzp.rn[-1]