From dfa86c06ca5150cb68577293e3dae19db04a98eb Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 9 Jul 2024 07:56:17 -0700 Subject: [PATCH 01/17] Update btms_config.py to support new laser sources --- pcdsdevices/lasers/btms_config.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pcdsdevices/lasers/btms_config.py b/pcdsdevices/lasers/btms_config.py index d775aa84d9d..d618caae06e 100644 --- a/pcdsdevices/lasers/btms_config.py +++ b/pcdsdevices/lasers/btms_config.py @@ -166,7 +166,10 @@ def description(self) -> str: """ return { SourcePosition.ls1: "Bay 1", - SourcePosition.ls5: "Bay 3", + SourcePosition.ls3: "Bay 2 800nm", + SourcePosition.ls4: "Bay 2 1um", + SourcePosition.ls5: "Bay 3 800nm", + SourcePosition.ls6: "Bay 3 1um", SourcePosition.ls8: "Bay 4", }.get(self, "Unknown") @@ -190,7 +193,10 @@ def bay(self) -> int | None: """The near field camera prefix associated with this source position.""" return { SourcePosition.ls1: 1, + SourcePosition.ls3: 2, + SourcePosition.ls4: 2, SourcePosition.ls5: 3, + SourcePosition.ls6: 3, SourcePosition.ls8: 4, }.get(self, None) @@ -332,7 +338,10 @@ def is_top(self) -> bool: # PV source index (bay) to installed LS port valid_sources: tuple[SourcePosition, ...] = ( SourcePosition.ls1, # Bay 1 - SourcePosition.ls5, # Bay 3 + SourcePosition.ls3, # Bay 2 800nm + SourcePosition.ls4, # Bay 2 1um + SourcePosition.ls5, # Bay 3 800nm + SourcePosition.ls6, # Bay 3 1um SourcePosition.ls8, # Bay 4 ) # PV destination index (bay) to installed LD port From 1c546efd014b566cf4c61c83918ec35949dcd4fa Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 9 Jul 2024 07:56:38 -0700 Subject: [PATCH 02/17] Update btps.py to support new laser sources --- pcdsdevices/lasers/btps.py | 55 +++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/pcdsdevices/lasers/btps.py b/pcdsdevices/lasers/btps.py index c8175e421b8..2b645cbd8ab 100644 --- a/pcdsdevices/lasers/btps.py +++ b/pcdsdevices/lasers/btps.py @@ -344,11 +344,29 @@ def __init__( source_pos=SourcePosition.ls1, doc="Settings for source LS1 (bay 1) to this destination", ) + ls3 = Cpt( + SourceToDestinationConfig, + "LS3:", + source_pos=SourcePosition.ls3, + doc="Settings for source LS3 (bay 2 800nm) to this destination", + ) + ls4 = Cpt( + SourceToDestinationConfig, + "LS4:", + source_pos=SourcePosition.ls4, + doc="Settings for source LS4 (bay 2 1um) to this destination", + ) ls5 = Cpt( SourceToDestinationConfig, "LS5:", source_pos=SourcePosition.ls5, - doc="Settings for source LS5 (bay 3) to this destination", + doc="Settings for source LS5 (bay 3 800nm) to this destination", + ) + ls6 = Cpt( + SourceToDestinationConfig, + "LS6:", + source_pos=SourcePosition.ls6, + doc="Settings for source LS6 (bay 3 1um) to this destination", ) ls8 = Cpt( SourceToDestinationConfig, @@ -356,7 +374,8 @@ def __init__( source_pos=SourcePosition.ls8, doc="Settings for source LS8 (bay 4) to this destination", ) - exit_valve = Cpt(BtpsVGC, "VGC:01", kind="normal", doc="Destination exit valve") + exit_valve = Cpt(BtpsVGC, "VGC:01", kind="normal", + doc="Destination exit valve") @property def sources(self) -> dict[SourcePosition, SourceToDestinationConfig]: @@ -369,7 +388,8 @@ def sources(self) -> dict[SourcePosition, SourceToDestinationConfig]: """ return { source.source_pos: source - for source in (self.ls1, self.ls5, self.ls8) + for source in (self.ls1, self.ls3, self.ls4, self.ls5, self.ls6, + self.ls8) } @@ -647,6 +667,24 @@ def __init__(self, *args, **kwargs): goniometer_prefix="LAS:BTS:MCS2:01:m3", doc="Source status for LS1 (Bay 1)" ) + ls3 = Cpt( + 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", + doc="Source status for LS3 (Bay 2 800nm)" + ) + 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", + doc="Source status for LS3 (Bay 2 1um)" + ) ls5 = Cpt( BtpsSourceStatus, "LTLHN:LS5:", @@ -654,7 +692,16 @@ def __init__(self, *args, **kwargs): linear_prefix="LAS:BTS:MCS2:01:m4", rotary_prefix="LAS:BTS:MCS2:01:m6", goniometer_prefix="LAS:BTS:MCS2:01:m5", - doc="Source status for LS5 (Bay 3)" + doc="Source status for LS5 (Bay 3 800nm)" + ) + ls6 = Cpt( + BtpsSourceStatus, + "LTLHN:LS6:", + source_pos=SourcePosition.ls6, + linear_prefix="LAS:BTS:MCS2:01:m16", + rotary_prefix="LAS:BTS:MCS2:01:m17", + goniometer_prefix="LAS:BTS:MCS2:01:m18", + doc="Source status for LS3 (Bay 3 1um)" ) ls8 = Cpt( BtpsSourceStatus, From 17d52d1471262f3971a528ba62e1339989775f65 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 9 Jul 2024 08:36:55 -0700 Subject: [PATCH 03/17] Update BTPS supporting UI files to include new sources --- pcdsdevices/ui/btps-camera-summary.ui | 140 ++ pcdsdevices/ui/btps-overview.ui | 2068 +++++++++++++++++---- pcdsdevices/ui/btps-source-tabs-config.ui | 122 +- pcdsdevices/ui/btps-source-tabs.ui | 122 +- 4 files changed, 2068 insertions(+), 384 deletions(-) diff --git a/pcdsdevices/ui/btps-camera-summary.ui b/pcdsdevices/ui/btps-camera-summary.ui index d2679f23ad0..7fed1eba743 100644 --- a/pcdsdevices/ui/btps-camera-summary.ui +++ b/pcdsdevices/ui/btps-camera-summary.ui @@ -256,6 +256,76 @@ + + + + + + + 0 + + + false + + + true + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS2:FF:FrameTime_RBV + + + false + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS2:FF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + @@ -472,6 +542,76 @@ + + + + + + + 0 + + + false + + + true + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS2:NF:FrameTime_RBV + + + false + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS2:NF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + diff --git a/pcdsdevices/ui/btps-overview.ui b/pcdsdevices/ui/btps-overview.ui index 96466fe1e69..f66ef433b3b 100644 --- a/pcdsdevices/ui/btps-overview.ui +++ b/pcdsdevices/ui/btps-overview.ui @@ -6,8 +6,8 @@ 0 0 - 798 - 108 + 2012 + 147 @@ -31,8 +31,8 @@ - - + + @@ -43,7 +43,7 @@ false - ca://LTLHN:LD9:LS8:BTPS:ChecksOK_RBV + ca://LTLHN:LD9:LS1:BTPS:ChecksOK_RBV @@ -60,19 +60,13 @@ - - + + - - false - - - false - - ca://LTLHN:LD10:LS8:BTPS:ChecksOK_RBV + ca://LTLHN:BTPS:Chk:LS1:FF:IsUpdating_RBV @@ -89,36 +83,26 @@ - - - - - true - - - - NF Cam - - - Qt::AlignCenter - - - - - - - - true - - + + - ca://LTLHN:LD9:BTPS:Name_RBV + ca://LTLHN:BTPS:Chk:LS8:FF:IsUpdating_RBV - - PyDMLabel::String + + + 255 + 0 + 0 + + + + false + + + true @@ -140,13 +124,19 @@ - - + + + + false + + + false + - ca://LTLHN:BTPS:Chk:LS1:FF:IsUpdating_RBV + ca://LTLHN:LD2:LS1:BTPS:ChecksOK_RBV @@ -163,7 +153,43 @@ - + + + + + true + + + + + + + 0 + + + false + + + true + + + false + + + true + + + + + + ca://LTLHN:LD1:BTPS:Name_RBV + + + PyDMLabel::String + + + + @@ -192,26 +218,59 @@ - - + + + + + + + false + + + false + + + ca://LTLHN:LS1:BTPS:LSS:OpenRequest_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + true - - - - - ca://LTLHN:LD6:BTPS:Name_RBV + + FF Cam - - PyDMLabel::String + + Qt::AlignCenter - - + + @@ -221,8 +280,11 @@ false + + + - ca://LTLHN:LD6:LS8:BTPS:ChecksOK_RBV + ca://LTLHN:LD1:LS1:BTPS:ChecksOK_RBV @@ -234,66 +296,74 @@ false + + false + true + + 1 + + + 0 + + + + Bit 0 + + - - + + true - - - - - 0 - - - false - - - true + + LS5 (Bay 3 800nm) - - false + + Qt::AlignCenter - - true + + + + + + + true + - + - ca://LTLHN:LD1:BTPS:Name_RBV + ca://LTLHN:LD9:BTPS:Name_RBV PyDMLabel::String - - + + true - - - - - ca://LTLHN:LD2:BTPS:Name_RBV + + Shutter - - PyDMLabel::String + + Qt::AlignCenter - + @@ -329,8 +399,26 @@ - - + + + + + true + + + + + + + ca://LTLHN:LD10:BTPS:Name_RBV + + + PyDMLabel::String + + + + + @@ -341,7 +429,7 @@ false - ca://LTLHN:LD2:LS1:BTPS:ChecksOK_RBV + ca://LTLHN:LD2:LS8:BTPS:ChecksOK_RBV @@ -358,13 +446,19 @@ - - + + - - ca://LTLHN:BTPS:Chk:LS5:FF:IsUpdating_RBV + + false + + + false + + + ca://LTLHN:LD2:LS5:BTPS:ChecksOK_RBV @@ -381,13 +475,19 @@ - - + + + + false + + + false + - ca://LTLHN:BTPS:Chk:LS5:NF:IsUpdating_RBV + ca://LTLHN:LD4:LS1:BTPS:ChecksOK_RBV @@ -404,13 +504,19 @@ - - + + + + false + + + false + - ca://LTLHN:BTPS:Chk:LS8:NF:IsUpdating_RBV + ca://LTLHN:LD9:LS8:BTPS:ChecksOK_RBV @@ -427,8 +533,8 @@ - - + + @@ -439,7 +545,7 @@ false - ca://LTLHN:LD8:LS1:BTPS:ChecksOK_RBV + ca://LTLHN:LD8:LS8:BTPS:ChecksOK_RBV @@ -456,8 +562,8 @@ - - + + @@ -468,7 +574,7 @@ false - ca://LTLHN:LD14:LS8:BTPS:ChecksOK_RBV + ca://LTLHN:LD8:LS5:BTPS:ChecksOK_RBV @@ -485,28 +591,19 @@ - - - - - true - - - - LS5 (Bay 3) - - - Qt::AlignCenter - - - - - + + + + false + + + false + - ca://LTLHN:BTPS:Chk:LS1:NF:IsUpdating_RBV + ca://LTLHN:LD14:LS1:BTPS:ChecksOK_RBV @@ -523,23 +620,23 @@ - - + + true - LS8 (Bay 4) + LS1 (Bay 1) Qt::AlignCenter - - + + @@ -550,7 +647,7 @@ false - ca://LTLHN:LD14:LS5:BTPS:ChecksOK_RBV + ca://LTLHN:LD6:LS1:BTPS:ChecksOK_RBV @@ -567,8 +664,8 @@ - - + + @@ -579,7 +676,7 @@ false - ca://LTLHN:LD2:LS5:BTPS:ChecksOK_RBV + ca://LTLHN:LD4:LS8:BTPS:ChecksOK_RBV @@ -596,37 +693,26 @@ - - + + + + + true + + - - false - - - false - - ca://LTLHN:LD8:LS5:BTPS:ChecksOK_RBV - - - - 255 - 0 - 0 - - - - false + ca://LTLHN:LD4:BTPS:Name_RBV - - true + + PyDMLabel::String - - + + @@ -636,8 +722,11 @@ false + + + - ca://LTLHN:LD6:LS1:BTPS:ChecksOK_RBV + ca://LTLHN:LD1:LS5:BTPS:ChecksOK_RBV @@ -649,28 +738,60 @@ false + + false + true + + 1 + + + 0 + + + + Bit 0 + + - - + + true - LS1 (Bay 1) + NF Cam Qt::AlignCenter - - + + + + + true + + + + + + + ca://LTLHN:LD14:BTPS:Name_RBV + + + PyDMLabel::String + + + + + @@ -681,7 +802,7 @@ false - ca://LTLHN:LD4:LS1:BTPS:ChecksOK_RBV + ca://LTLHN:LD10:LS5:BTPS:ChecksOK_RBV @@ -698,26 +819,8 @@ - - - - - true - - - - - - - ca://LTLHN:LD10:BTPS:Name_RBV - - - PyDMLabel::String - - - - - + + @@ -728,32 +831,25 @@ false - ca://LTLHN:LS8:BTPS:LSS:OpenRequest_RBV + ca://LTLHN:LD14:LS8:BTPS:ChecksOK_RBV - - false + + + 255 + 0 + 0 + - + false true - - 1 - - - 0 - - - - Bit 0 - - - - + + @@ -763,11 +859,8 @@ false - - - - ca://LTLHN:LD1:LS5:BTPS:ChecksOK_RBV + ca://LTLHN:LD6:LS8:BTPS:ChecksOK_RBV @@ -779,27 +872,36 @@ false - - false - true - - 1 + + + + + + - - 0 + + ca://LTLHN:BTPS:Chk:LS1:NF:IsUpdating_RBV - - - Bit 0 - + + + 255 + 0 + 0 + + + + false + + + true - - + + @@ -810,7 +912,7 @@ false - ca://LTLHN:LD4:LS5:BTPS:ChecksOK_RBV + ca://LTLHN:LD6:LS5:BTPS:ChecksOK_RBV @@ -827,59 +929,41 @@ - - + + true - FF Cam + LS8 (Bay 4) Qt::AlignCenter - - + + + + + true + + - - false - - - false - - ca://LTLHN:LS1:BTPS:LSS:OpenRequest_RBV - - - false - - - false - - - true - - - 1 - - - 0 + ca://LTLHN:LD6:BTPS:Name_RBV - - - Bit 0 - + + PyDMLabel::String - - + + @@ -890,7 +974,7 @@ false - ca://LTLHN:LD10:LS5:BTPS:ChecksOK_RBV + ca://LTLHN:LD4:LS5:BTPS:ChecksOK_RBV @@ -907,37 +991,23 @@ - - - - - - - false - - - false - - - ca://LTLHN:LD2:LS8:BTPS:ChecksOK_RBV - - - - 255 - 0 - 0 - + + + + + true + - - false + + LS6 (Bay 3 1um) - - true + + Qt::AlignCenter - - + + @@ -947,18 +1017,8 @@ false - - - - ca://LTLHN:LD1:LS1:BTPS:ChecksOK_RBV - - - - 255 - 0 - 0 - + ca://LTLHN:LS8:BTPS:LSS:OpenRequest_RBV false @@ -982,26 +1042,8 @@ - - - - - true - - - - - - - ca://LTLHN:LD14:BTPS:Name_RBV - - - PyDMLabel::String - - - - - + + @@ -1012,7 +1054,7 @@ false - ca://LTLHN:LD14:LS1:BTPS:ChecksOK_RBV + ca://LTLHN:LD10:LS8:BTPS:ChecksOK_RBV @@ -1029,24 +1071,6 @@ - - - - - true - - - - - - - ca://LTLHN:LD4:BTPS:Name_RBV - - - PyDMLabel::String - - - @@ -1076,19 +1100,13 @@ - - + + - - false - - - false - - ca://LTLHN:LD9:LS1:BTPS:ChecksOK_RBV + ca://LTLHN:BTPS:Chk:LS5:NF:IsUpdating_RBV @@ -1105,13 +1123,13 @@ - - + + - ca://LTLHN:BTPS:Chk:LS8:FF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS8:NF:IsUpdating_RBV @@ -1128,34 +1146,13 @@ - - - - - true - - - - Shutter - - - Qt::AlignCenter - - - - - + + - - false - - - false - - ca://LTLHN:LD8:LS8:BTPS:ChecksOK_RBV + ca://LTLHN:BTPS:Chk:LS5:FF:IsUpdating_RBV @@ -1172,8 +1169,8 @@ - - + + @@ -1184,7 +1181,7 @@ false - ca://LTLHN:LD4:LS8:BTPS:ChecksOK_RBV + ca://LTLHN:LD8:LS1:BTPS:ChecksOK_RBV @@ -1201,8 +1198,8 @@ - - + + @@ -1213,7 +1210,7 @@ false - ca://LTLHN:LD6:LS5:BTPS:ChecksOK_RBV + ca://LTLHN:LD14:LS5:BTPS:ChecksOK_RBV @@ -1230,7 +1227,7 @@ - + @@ -1276,6 +1273,1341 @@ + + + + + true + + + + LS4 (Bay 2 1um) + + + Qt::AlignCenter + + + + + + + + true + + + + + + + ca://LTLHN:LD2:BTPS:Name_RBV + + + PyDMLabel::String + + + + + + + + true + + + + LS3 (Bay 2 800nm) + + + Qt::AlignCenter + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LS3:BTPS:LSS:OpenRequest_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS3:NF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS3:FF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD8:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD10:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD2:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD6:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD4:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD14:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD9:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD1:LS3:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD1:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD9:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD14:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD4:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD6:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD2:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD10:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD8:LS4:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS4:FF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS4:NF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LS4:BTPS:LSS:OpenRequest_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LS6:BTPS:LSS:OpenRequest_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS6:NF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS6:FF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD8:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD10:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD2:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD6:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD4:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD14:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD9:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:LD1:LS6:BTPS:ChecksOK_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + diff --git a/pcdsdevices/ui/btps-source-tabs-config.ui b/pcdsdevices/ui/btps-source-tabs-config.ui index bf9977e0871..80d6faf2362 100644 --- a/pcdsdevices/ui/btps-source-tabs-config.ui +++ b/pcdsdevices/ui/btps-source-tabs-config.ui @@ -23,17 +23,13 @@ - 0 + 3 - ca://${DEST}LS1:BTPS:ChecksOK_RBV + - - ca://${DEST}LS1:BTPS:ChecksOK_RBV - ca://${DEST}LS5:BTPS:ChecksOK_RBV - ca://${DEST}LS8:BTPS:ChecksOK_RBV - + @@ -64,9 +60,81 @@ + + + LS3 (Bay 2 800nm) + + + + + 10 + 10 + 741 + 514 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS3:", "SHUTTER": "LTLHN:LS3:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + + + LS4 (Bay 2 1um) + + + + + 10 + 10 + 741 + 514 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS4:", "SHUTTER": "LTLHN:LS4:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + - LS5 (Bay 3) + LS5 (Bay 3 800nm) @@ -93,6 +161,42 @@ + + + LS6 (Bay 3 1um) + + + + + 10 + 10 + 741 + 514 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS6:", "SHUTTER": "LTLHN:LS6:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + LS8 (Bay 4) @@ -131,11 +235,13 @@ PyDMTabWidget QTabWidget
pydm.widgets.tab_bar
+ 1 PyDMEmbeddedDisplay QFrame
pydm.widgets.embedded_display
+ 1 diff --git a/pcdsdevices/ui/btps-source-tabs.ui b/pcdsdevices/ui/btps-source-tabs.ui index ed9b077ce35..77f0aa6a011 100644 --- a/pcdsdevices/ui/btps-source-tabs.ui +++ b/pcdsdevices/ui/btps-source-tabs.ui @@ -23,17 +23,13 @@ - 0 + 3 - ca://${DEST}LS1:BTPS:ChecksOK_RBV + - - ca://${DEST}LS1:BTPS:ChecksOK_RBV - ca://${DEST}LS5:BTPS:ChecksOK_RBV - ca://${DEST}LS8:BTPS:ChecksOK_RBV - + @@ -64,9 +60,81 @@ + + + LS3 (Bay 2 800nm) + + + + + 10 + 10 + 741 + 514 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS3:", "SHUTTER": "LTLHN:LS3:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m10", "HAPPI_ROTARY": "las_bts_mcs2_01_m12", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m11", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "2"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + + + LS4 (Bay 2 1um) + + + + + 10 + 10 + 741 + 514 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS4:", "SHUTTER": "LTLHN:LS4:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m15", "HAPPI_ROTARY": "las_bts_mcs2_01_m14", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m13", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "2"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + - LS5 (Bay 3) + LS5 (Bay 3 800nm) @@ -93,6 +161,42 @@ + + + LS6 (Bay 3 1um) + + + + + 10 + 10 + 741 + 514 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS6:", "SHUTTER": "LTLHN:LS6:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m16", "HAPPI_ROTARY": "las_bts_mcs2_01_m17", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m18", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "3"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + LS8 (Bay 4) @@ -131,11 +235,13 @@ PyDMTabWidget QTabWidget
pydm.widgets.tab_bar
+ 1 PyDMEmbeddedDisplay QFrame
pydm.widgets.embedded_display
+ 1 From a69f643130b37e72c89447d9508d21f4930a923b Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 9 Jul 2024 08:46:58 -0700 Subject: [PATCH 04/17] Update labels for LS3/LS4, swapping the 800nm and 1um designations. --- pcdsdevices/lasers/btms_config.py | 8 ++++---- pcdsdevices/lasers/btps.py | 8 ++++---- pcdsdevices/ui/btps-source-tabs-config.ui | 15 +++++++++++---- pcdsdevices/ui/btps-source-tabs.ui | 15 +++++++++++---- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/pcdsdevices/lasers/btms_config.py b/pcdsdevices/lasers/btms_config.py index d618caae06e..d9277a73a12 100644 --- a/pcdsdevices/lasers/btms_config.py +++ b/pcdsdevices/lasers/btms_config.py @@ -166,8 +166,8 @@ def description(self) -> str: """ return { SourcePosition.ls1: "Bay 1", - SourcePosition.ls3: "Bay 2 800nm", - SourcePosition.ls4: "Bay 2 1um", + SourcePosition.ls3: "Bay 2 1um", + SourcePosition.ls4: "Bay 2 800nm", SourcePosition.ls5: "Bay 3 800nm", SourcePosition.ls6: "Bay 3 1um", SourcePosition.ls8: "Bay 4", @@ -338,8 +338,8 @@ def is_top(self) -> bool: # PV source index (bay) to installed LS port valid_sources: tuple[SourcePosition, ...] = ( SourcePosition.ls1, # Bay 1 - SourcePosition.ls3, # Bay 2 800nm - SourcePosition.ls4, # Bay 2 1um + SourcePosition.ls3, # Bay 2 1um + SourcePosition.ls4, # Bay 2 800nm SourcePosition.ls5, # Bay 3 800nm SourcePosition.ls6, # Bay 3 1um SourcePosition.ls8, # Bay 4 diff --git a/pcdsdevices/lasers/btps.py b/pcdsdevices/lasers/btps.py index 2b645cbd8ab..97c1dbf4bb3 100644 --- a/pcdsdevices/lasers/btps.py +++ b/pcdsdevices/lasers/btps.py @@ -348,13 +348,13 @@ def __init__( SourceToDestinationConfig, "LS3:", source_pos=SourcePosition.ls3, - doc="Settings for source LS3 (bay 2 800nm) to this destination", + doc="Settings for source LS3 (bay 2 1um) to this destination", ) ls4 = Cpt( SourceToDestinationConfig, "LS4:", source_pos=SourcePosition.ls4, - doc="Settings for source LS4 (bay 2 1um) to this destination", + doc="Settings for source LS4 (bay 2 800m) to this destination", ) ls5 = Cpt( SourceToDestinationConfig, @@ -674,7 +674,7 @@ def __init__(self, *args, **kwargs): 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 800nm)" + doc="Source status for LS3 (Bay 2 1um)" ) ls4 = Cpt( BtpsSourceStatus, @@ -683,7 +683,7 @@ def __init__(self, *args, **kwargs): 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)" + doc="Source status for LS3 (Bay 2 800m)" ) ls5 = Cpt( BtpsSourceStatus, diff --git a/pcdsdevices/ui/btps-source-tabs-config.ui b/pcdsdevices/ui/btps-source-tabs-config.ui index 80d6faf2362..1b345976c80 100644 --- a/pcdsdevices/ui/btps-source-tabs-config.ui +++ b/pcdsdevices/ui/btps-source-tabs-config.ui @@ -23,13 +23,20 @@ - 3 + 2 - + + + + + + + + @@ -62,7 +69,7 @@ - LS3 (Bay 2 800nm) + LS3 (Bay 2 1um) @@ -98,7 +105,7 @@ - LS4 (Bay 2 1um) + LS4 (Bay 2 800nm) diff --git a/pcdsdevices/ui/btps-source-tabs.ui b/pcdsdevices/ui/btps-source-tabs.ui index 77f0aa6a011..78e9bb27898 100644 --- a/pcdsdevices/ui/btps-source-tabs.ui +++ b/pcdsdevices/ui/btps-source-tabs.ui @@ -23,13 +23,20 @@ - 3 + 2 - + + + + + + + + @@ -62,7 +69,7 @@ - LS3 (Bay 2 800nm) + LS3 (Bay 2 1um) @@ -98,7 +105,7 @@ - LS4 (Bay 2 1um) + LS4 (Bay 2 800nm) From 0acff7fd30676661982c8c8e65808ef5fb83bfc6 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 9 Jul 2024 15:47:21 -0700 Subject: [PATCH 05/17] Fix error in name to LD2 (TMO --> RIX) --- pcdsdevices/lasers/btms_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcdsdevices/lasers/btms_config.py b/pcdsdevices/lasers/btms_config.py index d9277a73a12..cfe218505ae 100644 --- a/pcdsdevices/lasers/btms_config.py +++ b/pcdsdevices/lasers/btms_config.py @@ -264,7 +264,7 @@ def description(self) -> str: # NOTE: Add new descriptions here. return { DestinationPosition.ld1: "Diagnostics", - DestinationPosition.ld2: "TMO IP3", + DestinationPosition.ld2: "RIX IP3", DestinationPosition.ld4: "RIX ChemRIXS", DestinationPosition.ld6: "RIX QRIXS", DestinationPosition.ld8: "TMO IP1", @@ -347,7 +347,7 @@ def is_top(self) -> bool: # PV destination index (bay) to installed LD port valid_destinations: tuple[DestinationPosition, ...] = ( DestinationPosition.ld1, # Diagnostics box - DestinationPosition.ld2, # TMO IP3 + DestinationPosition.ld2, # RIX IP3 DestinationPosition.ld4, # RIX ChemRIXS DestinationPosition.ld6, # RIX QRIXS DestinationPosition.ld8, # TMO IP1 From 40fba68af32fad423b775687d5d0a853cb9e509d Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 16 Jul 2024 13:45:47 -0700 Subject: [PATCH 06/17] Fix bay 2 PVs, add 1um line for bay 2/bay 3 --- pcdsdevices/ui/btps-camera-summary.ui | 540 +++++++++++++++++++++----- 1 file changed, 449 insertions(+), 91 deletions(-) diff --git a/pcdsdevices/ui/btps-camera-summary.ui b/pcdsdevices/ui/btps-camera-summary.ui index 7fed1eba743..f0f6f8387f7 100644 --- a/pcdsdevices/ui/btps-camera-summary.ui +++ b/pcdsdevices/ui/btps-camera-summary.ui @@ -41,7 +41,7 @@ Qt::AlignCenter - 0 + 3 false @@ -72,7 +72,7 @@ - 0 + 3 false @@ -109,7 +109,7 @@ - + @@ -124,20 +124,38 @@ - - + + + + ca://LTLHN:BTPS:Chk:LS1:FF:IsUpdating_RBV + + + false + + + true + + + + + + + + true + + + + Bay 1 + Qt::AlignCenter - - ca://LTLHN:BTPS:Chk:LS8:FF:FrameTime_RBV - - + @@ -145,20 +163,20 @@ - Bay 3 + Bay 3 - 800nm Qt::AlignCenter - - + + - ca://LTLHN:BTPS:Chk:LS1:FF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS5:FF:IsUpdating_RBV false @@ -168,75 +186,184 @@ - - + + + + Qt::AlignCenter + - ca://LTLHN:BTPS:Chk:LS8:FF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS8:FF:FrameTime_RBV + + + + + + + + + + Qt::AlignCenter + + + ca://LTLHN:BTPS:Chk:LS5:FF:FrameTime_RBV + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS3:FF:IsUpdating_RBV false + + false + true + + 1 + + + 0 + + + + Bit 0 + + - - + + + + false + + + true + + + + - ca://LTLHN:BTPS:Chk:LS5:FF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS4:FF:IsUpdating_RBV false + + false + true - - - - - - - true - + + 1 - - Bay 2 + + 0 - - Qt::AlignCenter + + + Bit 0 + - + Qt::AlignCenter + + 3 + + + false + + + true + + + false + + + true + + + + - ca://LTLHN:BTPS:Chk:LS5:FF:FrameTime_RBV + ca://LTLHN:BTPS:Chk:LS3:FF:FrameTime_RBV + + + false - - + + + + + + + ca://LTLHN:BTPS:Chk:LS8:FF:IsUpdating_RBV + + + false + + + true + + + + + true - Bay 1 + Bay 2 - 1um + + + Qt::AlignCenter + + + + + + + + true + + + + Bay 2 - 800nm Qt::AlignCenter @@ -261,8 +388,11 @@ + + Qt::AlignCenter + - 0 + 3 false @@ -280,15 +410,15 @@ - ca://LTLHN:BTPS:Chk:LS2:FF:FrameTime_RBV + ca://LTLHN:BTPS:Chk:LS4:FF:FrameTime_RBV false - - + + @@ -302,7 +432,7 @@ - ca://LTLHN:BTPS:Chk:LS2:FF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS6:FF:IsUpdating_RBV false @@ -326,6 +456,55 @@ + + + + + + + Qt::AlignCenter + + + 3 + + + false + + + true + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS6:FF:FrameTime_RBV + + + false + + + + + + + + true + + + + Bay 3 - 1um + + + Qt::AlignCenter + + + @@ -395,22 +574,137 @@ - - + + + + + + + ca://LTLHN:BTPS:Chk:LS8:NF:IsUpdating_RBV + + + false + + + true + + + + + + + + + + Qt::AlignCenter + + + 3 + + + false + + + true + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS4:NF:FrameTime_RBV + + + false + + + + + + + + + + false + + + true + + + + + + ca://LTLHN:BTPS:Chk:LS4:NF:IsUpdating_RBV + + + false + + + false + + + true + + + 1 + + + 0 + + + + Bit 0 + + + + + + + + + + + Qt::AlignCenter + + + ca://LTLHN:BTPS:Chk:LS8:NF:FrameTime_RBV + + + + + true - Bay 2 + Bay 4 Qt::AlignCenter - + + + + + + + Qt::AlignCenter + + + ca://LTLHN:BTPS:Chk:LS1:NF:FrameTime_RBV + + + + @@ -418,14 +712,44 @@ - Bay 3 + Bay 3 - 800nm Qt::AlignCenter - + + + + + true + + + + Bay 2 - 1um + + + Qt::AlignCenter + + + + + + + + true + + + + Bay 2 - 800nm + + + Qt::AlignCenter + + + + @@ -442,25 +766,46 @@ - + Qt::AlignCenter + + 3 + + + false + + + true + + + false + + + true + + + + - ca://LTLHN:BTPS:Chk:LS5:NF:FrameTime_RBV + ca://LTLHN:BTPS:Chk:LS3:NF:FrameTime_RBV + + + false - - + + - ca://LTLHN:BTPS:Chk:LS8:NF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS1:NF:IsUpdating_RBV false @@ -470,15 +815,15 @@ - - + + true - Bay 4 + Bay 1 Qt::AlignCenter @@ -486,7 +831,7 @@ - + @@ -494,61 +839,59 @@ Qt::AlignCenter - ca://LTLHN:BTPS:Chk:LS8:NF:FrameTime_RBV + ca://LTLHN:BTPS:Chk:LS5:NF:FrameTime_RBV - - + + + + false + + + true + + + + - ca://LTLHN:BTPS:Chk:LS1:NF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS3:NF:IsUpdating_RBV false + + false + true - - - - - - + + 1 - - Qt::AlignCenter + + 0 - - ca://LTLHN:BTPS:Chk:LS1:NF:FrameTime_RBV + + + Bit 0 + - - - - - true - - - - Bay 1 + + + + Qt::AlignCenter - - - - - - - - 0 + 3 false @@ -566,15 +909,30 @@ - ca://LTLHN:BTPS:Chk:LS2:NF:FrameTime_RBV + ca://LTLHN:BTPS:Chk:LS6:NF:FrameTime_RBV false - - + + + + + true + + + + Bay 3 - 1um + + + Qt::AlignCenter + + + + + @@ -588,7 +946,7 @@ - ca://LTLHN:BTPS:Chk:LS2:NF:IsUpdating_RBV + ca://LTLHN:BTPS:Chk:LS6:NF:IsUpdating_RBV false From 526b02e0142f1f805461f8315ddc0d9bbc3a7379 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 16 Jul 2024 13:59:21 -0700 Subject: [PATCH 07/17] Fix RIX IP3 naming --- pcdsdevices/ui/btps.ui | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pcdsdevices/ui/btps.ui b/pcdsdevices/ui/btps.ui index 47db93d1244..885901a60b8 100644 --- a/pcdsdevices/ui/btps.ui +++ b/pcdsdevices/ui/btps.ui @@ -107,7 +107,7 @@ - 0 + 2 @@ -200,9 +200,9 @@ - + - TMO IP3 + RIX IP3 @@ -218,7 +218,7 @@ 0 - + From c0f2812b96c3b43ddba7887663c7ea4633b30473 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 16 Jul 2024 13:59:54 -0700 Subject: [PATCH 08/17] Fix BTPS overview size and naming --- pcdsdevices/ui/btps-overview.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcdsdevices/ui/btps-overview.ui b/pcdsdevices/ui/btps-overview.ui index f66ef433b3b..ea1a535429f 100644 --- a/pcdsdevices/ui/btps-overview.ui +++ b/pcdsdevices/ui/btps-overview.ui @@ -1281,7 +1281,7 @@ - LS4 (Bay 2 1um) + LS4 (Bay 2 800nm) Qt::AlignCenter @@ -1314,7 +1314,7 @@ - LS3 (Bay 2 800nm) + LS3 (Bay 2 1um) Qt::AlignCenter From f8674e67ea41626f2d816f6e34713e7c8c915dcb Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 16 Jul 2024 14:00:39 -0700 Subject: [PATCH 09/17] Update camera summary for LS3/LS4 --- pcdsdevices/ui/btps-camera-summary.ui | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pcdsdevices/ui/btps-camera-summary.ui b/pcdsdevices/ui/btps-camera-summary.ui index f0f6f8387f7..7239247040e 100644 --- a/pcdsdevices/ui/btps-camera-summary.ui +++ b/pcdsdevices/ui/btps-camera-summary.ui @@ -6,10 +6,22 @@ 0 0 - 945 - 231 + 1045 + 232 + + + 0 + 0 + + + + + 1000 + 0 + + Form From 40450637ee871a6b04d16ebde3b1e8fe65c9f773 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Tue, 16 Jul 2024 15:55:11 -0700 Subject: [PATCH 10/17] Fix source tabs layouts --- pcdsdevices/ui/btps-source-tabs.ui | 189 ++++++++++++++--------------- 1 file changed, 93 insertions(+), 96 deletions(-) diff --git a/pcdsdevices/ui/btps-source-tabs.ui b/pcdsdevices/ui/btps-source-tabs.ui index 78e9bb27898..ec08ad2d37c 100644 --- a/pcdsdevices/ui/btps-source-tabs.ui +++ b/pcdsdevices/ui/btps-source-tabs.ui @@ -6,7 +6,7 @@ 0 0 - 781 + 983 580 @@ -23,7 +23,7 @@ - 2 + 4 @@ -42,7 +42,7 @@ LS1 (Bay 1) - + @@ -71,73 +71,74 @@ LS3 (Bay 2 1um) - - - - 10 - 10 - 741 - 514 - - - - - - - QFrame::NoFrame - - - {"SOURCE": "${DEST}LS3:", "SHUTTER": "LTLHN:LS3:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m10", "HAPPI_ROTARY": "las_bts_mcs2_01_m12", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m11", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "2"} - - - btps-source-dest.ui - - - true - - - true - - - false - - + + + + + true + + + + 0 + 0 + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS3:", "SHUTTER": "LTLHN:LS3:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m10", "HAPPI_ROTARY": "las_bts_mcs2_01_m12", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m11", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "2"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + LS4 (Bay 2 800nm) - - - - 10 - 10 - 741 - 514 - - - - - - - QFrame::NoFrame - - - {"SOURCE": "${DEST}LS4:", "SHUTTER": "LTLHN:LS4:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m15", "HAPPI_ROTARY": "las_bts_mcs2_01_m14", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m13", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "2"} - - - btps-source-dest.ui - - - true - - - true - - - false - - + + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS4:", "SHUTTER": "LTLHN:LS4:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m15", "HAPPI_ROTARY": "las_bts_mcs2_01_m14", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m13", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "2"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + @@ -172,37 +173,33 @@ LS6 (Bay 3 1um) - - - - 10 - 10 - 741 - 514 - - - - - - - QFrame::NoFrame - - - {"SOURCE": "${DEST}LS6:", "SHUTTER": "LTLHN:LS6:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m16", "HAPPI_ROTARY": "las_bts_mcs2_01_m17", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m18", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "3"} - - - btps-source-dest.ui - - - true - - - true - - - false - - + + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS6:", "SHUTTER": "LTLHN:LS6:BTPS:", "RANGE_SCREEN": "btps-range-summary.ui", "HAPPI_LINEAR": "las_bts_mcs2_01_m16", "HAPPI_ROTARY": "las_bts_mcs2_01_m17", "HAPPI_GONIOMETER": "las_bts_mcs2_01_m18", "HAPPI_NF_CAM": "las_lhn_bay${BAY}_cam_nf", "HAPPI_FF_CAM": "las_lhn_bay${BAY}_cam_ff", "BAY": "3"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + From 4928f52078df46518fb33409ffac1023791d23e4 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 09:48:14 -0700 Subject: [PATCH 11/17] Fix starting index on tab widget --- pcdsdevices/ui/btps.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcdsdevices/ui/btps.ui b/pcdsdevices/ui/btps.ui index 885901a60b8..5191ce4c9e5 100644 --- a/pcdsdevices/ui/btps.ui +++ b/pcdsdevices/ui/btps.ui @@ -107,7 +107,7 @@ - 2 + 0 From 5fab5623887071c0ef8e1b71a8b7a3f10a39723c Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 09:50:04 -0700 Subject: [PATCH 12/17] Fix layout on new BTPS sources. --- pcdsdevices/ui/btps-source-tabs-config.ui | 176 ++++++++++------------ 1 file changed, 82 insertions(+), 94 deletions(-) diff --git a/pcdsdevices/ui/btps-source-tabs-config.ui b/pcdsdevices/ui/btps-source-tabs-config.ui index 1b345976c80..c11703f04bb 100644 --- a/pcdsdevices/ui/btps-source-tabs-config.ui +++ b/pcdsdevices/ui/btps-source-tabs-config.ui @@ -23,7 +23,7 @@ - 2 + 4 @@ -71,73 +71,65 @@ LS3 (Bay 2 1um) - - - - 10 - 10 - 741 - 514 - - - - - - - QFrame::NoFrame - - - {"SOURCE": "${DEST}LS3:", "SHUTTER": "LTLHN:LS3:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} - - - btps-source-dest.ui - - - true - - - true - - - false - - + + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS3:", "SHUTTER": "LTLHN:LS3:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + LS4 (Bay 2 800nm) - - - - 10 - 10 - 741 - 514 - - - - - - - QFrame::NoFrame - - - {"SOURCE": "${DEST}LS4:", "SHUTTER": "LTLHN:LS4:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} - - - btps-source-dest.ui - - - true - - - true - - - false - - + + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS4:", "SHUTTER": "LTLHN:LS4:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + @@ -172,37 +164,33 @@ LS6 (Bay 3 1um) - - - - 10 - 10 - 741 - 514 - - - - - - - QFrame::NoFrame - - - {"SOURCE": "${DEST}LS6:", "SHUTTER": "LTLHN:LS6:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} - - - btps-source-dest.ui - - - true - - - true - - - false - - + + + + + + + + QFrame::NoFrame + + + {"SOURCE": "${DEST}LS6:", "SHUTTER": "LTLHN:LS6:BTPS:", "RANGE_SCREEN": "btps-range-config.ui"} + + + btps-source-dest.ui + + + true + + + true + + + false + + + + From ab6ab7be7dd58a870496d6dc501ee1453f613518 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 10:04:32 -0700 Subject: [PATCH 13/17] Fix tab alarm channels --- pcdsdevices/ui/btps-source-tabs.ui | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pcdsdevices/ui/btps-source-tabs.ui b/pcdsdevices/ui/btps-source-tabs.ui index ec08ad2d37c..fd2ab3d2ffe 100644 --- a/pcdsdevices/ui/btps-source-tabs.ui +++ b/pcdsdevices/ui/btps-source-tabs.ui @@ -23,19 +23,20 @@ - 4 + 5 - + ca://${DEST}LS8:BTPS:ChecksOK_RBV - - - - - - + ca://${DEST}LS1:BTPS:ChecksOK_RBV + ca://${DEST}LS3:BTPS:ChecksOK_RBV + + ca://${DEST}LS4:BTPS:ChecksOK_RBV + ca://${DEST}LS5:BTPS:ChecksOK_RBV + ca://${DEST}LS6:BTPS:ChecksOK_RBV + ca://${DEST}LS8:BTPS:ChecksOK_RBV From a72e961fd5c55f2288263f52cb83ea58bd6142c3 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 10:09:58 -0700 Subject: [PATCH 14/17] Fix default tab --- pcdsdevices/ui/btps-source-tabs.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcdsdevices/ui/btps-source-tabs.ui b/pcdsdevices/ui/btps-source-tabs.ui index fd2ab3d2ffe..491ca71e055 100644 --- a/pcdsdevices/ui/btps-source-tabs.ui +++ b/pcdsdevices/ui/btps-source-tabs.ui @@ -23,10 +23,10 @@ - 5 + 0 - ca://${DEST}LS8:BTPS:ChecksOK_RBV + ca://${DEST}LS1:BTPS:ChecksOK_RBV From 02b2635e3c5586d1a4f096d84b8cbe63e6c53fbe Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 10:10:17 -0700 Subject: [PATCH 15/17] Fix tab alarm channels --- pcdsdevices/ui/btps-source-tabs-config.ui | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pcdsdevices/ui/btps-source-tabs-config.ui b/pcdsdevices/ui/btps-source-tabs-config.ui index c11703f04bb..f05f2d9dcb2 100644 --- a/pcdsdevices/ui/btps-source-tabs-config.ui +++ b/pcdsdevices/ui/btps-source-tabs-config.ui @@ -6,7 +6,7 @@ 0 0 - 781 + 983 580 @@ -23,19 +23,19 @@ - 4 + 0 - + ca://${DEST}LS1:BTPS:ChecksOK_RBV - - - - - - + ca://${DEST}LS1:BTPS:ChecksOK_RBV + ca://${DEST}LS3:BTPS:ChecksOK_RBV + ca://${DEST}LS4:BTPS:ChecksOK_RBV + ca://${DEST}LS5:BTPS:ChecksOK_RBV + ca://${DEST}LS6:BTPS:ChecksOK_RBV + ca://${DEST}LS8:BTPS:ChecksOK_RBV From a32f2de1ba996c6756db58ac38baf555542835e0 Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 10:44:25 -0700 Subject: [PATCH 16/17] Fix alarm borders and off colors for new byte widgets. --- pcdsdevices/ui/btps-overview.ui | 216 ++++++++++++++++++++++++++++---- 1 file changed, 192 insertions(+), 24 deletions(-) diff --git a/pcdsdevices/ui/btps-overview.ui b/pcdsdevices/ui/btps-overview.ui index ea1a535429f..f4b32cc8450 100644 --- a/pcdsdevices/ui/btps-overview.ui +++ b/pcdsdevices/ui/btps-overview.ui @@ -1447,7 +1447,7 @@ false - true + false @@ -1455,6 +1455,13 @@ ca://LTLHN:LD8:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1486,7 +1493,7 @@ false - true + false @@ -1494,6 +1501,13 @@ ca://LTLHN:LD10:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1525,7 +1539,7 @@ false - true + false @@ -1533,6 +1547,13 @@ ca://LTLHN:LD2:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1564,7 +1585,7 @@ false - true + false @@ -1572,6 +1593,13 @@ ca://LTLHN:LD6:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1603,7 +1631,7 @@ false - true + false @@ -1611,6 +1639,13 @@ ca://LTLHN:LD4:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1642,7 +1677,7 @@ false - true + false @@ -1650,6 +1685,13 @@ ca://LTLHN:LD14:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1681,7 +1723,7 @@ false - true + false @@ -1689,6 +1731,13 @@ ca://LTLHN:LD9:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1720,7 +1769,7 @@ false - true + false @@ -1728,6 +1777,13 @@ ca://LTLHN:LD1:LS3:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1759,7 +1815,7 @@ false - true + false @@ -1767,6 +1823,13 @@ ca://LTLHN:LD1:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1798,7 +1861,7 @@ false - true + false @@ -1806,6 +1869,13 @@ ca://LTLHN:LD9:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1837,7 +1907,7 @@ false - true + false @@ -1845,6 +1915,13 @@ ca://LTLHN:LD14:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1876,7 +1953,7 @@ false - true + false @@ -1884,6 +1961,13 @@ ca://LTLHN:LD4:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1915,7 +1999,7 @@ false - true + false @@ -1923,6 +2007,13 @@ ca://LTLHN:LD6:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1954,7 +2045,7 @@ false - true + false @@ -1962,6 +2053,13 @@ ca://LTLHN:LD2:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -1993,7 +2091,7 @@ false - true + false @@ -2001,6 +2099,13 @@ ca://LTLHN:LD10:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2032,7 +2137,7 @@ false - true + false @@ -2040,6 +2145,13 @@ ca://LTLHN:LD8:LS4:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2305,7 +2417,7 @@ false - true + false @@ -2313,6 +2425,13 @@ ca://LTLHN:LD8:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2344,7 +2463,7 @@ false - true + false @@ -2352,6 +2471,13 @@ ca://LTLHN:LD10:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2383,7 +2509,7 @@ false - true + false @@ -2391,6 +2517,13 @@ ca://LTLHN:LD2:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2422,7 +2555,7 @@ false - true + false @@ -2430,6 +2563,13 @@ ca://LTLHN:LD6:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2461,7 +2601,7 @@ false - true + false @@ -2469,6 +2609,13 @@ ca://LTLHN:LD4:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2500,7 +2647,7 @@ false - true + false @@ -2508,6 +2655,13 @@ ca://LTLHN:LD14:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2539,7 +2693,7 @@ false - true + false @@ -2547,6 +2701,13 @@ ca://LTLHN:LD9:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false @@ -2578,7 +2739,7 @@ false - true + false @@ -2586,6 +2747,13 @@ ca://LTLHN:LD1:LS6:BTPS:ChecksOK_RBV + + + 255 + 0 + 0 + + false From c4c4aec79af967586d34add967284d8b107c08ba Mon Sep 17 00:00:00 2001 From: slactjohnson Date: Fri, 19 Jul 2024 10:59:52 -0700 Subject: [PATCH 17/17] Add in release notes --- ...-Add_new_source_lines_to_BTMS_and_BTPS.rst | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 docs/source/upcoming_release_notes/1256-Add_new_source_lines_to_BTMS_and_BTPS.rst diff --git a/docs/source/upcoming_release_notes/1256-Add_new_source_lines_to_BTMS_and_BTPS.rst b/docs/source/upcoming_release_notes/1256-Add_new_source_lines_to_BTMS_and_BTPS.rst new file mode 100644 index 00000000000..19b8de02da5 --- /dev/null +++ b/docs/source/upcoming_release_notes/1256-Add_new_source_lines_to_BTMS_and_BTPS.rst @@ -0,0 +1,35 @@ +1256 Add new source lines to BTMS and BTPS +################# + +API Breaks +---------- +- N/A + +Features +-------- +- N/A + +Device Updates +-------------- +- btps.BtpsState: add LS3, LS4, and LS6 +- btps.DestinationConfig: add LS3, LS4, and LS6 +- btms_config.SourcePosition: add LS3, LS4, and LS6 +- btms_config.valid_sources: add LS3, LS4, and LS6 +- UI file updates to support above device updates + +New Devices +----------- +- N/A + +Bugfixes +-------- +- btms_config.DestinationPosition: fix description of RIX IP3 +- btms_config.valid_destinations: fix description of RIX IP3 + +Maintenance +----------- +- N/A + +Contributors +------------ +- slactjohnson