Commit bba086ac authored by payno's avatar payno
Browse files

[doc] fix typo from fail merge action

parent 82812c16
Pipeline #31479 passed with stage
in 19 seconds
......@@ -51,14 +51,11 @@ The result can be displayed using any hdf5 display or using silx:
silx view /data/idxx/inhouse/myname/sample1_.nx
<<<<<<< HEAD
All the .edf files in the origin directory are considered except those having '_slice_' in thir name.
=======
All the .edf files in the origin directory are considered except those having '_slice_' in thir name.
>>>>>>> 0.2
The algorithm selects raw dark fields - darkendxxxx.edf - and raw flat fields refxxxx.edf. However, if processed darks (dark.edf) and refs (refHST) exist,
All the .edf files in the origin directory are considered except those having '_slice_' in their name.
The algorithm selects raw dark fields - darkendxxxx.edf - and raw flat fields refxxxx.edf. However, if processed darks (dark.edf) and refs (refHST) exist,
they are stored in the destination file instead of the raw files.
The names of the motors are hard-coded: 'srot' for the rotation, 'sx', 'sy' and 'sz' for the positionning motors.
The names of the motors are hard-coded: 'srot' for the rotation, 'sx', 'sy' and 'sz' for the positioning motors.
.. note:: The conversion is based on a set of key value that are contained in the EDF file headers.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment