xrt 1.6.0__zip → 1.6.1__zip

xrt-1.6.1/examples/withRaycing/09_Gratings/GratingFlexPES-turned.py

@@ -0,0 +1,440 @@
+# -*- coding: utf-8 -*-
+__author__ = "Konstantin Klementiev"
+__date__ = "08 Mar 2016"
+import os, sys; sys.path.append(os.path.join('..', '..', '..'))  # analysis:ignore
+import numpy as np
+import copy
+#import matplotlib as mpl
+import matplotlib.pyplot as plt
+
+import xrt.backends.raycing as raycing
+import xrt.backends.raycing.sources as rs
+import xrt.backends.raycing.apertures as ra
+import xrt.backends.raycing.oes as roe
+import xrt.backends.raycing.run as rr
+import xrt.backends.raycing.materials as rm
+import xrt.plotter as xrtp
+import xrt.runner as xrtr
+import xrt.backends.raycing.screens as rsc
+
+showIn3D = True
+
+mGold = rm.Material('Au', rho=19.3)
+mGoldenGrating = rm.Material(
+    'Au', rho=19.3, kind='grating',
+    efficiency=[(1, 2)], efficiencyFile='efficiency1-LEG.txt')
+#    efficiency=[(1, 1)], efficiencyFile='efficiency1-LEG.pickle')
+#    efficiency=[(1, 0.3)])
+#    )
+E0 = 80.
+dE = 0.01
+
+#distE = 'lines'
+#energies = np.linspace(E0-dE, E0+dE, 5)
+
+distE = 'flat'
+energies = E0-dE, E0+dE
+
+#=============================================================================
+# Do not put many scanEnergies AND s1openings together or else you'll have
+# MemoryError due to the numerous plots. You should fix one of the two and scan
+# the other.
+#=============================================================================
+#scanEnergies = np.linspace(E0 - dE*0.75, E0 + dE*0.75, 7)
+scanEnergies = E0,
+#s1openings = np.linspace(0.01, 0.25, 25)
+s1openings = 0.03,
+
+cff = 2.25
+pitch = np.radians(2)
+fixedExit = 30.
+rho = 1221.
+
+
+class Grating(roe.OE):
+    def local_g(self, x, y, rho=rho):
+        return 0, -rho, 0  # constant line spacing along y
+
+
+def build_beamline(azimuth=0, nrays=raycing.nrays):
+    beamLine = raycing.BeamLine(azimuth=azimuth, height=0)
+    rs.GeometricSource(
+        beamLine, 'MAX-IV',
+        nrays=nrays, dx=0.187, dz=0.032, dxprime=77e-6, dzprime=70e-6,
+        distE=distE, energies=energies, polarization='horizontal')
+    beamLine.fsm0 = rsc.Screen(beamLine, 'FSM0')
+    beamLine.m1 = roe.ToroidMirror(
+        beamLine, 'M1', surface=('Au',), material=(mGold,),
+        limPhysX=(-10., 10.), limPhysY=(-150., 150.), positionRoll=np.pi/2,
+        R=1e12, alarmLevel=0.2)
+    beamLine.fsm1 = rsc.Screen(beamLine, 'FSM-M1')
+    beamLine.m2 = roe.OE(
+        beamLine, 'M2', surface=('Au',), material=(mGold,),
+        limPhysX=(-10., 10.), limPhysY=(-150., 150.), alarmLevel=0.2)
+    beamLine.pg = Grating(
+        beamLine, 'PlaneGrating', material=mGoldenGrating,
+        positionRoll=np.pi, limPhysX=(-15., 15.), limPhysY=(-55., 55.),
+        alarmLevel=0.2)
+#    beamLine.pg.order = -2,-1,0,1,2,3
+    beamLine.pg.order = 1
+    beamLine.fsmPG = rsc.Screen(beamLine, 'FSM-PG')
+    beamLine.m3 = roe.ToroidMirror(
+        beamLine, 'M3', material=(mGold,),
+        positionRoll=-np.pi/2, limPhysX=(-15., 15.), limPhysY=(-150., 150.),
+        alarmLevel=0.2)
+    beamLine.fsm3hf = rsc.Screen(beamLine, 'FSM-M3hf')
+    beamLine.fsm3vf = rsc.Screen(beamLine, 'FSM-M3vf')
+
+    beamLine.s1s = [
+        ra.RectangularAperture(
+            beamLine, 'vert. slit', [0, 0, fixedExit],
+            ('bottom', 'top'), [-opening/2., +opening/2.])
+        for opening in s1openings]
+
+    beamLine.m4 = roe.ToroidMirror(
+        beamLine, 'M4', material=(mGold,),
+        positionRoll=np.pi/2, limPhysX=(-15., 15.), limPhysY=(-150., 150.),
+        alarmLevel=0.2)
+    beamLine.fsmExp1 = rsc.Screen(beamLine, 'FSM-Exp1')
+    beamLine.fsmExp2 = rsc.Screen(beamLine, 'FSM-Exp2')
+    return beamLine
+
+
+def run_process(beamLine, shineOnly1stSource=False):
+    beamSource = beamLine.sources[0].shine()
+#    beamLine.feFixedMask.propagate(beamSource)
+    beamFSM0 = beamLine.fsm0.expose(beamSource)
+    beamM1global, beamM1local = beamLine.m1.reflect(beamSource)
+    beamFSM1 = beamLine.fsm1.expose(beamM1global)
+    beamM2global, beamM2local = beamLine.m2.reflect(beamM1global)
+    beamPGglobal, beamPGlocal = beamLine.pg.reflect(beamM2global)
+    beamFSMPG = beamLine.fsmPG.expose(beamPGglobal)
+
+    beamM3global, beamM3local = beamLine.m3.reflect(beamPGglobal)
+    beamFSM3hf = beamLine.fsm3hf.expose(beamM3global)
+    beamFSM3vf = beamLine.fsm3vf.expose(beamM3global)
+
+    outDict = {'beamSource': beamSource,
+               'beamFSM0': beamFSM0,
+               'beamM1global': beamM1global, 'beamM1local': beamM1local,
+               'beamFSM1': beamFSM1,
+               'beamM2global': beamM2global, 'beamM2local': beamM2local,
+               'beamPGglobal': beamPGglobal, 'beamPGlocal': beamPGlocal,
+               'beamFSMPG': beamFSMPG,
+               'beamM3global': beamM3global, 'beamM3local': beamM3local,
+               'beamFSM3hf': beamFSM3hf, 'beamFSM3vf': beamFSM3vf,
+               }
+    for iopening, s1 in enumerate(beamLine.s1s):
+        if showIn3D:
+            beamM3globalCopy = beamM3global
+        else:
+            beamM3globalCopy = copy.deepcopy(beamM3global)
+        beamTemp1 = s1.propagate(beamM3globalCopy)
+        beamFSM3vs = beamLine.fsm3vf.expose(beamM3globalCopy)
+        beamM4global, beamM4local = beamLine.m4.reflect(beamM3globalCopy)
+        beamFSMExp1 = beamLine.fsmExp1.expose(beamM4global)
+        beamFSMExp2 = beamLine.fsmExp2.expose(beamM4global)
+        sti = '{0:02d}'.format(iopening)
+        outDict['beamFSM3vsOp'+sti] = beamFSM3vs
+        outDict['beamM4globalOp'+sti] = beamM4global
+        outDict['beamM4localOp'+sti] = beamM4local
+        outDict['beamFSMExp1Op'+sti] = beamFSMExp1
+        outDict['beamFSMExp2Op'+sti] = beamFSMExp2
+        if showIn3D:
+            break
+
+    if showIn3D:
+        beamLine.prepare_flow()
+    return outDict
+rr.run_process = run_process
+
+eps = 1e-5
+
+
+def align_grating(grating, E, m, cff):
+    g = grating.local_g(0, 0)
+    rho = np.dot(g, g)**0.5
+
+    order = abs(m) if cff > 1 else -abs(m)
+    f1 = cff**2 + 1
+    f2 = cff**2 - 1
+    if abs(f2) < eps:
+        raise ValueError('cff is not allowed to be close to 1!')
+
+    ml_d = order * rho * rm.ch / E * 1e-7
+    cosAlpha = np.sqrt(-ml_d**2 * f1 + 2*abs(ml_d) *
+                       np.sqrt(f2**2 + cff**2 * ml_d**2)) / abs(f2)
+    cosBeta = cff * cosAlpha
+    alpha = np.arccos(cosAlpha)
+    beta = -np.arccos(cosBeta)
+    return alpha, beta
+
+
+def align_beamline(
+    beamLine, E0=E0, pitchM1=pitch, cff=cff, fixedExit=fixedExit,
+        pitchM3=pitch, pitchM4=pitch):
+    pM1 = 12000.
+    beamLine.sources[0].center = pM1 * np.sin(2*pitchM1), \
+        -pM1 * np.cos(2*pitchM1), 0
+    beamLine.fsm0.center = beamLine.sources[0].center
+
+    rM1 = 2. * pM1 * np.sin(pitchM1)
+    print('M1: r = {0} mm'.format(rM1))
+    beamLine.m1.center = 0, 0, 0
+    beamLine.m1.pitch = pitchM1
+    beamLine.m1.r = rM1
+
+    beamLine.fsm1.center = beamLine.m1.center
+
+    if isinstance(beamLine.pg.order, int):
+        m = beamLine.pg.order
+    else:
+        m = beamLine.pg.order[0]
+    alpha, beta = align_grating(beamLine.pg, E0, m=m, cff=cff)
+    includedAngle = alpha - beta
+    print('alpha = {0} deg'.format(np.degrees(alpha)))
+    print('beta = {0} deg'.format(np.degrees(beta)))
+    print('included angle = {0} deg'.format(np.degrees(includedAngle)))
+    print('cos(beta)/cos(alpha) = {0}'.format(np.cos(beta)/np.cos(alpha)))
+    t = -fixedExit / np.tan(includedAngle)
+    print('t = {0} mm'.format(t))
+    pPG = 3000.
+    beamLine.m2.center = 0, pPG - t, 0
+    beamLine.m2.pitch = (np.pi - includedAngle) / 2.
+    print('M2 pitch = {0} deg'.format(np.degrees(beamLine.m2.pitch)))
+    beamLine.m2.yaw = -2 * pitchM1
+    beamLine.pg.pitch = -(beta + np.pi/2)
+    print('PG pitch = {0} deg'.format(np.degrees(beamLine.pg.pitch)))
+    beamLine.pg.center = 0, pPG, fixedExit
+    beamLine.pg.yaw = -2 * pitchM1
+
+    beamLine.fsmPG.center = 0, beamLine.pg.center[1]+1000, fixedExit
+
+    pM3 = 1000.
+    pM3mer = pM1 + pPG + pM3
+    qM3mer = 5000.
+    qM3sag = 7000.
+    sinPitchM3 = np.sin(pitchM3)
+    rM3 = 2. * sinPitchM3 * qM3sag
+    RM3 = 2. / sinPitchM3 * (pM3mer*qM3mer) / (pM3mer+qM3mer)
+    print('M3: r = {0} mm, R = {1} m'.format(rM3, RM3*1e-3))
+    beamLine.m3.center = 0, pPG + pM3, fixedExit
+    beamLine.m3.pitch = -2*pitchM1 + pitchM3
+    beamLine.m3.r = rM3
+    beamLine.m3.R = RM3
+
+    beamLine.fsm3hf.center = -qM3mer * np.sin(2*pitchM3),\
+        beamLine.m3.center[1] + qM3mer * np.cos(2*pitchM3), fixedExit
+    beamLine.fsm3vf.center = -qM3sag * np.sin(2*pitchM3),\
+        beamLine.m3.center[1] + qM3sag * np.cos(2*pitchM3), fixedExit
+    for s1 in beamLine.s1s:
+        s1.center = beamLine.fsm3vf.center
+
+    pM4mer = 5000.
+    pM4sag = 3000.
+    qM4 = 3500.
+    sinPitchM4 = np.sin(pitchM4)
+    rM4 = 2. * sinPitchM4 * (pM4sag*qM4) / (pM4sag+qM4)
+    RM4 = 2. / sinPitchM4 * (pM4mer*qM4) / (pM4mer+qM4)
+    print('M4: r = {0} mm, R = {1} m'.format(rM4, RM4*1e-3))
+    dM34 = qM3mer + pM4mer  # = qM3sag + pM4sag
+    beamLine.m4.center = -dM34 * np.sin(2*pitchM3),\
+        beamLine.m3.center[1] + dM34 * np.cos(2*pitchM3), fixedExit
+    beamLine.m4.pitch = 2*pitchM1 - 2*pitchM3 + pitchM4
+    beamLine.m4.r = rM4
+    beamLine.m4.R = RM4
+
+    qFSMExp1 = 1500.  # upstream of the focus
+    beamLine.fsmExp1.center = beamLine.m4.center[0],\
+        beamLine.m4.center[1] + qM4 - qFSMExp1, fixedExit
+    beamLine.fsmExp2.center = beamLine.m4.center[0],\
+        beamLine.m4.center[1] + qM4, fixedExit
+
+
+def define_plots(beamLine):
+    plots = []
+    plotsMono = []
+    plotsFocus = []
+
+#    plot = xrtp.XYCPlot('beamSource', (1,),
+#      xaxis=xrtp.XYCAxis(r'$x$', 'mm'),
+#      yaxis=xrtp.XYCAxis(r'$z$', 'mm'))
+#    plot.xaxis.fwhmFormatStr = '%.3f'
+#    plot.yaxis.fwhmFormatStr = '%.3f'
+#    plots.append(plot)
+
+    plot = xrtp.XYCPlot(
+        'beamFSM0', (1,),
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm'),
+        yaxis=xrtp.XYCAxis(r'$z$', 'mm'),
+        title='00-FSM0')
+    plot.xaxis.fwhmFormatStr = '%.3f'
+    plot.yaxis.fwhmFormatStr = '%.3f'
+    plots.append(plot)
+#
+#    plot = xrtp.XYCPlot(
+#        'beamM1local', (1,), aspect='auto',
+#        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+#        yaxis=xrtp.XYCAxis(r'$y$', 'mm', limits=[-150, 150]),
+#        title='01-M1local')
+#    plots.append(plot)
+#
+    plot = xrtp.XYCPlot(
+        'beamFSM1', (1,),
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+        yaxis=xrtp.XYCAxis(r'$z$', 'mm', limits=[-4, 4]),
+        title='02-FSM1')
+    plots.append(plot)
+#
+#    plot = xrtp.XYCPlot(
+#        'beamM2local', (1,), aspect='auto',
+#        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+#        yaxis=xrtp.XYCAxis(r'$y$', 'mm', limits=[-55, 55]),
+#        title='03-M2local')
+#    plots.append(plot)
+#
+    plot = xrtp.XYCPlot(
+        'beamPGlocal', (1,), aspect='auto',
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+        yaxis=xrtp.XYCAxis(r'$y$', 'mm', limits=[-55, 55]),
+        title='04-PGlocal')
+    plots.append(plot)
+
+    plot = xrtp.XYCPlot(
+        'beamFSMPG', (1,),
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+        yaxis=xrtp.XYCAxis(r'$z$', 'mm', limits=[-4, 4]),
+        title='05-FSMPG')
+    plots.append(plot)
+
+    plot = xrtp.XYCPlot(
+        'beamFSMPG', (1,),
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+        yaxis=xrtp.XYCAxis(r'$z$', 'mm', limits=[-4, 4]),
+        caxis=xrtp.XYCAxis('path', 'mm'),
+        title='05-FSMPG-P')
+    plot.caxis.offset = 16000
+    plots.append(plot)
+
+    plot = xrtp.XYCPlot(
+        'beamM3local', (1,), aspect='auto',
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+        yaxis=xrtp.XYCAxis(r'$y$', 'mm', limits=[-150, 150]),
+        title='06-M3local')
+    plots.append(plot)
+
+    plot = xrtp.XYCPlot(
+        'beamFSM3hf', (1,),
+        xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-0.5, 0.5]),
+        yaxis=xrtp.XYCAxis(r'$z$', 'mm',
+                           limits=[-0.5, 0.5]),
+        title='07-FSM3hf')
+    plots.append(plot)
+
+    for is1, (s1, op) in enumerate(zip(beamLine.s1s, s1openings)):
+        sti = '{0:02d}'.format(is1)
+
+        plot = xrtp.XYCPlot(
+            'beamFSM3vf', (1,),
+            xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-0.5, 0.5]),
+            yaxis=xrtp.XYCAxis(r'$z$', 'mm',
+                               limits=[-0.5, 0.5]),
+            title='08-FSM3vfOp'+sti, oe=s1)
+        plots.append(plot)
+
+        plot = xrtp.XYCPlot(
+            'beamFSM3vsOp'+sti, (1,),
+            xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-0.5, 0.5]),
+            yaxis=xrtp.XYCAxis(r'$z$', 'mm',
+                               limits=[-0.5, 0.5]),
+            title='09-FSM3vsOp'+sti)
+        plots.append(plot)
+        plotsMono.append(plot)
+
+        plot = xrtp.XYCPlot(
+            'beamM4localOp'+sti, (1,), aspect='auto',
+            xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-4, 4]),
+            yaxis=xrtp.XYCAxis(r'$y$', 'mm', limits=[-150, 150]),
+            title='10-M4localOp'+sti)
+        plots.append(plot)
+        plotsMono.append(plot)
+
+        plot = xrtp.XYCPlot(
+            'beamFSMExp1Op'+sti, (1,),
+            xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-1, 1]),
+            yaxis=xrtp.XYCAxis(r'$z$', 'mm',
+                               limits=[-1, 1]),
+            title='11-FSMExp1Op'+sti)
+        plot.xaxis.fwhmFormatStr = '%.3f'
+        plot.yaxis.fwhmFormatStr = '%.3f'
+        plots.append(plot)
+        plotsMono.append(plot)
+
+        plot = xrtp.XYCPlot(
+            'beamFSMExp2Op'+sti, (1,),
+            xaxis=xrtp.XYCAxis(r'$x$', 'mm', limits=[-0.25, 0.25]),
+            yaxis=xrtp.XYCAxis(r'$z$', 'mm',
+                               limits=[-0.25, 0.25]),
+            caxis=xrtp.XYCAxis('energy', 'eV', bins=256, ppb=1),
+            title='12-FSMExp2Op'+sti)
+        plot.xaxis.fwhmFormatStr = '%.3f'
+        plot.yaxis.fwhmFormatStr = '%.3f'
+        if len(s1openings) > 1:
+            plot.textPanel = plot.fig.text(
+                0.8, 0.8, u'slit opening\n{0:.0f} µm'.format(op*1e3),
+                transform=plot.fig.transFigure, size=14, color='r', ha='left')
+        plots.append(plot)
+        plotsMono.append(plot)
+        plotsFocus.append(plot)
+
+    for plot in plots:
+        if "energy" in plot.caxis.label:
+            plot.caxis.limits = [E0-dE, E0+dE]
+            plot.caxis.offset = E0
+        if plot in plotsMono:
+            plot.caxis.fwhmFormatStr = '%.4f'
+        else:
+            plot.caxis.fwhmFormatStr = None
+    return plots, plotsMono, plotsFocus
+
+
+def plot_generator(plots, plotsMono, plotsFocus, beamLine):
+    for ienergy, energy in enumerate(scanEnergies):
+        align_beamline(beamLine, E0=energy)
+        for plot in plots:
+            plot.saveName = 'FlexPES-{0}-{1}.png'.format(
+                plot.title, ienergy)
+        yield
+    if len(s1openings) > 1:
+        flux = np.array([plot.intensity for plot in plotsFocus])
+        dE = np.array([E0/plot.dE*1e-4 for plot in plotsFocus])
+        op = np.array(s1openings)
+        fig = plt.figure(figsize=(5, 4), dpi=72)
+        fig.subplots_adjust(right=0.88, bottom=0.12)
+        ax1 = fig.add_subplot(111)
+        ax2 = ax1.twinx()
+        ax1.set_title('At E = 40 eV')
+        ax1.plot(op*1e3, dE, '-r', lw=2)
+        ax2.plot(op*1e3, flux/max(flux), '-b', lw=2)
+        ax1.set_xlabel(u'slit opening (µm)')
+        ax1.set_ylabel(r'energy resolution $E/dE\times10^{4}$', color='r')
+        ax2.set_ylabel('relative flux', color='b')
+        fig.savefig('FlexPES-dE.png')
+
+
+def main():
+    beamLine = build_beamline(azimuth=-2*pitch, nrays=10000)
+    align_beamline(beamLine)
+    if showIn3D:
+        beamLine.glow(scale=[100, 10, 1000], centerAt='M2')
+        return
+    plots, plotsMono, plotsFocus = define_plots(beamLine)
+    args = [plots, plotsMono, plotsFocus, beamLine]
+    xrtr.run_ray_tracing(plots, repeats=1, beamLine=beamLine,
+                         generator=plot_generator, generatorArgs=args,
+                         processes='half')
+
+#this is necessary to use multiprocessing in Windows, otherwise the new Python
+#contexts cannot be initialized:
+if __name__ == '__main__':
+    main()

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

