Skip to content

Commit

Permalink
a few updates and typo corrections for 2024-1
Browse files Browse the repository at this point in the history
  • Loading branch information
bruceravel committed Jan 23, 2024
1 parent 8d8378b commit 14ca0fd
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 26 deletions.
33 changes: 24 additions & 9 deletions docs/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ This provides a (very) concise overview of the state of the beamline.
**Top line**
In short, if the top line has no red text, the beamline is all ready to go.

+ BMM is enabled (green) or disabled (red)
+ The BM, FE, & user photon shutters are open (green) or closed (red)
+ The ring current
+ BMM is enabled (green) or disabled (gray)
+ The BM, FE, & user photon shutters are open (green) or closed (gray)
+ Indicators that the temperature sensors in the racks are in range
(green) or running hot (red)
+ The state of vacuum sections 1 through 7 |nd| green means vacuum
level is OK, red means vacuum level is high
+ The state of the in-vacuum motors, 4 on the DCM, 2 on the
Expand All @@ -123,19 +124,25 @@ This provides a (very) concise overview of the state of the beamline.

**Middle line**
+ The energy position of the monochromator
+ The signals on the I0 and It ion chambers, measured in nanoamps
+ The current element and edge configuration of the beamline
+ The ring current
+ The signals on the I\ :sub:`0`, I\ :sub:`t`, and I\ :sub:`r` ion
chambers, measured in nanoamps
+ The current operation at the beamline, options are: idle (white),
XAFS scan (pink), line scan (cyan), area scan (yellow), or time
scan (blue)

**Bottom line**
+ Positions of common sample motors and size of sample slits
+ Positions of common sample motors
+ size of sample slits
+ the element currently in the reference position
+ the state of the instrument being used |nd| in this example, *the
ex-situ* sample wheel
+ the brown block at the end is a heartbeat monitor to visually
verify that the dashboard is functioning correctly

For more information about this tool, `follow this link
<https://wiki-nsls2.bnl.gov/beamline6BM/index.php/Cadashboard>`_,
which explains how to run the tool and position it on the screen. It
also explains how to launch the tool when the beamline is set up for
XRD measurements.
<https://wiki-nsls2.bnl.gov/beamline6BM/index.php/Cadashboard>`_.


.. _slack:
Expand All @@ -161,6 +168,14 @@ physically at the beamline.
An example of messages and a picture of measured data posted to the
beamline Slack channel.

.. attention::

In the 2024-1 cycle, BMM is no longer synching data automatically
to Google Drive, although data will be manually transferred to a
Google Drive for the time being. Soon, data will be available to
users via sftp with proper integration into new data storage and
authentication services in the 2024-2 cycle.

The measured data along with the entire contents of the
:numref:`measurement dossier (Section %s) <dossier>` will be synched
to Google Drive. At the beginning of the experiment (in fact, when
Expand Down
2 changes: 0 additions & 2 deletions docs/linescans.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ will then move to the motor position you clicked on.
You can skip the "click for motor position" step by typing
:key:`n` and hitting :key:`Enter`.

.. todo:: Document plucking with Kafka + verification interaction


Plucking a point from a line scan
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
6 changes: 6 additions & 0 deletions docs/manage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,12 @@ Ni, Cu, Zn, Pt, Au, Pb, Nb, and Mo.
the monochromator. Those will be computed from the edge energy
values you edited into the INI file by hand.

.. todo::

Implement on-the-fly determination of E0 to obviate the step of
editing the INI file. Pb is tricky. Nb and Mo are kind of tricky.


..
Compute the
angular positions using
Expand Down
17 changes: 9 additions & 8 deletions docs/motors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -262,20 +262,21 @@ crystalline substrate into the fluorescence detector to be suppressed.

To move to a sample position::

RE(ga.to(<N>))
RE(ga.to(3))

where ``<N>`` is a number from 1 to 8, as shown by the labels in
:numref:`Figure %s <fig-gastage>`. This command will rotate that
sample into the beam path and start the sample spinning.
where the argument is a number from 1 to 8, as shown by the labels in
:numref:`Figure %s <fig-gastage>`. This command will turn off all
other spinners, rotate that sample into the beam path, and start the
sample spinning.

To turn a spinner on or off::
To turn a spinner on or off, where the argument is a number from 1 to 8::

ga.on(<N>)
ga.off(<N>)
RE(ga.on(3))
RE(ga.off(3))

To turn off all spinners::

ga.alloff()
RE(ga.alloff())

In a plan::

Expand Down
14 changes: 7 additions & 7 deletions docs/pds.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ This dictionary identifies the positions in ``xafs_ref`` and
``xafs_refx`` for each reference sample. It also identifies the form
of the reference samples and its chemical composition.

To see the available reference mayerials and their positions on the
To see the available reference materials and their positions on the
reference wheel, do ``%se``.

`Here is a complete list of standards
Expand Down Expand Up @@ -486,13 +486,13 @@ to define the beam size on the sample.
=============== ======== ======================= ===================


The individual blades are moved like any other motor::
The individual blades are moved like any other motor, for example::

RE(mv(slits3.outboard, -0.5))
RE(mvr(slits3.top, -0.1))


Coordinated motions are moved the same way::
Coordinated motions are moved the same way, for example::

RE(mv(slits3.hsize, 6))
RE(mvr(slits3.vcenter, -0.1))
Expand Down Expand Up @@ -542,8 +542,8 @@ Mode XRD delivers high energy, focused beam to the goniometer.
XRD |checkmark| above 8 keV
====== ============ =========================

.. todo:: Lookup table not complete for mode B. In fact, the ydo and
ydi jacks of M3 cannot move low enough to enter mode B. In
.. todo:: The lookup table is not complete for mode B. In fact, the
ydo and ydi jacks of M3 cannot move low enough to enter mode B. In
practice, mode B is not available. Elements that should be
measured in mode B are, instead, measured in mode C and we live
with incomplete harmonic rejection.
Expand Down Expand Up @@ -581,8 +581,8 @@ or::
This will move the lateral motor of the monochromator between the two
crystal sets and adjust the pitch of the second crystal to be nearly
in tune and the roll to deliver the beam to nearly the same location
for both crystals. It will also return the monochromator to the same
energy.
for both crystals. It will also return the monochromator to the
starting energy.

This takes about 5 minutes.

Expand Down
2 changes: 2 additions & 0 deletions docs/todo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Chapters needed:
#. Dealing with XRF spectra, including ``%xrf``, ``xrfat()``, saving
XRF spectra
#. Valence maps
#. Document why M1 is the way it is, explain why moving it is a BAD
idea, explain front end slits


This is an aggregate list of things missing from the BMM beamline
Expand Down

0 comments on commit 14ca0fd

Please sign in to comment.