From ec8a461c97b2b9b72846cc9c24c9e85697a8c523 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 26 Jul 2024 11:19:59 -0700 Subject: [PATCH 1/2] Swap LS4 and LS3 on the BTPS/BTMS to match real mapping. --- pcdsdevices/lasers/btps.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcdsdevices/lasers/btps.py b/pcdsdevices/lasers/btps.py index 97c1dbf4bb3..2564c6e312b 100644 --- a/pcdsdevices/lasers/btps.py +++ b/pcdsdevices/lasers/btps.py @@ -671,18 +671,18 @@ def __init__(self, *args, **kwargs): BtpsSourceStatus, "LTLHN:LS3:", source_pos=SourcePosition.ls3, - linear_prefix="LAS:BTS:MCS2:01:m10", - rotary_prefix="LAS:BTS:MCS2:01:m12", - goniometer_prefix="LAS:BTS:MCS2:01:m11", + linear_prefix="LAS:BTS:MCS2:01:m15", + rotary_prefix="LAS:BTS:MCS2:01:m14", + goniometer_prefix="LAS:BTS:MCS2:01:m13", doc="Source status for LS3 (Bay 2 1um)" ) ls4 = Cpt( BtpsSourceStatus, "LTLHN:LS4:", source_pos=SourcePosition.ls4, - linear_prefix="LAS:BTS:MCS2:01:m15", - rotary_prefix="LAS:BTS:MCS2:01:m14", - goniometer_prefix="LAS:BTS:MCS2:01:m13", + linear_prefix="LAS:BTS:MCS2:01:m10", + rotary_prefix="LAS:BTS:MCS2:01:m12", + goniometer_prefix="LAS:BTS:MCS2:01:m11", doc="Source status for LS3 (Bay 2 800m)" ) ls5 = Cpt( From 58d5ccb82be0633645a5dcf63c7469022ec0b8ba Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 26 Jul 2024 11:55:29 -0700 Subject: [PATCH 2/2] Add in release notes. --- .../1261-Fix_mis-match_of_LS3_and_LS4.rst | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 docs/source/upcoming_release_notes/1261-Fix_mis-match_of_LS3_and_LS4.rst diff --git a/docs/source/upcoming_release_notes/1261-Fix_mis-match_of_LS3_and_LS4.rst b/docs/source/upcoming_release_notes/1261-Fix_mis-match_of_LS3_and_LS4.rst new file mode 100644 index 00000000000..4901e07ee5f --- /dev/null +++ b/docs/source/upcoming_release_notes/1261-Fix_mis-match_of_LS3_and_LS4.rst @@ -0,0 +1,30 @@ +1261 Fix mis-match of LS3 and LS4 +################# + +API Breaks +---------- +- N/A + +Features +-------- +- N/A + +Device Updates +-------------- +- N/A + +New Devices +----------- +- N/A + +Bugfixes +-------- +- BtpsState: Fix mis-match of LS3 and LS4 PVs. + +Maintenance +----------- +- N/A + +Contributors +------------ +- slactjohnson