@@ -57,9 +57,14 @@ at *q* = 20 m, whereas the Bragg crystal provides good energy resolution. One
 can easily study how the band width affects the focusing properties (not shown
 here).
 
-.. imagezoom:: _images/BFZPlocalFull.png
-.. imagezoom:: _images/BFZPlocal.png
-.. animation:: _images/BraggFresnel
++---------+---------+---------+
+|  |bf1|  |  |bf2|  |  |bf3|  |
++---------+---------+---------+
+
+.. |bf1| imagezoom:: _images/BFZPlocalFull.png
+.. |bf2| imagezoom:: _images/BFZPlocal.png
+.. |bf3| animation:: _images/BraggFresnel
+   :loc: upper-right-corner
 
 Generic cPGM beamline
 ~~~~~~~~~~~~~~~~~~~~~
@@ -73,14 +78,24 @@ density is 1221 mm\ :sup:`-1`\ .
 An energy scan at a given vertical slit (here, 30 µm) between M3 and M4. Shown
 are images at the slit and at the final focus 'Exp2':
 
-.. animation:: _images/FlexPES-energyScanAtSlit
-.. animation:: _images/FlexPES-energyScan
++--------------+--------------+
+|  |FlexPES1|  |  |FlexPES2|  |
++--------------+--------------+
+
+.. |FlexPES1| animation:: _images/FlexPES-energyScanAtSlit
+.. |FlexPES2| animation:: _images/FlexPES-energyScan
+   :loc: upper-right-corner
 
 A vertical slit scan at a given energy (here, 40 eV) with a final dependency of
 energy resolution and flux on the slit size:
 
