Merge branch 'master' into fix_att_move_err

pcdshub · Nov 10, 2023 · bf54961 · bf54961
2 parents c0b4fbf + 04b27ca
commit bf54961
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
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
@@ -0,0 +1,30 @@
+1181 adding sp1k4-att-rtd
+#################
+
+API Breaks
+----------
+- N/A
+
+Features
+--------
+- Adds attenuator RTD temperatures to sp1k4, for display in GUI.
+
+Device Updates
+--------------
+- N/A
+
+New Devices
+-----------
+- N/A
+
+Bugfixes
+--------
+- N/A
+
+Maintenance
+-----------
+- N/A
+
+Contributors
+------------
+- tongju12
diff --git 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='normal')
+    att_rtd_02 = Cpt(PytmcSignal, ':RTD:02:TEMP', doc="solid attenuator 02 PT100", io='i', kind='normal')
     # Lightpath constants
     inserted = True
     removed = False