Skip to content

Supports ACTIVE_TOMOCONFIG as hardware object

Valentin Valls requested to merge cherry-pick-f7cc0347 into master

(cherry picked from commit f7cc0347)

Closes daiquiri-tomo#169 (closed)

This PR supports the new ACTIVE_TOMOCONFIG provided by ebs-tomo.

  • The same way it exists ACTIVE_MG, ebs-tomo provides now ACTIVE_TOMOCONFIG
  • In BLISS shell this is a proxy to the active TomoConfig object which share the modelization of the beamline for tomo experiments
  • This PR expose this new object as a Daiquiri objectref
  • This allows to use the same entry point for any beamlines, and then to copy paste config files without changing anything

At some point We could handle the same way ACTIVE_MG

Implementation

  • ACTIVE_TOMOCONFIG is not a named object from the BLISS config -> it was needed to do something special to get the Daiquiri class
  • So now we can specify a type for BLISS hardware, in this case we have to use activetomoconfig
  • Finally a Daiquiri hardware Activetomoconfig was created

I will use it the following way in every tomo beamlines

# hardware.yml
  - url: bliss://active_tomo_config
    type: activetomoconfig

And for example the following way in layouts

A was guessing maybe it's better to use url: bliss://ACTIVE_TOMOCONFIG, but it's up to you.

name: Sample alignment (tomo3)
description: Sample alignment for tomo3 sample stage
icon: fad fam-picture-dinohead
insidebar: true
contents: !include
   file: fullfield-tomo/sample-stage.yml
   variables:
      tomo_config: active_tomo_config.ref
      tomo_imaging: hrimaging
      beam_shutter: beam_shutter
Edited by Valentin Valls

Merge request reports