From 6f23cfa594778417a79e3aa48728e174116dc83c Mon Sep 17 00:00:00 2001 From: David Daminelli Date: Thu, 3 Oct 2024 09:14:15 -0300 Subject: [PATCH] Fixed PV names, removed unused and disconnected PVs --- .../siriuspy/clientconfigdb/types/as_rf.py | 135 ++++++++---------- 1 file changed, 59 insertions(+), 76 deletions(-) diff --git a/siriuspy/siriuspy/clientconfigdb/types/as_rf.py b/siriuspy/siriuspy/clientconfigdb/types/as_rf.py index ebb066161..f5a525951 100644 --- a/siriuspy/siriuspy/clientconfigdb/types/as_rf.py +++ b/siriuspy/siriuspy/clientconfigdb/types/as_rf.py @@ -97,25 +97,25 @@ def get_dict(): ['BO-05D:VA-CCG-RFC:FastRelay-SP', 0, 0.0], # Pressure Lock power increase ['RA-RaBO01:RF-LLRF:CondAuto-Sel', 0, 0.0], - ['RA-RaBO01:RF-LLRF:EPSEn-Sel', 0, 0.0], - ['RA-RaBO01:RF-LLRF:FIMEn-Sel', 0, 0.0], + ['RA-RaBO01:RF-LLRF:EPSEnbl-Sel', 0, 0.0], + ['RA-RaBO01:RF-LLRF:FIMEnbl-Sel', 0, 0.0], # ADC Phase and Gain - ['RA-RaBO01:RF-LLRF:PHSHCav-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHFwdCav-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHFwdSSA1-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHFwdSSA2-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHFwdSSA3-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHFwdSSA4-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShCav-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShFwdCav-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShFwdSSA1-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShFwdSSA2-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShFwdSSA3-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShFwdSSA4-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainFwdCav-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainFwdSSA1-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainFwdSSA2-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainFwdSSA3-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainFwdSSA4-SP', 0, 0.0], # DAC Phse and Gain - ['RA-RaBO01:RF-LLRF:PHSHSSA1-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHSSA2-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHSSA3-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:PHSHSSA4-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShSSA1-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShSSA2-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShSSA3-SP', 0, 0.0], + ['RA-RaBO01:RF-LLRF:PhShSSA4-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainSSA1-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainSSA2-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:GainSSA3-SP', 0, 0.0], @@ -158,7 +158,7 @@ def get_dict(): ['RA-RaBO01:RF-LLRF:TuneTrig-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:FFEnbl-Sel', 0, 0.0], ['RA-RaBO01:RF-LLRF:FFDir-Sel', 0, 0.0], ['RA-RaBO01:RF-LLRF:FFDeadBand-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:FFGainCell2-SP', 0, 0.0], @@ -239,17 +239,14 @@ def get_dict(): ['RA-RaBO01:RF-LLRF:Cell5SysCal-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:InPre1AmpOffset-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:InPre1AmpSysCal-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:FwdPre1Offset-SP', 0, 0.0], - ['RA-RaBO01:RF-LLRF:FwdPre1SysCal-SP', 0, 0.0], + + ['RA-RaBO01:RF-LLRF:RevPreAmpOffset-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:RevPreAmpSysCal-SP', 0, 0.0], ['RA-RaBO01:RF-LLRF:FwdCircOffset-SP', 0, 0.0], ['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: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:Hw2AmpVCavCoeff-SP', 0, 0.0], @@ -348,25 +345,25 @@ def get_dict(): ['RA-RaSIA01:RF-LLRF:SLKP-SP.DRVL', 0, 0.0], # Pressure Lock power increase ['RA-RaSIA01:RF-LLRF:CondAuto-Sel', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:EPSEn-Sel', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:FIMEn-Sel', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:EPSEnbl-Sel', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:FIMEnbl-Sel', 0, 0.0], # ADC Phase and Gain - ['RA-RaSIA01:RF-LLRF:PHSHCav-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHFwdCav-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHFwdSSA1-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHFwdSSA2-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHFwdSSA3-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHFwdSSA4-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShCav-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShFwdCav-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShFwdSSA1-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShFwdSSA2-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShFwdSSA3-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShFwdSSA4-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainFwdCav-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainFwdSSA1-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainFwdSSA2-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainFwdSSA3-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainFwdSSA4-SP', 0, 0.0], # DAC Phse and Gain - ['RA-RaSIA01:RF-LLRF:PHSHSSA1-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHSSA2-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHSSA3-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:PHSHSSA4-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShSSA1-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShSSA2-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShSSA3-SP', 0, 0.0], + ['RA-RaSIA01:RF-LLRF:PhShSSA4-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainSSA1-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainSSA2-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:GainSSA3-SP', 0, 0.0], @@ -495,15 +492,15 @@ def get_dict(): # ['RA-ToSIA04:AlarmConfig:CurrentLimLow', 0, 0.0], # ['RA-ToSIA04:AlarmConfig:CurrentLimLoLo', 0, 0.0], #SSA1 Pwr Cal Coeff - ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrFwdInCoeff-SP', az, 0.0], - ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrRevInCoeff-SP', az, 0.0], - ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrFwdOutCoeff-SP', az, 0.0], - ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrRevOutCoeff-SP', az, 0.0], + ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrFwdInCoeff-Cte', az, 0.0], + ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrRevInCoeff-Cte', az, 0.0], + ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrFwdOutCoeff-Cte', az, 0.0], + ['RA-ToSIA01:RF-SSAmpTower:Hw2PwrRevOutCoeff-Cte', az, 0.0], #SSA2 Pwr Cal Coeff - ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrFwdInCoeff-SP', az, 0.0], - ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrRevInCoeff-SP', az, 0.0], - ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrFwdOutCoeff-SP', az, 0.0], - ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrRevOutCoeff-SP', az, 0.0], + ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrFwdInCoeff-Cte', az, 0.0], + ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrRevInCoeff-Cte', az, 0.0], + ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrFwdOutCoeff-Cte', az, 0.0], + ['RA-ToSIA02:RF-SSAmpTower:Hw2PwrRevOutCoeff-Cte', az, 0.0], # # SSA3 Pwr Cal Coeff # ['RA-ToSIA03:RF-SSAmpTower:Hw2PwrFwdInCoeff-Cte', az, 0.0], # ['RA-ToSIA03:RF-SSAmpTower:Hw2PwrRevInCoeff-Cte', az, 0.0], @@ -545,12 +542,12 @@ def get_dict(): ['RA-RaSIA01:RF-LLRF:FwdCavSysCalInv-SP', az, 0.0], ['RA-RaSIA01:RF-LLRF:FwdCircOffset-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:FwdCircSysCal-SP', az, 0.0], - ['RA-RaSIA01:RF-LLRF:FwdPreOffset-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:FwdPreSysCal-SP', az, 0.0], - ['RA-RaSIA01:RF-LLRF:FwdPre1Offset-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:FwdPre1SysCal-SP', az, 0.0], - ['RA-RaSIA01:RF-LLRF:FwdPre2Offset-SP', 0, 0.0], - ['RA-RaSIA01:RF-LLRF:FwdPre2SysCal-SP', az, 0.0], + ['RA-RaSIA01:RF-LLRF:FBTNTopOffset-SP', az, 0.0], + ['RA-RaSIA01:RF-LLRF:FBTNTopSysCal-SP', az, 0.0], + ['RA-RaSIA01:RF-LLRF:WgPkupOffset-SP', az, 0.0], + ['RA-RaSIA01:RF-LLRF:WgPkupSysCal-SP', az, 0.0], + ['RA-RaSIA01:RF-LLRF:FBTNBotOffset-SP', az, 0.0], + ['RA-RaSIA01:RF-LLRF:FBTNBotSysCal-SP', az, 0.0], ['RA-RaSIA01:RF-LLRF:FwdSSA1Offset-SP', 0, 0.0], ['RA-RaSIA01:RF-LLRF:FwdSSA1SysCal-SP', az, 0.0], ['RA-RaSIA01:RF-LLRF:FwdSSA1SysCalInv-SP', az, 0.0], @@ -571,13 +568,6 @@ 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: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], ['RA-RaSIA01:RF-LLRF:AmpVCav2HwCoeff-SP', az, 0.0], ['SI-03SP:RF-SRFCav-A:Rsh-Cte', 0, 0.0], ['RA-RaSIA01:RF-RFCalSys:OFSdB1-Mon', 0, 0.0], @@ -666,25 +656,25 @@ def get_dict(): ['RA-RaSIB01:RF-LLRF:SLKP-SP.DRVL', 0, 0.0], # Pressure Lock power increase ['RA-RaSIB01:RF-LLRF:CondAuto-Sel', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:EPSEn-Sel', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:FIMEn-Sel', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:EPSEnbl-Sel', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:FIMEnbl-Sel', 0, 0.0], # ADC Phase and Gain - ['RA-RaSIB01:RF-LLRF:PHSHCav-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHFwdCav-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHFwdSSA1-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHFwdSSA2-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHFwdSSA3-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHFwdSSA4-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShCav-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShFwdCav-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShFwdSSA1-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShFwdSSA2-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShFwdSSA3-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShFwdSSA4-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainFwdCav-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainFwdSSA1-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainFwdSSA2-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainFwdSSA3-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainFwdSSA4-SP', 0, 0.0], # DAC Phse and Gain - ['RA-RaSIB01:RF-LLRF:PHSHSSA1-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHSSA2-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHSSA3-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:PHSHSSA4-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShSSA1-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShSSA2-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShSSA3-SP', 0, 0.0], + ['RA-RaSIB01:RF-LLRF:PhShSSA4-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainSSA1-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainSSA2-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:GainSSA3-SP', 0, 0.0], @@ -844,12 +834,12 @@ def get_dict(): ['RA-RaSIB01:RF-LLRF:FwdCavSysCalInv-SP', az, 0.0], ['RA-RaSIB01:RF-LLRF:FwdCircOffset-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:FwdCircSysCal-SP', az, 0.0], - ['RA-RaSIB01:RF-LLRF:FwdPreOffset-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:FwdPreSysCal-SP', az, 0.0], - ['RA-RaSIB01:RF-LLRF:FwdPre1Offset-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:FwdPre1SysCal-SP', az, 0.0], - ['RA-RaSIB01:RF-LLRF:FwdPre2Offset-SP', 0, 0.0], - ['RA-RaSIB01:RF-LLRF:FwdPre2SysCal-SP', az, 0.0], + ['RA-RaSIB01:RF-LLRF:FBTNTopOffset-SP', az, 0.0], + ['RA-RaSIB01:RF-LLRF:FBTNTopSysCal-SP', az, 0.0], + ['RA-RaSIB01:RF-LLRF:WgPkupOffset-SP', az, 0.0], + ['RA-RaSIB01:RF-LLRF:WgPkupSysCal-SP', az, 0.0], + ['RA-RaSIB01:RF-LLRF:FBTNBotOffset-SP', az, 0.0], + ['RA-RaSIB01:RF-LLRF:FBTNBotSysCal-SP', az, 0.0], ['RA-RaSIB01:RF-LLRF:FwdSSA1Offset-SP', 0, 0.0], ['RA-RaSIB01:RF-LLRF:FwdSSA1SysCal-SP', az, 0.0], ['RA-RaSIB01:RF-LLRF:FwdSSA1SysCalInv-SP', az, 0.0], @@ -870,13 +860,6 @@ 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: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], ['RA-RaSIB01:RF-LLRF:AmpVCav2HwCoeff-SP', az, 0.0], ['SI-03SP:RF-SRFCav-B:Rsh-Cte', 0, 0.0], ['RA-RaSIB01:RF-RFCalSys:OFSdB1-Mon', 0, 0.0],