-.. animation:: _images/FlexPES-slitScan
-.. imagezoom:: _images/FlexPES-dE.png
++--------------+--------------+
+|  |FlexPES3|  |  |FlexPES4|  |
++--------------+--------------+
+
+.. |FlexPES3| animation:: _images/FlexPES-slitScan
+.. |FlexPES4| imagezoom:: _images/FlexPES-dE.png
+   :loc: upper-right-corner
 
 """
 pass

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/10_MultipleReflect/BentTaperedPolyCapillary.py

@@ -65,7 +65,7 @@ class BentCapillary(roe.OE):
 
     def xyz_to_param(self, x, y, z):
         """ *s*, *r*, *phi* are cynindrc-like coordinates of the capillary.
-        *s* is along y in inverse direction, started at the exit,
+        *s* is along y in the reverse direction, starting at the exit,
         *r* is measured from the capillary axis x0(s)
         *phi* is the polar angle measured from the z (vertical) direction."""
         s = self.f - y

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/10_MultipleReflect/__init__.py

@@ -24,14 +24,24 @@ another shape. The coloring is by categories and the number of reflections.
 Notice a gap between the mirrors (here 0.2 mm) that transforms into a diagonal
 gap in the final image.
 
-.. imagezoom:: _images/Montel_par_exit_cat.png
-.. imagezoom:: _images/Montel_par_exit_n.png
++-------------+-------------+
+|  |montel1|  |  |montel2|  |
++-------------+-------------+
+
+.. |montel1| imagezoom:: _images/Montel_par_exit_cat.png
+.. |montel2| imagezoom:: _images/Montel_par_exit_n.png
+   :loc: upper-right-corner
 
 In the present example one can visualize the local footprints on either of the
 mirrors. The footprints are colored by the number of reflections.
 
-.. imagezoom:: _images/Montel_par_localHFM_n.png
-.. imagezoom:: _images/Montel_par_localVFM_n.png
++-------------+-------------+
+|  |montel3|  |  |montel4|  |
++-------------+-------------+
+
+.. |montel3| imagezoom:: _images/Montel_par_localHFM_n.png
+.. |montel4| imagezoom:: _images/Montel_par_localVFM_n.png
+   :loc: upper-right-corner
 
 .. _polycapillary:
 
@@ -51,8 +61,13 @@ reflected by the capillaries, the orange ones are transmitted without any
 reflection and the red ones are absorbed) and a longitudinal cross-section
 (note very different scales of *x* and *y* axes).
 
-.. imagezoom:: _images/NCapillaries-a-FSM1Cat.png
-.. imagezoom:: _images/PolycapillaryZ0crosssection.png
++----------+----------+
+|  |cap1|  |  |cap2|  |
++----------+----------+
+
+.. |cap1| imagezoom:: _images/NCapillaries-a-FSM1Cat.png
+.. |cap2| imagezoom:: _images/PolycapillaryZ0crosssection.png
+   :loc: upper-right-corner
 
 Each capillary reflects the rays many times until they are out. The local
 footprints over the capillary surface are vs. the polar angle and the
@@ -71,7 +86,9 @@ from the capillary.
 .. |cN0| imagezoom:: _images/NCapillaries-b-Local0N.png
 .. |cTheta0| imagezoom:: _images/NCapillaries-c-Local0Theta.png
 .. |cN5| imagezoom:: _images/NCapillaries-b-Local5N.png
+   :loc: upper-right-corner
 .. |cTheta5| imagezoom:: _images/NCapillaries-c-Local5Theta.png
+   :loc: upper-right-corner
 .. |cN11| imagezoom:: _images/NCapillaries-b-Local11N.png
    :loc: upper-right-corner
 .. |cTheta11| imagezoom:: _images/NCapillaries-c-Local11Theta.png
@@ -84,8 +101,13 @@ below. The phase space of the exit beam (shown is the horizontal one) shows the
 quality of collimation, see below. The divergence of ~1 mrad is large and
 cannot be efficiently used with a flat crystal analyzer.
 
-.. imagezoom:: _images/NCapillaries-e-FSM2-xzN.png
-.. imagezoom:: _images/NCapillaries-f-FSM2-xPhaseSpaceN.png
++----------+----------+
+|  |cap3|  |  |cap4|  |
++----------+----------+
+
+.. |cap3| imagezoom:: _images/NCapillaries-e-FSM2-xzN.png
+.. |cap4| imagezoom:: _images/NCapillaries-f-FSM2-xPhaseSpaceN.png
+   :loc: upper-right-corner
 
 One may attempt to add a second-stage to collimate the beam with ~1 mrad
 divergence. However, this would not work because the rays collimated by a
@@ -93,6 +115,7 @@ polycapillary have a very large distribution of the ray origins over the
 longitudinal direction *y*, as shown below.
 
 .. imagezoom:: _images/NCapillaries-g-CapillaryOut-depthX.png
+   :align: center
 
 """
 pass

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/11_Waves/doubleSlitScan.py

