xrt 1.5.0__zip → 1.6.1__zip

{xrt-1.5.0 → xrt-1.6.1}/examples/withRaycing/06_AnalyzerBent1D/02_vonHamos.py

@@ -8,9 +8,8 @@ saved. Then a single line source is ray-traced and provides the width of *z*
 distribution. From these 3 numbers we calculate energy resolution and, as a
 check, ray-trace a third source with 7 energy lines with a spacing equal to the
 previously calculated energy resolution. The source sizes, axis limits, number
-of iterations etc. were determined experimentally and are given by lists in the
-upper part of the script. The outputs are the plots and a text file with the
-resulted energy resolutions."""
+of iterations etc. were determined experimentally and are given in the upper
+part of the script."""
 __author__ = "Konstantin Klementiev"
 __date__ = "08 Mar 2016"
 import os, sys; sys.path.append(os.path.join('..', '..', '..'))  # analysis:ignore
@@ -29,6 +28,9 @@ import xrt.plotter as xrtp
 import xrt.runner as xrtr
 
 showIn3D = False
+useTT = False
+if showIn3D:
+    useTT = False
 
 crystalMaterial = 'Si'
 if crystalMaterial == 'Si':
@@ -38,27 +40,30 @@ elif crystalMaterial == 'Ge':
 else:
     raise
 
-crystal = rm.CrystalDiamond((4, 4, 4), d111/4, elements=crystalMaterial)
-#numiter = 640
-numiter = 40
+# crystal = rm.CrystalDiamond((4, 4, 4), d111/4, elements=crystalMaterial,
+#                             useTT=useTT)
+crystal = rm.CrystalSi(hkl=(4, 4, 4), t=0.1, useTT=useTT)
+# if useTT:
+#     crystal.auto_PyTTE_Limits = False
+
+numiter = 256
+nprocesses = 'half'  # if not useTT
 
 Rm = 1e9  # meridional radius, mm
-Rs = 1000  # tmp sagittal radius, mm
-#Rs = 250  # tmp sagittal radius, mm
+# Rs = 1000  # tmp sagittal radius, mm
+Rs = 250.  # tmp sagittal radius, mm
 dphi = 0
 
 beamV = 0.1/2.35  # vertical beam size
 beamH = 0.1/2.35  # horizontal beam size
 
+isDiced = False
+
 yAxesLim = 20
 
 dxCrystal = 100.
-dyCrystal = 100.
-#dyCrystal = 50.
-#dxCrystal = 300.
-#dyCrystal = 70.
+dyCrystal = 50.
 
-isDiced = False
 yAxisLim = 32  # Mythen length = 64 mm
 yAxisLine = 0.4
 if isDiced:
@@ -66,14 +71,15 @@ if isDiced:
     facetKWargs = {'dxFacet': 1-0.05, 'dyFacet': 50.,
                    'dxGap': 0.05, 'dyGap': 0.}
     Toroid = roe.DicedJohannToroid
-    analyzerName = crystalMaterial + 'vonHamosDiced'
+    analyzerName = crystalMaterial + 'vonHamos-{0:.0f}mmDiced'.format(
+        facetKWargs['dxFacet'])
 else:
     xAxisLim = 5
     facetKWargs = {}
     Toroid = roe.JohannToroid
     analyzerName = crystalMaterial + 'vonHamos'
 
-thetaDegree = 40
+thetaDegree = 60.
 
 if isDiced:
     dphi = np.arcsin((facetKWargs['dxFacet'] + facetKWargs['dxGap']) / Rs)
@@ -97,7 +103,7 @@ else:
     raise
 
 
-def build_beamline(nrays=2e5):
+def build_beamline(nrays=1e6):
     beamLine = raycing.BeamLine(azimuth=0, height=0)
     rs.GeometricSource(
         beamLine, 'GeometricSource', nrays=nrays, dx=beamH, dy=0,
@@ -107,6 +113,7 @@ def build_beamline(nrays=2e5):
         limPhysX=(-dxCrystal/2, dxCrystal/2),
         limPhysY=(-dyCrystal/2*3, dyCrystal/2*3),
         Rm=Rm, Rs=Rs, shape='rect',
+        targetOpenCL='auto' if useTT else None, precisionOpenCL='float32',
         **facetKWargs)
     beamLine.detector = rsc.Screen(beamLine, 'Detector', z=(0, 0, 1))
 #    beamLine.s1h = ra.RectangularAperture(
