Skip to content

make a clear distinction between aperture name and size

Wout De Nolf requested to merge fix_mxpress_setup_aperture into main

Closes #27 (closed)

https://requests.esrf.fr/browse/DPC-326

https://requests.esrf.fr/browse/DPC-327

https://requests.esrf.fr/browse/DPC-328

Apertures have names (strings) and sizes in micron (integers). The names can be "A20, "A30", ... or simply "20", "30", ... or other strings like "outBeam". Currently I see mostly "A20, "A30", ... except for the simulator I think which uses "20", "30", ...

Getting and setting apertures from/to MXCube

bes.workflow_lib.collect had

  • getApertureList
  • getAperture
  • setAperture

These MXCube calls only deal with names, not with sizes.

After this MR bes.workflow_lib.collect has

  • getApertureNames
  • getApertureName
  • setApertureName
  • getApertureSize
  • setApertureSize

Workflow parameter names

  • targetAperture -> targetApertureName
  • preferredAperture -> preferredApertureName
  • preferredAperture -> preferredApertureName
  • dozormTargetAperture -> dozormTargetApertureSize

Aperture names are unique, sizes might not be so we use the names are parameters. dozormTargetApertureSize comes from a calculation so this has to be a size.

BES configuration

  • fixedTargetAperture -> fixedTargetApertureSize
  • apertures -> apertureSizes
Edited by Wout De Nolf

Merge request reports