@@ -10,8 +10,14 @@ slit width is 10 µm, the slit separation is variable (displayed is edge-to-edge
 distance), the slit position is 90 m from the source and the screen is at 110
 m.
 
-.. animation:: _images/YoungRays
-.. animation:: _images/YoungWave
++---------------+---------------+
+|  |YoungRays|  |  |YoungWave|  |
++---------------+---------------+
+
+.. |YoungRays| animation:: _images/YoungRays
+   :alt:  in ray tracing
+.. |YoungWave| animation:: _images/YoungWave
+   :alt:  in wave propagation
 
 """
 __author__ = "Roman Chernikov", "Konstantin Klementiev"
@@ -96,7 +102,6 @@ else:
     xName = '$x$'
     zName = '$z$'
     unit = u'µm'
-    dunit = '$\mu$rad'
 
 dx = (xlimits[1] - xlimits[0]) / xBins
 xmesh = np.linspace((xlimits[0] + dx/2) / xfactor,
@@ -206,7 +211,7 @@ def plot_generator(plots, beamLine):
         beamLine.fsm1.center[1] = (R0s+dX)*1000.
         str1 = '{0} - slit at {1:.0f}m, deltaSlit {2:03.0f}mum'
         str2 = ', slitWidth {3:.0f}mum, screen at {4:.0f}m.png'
-        tt = u'$\Delta$ slit = {0:.0f} µm'.format((slitZ-slitwidth)*1e3)
+        tt = u'Δ slit = {0:.0f} µm'.format((slitZ-slitwidth)*1e3)
         for plot in plots:
             plot.ax2dHist.locator_params(axis='x', nbins=4)
             plot.xaxis.limits = xlimits

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/11_Waves/slitscan.py

@@ -43,9 +43,13 @@ because the horizontal emittance is much larger than the vertical one.
 .. |slit_w0_300| imagezoom:: _images/slit_w0_300.*
 
 .. |slit_wr_100| imagezoom:: _images/slit_wr_100.*
+   :loc: upper-right-corner
 .. |slit_wr_150| imagezoom:: _images/slit_wr_150.*
+   :loc: upper-right-corner
 .. |slit_wr_200| imagezoom:: _images/slit_wr_200.*
+   :loc: upper-right-corner
 .. |slit_wr_300| imagezoom:: _images/slit_wr_300.*
+   :loc: upper-right-corner
 
 .. |e100| imagezoom:: _images/slit_e_100.*
    :loc: upper-right-corner

{xrt-1.6.0 → xrt-1.6.1}/examples/withRaycing/11_Waves/waveFZP.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""
+r"""
 .. !!! select one of the two functions to run at the very bottom !!!
 
 .. _fzpDiffraction:
@@ -7,19 +7,24 @@
 Diffraction from FZP
 --------------------
 
+.. imagezoom:: _images/1-LE-FZP_70nm-orders-r_E.*
+   :align: right
+
 This examples demonstrates diffraction from a Fresnel Zone Plate with variously
 thick outer zone and at variable energy. The radial intensity distribution is
 shown in the figure below for a 70-nm-outer-zone FZP. Notice that the 2nd order
 was also calculated and together with other even orders indeed results in
 vanishing intensity.
 
-.. imagezoom:: _images/1-LE-FZP_70nm-orders-r_E.*
-
 The energy dependence of efficiency for 3 different FZPs is shown below. The
 horizontal bars mark the expected :math:`1/m^2\pi^2` levels for odd orders and
 25% transmission for the 0th order. Watch how a zone plate becomes a band pass
 filter as the outer zone size approaches the wavelength, here ~10 nm.
 
+.. raw:: html
+
+    <div class="clearer"> </div>
+
 +----------+----------+----------+
 | |FZP_70| | |FZP_50| | |FZP_30| |
 +----------+----------+----------+