Skip to content

Commit

Permalink
Update docs
Browse files Browse the repository at this point in the history
  • Loading branch information
noemifrisina committed Sep 11, 2024
1 parent 2fe1ae6 commit 2d4a386
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ shell commands pointing to the correct scripts/edm locations.

.. code:: bash
./path/to/mx-bluesky/deploy/deploy_edm_for_ssx.sh
./path/to/mx-bluesky/utility_scripts/deploy/deploy_edm_for_ssx.sh
Setting the current visit directory
===================================
Expand All @@ -37,7 +37,7 @@ point to the current visit and then running the command:

.. code:: bash
./path/to/mx-bluesky/src/mx_bluesky/i24/serial/set_visit_directory.sh
./path/to/mx-bluesky/src/mx_bluesky/beamlines/i24/serial/set_visit_directory.sh
Note that the default experiment type for the script setting the
directory will be ``fixed-target``. In case of an extruder collection,
Expand All @@ -46,4 +46,4 @@ the command line.

.. code:: bash
./path/to/mx-bluesky/src/mx_bluesky/i24/serial/set_visit_directory.sh extruder
./path/to/mx-bluesky/src/mx_bluesky/beamlines/i24/serial/set_visit_directory.sh extruder
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ A couple of entry points have been set up so that:

Before opening the experiment specific edm, each of these entry points
will start a ``BlueAPI`` server. The configuration used by ``BlueAPI``
is saved in ``src/mx_bluesky/i24/serial/blueapi_config.yaml``.
is saved in ``src/mx_bluesky/beamlines/i24/serial/blueapi_config.yaml``.

Detector choice
===============
Expand Down Expand Up @@ -54,7 +54,9 @@ into a single sub-directory but split into multiple smaller collections.

For a pump-probe experiment, select ``True`` on the dropdown menu in
``Data Collection Setup`` and then set the laser dwell and delay times
in the ``Pump Probe`` panel. **WARNING** This setting requires an
in the ``Pump Probe`` panel.

**WARNING** This setting requires an
hardware change, as there are only 4 outputs on the zebra and they are
all in use. When using the Eiger the Pilatus trigger cable should be
used to trigger the light source. When using the pilatus the eiger
Expand All @@ -75,7 +77,7 @@ set up the coordinate system.

Before this step remember to reset the scale and skew factors as well as
the motor directions as needed. Current values are saved in
``src/mx_bluesky/i24/serial/parameters/fixed_target`` in the
``src/mx_bluesky/beamlines/i24/serial/parameters/fixed_target`` in the
``cs_maker.json`` and ``motor_direction.txt`` files.

1. From the main edm screen open the ``viewer`` and ``moveonclick``.
Expand Down Expand Up @@ -146,17 +148,15 @@ set the laser dwell and delay times accordingly.
For more details on the pump probe settings see `Dynamics and fixed
targets <https://confluence.diamond.ac.uk/display/MXTech/Dynamics+and+fixed+targets>`__

III - **Save the parameters**

**This step cannot be skipped!**

Once all of the previous steps have been completed - and before running
a collection - all parameters have to be saved using the
``Set parameters`` button so that they can be applied to the collection.
A copy parameter file will be saved along with the chip map (if
applicable) in the data directory at collection time.

IV - **Run a collection**
III - **Run a collection**

Once all parameters have been set, press ``Start`` to run the
collection. A stream log will show what is going on in the terminal.


**NOTE** As of version `1.0.0`, the ``Set parameters`` button has been removed and
the parameters will now be read from the edm and applied to the collection directly
once the ``Start`` button is pressed. For previous versions however, the button must
still be pressed before starting the collection. A copy of the parameter file and chip
map (if applicable) will still be saved in the data directory at collection time.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ in a couple of different ways.

.. code:: python
yield from bps.mv(pmac.x, 0, pmac.y, 1)https://github.com/DiamondLightSource/mx-bluesky/wiki/Serial-Crystallography-on-I24#cs_reset-custom-chips
yield from bps.mv(pmac.x, 0, pmac.y, 1)
Notes on the coordinate system for a fixed-target collection
============================================================
Expand Down

0 comments on commit 2d4a386

Please sign in to comment.