Skip to content

Refactor Flat motion for Daiquiri interaction

Valentin Valls requested to merge flat-motion into main

Rework the flat motion as a shareable component.

  • Added ability to use or not a motor to take flats
  • Changed component name TomoRefMot into FlatMotion
  • Changed FlatMotion meaning of motor configuration to motors which can be selected for the motion
  • Changed FlatMotion inheritance from TomoParameters to BeaconObject
  • Changed FlatMotion motion storage as single list of named tuple
  • Removed FlatMotion.parameters was removed
DEMO_SESSION [1]: tomo3_config.reference
         Out [1]: Flat displacement info: tomo3cam_ref_displ

                  Role
                  -----------------  -------
                  motor              sy, sy2
                  settle_time        2.000 s
                  power_onoff        False
                  always_update_pos  False
                  move_in_parallel   True

                  Out beam motion

                  Axis name        Relative motion    Absolute motion
                  ---------------  -----------------  -----------------
                  -> sy            +1500.000000 mm
┌─────────────────────────────| Reference Displacement Setup |─────────────────────────────┐
│                                                                                          │
│ ┌────────────────────────────────────────| sy |────────────────────────────────────────┐ │
│ │[*] Use this axis                                                                     │ │
│ │[ ] Absolute move                                                                     │ │
│ │Out of beam displacement: 1500.0                                                      │ │
│ │New out of beam position/displacement:  1500.0                                        │ │
│ └──────────────────────────────────────────────────────────────────────────────────────┘ │
│ ┌───────────────────────────────────────| sy2 |────────────────────────────────────────┐ │
│ │[ ] Use this axis                                                                     │ │
│ │[ ] Absolute move                                                                     │ │
│ │Out of beam displacement: 0.0                                                         │ │
│ │New out of beam position/displacement:  0.0                                           │ │
│ └──────────────────────────────────────────────────────────────────────────────────────┘ │
│                                                                                          │
│                                                                                          │
│                                 <    OK    > <0. Cancel >                                │
│                                                                                          │
└──────────────────────────────────────────────────────────────────────────────────────────┘
Edited by Valentin Valls

Merge request reports