Fixed the Ramp names

lnls-sirius · Sep 19, 2024 · 3e66b40 · 3e66b40
1 parent b9c7c0b
commit 3e66b40
Showing 1 changed file with 39 additions and 43 deletions.
diff --git a/siriuspy/siriuspy/clientconfigdb/types/as_rf.py b/siriuspy/siriuspy/clientconfigdb/types/as_rf.py
@@ -85,10 +85,10 @@ def get_dict():
     ### Are we still saving this?
     ['RA-RaBO01:RF-LLRF:ALRef-SP.DRVH', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:ALRef-SP.DRVL', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampAmpTop-SP.DRVH', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampAmpTop-SP.DRVL', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampAmpBot-SP.DRVH', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampAmpBot-SP.DRVL', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpAmpTop-SP.DRVH', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpAmpTop-SP.DRVL', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpAmpBot-SP.DRVH', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpAmpBot-SP.DRVL', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:OLGain-SP.DRVH', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:OLGain-SP.DRVL', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:SLKP-SP.DRVH', 0, 0.0],
@@ -156,7 +156,7 @@ def get_dict():
     ['RA-RaBO01:RF-LLRF:TuneFreq-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:TuneFilt-Sel', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:TuneTrig-Sel', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampTuneTop-Sel', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpTuneTop-Sel', 0, 0.0],
     # Field Flatness loop config
     ['RA-RaBO01:RF-LLRF:FFEn-Sel', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:FFDir-Sel', 0, 0.0],
@@ -166,17 +166,17 @@ def get_dict():
     # Pulsed mode config
     ['RA-RaBO01:RF-LLRF:CondFreq-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:CondDuty2-SP', 0, 0.0],
-    # Ramp mode config
+    # Rmp mode config
     ['RA-RaBO01:RF-LLRF:RmpTs1-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:RmpTs2-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:RmpTs3-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:RmpTs4-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampAmpBot-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampPhsBot-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampAmpTop-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampPhsTop-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpAmpBot-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpPhsBot-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpAmpTop-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpPhsTop-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:RmpIncTime-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:RampDownDsbl-Sel', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:RmpDownDsbl-Sel', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:FDLFrame-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:FDLRearm-Sel', 0, 0.0],
     # Enable plungers step motor drivers
@@ -247,16 +247,12 @@ def get_dict():
     ['RA-RaBO01:RF-LLRF:FwdCircSysCal-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:RevCircOffset-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:RevCircSysCal-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:CavOLG-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:FwdCavOLG-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:FwdSSA1OLG-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:CavSysCalOLG-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:FwdCavSysCalOLG-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:FwdSSA1SysCalOLG-SP', 0, 0.0],
     ['RA-RaBO01:RF-LLRF:AmpVCav2HwCoeff-SP', 0, 0.0],
     ['BO-05D:RF-P5Cav:Rsh-Cte', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:Hw2AmpVCavCoeff0-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:Hw2AmpVCavCoeff1-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:Hw2AmpVCavCoeff2-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:Hw2AmpVCavCoeff3-SP', 0, 0.0],
-    ['RA-RaBO01:RF-LLRF:Hw2AmpVCavCoeff4-SP', 0, 0.0],
+    ['RA-RaBO01:RF-LLRF:Hw2AmpVCavCoeff-SP', 0, 0.0],
     # CalSys Offsets
     ['RA-RaBO01:RF-RFCalSys:OFSdB1-Mon', 0, 0.0],
     ['RA-RaBO01:RF-RFCalSys:OFSdB2-Mon', 0, 0.0],
@@ -345,7 +341,7 @@ def get_dict():
     ['RA-RaSIA01:RF-LLRF:IntlkDly-SP', 0, 0.0],
     # Set PVs value lims
     ['RA-RaSIA01:RF-LLRF:ALRef-SP.DRVH', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:ALRef-SP-SP.DRVL', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:ALRef-SP.DRVL', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:OLGain-SP.DRVH', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:OLGain-SP.DRVL', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:SLKP-SP.DRVH', 0, 0.0],
@@ -413,18 +409,18 @@ def get_dict():
     ['RA-RaSIA01:RF-LLRF:TuneFreq-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:TuneFilt-Sel', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:TuneTrig-Sel', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RampTuneTop-Sel', 0, 0.0],
-    # Ramp mode config
+    ['RA-RaSIA01:RF-LLRF:RmpTuneTop-Sel', 0, 0.0],
+    # Rmp mode config
     ['RA-RaSIA01:RF-LLRF:RmpTs1-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RmpTs2-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RmpTs3-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RmpTs4-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RampAmpTop-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RampPhsTop-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RampAmpBot-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RampPhsBot-SP', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RmpAmpTop-SP', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RmpPhsTop-SP', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RmpAmpBot-SP', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RmpPhsBot-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RmpIncTime-SP', 0, 0.0],
-    ['RA-RaSIA01:RF-LLRF:RampDownDsbl-Sel', 0, 0.0],
+    ['RA-RaSIA01:RF-LLRF:RmpDownDsbl-Sel', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:FDLFrame-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:FDLRearm-Sel', 0, 0.0],
     # Enable ADC phase and gain
@@ -575,10 +571,10 @@ def get_dict():
     ['RA-RaSIA01:RF-LLRF:RevSSA1SysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevSSA2Offset-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:RevSSA2SysCal-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:CavOLG-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FwdCavOLG-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FwdSSA1OLG-SP', az, 0.0],
-    ['RA-RaSIA01:RF-LLRF:FwdSSA2OLG-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:CavSysCalOLG-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdCavSysCalOLG-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdSSA1SysCalOLG-SP', az, 0.0],
+    ['RA-RaSIA01:RF-LLRF:FwdSSA2SysCalOLG-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:ALRefOffset-SP', 0, 0.0],
     ['RA-RaSIA01:RF-LLRF:ALRefSysCal-SP', az, 0.0],
     ['RA-RaSIA01:RF-LLRF:ALRefSysCalInv-SP', az, 0.0],
@@ -662,7 +658,7 @@ def get_dict():
     ['RA-RaSIB01:RF-LLRF:IntlkDly-SP', 0, 0.0],
     # Set PVs value lims
     ###Are we still saving this?
-    ['RA-RaSIB01:RF-LLRF:ALRef-SP-SP.DRVL', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:ALRef-SP.DRVL', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:ALRef-SP.DRVH', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:OLGain-SP.DRVH', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:OLGain-SP.DRVL', 0, 0.0],
@@ -731,18 +727,18 @@ def get_dict():
     ['RA-RaSIB01:RF-LLRF:TuneFreq-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:TuneFilt-Sel', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:TuneTrig-Sel', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RampTuneTop-Sel', 0, 0.0],
-    # Ramp mode config
+    ['RA-RaSIB01:RF-LLRF:RmpTuneTop-Sel', 0, 0.0],
+    # Rmp mode config
     ['RA-RaSIB01:RF-LLRF:RmpTs1-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RmpTs2-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RmpTs3-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RmpTs4-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RampAmpTop-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RampPhsTop-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RampAmpBot-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RampPhsBot-SP', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RmpAmpTop-SP', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RmpPhsTop-SP', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RmpAmpBot-SP', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RmpPhsBot-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RmpIncTime-SP', 0, 0.0],
-    ['RA-RaSIB01:RF-LLRF:RampDownDsbl-Sel', 0, 0.0],
+    ['RA-RaSIB01:RF-LLRF:RmpDownDsbl-Sel', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:FDLFrame-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:FDLRearm-Sel', 0, 0.0],
     # Enable ADC phase and gain
@@ -874,10 +870,10 @@ def get_dict():
     ['RA-RaSIB01:RF-LLRF:RevSSA1SysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevSSA2Offset-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:RevSSA2SysCal-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:CavOLG-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FwdCavOLG-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FwdSSA1OLG-SP', az, 0.0],
-    ['RA-RaSIB01:RF-LLRF:FwdSSA2OLG-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:CavSysCalOLG-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdCavSysCalOLG-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdSSA1SysCalOLG-SP', az, 0.0],
+    ['RA-RaSIB01:RF-LLRF:FwdSSA2SysCalOLG-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:ALRefOffset-SP', 0, 0.0],
     ['RA-RaSIB01:RF-LLRF:ALRefSysCal-SP', az, 0.0],
     ['RA-RaSIB01:RF-LLRF:ALRefSysCalInv-SP', az, 0.0],