@@ -143,7 +150,7 @@ def align_spectrometer_Rs(beamLine, theta, Rs):
     beamLine.analyzer.center = 0, p, 0
     beamLine.analyzer.pitch = theta
     beamLine.detector.center = 0, yDet, zDet
-    beamLine.detector.set_orientation(z=(0, cosTheta, sinTheta))
+    beamLine.detector.z = 0, cosTheta, sinTheta
 
     beamLine.sources[0].dxprime = 1.1 * dxCrystal / p
     beamLine.sources[0].dzprime = dyCrystal * np.sin(theta) / p
@@ -162,7 +169,7 @@ def align_spectrometer_Rs(beamLine, theta, Rs):
 #    beamLine.analyzer.Rs = Rs
 #    beamLine.analyzer.pitch = theta
 #    beamLine.detector.center = 0, yDet, zDet
-#    beamLine.detector.set_orientation(z=(0, cosTheta, sinTheta))
+#    beamLine.detector.z = 0, cosTheta, sinTheta
 #
 #    beamLine.sources[0].dxprime = 1.1 * dxCrystal / p
 #    beamLine.sources[0].dzprime = dyCrystal * np.sin(theta) / p
@@ -244,10 +251,10 @@ def define_plots(beamLine):
         xaxis=xrtp.XYCAxis(r'$x$', 'mm', fwhmFormatStr='%.3f'),
         yaxis=xrtp.XYCAxis(r'$z$', 'mm', fwhmFormatStr='%.3f'),
         title='det_E')
