5 Commits

Author SHA1 Message Date
09dd93ffb5 Merge branch 'online_changes_e20632' into 'lamni_commissioning'
# Conflicts:
#   bec_client/bec_client/bin/bec_startup.py
#   bec_client/bec_client/callbacks/move_device.py
#   bec_client/bec_client/plugins/LamNI/x_ray_eye_align.py
#   device_server/launch.py
#   file_writer/file_writer_plugins/cSAXS.py
#   scibec/init_scibec/configs/lamni_config.py
#   scihub/scihub/scibec/scibec.py
#   scihub/scihub/scibec/scibec_connector.py
#   scihub/scihub/scibec/scibec_metadata_handler.py
#   scihub/scihub/scilog/scilog.py
2023-04-23 13:37:20 +00:00
e20632
518ac8400f changes during the beamtime for e20632 2023-04-18 09:33:27 +02:00
e21125
99fe3efbb6 online changes e21125 2023-04-17 14:30:45 +02:00
e21125
fce507c0f5 online changes e21125 2023-04-17 14:13:25 +02:00
44e938ee74 fix: fixed file writer plugins 2023-03-03 11:56:43 +01:00