Skip to content

Commit d356af9

Browse files
committed
Fix equations
1 parent 2ba562c commit d356af9

File tree

3 files changed

+55
-6
lines changed

3 files changed

+55
-6
lines changed

docs/source/experiment.rst

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,18 @@ should be created for each configuration that requires a change in the
350350
instrument calibration (wavelength, detector distance, detector
351351
translation) or scan angles.
352352

353+
The detector is chosen from a pull-down menu that contains all the
354+
detectors defined in the *PyFAI* package. This defines the number of
355+
pixels, their size, and a mask array used to exclude all the pixels
356+
within gaps between the detector chips.
357+
353358
Calibrate Powder
354359
----------------
355360
This dialog will import a TIFF or CBF file containing measurements of a
356361
powder calibrant and refine the detector position and coordinates, using
357-
the PyFAI API. Alternatively, if the calibration parameters are already
358-
available in a PONI file, they can be directly imported. The resulting
359-
powder data and calbration parameters are then saved to the
362+
the *PyFAI* API. Alternatively, if the calibration parameters are
363+
already available in a PONI file, they can be directly imported. The
364+
resulting powder data and calbration parameters are then saved to the
360365
configuration template previously created using the *New Configuration*
361366
dialog.
362367

@@ -441,3 +446,44 @@ powder calibration data and parameters to the configuration file. The
441446
calibration parameters can also be saved to a PONI file, using the
442447
"Export Calibration" button. This process should be repeated for each
443448
entry, after which the dialog can be closed.
449+
450+
Create Mask
451+
-----------
452+
This dialog creates a pixel mask that is used to exclude bad pixels from
453+
further analysis. As described above, when a new configuration file is
454+
created, a pixel mask that excludes gaps between detector chips is
455+
automatically added. Additional pixels can be excluded using this
456+
dialog, either by adding editable shapes that are constructively added
457+
to the existing mask or by importing the mask from an external file,
458+
which can store the mask in any image format. The latter is useful if a
459+
beamline regularly updates a particular detector's mask as bad pixels are identified.
460+
461+
.. warning:: If an external mask is input using "Import Mask", it will
462+
overwrite the existing mask. It is important therefore that
463+
the external pixel mask also excludes the detector gaps.
464+
465+
After launching the dialog, the current mask can be plotted by clicking
466+
on "Plot Mask." This overlays the mask on the powder diffraction data to
467+
enable the center of the beam and other features of the data to be
468+
identified.
469+
470+
.. figure:: /images/create-mask.png
471+
:align: center
472+
:width: 80%
473+
474+
*Create Mask dialog. The translucent red circle shows the circle
475+
created by clicking "Add Shape".*
476+
477+
By clicking on "Add Shape" with either a rectangle or circle selected, a
478+
translucent shape is added to the plot. By default, it is centered on
479+
the beam center, but may be moved by dragging the center of the shape
480+
and/or resized by dragging one of the shape edges. When the shape has
481+
the correct position and size, click on "Add Shape" again for the shape
482+
to be added to the current list. A pull-down menu allows existing shapes
483+
to be selected for removal if necessary.
484+
485+
If a more complicated mask is required, it can be generated by an
486+
external image editor and imported using "Import Mask".
487+
488+
When the mask is complete, click "Save" to save it to the configuration file.
489+

docs/source/images/create-mask.png

307 KB
Loading

docs/source/introduction.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,12 @@ where
124124

125125
.. math::
126126
127-
\mathbf{d}(x_{p}, y_{p})=\mathcal{D}\mathcal{O}^{-1}_{det}
128-
\begin{pmatrix}{x_{p}-x_{c}}\\{y_{p}-y_{c}}\\0\end{pmatrix}-\mathcal{G}
129-
\begin{pmatrix}{x_{s}-l_{sd}}\\{y_{s}}\\{z_{s}}\end{pmatrix}
127+
\mathbf{d}(x_{p},
128+
y_{p})=\mathcal{D}\mathcal{O}^{-1}_{det}
129+
\begin{pmatrix}{x_{p}-x_{c}}\\{y_{p}-y_{c}}\\0\end{pmatrix}-
130+
\mathcal{G}
131+
\begin{pmatrix}{x_{s}}\\{y_{s}}\\{z_{s}}\end{pmatrix}-
132+
\begin{pmatrix}{l_{sd}}\\{0}\\{0}\end{pmatrix}
130133
131134
The :math:`\mathcal{B}` matrix is defined by the lattice parameters of
132135
the sample, as described by Busing and Levy in Acta Cryst. **22**, 457

0 commit comments

Comments
 (0)