-    plotDetE.xaxis.limits = 'symmetric'
-    plotDetE.yaxis.limits = 'symmetric'
-#    plotDetE.xaxis.limits = -xAxisLim, xAxisLim
-#    plotDetE.yaxis.limits = -yAxisLim, yAxisLim
+    # plotDetE.xaxis.limits = 'symmetric'
+    # plotDetE.yaxis.limits = 'symmetric'
+    plotDetE.xaxis.limits = -xAxisLim, xAxisLim
+    plotDetE.yaxis.limits = -yAxisLim, yAxisLim
     plotDetE.caxis.fwhmFormatStr = fwhmFormatStrE
     plotDetE.textPanel = plotDetE.fig.text(
         0.88, 0.8, '', transform=plotDetE.fig.transFigure, size=14, color='r',
@@ -309,13 +316,10 @@ def plot_generator(beamLine, plots=[], plotsAnalyzer=[], plotsDetector=[],
                     continue
                 plot.caxis.offset = int(round(offsetE, -2))
                 plot.caxis.limits = [eAxisMin, eAxisMax]
-            tt = r'{0}{1}$\theta = {2:.0f}^\circ$'.format(
+            txt = r'{0}{1}$\theta = {2:.0f}^\circ$'.format(
                 crystalLabel, '\n', thetaDegree)
             for plot in plots:
-                try:
-                    plot.textPanel.set_text(tt)
-                except AttributeError:
-                    pass
+                plot.textPanel.set_text(txt)
             if isource == -1:
                 beamLine.sources[0].distE = 'normal'
                 beamLine.sources[0].energies = E0, eAxisFlat/2.355
@@ -335,14 +339,11 @@ def plot_generator(beamLine, plots=[], plotsAnalyzer=[], plotsDetector=[],
 #            xrtr.set_repeats(2560*16L)
             for plot in plotsDetector:
                 plot.xaxis.limits = -6, 6
-            tt = (r'{0}{1}$\theta = {2:.0f}^\circ${1}$' +
-                  '\delta E = ${3:.3f} eV').format(
-                crystalLabel, '\n', thetaDegree, dELine)
+            txt = (r'{0}{1}$\theta = {2:.0f}^\circ${1}$' +
+                   '\delta E = ${3:.3f} eV').format(
+                       crystalLabel, '\n', thetaDegree, dELine)
             for plot in plots:
-                try:
-                    plot.textPanel.set_text(tt)
-                except AttributeError:
-                    pass
+                plot.textPanel.set_text(txt)
             beamLine.sources[0].distE = 'lines'
             sourcename = '7lin'
             for plot in plotsDetector:
@@ -358,14 +359,14 @@ def plot_generator(beamLine, plots=[], plotsAnalyzer=[], plotsDetector=[],
                 plot.caxis.limits = [eAxisMin, eAxisMax]
 
         for plot in plots:
-            filename = '{0}{1}-{2}-{3}'.format(
+            filename = '{0}{1:.0f}-{2}-{3}'.format(
                 analyzerName, thetaDegree, plot.title, sourcename)
-            plot.saveName = filename + '.png'
+            plot.saveName = filename + '{}.png'.format("_TT" if useTT else "")
 #            plot.persistentName = filename + '.pickle'
         if showIn3D:
             beamLine.glowFrameName = \
-                '{0}{1}-{2}-{3}.jpg'.format(analyzerName, thetaDegree, isource,
-                                            sourcename)
+                '{0}{1:.0f}-{2}-{3}.jpg'.format(
+                    analyzerName, thetaDegree, isource, sourcename)
         yield
 
         if not showIn3D:
@@ -392,7 +393,8 @@ def main():
     args = [beamLine, plots, plotsAnalyzer, plotsDetector, plotsE, plotDetE]
     xrtr.run_ray_tracing(
         plots, generator=plot_generator, generatorArgs=args,
-        beamLine=beamLine, processes='half')
+        beamLine=beamLine,
+        processes=1 if useTT else nprocesses)
 
 #this is necessary to use multiprocessing in Windows, otherwise the new Python
 #contexts cannot be initialized:

{xrt-1.5.0 → xrt-1.6.1}/examples/withRaycing/06_AnalyzerBent1D/02_vonHamosElliptical.py

@@ -312,7 +312,8 @@ def align_spectrometer_Rs(beamLine, theta, Rs):
     beamLine.analyzer.center = 0, p, 0
     beamLine.analyzer.pitch = theta
     beamLine.detector.center = 0, yDet, zDet
-    beamLine.detector.set_orientation(z=(0, cosTheta, sinTheta))
+    # beamLine.detector.z = 0, cosTheta, sinTheta
+    beamLine.detector.z = 0, -sin2Theta, cos2Theta
 
     beamLine.sources[0].dxprime = 1.1 * dxCrystal / p
     beamLine.sources[0].dzprime = dyCrystal * np.sin(theta) / p / 4
@@ -331,7 +332,7 @@ def align_spectrometer_Rs(beamLine, theta, Rs):
 #    beamLine.analyzer.Rs = Rs
 #    beamLine.analyzer.pitch = theta
 #    beamLine.detector.center = 0, yDet, zDet
-#    beamLine.detector.set_orientation(z=(0, cosTheta, sinTheta))
+#    beamLine.detector.z = 0, cosTheta, sinTheta
 #
 #    beamLine.sources[0].dxprime = 1.1 * dxCrystal / p
 #    beamLine.sources[0].dzprime = dyCrystal * np.sin(theta) / p

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

@@ -3,29 +3,30 @@ r"""
 Comparison of 1D-bent crystal analyzers
 ---------------------------------------
 
-Files in ``\examples\withRaycing\06_AnalyzerBent1D``
+Files in ``/examples/withRaycing/06_AnalyzerBent1D``
 
 Rowland circle based analyzers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This study compares simply bent and ground-bent spectrometers utilizing Bragg
-and Laue crystals. The bending is cylindrical (one-dimensional).
+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².
 
-The energy resolution was calculated as described in `the CDR of a diced
+Energy resolution was calculated as described in `the CDR of a diced
 Johansson-like spectrometer at Alba/CLÆSS beamline
 <http://www.cells.es/Beamlines/CLAESS/EXD-BL22-FA-0001v4.0.pdf>`_. This
-requires two images: 1) of a flat energy distribution source and 2) of a
-monochromatic source. The image is energy dispersive in the diffraction plane,
-which can be used in practice with a position sensitive detector or with a slit
-scan in front of a bulk detector. From these two images the energy resolution
-*δE* was calculated and then 3) a verifying image was ray-traced for a source
-of 7 energy lines evenly spaced with the found step *δE*. Such images are shown
-for the four crystal geometries at a particular Bragg angle:
+calculation requires two images: 1) of a flat energy distribution source and
+2) of a monochromatic source. The images are dispersive in the diffraction
+plane, which can be used in practice with a position sensitive detector or with
+a slit scan in front of a bulk detector. From these two images energy
+resolution *δE* was calculated and then 3) a verifying image was ray-traced for
+a source of 7 energy lines evenly spaced with the found step *δE*. Such images
+are shown for the four crystal geometries at a particular Bragg angle:
 
 +----------+---------------------+---------------------+---------------------+
 | geometry |     flat source     |     line source     |       7 lines       |
@@ -127,7 +128,8 @@ crystal analyzer. As expected, the beam is fully polarized at 45° Bragg angle
    for a single energy, as opposed to simply bent crystals which have different
    parts reflecting the rays of different energies.
 2) When the crystal is close to the source (small θ for Bragg and large θ for
-   Laue), the images are distorted, even for the ground-bent crystals.
+   Laue spectrometers), the images are distorted, even for the ground-bent
+   crystals.
 3) The Bragg case requires small pixel size in the meridional direction (~10 µm
    for 1-m-diameter Rowland circle) for a good spatial resolution but can
    profit from its compactness. The Laue case requires a big detector of a size
@@ -149,6 +151,42 @@ crystal analyzer. As expected, the beam is fully polarized at 45° Bragg angle
    visible not only in terms of efficiency but also in terms of energy
    resolution.
 
+.. _JohanssonTT:
+
+Johansson analyzer with elastically deformed crystal
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Example in ``/examples/withRaycing/06_AnalyzerBent1D/01B_BentTT.py``
+
+A Johansson 1D ground-bent analyzer is studied here by ray tracing with two
+ways of reflectivity calculations: for a perfect crystal and for an elastically
+deformed crystal by means of :ref:`the Takagi-Taupin equations <useTT>`. For
+higher reflection indices, the deviation from perfect crystal reflectivity
+becomes increasingly pronounced. Notice here an increased flux value and
+decreased energy resolution for the latter case.
+
++----------+---------------------+---------------------+---------------------+
+| study    |     flat source     |     line source     |       7 lines       |
++==========+=====================+=====================+=====================+
+| perfect  |      |jp_flat|      |      |jp_line|      |      |jp_7lin|      |
+| crystal  |                     |                     |                     |
++----------+---------------------+---------------------+---------------------+
+| deformed |      |jd_flat|      |      |jd_line|      |      |jd_7lin|      |
+| crystal  |                     |                     |                     |
+|          |                     |                     |                     |
+| (Takagi- |                     |                     |                     |
+| Taupin)  |                     |                     |                     |
++----------+---------------------+---------------------+---------------------+
+
+.. |jp_flat| imagezoom:: _images/1D-02gb-Si10,10,0-54-det_E-flat.*
+.. |jp_line| imagezoom:: _images/1D-02gb-Si10,10,0-54-det_E-line.*
+.. |jp_7lin| imagezoom:: _images/1D-02gb-Si10,10,0-54-det_E-7lin.*
+   :loc: upper-right-corner
+.. |jd_flat| imagezoom:: _images/1D-02gb-Si10,10,0-54-det_E-flat_TT.*
+.. |jd_line| imagezoom:: _images/1D-02gb-Si10,10,0-54-det_E-line_TT.*
+.. |jd_7lin| imagezoom:: _images/1D-02gb-Si10,10,0-54-det_E-7lin_TT.*
+   :loc: upper-right-corner
+
 .. _VonHamos:
 
 Von Hamos analyzer
@@ -157,27 +195,33 @@ Von Hamos analyzer
 A von Hamos spectrometer has axial symmetry around the axis connecting the
 source and the detector. The analyzing crystal is cylindrically bent with the
 radius equal to the crystal-to-axis distance. In this scheme, the emission
-escape direction depends on the Bragg angle (energy). In practice, the
-spectrometer axis is adapted such that the escape direction is appropriate for
-a given sample setup. In particular, the escape direction can be kept in back
-scattering (relatively to the sample), see the figure below. In the latter case
-the mechanical model is more complex and includes three translations and two
-rotations. In the figure below, the crystal is sagittally curved around the
-source–detector line. The detector plane is perpendicular to the sketch.
+escape direction depends on Bragg angle (energy). In practice, the spectrometer
+axis is adapted such that the escape direction is appropriate for a given
+sample setup. If the emission escape direction is kept fixed relatively to the
+sample, the mechanical model becomes more complex and includes three
+translations and two rotations. In the figure below, the crystal is sagittally
+curved around the source-detector line. The detector plane is perpendicular to
+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
 curved with Rs = 250 mm. The width of segmented facets was taken equal to 5 mm
-(as in [vH_SLS]_) and 1 mm together with a continuously bent case.
+(as in [vH_SLS]_) and 1 mm together with a continuously bent case. The crystal
+thickness = 100 µm.
 
 .. [vH] L. von Hámos, *Röntgenspektroskopie und Abbildung mittels gekrümmter
    Kristallreflektoren II. Beschreibung eines fokussierenden Spektrographen mit
-   punktgetreuer Spaltabbildung*, Annalen der Physik **411** (1934) 252–260
+   punktgetreuer Spaltabbildung*, Annalen der Physik **411** (1934) 252-260
 
 .. [vH_SLS] J. Szlachetko, M. Nachtegaal, E. de Boni, M. Willimann,
    O. Safonova, J. Sa, G. Smolentsev, M. Szlachetko, J. A. van Bokhoven,
@@ -189,23 +233,28 @@ curved with Rs = 250 mm. The width of segmented facets was taken equal to 5 mm
 
 The calculation of energy resolution requires two detector images: 1) of a flat
 energy distribution source and 2) of a monochromatic source. From these two
-images the energy resolution *δE* was calculated and then 3) a verifying image
-was ray-traced for a source of 7 energy lines evenly spaced with the found step
+images, energy resolution *δE* was calculated and then 3) a verifying image was
+ray-traced for a source of 7 energy lines evenly spaced with the found step
 *δE*. Such images are shown for different dicing sizes at a particular Bragg
-angle.
-
-+---------+--------------------+--------------------+--------------------+
-| crystal |     flat source    |     line source    |       7 lines      |
-+=========+====================+====================+====================+
-| diced   |                    |                    |                    |
-| 5 mm    |     |vH5_flat|     |     |vH5_line|     |     |vH5_7lin|     |
-+---------+--------------------+--------------------+--------------------+
-| diced   |                    |                    |                    |
-| 1 mm    |     |vH1_flat|     |     |vH1_line|     |     |vH1_7lin|     |
-+---------+--------------------+--------------------+--------------------+
-| not     |                    |                    |                    |
-| diced   |     |vHc_flat|     |     |vHc_line|     |     |vHc_7lin|     |
-+---------+--------------------+--------------------+--------------------+
+angle. In addition to perfect crystal reflectivity calculations, elastically
+deformed crystal reflectivity was calculated by means of
+:ref:`the Takagi-Taupin equations <useTT>` (labelled TT).
+
++----------+--------------------+--------------------+--------------------+
+| crystal  |     flat source    |     line source    |       7 lines      |
++==========+====================+====================+====================+
+| diced    |                    |                    |                    |
+| 5 mm     |     |vH5_flat|     |     |vH5_line|     |     |vH5_7lin|     |
++----------+--------------------+--------------------+--------------------+
+| diced    |                    |                    |                    |
+| 1 mm     |     |vH1_flat|     |     |vH1_line|     |     |vH1_7lin|     |
++----------+--------------------+--------------------+--------------------+
+| not      |                    |                    |                    |
+| diced    |     |vHc_flat|     |     |vHc_line|     |     |vHc_7lin|     |
++----------+--------------------+--------------------+--------------------+
+| not      |                    |                    |                    |
+| diced TT |     |vHT_flat|     |     |vHT_line|     |     |vHT_7lin|     |
++----------+--------------------+--------------------+--------------------+
 
 .. |vH5_flat| imagezoom:: _images/SivonHamos-5mmDiced60-det_E-flat.*
 .. |vH5_line| imagezoom:: _images/SivonHamos-5mmDiced60-det_E-line.*
@@ -222,6 +271,11 @@ angle.
 .. |vHc_7lin| imagezoom:: _images/SivonHamos-notDiced60-det_E-7lin.*
    :loc: upper-right-corner
 
+.. |vHT_flat| imagezoom:: _images/SivonHamos-notDiced60-det_E-flat_TT.*
+.. |vHT_line| imagezoom:: _images/SivonHamos-notDiced60-det_E-line_TT.*
+.. |vHT_7lin| imagezoom:: _images/SivonHamos-notDiced60-det_E-7lin_TT.*
+   :loc: upper-right-corner
+
 With the coloring by stripe (crystal facet) number, the image below explains
 why energy resolution is worse when stripes are wider and the crystal is
 sagittally larger. The peripheral stripes contribute to aberrations which
@@ -238,7 +292,6 @@ increase the detector image.
 .. |vH5_line_stripes| imagezoom:: _images/SivonHamos-5mmDiced60-det_stripes-line.*
 .. |vH1_line_stripes| imagezoom:: _images/SivonHamos-1mmDiced60-det_stripes-line.*
 
-
 The efficiency of a von Hamos spectrometer is significantly lower as compared
 to Johann and Johansson crystals. The reason for the lower efficiency can be
 understood from the figure below, where the magnified footprint on the crystal
@@ -247,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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -254,7 +308,7 @@ Comparison of Rowland circle based and von Hamos analyzers
 An additional case was also included here: when a Johann crystal is rotated by
 90⁰ around the sample-to-crystal line, it becomes a von Hamos crystal that has
 to be put at a correct distance corresponding to the 1 m sagittal radius. This
-case is labelled as “Johann as von Hamos”.
+case is labelled as "Johann as von Hamos".
 
 In comparing with a von Hamos spectrometer, one should realize its strongest
 advantage – inherent energy dispersive operation without a need for energy
@@ -276,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
@@ -310,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.5.0 → xrt-1.6.1}/examples/withRaycing/06_AnalyzerBent1D/flux-dE.py

@@ -166,16 +166,15 @@ def plot_res_eff():
         t, int(round(e))) for t, e in zip(thetaDegrees, E0s)]
     legBragg = ax1.legend(lines[::block], labelThetas,
                           title='Bragg angle, Si444', numpoints=1, loc=(1, 0))
-    for line in legBragg.get_lines():
-        line._legmarker.set_marker([(4, 3), (-4, 3), (-4, -3), (4, -3)])
-#        line._legmarker.set_marker('.')
-#        raise
+    for i in range(len(legBragg.get_lines())):
+        legBragg.legend_handles[i].set_marker(
+            [(4, 3), (-4, 3), (-4, -3), (4, -3)])
 
     leg = ax1.legend(lines[:block], labels[:block], title='crystal type',
                      numpoints=1, loc=(1, 0.5))
-    for line in leg.get_lines():
-        line._legmarker.set_markerfacecolor('gray')
-        line._legmarker.set_markeredgecolor('gray')
+    for i in range(len(leg.get_lines())):
+        leg.legend_handles[i].set_markerfacecolor('gray')
+        leg.legend_handles[i].set_markeredgecolor('gray')
     ax1.add_artist(legBragg)
 
     if band == 'narrow':