From 1a243479ca49519048190fbae6d2eb3b08eaf988 Mon Sep 17 00:00:00 2001 From: tongju12 Date: Wed, 8 Nov 2023 14:28:36 -0800 Subject: [PATCH 1/4] ENH:adding sp1k4-att-rtd into sp1k4 gui --- pcdsdevices/spectrometer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pcdsdevices/spectrometer.py b/pcdsdevices/spectrometer.py index 90bc9347099..aef4e2ad54e 100644 --- a/pcdsdevices/spectrometer.py +++ b/pcdsdevices/spectrometer.py @@ -364,7 +364,9 @@ class TMOSpectrometer(BaseInterface, GroupDevice, LightpathMixin): yag_y = Cpt(BeckhoffAxis, ':MMS:07', doc="y-axis of spectrometer detector", kind='normal') yag_z = Cpt(BeckhoffAxis, ':MMS:08', doc="z-axis of spectrometer detector", kind='normal') yag_theta = Cpt(BeckhoffAxis, ':MMS:09', doc="theta axis to rotate spectrometer detector", kind='normal') - + # sp1k4-att-rtd + att_rtd_01 = Cpt(PytmcSignal, ':RTD:01:TEMP', doc="solid attenuator 01 PT100", io='i', kind='nomal') + att_rtd_02 = Cpt(PytmcSignal, ':RTD:02:TEMP', doc="solid attenuator 02 PT100", io='i', kind='nomal') # Lightpath constants inserted = True removed = False From 22ef4061396993588e7a2310c2517da6984e36e7 Mon Sep 17 00:00:00 2001 From: tongju12 Date: Thu, 9 Nov 2023 15:45:54 -0800 Subject: [PATCH 2/4] fix type error --- pcdsdevices/spectrometer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcdsdevices/spectrometer.py b/pcdsdevices/spectrometer.py index aef4e2ad54e..631badf64d5 100644 --- a/pcdsdevices/spectrometer.py +++ b/pcdsdevices/spectrometer.py @@ -365,8 +365,8 @@ class TMOSpectrometer(BaseInterface, GroupDevice, LightpathMixin): yag_z = Cpt(BeckhoffAxis, ':MMS:08', doc="z-axis of spectrometer detector", kind='normal') yag_theta = Cpt(BeckhoffAxis, ':MMS:09', doc="theta axis to rotate spectrometer detector", kind='normal') # sp1k4-att-rtd - att_rtd_01 = Cpt(PytmcSignal, ':RTD:01:TEMP', doc="solid attenuator 01 PT100", io='i', kind='nomal') - att_rtd_02 = Cpt(PytmcSignal, ':RTD:02:TEMP', doc="solid attenuator 02 PT100", io='i', kind='nomal') + att_rtd_01 = Cpt(PytmcSignal, ':RTD:01:TEMP', doc="solid attenuator 01 PT100", io='i', kind='normal') + att_rtd_02 = Cpt(PytmcSignal, ':RTD:02:TEMP', doc="solid attenuator 02 PT100", io='i', kind='normal') # Lightpath constants inserted = True removed = False From 33af125623a684a0048f476d942eb38dc06a260b Mon Sep 17 00:00:00 2001 From: tongju12 Date: Thu, 9 Nov 2023 15:50:51 -0800 Subject: [PATCH 3/4] DOC: adding release notes for sp1k4-att-rtd --- .../1181-adding_sp1k4-att-rtd.rst | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst diff --git a/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst b/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst new file mode 100644 index 00000000000..9a8c2b48b11 --- /dev/null +++ b/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst @@ -0,0 +1,30 @@ +1181 adding sp1k4-att-rtd +################# + +API Breaks +---------- +- N/A + +Features +-------- +- Adding sp1k4-att-rtd on the sp1k4 gui + +Device Updates +-------------- +- N/A + +New Devices +----------- +- N/A + +Bugfixes +-------- +- N/A + +Maintenance +----------- +- N/A + +Contributors +------------ +- @tongju12 From 5b5cabcc181afd71c8766fe12e573836dda46d06 Mon Sep 17 00:00:00 2001 From: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:00:04 -0800 Subject: [PATCH 4/4] DOC: touch up pre-release notes --- .../upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst b/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst index 9a8c2b48b11..bd3a7887be1 100644 --- a/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst +++ b/docs/source/upcoming_release_notes/1181-adding_sp1k4-att-rtd.rst @@ -7,7 +7,7 @@ API Breaks Features -------- -- Adding sp1k4-att-rtd on the sp1k4 gui +- Adds attenuator RTD temperatures to sp1k4, for display in GUI. Device Updates -------------- @@ -27,4 +27,4 @@ Maintenance Contributors ------------ -- @tongju12 +- tongju12