From d24c59a4ef747f1533a12eaca37ac02f65ebf9b3 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Wed, 28 Aug 2024 16:54:49 -0500 Subject: [PATCH 1/3] ENH #61 add rl1 Transfocator for 8-ID-D --- src/instrument/devices/__init__.py | 1 + src/instrument/devices/transfocator_8idd.py | 40 +++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 src/instrument/devices/transfocator_8idd.py diff --git a/src/instrument/devices/__init__.py b/src/instrument/devices/__init__.py index f950f7a..f180d8d 100755 --- a/src/instrument/devices/__init__.py +++ b/src/instrument/devices/__init__.py @@ -36,6 +36,7 @@ from .slit_base import sl4_base, sl5_base, sl7_base, sl8_base, sl9_base from .slit import sl4, sl5, sl7, sl8, sl9 from .granite import granite +from .transfocator_8idd.py import rl1 from .win import win_e, win_i ## Beamline Area Detectors diff --git a/src/instrument/devices/transfocator_8idd.py b/src/instrument/devices/transfocator_8idd.py new file mode 100644 index 0000000..9736244 --- /dev/null +++ b/src/instrument/devices/transfocator_8idd.py @@ -0,0 +1,40 @@ +""" +Transfocator (compound refractive lens, CRL) in 8-ID-D + +.. note:: POLAR instrument has some related functions (`transfocator.py`). + https://github.com/APS-4ID-POLAR/polar_instrument/pull/7/files +""" + +__all__ = """ + rl1 +""".split() + +import logging + +from ophyd import Component +from ophyd import EpicsMotor +from ophyd import MotorBundle + +logger = logging.getLogger(__name__) +logger.info(__file__) + + +class Transfocator(MotorBundle): + y = Component(EpicsMotor, "m1") + x = Component(EpicsMotor, "m2") + yaw = Component(EpicsMotor, "m3") + pitch = Component(EpicsMotor, "m4") + + lens1 = Component(EpicsMotor, "m5") + lens2 = Component(EpicsMotor, "m6") + lens3 = Component(EpicsMotor, "m7") + lens4 = Component(EpicsMotor, "m8") + lens5 = Component(EpicsMotor, "m9") + lens6 = Component(EpicsMotor, "m10") + lens7 = Component(EpicsMotor, "m11") + lens8 = Component(EpicsMotor, "m12") + lens9 = Component(EpicsMotor, "m13") + lens10 = Component(EpicsMotor, "m14") + + +rl1 = Transfocator("8iddSoft:TRANS:", name="rl1") From dd16b2bba3ed83d482034b98dc5fceda01c184ed Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Wed, 28 Aug 2024 17:03:18 -0500 Subject: [PATCH 2/3] DOC #61 --- src/instrument/devices/transfocator_8idd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/instrument/devices/transfocator_8idd.py b/src/instrument/devices/transfocator_8idd.py index 9736244..3bb55ae 100644 --- a/src/instrument/devices/transfocator_8idd.py +++ b/src/instrument/devices/transfocator_8idd.py @@ -1,5 +1,5 @@ """ -Transfocator (compound refractive lens, CRL) in 8-ID-D +RL1: Transfocator (compound refractive lens, CRL) in 8-ID-D .. note:: POLAR instrument has some related functions (`transfocator.py`). https://github.com/APS-4ID-POLAR/polar_instrument/pull/7/files From c1c18d1045e06ce530d2a84fb68ec1faf3480727 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Wed, 28 Aug 2024 17:04:15 -0500 Subject: [PATCH 3/3] ENH #61 RL2 (CRL in E station) --- src/instrument/devices/__init__.py | 1 + src/instrument/devices/transfocator_8ide.py | 40 +++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 src/instrument/devices/transfocator_8ide.py diff --git a/src/instrument/devices/__init__.py b/src/instrument/devices/__init__.py index f180d8d..605dc60 100755 --- a/src/instrument/devices/__init__.py +++ b/src/instrument/devices/__init__.py @@ -37,6 +37,7 @@ from .slit import sl4, sl5, sl7, sl8, sl9 from .granite import granite from .transfocator_8idd.py import rl1 +from .transfocator_8ide.py import rl2 from .win import win_e, win_i ## Beamline Area Detectors diff --git a/src/instrument/devices/transfocator_8ide.py b/src/instrument/devices/transfocator_8ide.py new file mode 100644 index 0000000..063dbca --- /dev/null +++ b/src/instrument/devices/transfocator_8ide.py @@ -0,0 +1,40 @@ +""" +RL2: Transfocator (compound refractive lens, CRL) in 8-ID-E + +.. note:: POLAR instrument has some related functions (`transfocator.py`). + https://github.com/APS-4ID-POLAR/polar_instrument/pull/7/files +""" + +__all__ = """ + rl2 +""".split() + +import logging + +from ophyd import Component +from ophyd import EpicsMotor +from ophyd import MotorBundle + +logger = logging.getLogger(__name__) +logger.info(__file__) + + +class Transfocator(MotorBundle): + y = Component(EpicsMotor, "m25") + x = Component(EpicsMotor, "m26") + yaw = Component(EpicsMotor, "m27") + pitch = Component(EpicsMotor, "m28") + + lens1 = Component(EpicsMotor, "m15") + lens2 = Component(EpicsMotor, "m16") + lens3 = Component(EpicsMotor, "m17") + lens4 = Component(EpicsMotor, "m18") + lens5 = Component(EpicsMotor, "m19") + lens6 = Component(EpicsMotor, "m20") + lens7 = Component(EpicsMotor, "m21") + lens8 = Component(EpicsMotor, "m22") + lens9 = Component(EpicsMotor, "m23") + lens10 = Component(EpicsMotor, "m24") + + +rl2 = Transfocator("8iddSoft:TRANS:", name="rl2")