From b6dfa4d31d1eaeea5c2fc91a94b2e9f5f9e94378 Mon Sep 17 00:00:00 2001 From: Gilberto Fabbris Date: Mon, 19 Oct 2020 15:38:11 -0500 Subject: [PATCH 1/4] Add ruby motors --- .../startup/instrument/devices/ruby_motors.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 profile_bluesky/startup/instrument/devices/ruby_motors.py diff --git a/profile_bluesky/startup/instrument/devices/ruby_motors.py b/profile_bluesky/startup/instrument/devices/ruby_motors.py new file mode 100644 index 00000000..300fbce3 --- /dev/null +++ b/profile_bluesky/startup/instrument/devices/ruby_motors.py @@ -0,0 +1,21 @@ + +__all__ = [ + 'ruby_mot' + ] + +from ..session_logs import logger +logger.info(__file__) + +from ophyd import Component, MotorBundle, EpicsMotor +from ..framework import sd + +class RubyMotors(MotorBundle): + focus = Component(EpicsMotor,':m37',labels=('motor','ruby') + y = Component(EpicsMotor,':m38',labels=('motor','ruby') + z = Component(EpicsMotor,':m39',labels=('motor','ruby') + zoom = Component(EpicsMotor,':m40',labels=('motor','ruby') + + +ruby_mot = RubyMotors('4iddx:', name='ruby_motors') +sd.baseline.append(ruby_mot) + From 8a59c55f3a18b03194a33e299f42b32e71bbd2f1 Mon Sep 17 00:00:00 2001 From: Gilberto Fabbris Date: Mon, 19 Oct 2020 15:39:09 -0500 Subject: [PATCH 2/4] Update __init__ to add ruby motors --- profile_bluesky/startup/instrument/devices/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/profile_bluesky/startup/instrument/devices/__init__.py b/profile_bluesky/startup/instrument/devices/__init__.py index 56d560a3..8563f368 100644 --- a/profile_bluesky/startup/instrument/devices/__init__.py +++ b/profile_bluesky/startup/instrument/devices/__init__.py @@ -18,3 +18,4 @@ from .kbic import * from .user_calc import * from .ge_controller import * +from .ruby_motors import * From bf3d856f52eb68e03c06c52f7cd91ac082f32ef6 Mon Sep 17 00:00:00 2001 From: gfabbris Date: Mon, 19 Oct 2020 15:48:39 -0500 Subject: [PATCH 3/4] Fix typos in ruby_motors --- profile_bluesky/startup/instrument/devices/ruby_motors.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profile_bluesky/startup/instrument/devices/ruby_motors.py b/profile_bluesky/startup/instrument/devices/ruby_motors.py index 300fbce3..9ef68e03 100644 --- a/profile_bluesky/startup/instrument/devices/ruby_motors.py +++ b/profile_bluesky/startup/instrument/devices/ruby_motors.py @@ -10,10 +10,10 @@ from ..framework import sd class RubyMotors(MotorBundle): - focus = Component(EpicsMotor,':m37',labels=('motor','ruby') - y = Component(EpicsMotor,':m38',labels=('motor','ruby') - z = Component(EpicsMotor,':m39',labels=('motor','ruby') - zoom = Component(EpicsMotor,':m40',labels=('motor','ruby') + focus = Component(EpicsMotor,'m37',labels=('motor','ruby')) + y = Component(EpicsMotor,'m38',labels=('motor','ruby')) + z = Component(EpicsMotor,'m39',labels=('motor','ruby')) + zoom = Component(EpicsMotor,'m40',labels=('motor','ruby')) ruby_mot = RubyMotors('4iddx:', name='ruby_motors') From e26ef2f8d7697698b9ab8db9e389d0913185cfe4 Mon Sep 17 00:00:00 2001 From: gfabbris Date: Tue, 3 Nov 2020 09:25:14 -0600 Subject: [PATCH 4/4] Fix format --- .../startup/instrument/devices/ruby_motors.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/profile_bluesky/startup/instrument/devices/ruby_motors.py b/profile_bluesky/startup/instrument/devices/ruby_motors.py index 9ef68e03..32977aea 100644 --- a/profile_bluesky/startup/instrument/devices/ruby_motors.py +++ b/profile_bluesky/startup/instrument/devices/ruby_motors.py @@ -1,4 +1,6 @@ - +""" +Ruby spectrometer motors. +""" __all__ = [ 'ruby_mot' ] @@ -9,13 +11,13 @@ from ophyd import Component, MotorBundle, EpicsMotor from ..framework import sd + class RubyMotors(MotorBundle): - focus = Component(EpicsMotor,'m37',labels=('motor','ruby')) - y = Component(EpicsMotor,'m38',labels=('motor','ruby')) - z = Component(EpicsMotor,'m39',labels=('motor','ruby')) - zoom = Component(EpicsMotor,'m40',labels=('motor','ruby')) + focus = Component(EpicsMotor, 'm37', labels=('motor', 'ruby')) + y = Component(EpicsMotor, 'm38', labels=('motor', 'ruby')) + z = Component(EpicsMotor, 'm39', labels=('motor', 'ruby')) + zoom = Component(EpicsMotor, 'm40', labels=('motor', 'ruby')) ruby_mot = RubyMotors('4iddx:', name='ruby_motors') sd.baseline.append(ruby_mot) -