diff --git a/siriuspy/siriuspy/VERSION b/siriuspy/siriuspy/VERSION index 895eb8a3b..d66b73871 100644 --- a/siriuspy/siriuspy/VERSION +++ b/siriuspy/siriuspy/VERSION @@ -1 +1 @@ -2.50.1 +2.51.0 diff --git a/siriuspy/siriuspy/clientconfigdb/types/global_config.py b/siriuspy/siriuspy/clientconfigdb/types/global_config.py index f8b6aee35..3ce84153a 100644 --- a/siriuspy/siriuspy/clientconfigdb/types/global_config.py +++ b/siriuspy/siriuspy/clientconfigdb/types/global_config.py @@ -196,26 +196,6 @@ def get_dict(): ['AS-RaMO:TI-EVG:CycleDelayType-Sel', 0, 0.0], ['AS-RaMO:TI-EVG:CycleMode-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:DigBODelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:DigBODelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:DigBOMode-Sel', 0, 0.0], - - ['AS-RaMO:TI-EVG:DigLIDelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:DigLIDelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:DigLIMode-Sel', 0, 0.0], - - ['AS-RaMO:TI-EVG:DigSIDelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:DigSIDelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:DigSIMode-Sel', 0, 0.0], - - ['AS-RaMO:TI-EVG:DigTBDelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:DigTBDelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:DigTBMode-Sel', 0, 0.0], - - ['AS-RaMO:TI-EVG:DigTSDelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:DigTSDelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:DigTSMode-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:InjBODelayRaw-SP', 0, 0], ['AS-RaMO:TI-EVG:InjBODelayType-Sel', 0, 0.0], # ['AS-RaMO:TI-EVG:InjBOMode-Sel', 0, 0.0], @@ -228,14 +208,6 @@ def get_dict(): ['AS-RaMO:TI-EVG:LinacDelayType-Sel', 0, 0.0], ['AS-RaMO:TI-EVG:LinacMode-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:MigSIDelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:MigSIDelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:MigSIMode-Sel', 0, 0.0], - - ['AS-RaMO:TI-EVG:OrbBODelayRaw-SP', 0, 0], - ['AS-RaMO:TI-EVG:OrbBODelayType-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:OrbBOMode-Sel', 0, 0.0], - ['AS-RaMO:TI-EVG:OrbSIDelayRaw-SP', 0, 0], ['AS-RaMO:TI-EVG:OrbSIDelayType-Sel', 0, 0.0], ['AS-RaMO:TI-EVG:OrbSIMode-Sel', 0, 0.0], @@ -252,6 +224,10 @@ def get_dict(): ['AS-RaMO:TI-EVG:TunSIDelayType-Sel', 0, 0.0], ['AS-RaMO:TI-EVG:TunSIMode-Sel', 0, 0.0], + ['AS-RaMO:TI-EVG:FOFBSDelayRaw-SP', 0, 0], + ['AS-RaMO:TI-EVG:FOFBSDelayType-Sel', 0, 0.0], + ['AS-RaMO:TI-EVG:FOFBSMode-Sel', 0, 0.0], + # AMCFPGAEVRs ['IA-01RaBPM:TI-AMCFPGAEVR:FPGAClk-Cte', 124916500, 0.0], ['IA-02RaBPM:TI-AMCFPGAEVR:FPGAClk-Cte', 124916500, 0.0], @@ -283,7 +259,7 @@ def get_dict(): ['AS-Fam:TI-Scrn-TBBO:RFDelayType-Sel', 0, 0.0], ['AS-Fam:TI-Scrn-TBBO:Src-Sel', 0, 0.0], ['AS-Fam:TI-Scrn-TBBO:State-Sel', 0, 0.0], - ['AS-Fam:TI-Scrn-TBBO:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['AS-Fam:TI-Scrn-TBBO:DeltaDelayRaw-SP', 30*[0, ], 0], ['AS-Fam:TI-Scrn-TBBO:LowLvlLock-Sel', 0, 0.0], ['AS-Glob:TI-FCT:DelayRaw-SP', 0, 0], @@ -293,7 +269,7 @@ def get_dict(): ['AS-Glob:TI-FCT:RFDelayType-Sel', 0, 0.0], ['AS-Glob:TI-FCT:Src-Sel', 0, 0.0], ['AS-Glob:TI-FCT:State-Sel', 0, 0.0], - ['AS-Glob:TI-FCT:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['AS-Glob:TI-FCT:DeltaDelayRaw-SP', 30*[0, ], 0], ['AS-Glob:TI-FCT:LowLvlLock-Sel', 0, 0.0], ['AS-Glob:TI-FillPtrnMon:DelayRaw-SP', 0, 0], @@ -303,7 +279,7 @@ def get_dict(): ['AS-Glob:TI-FillPtrnMon:RFDelayType-Sel', 0, 0.0], ['AS-Glob:TI-FillPtrnMon:Src-Sel', 0, 0.0], ['AS-Glob:TI-FillPtrnMon:State-Sel', 0, 0.0], - ['AS-Glob:TI-FillPtrnMon:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['AS-Glob:TI-FillPtrnMon:DeltaDelayRaw-SP', 30*[0, ], 0], ['AS-Glob:TI-FillPtrnMon:LowLvlLock-Sel', 0, 0.0], ['AS-Glob:TI-Osc-EjeBO:DelayRaw-SP', 0, 0], @@ -313,7 +289,7 @@ def get_dict(): ['AS-Glob:TI-Osc-EjeBO:RFDelayType-Sel', 0, 0.0], ['AS-Glob:TI-Osc-EjeBO:Src-Sel', 0, 0.0], ['AS-Glob:TI-Osc-EjeBO:State-Sel', 0, 0.0], - ['AS-Glob:TI-Osc-EjeBO:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['AS-Glob:TI-Osc-EjeBO:DeltaDelayRaw-SP', 30*[0, ], 0], ['AS-Glob:TI-Osc-EjeBO:LowLvlLock-Sel', 0, 0.0], ['AS-Glob:TI-Osc-InjBO:DelayRaw-SP', 0, 0], @@ -322,7 +298,7 @@ def get_dict(): ['AS-Glob:TI-Osc-InjBO:Polarity-Sel', 0, 0.0], ['AS-Glob:TI-Osc-InjBO:Src-Sel', 0, 0.0], ['AS-Glob:TI-Osc-InjBO:State-Sel', 0, 0.0], - ['AS-Glob:TI-Osc-InjBO:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['AS-Glob:TI-Osc-InjBO:DeltaDelayRaw-SP', 30*[0, ], 0], ['AS-Glob:TI-Osc-InjBO:LowLvlLock-Sel', 0, 0.0], ['AS-Glob:TI-Osc-InjSI:DelayRaw-SP', 0, 0], @@ -331,7 +307,7 @@ def get_dict(): ['AS-Glob:TI-Osc-InjSI:Polarity-Sel', 0, 0.0], ['AS-Glob:TI-Osc-InjSI:Src-Sel', 0, 0.0], ['AS-Glob:TI-Osc-InjSI:State-Sel', 0, 0.0], - ['AS-Glob:TI-Osc-InjSI:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['AS-Glob:TI-Osc-InjSI:DeltaDelayRaw-SP', 30*[0, ], 0], ['AS-Glob:TI-Osc-InjSI:LowLvlLock-Sel', 0, 0.0], ['BO-01D:TI-InjKckr:DelayRaw-SP', 0, 0], @@ -340,7 +316,7 @@ def get_dict(): ['BO-01D:TI-InjKckr:Polarity-Sel', 0, 0.0], ['BO-01D:TI-InjKckr:Src-Sel', 0, 0.0], ['BO-01D:TI-InjKckr:State-Sel', 0, 0.0], - ['BO-01D:TI-InjKckr:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-01D:TI-InjKckr:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-01D:TI-InjKckr:LowLvlLock-Sel', 0, 0.0], ['BO-35D:TI-DCCT:DelayRaw-SP', 0, 0], @@ -350,7 +326,7 @@ def get_dict(): ['BO-35D:TI-DCCT:RFDelayType-Sel', 0, 0.0], ['BO-35D:TI-DCCT:Src-Sel', 0, 0.0], ['BO-35D:TI-DCCT:State-Sel', 0, 0.0], - ['BO-35D:TI-DCCT:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-35D:TI-DCCT:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-35D:TI-DCCT:LowLvlLock-Sel', 0, 0.0], ['BO-48D:TI-EjeKckr:DelayRaw-SP', 0, 0], @@ -360,7 +336,7 @@ def get_dict(): ['BO-48D:TI-EjeKckr:RFDelayType-Sel', 0, 0.0], ['BO-48D:TI-EjeKckr:Src-Sel', 0, 0.0], ['BO-48D:TI-EjeKckr:State-Sel', 0, 0.0], - ['BO-48D:TI-EjeKckr:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-48D:TI-EjeKckr:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-48D:TI-EjeKckr:LowLvlLock-Sel', 0, 0.0], ['BO-50U:TI-VLightCam:DelayRaw-SP', 0, 0], @@ -370,7 +346,7 @@ def get_dict(): ['BO-50U:TI-VLightCam:RFDelayType-Sel', 0, 0.0], ['BO-50U:TI-VLightCam:Src-Sel', 0, 0.0], ['BO-50U:TI-VLightCam:State-Sel', 0, 0.0], - ['BO-50U:TI-VLightCam:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-50U:TI-VLightCam:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-50U:TI-VLightCam:LowLvlLock-Sel', 0, 0.0], ['BO-Fam:TI-BPM:DelayRaw-SP', 0, 0], @@ -379,7 +355,7 @@ def get_dict(): ['BO-Fam:TI-BPM:Polarity-Sel', 0, 0.0], ['BO-Fam:TI-BPM:Src-Sel', 0, 0.0], ['BO-Fam:TI-BPM:State-Sel', 0, 0.0], - ['BO-Fam:TI-BPM:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-Fam:TI-BPM:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-Fam:TI-BPM:LowLvlLock-Sel', 0, 0.0], ['BO-Glob:TI-LLRF-PsMtn:DelayRaw-SP', 0, 0], @@ -388,7 +364,7 @@ def get_dict(): ['BO-Glob:TI-LLRF-PsMtn:Polarity-Sel', 0, 0.0], ['BO-Glob:TI-LLRF-PsMtn:Src-Sel', 0, 0.0], ['BO-Glob:TI-LLRF-PsMtn:State-Sel', 0, 0.0], - ['BO-Glob:TI-LLRF-PsMtn:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-Glob:TI-LLRF-PsMtn:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-Glob:TI-LLRF-PsMtn:LowLvlLock-Sel', 0, 0.0], ['BO-Glob:TI-LLRF-Rmp:DelayRaw-SP', 0, 0], @@ -397,7 +373,7 @@ def get_dict(): ['BO-Glob:TI-LLRF-Rmp:Polarity-Sel', 0, 0.0], ['BO-Glob:TI-LLRF-Rmp:Src-Sel', 0, 0.0], ['BO-Glob:TI-LLRF-Rmp:State-Sel', 0, 0.0], - ['BO-Glob:TI-LLRF-Rmp:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-Glob:TI-LLRF-Rmp:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-Glob:TI-LLRF-Rmp:LowLvlLock-Sel', 0, 0.0], ['BO-Glob:TI-Mags-Corrs:DelayRaw-SP', 0, 0], @@ -406,7 +382,7 @@ def get_dict(): ['BO-Glob:TI-Mags-Corrs:Polarity-Sel', 0, 0.0], ['BO-Glob:TI-Mags-Corrs:Src-Sel', 0, 0.0], # ['BO-Glob:TI-Mags-Corrs:State-Sel', 0, 0.0], - ['BO-Glob:TI-Mags-Corrs:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-Glob:TI-Mags-Corrs:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-Glob:TI-Mags-Corrs:LowLvlLock-Sel', 0, 0.0], ['BO-Glob:TI-Mags-Fams:DelayRaw-SP', 0, 0], @@ -415,7 +391,7 @@ def get_dict(): ['BO-Glob:TI-Mags-Fams:Polarity-Sel', 0, 0.0], ['BO-Glob:TI-Mags-Fams:Src-Sel', 0, 0.0], # ['BO-Glob:TI-Mags-Fams:State-Sel', 0, 0.0], - ['BO-Glob:TI-Mags-Fams:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-Glob:TI-Mags-Fams:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-Glob:TI-Mags-Fams:LowLvlLock-Sel', 0, 0.0], ['BO-Glob:TI-TuneProc:DelayRaw-SP', 0, 0], @@ -425,7 +401,7 @@ def get_dict(): ['BO-Glob:TI-TuneProc:RFDelayType-Sel', 0, 0.0], ['BO-Glob:TI-TuneProc:Src-Sel', 0, 0.0], ['BO-Glob:TI-TuneProc:State-Sel', 0, 0.0], - ['BO-Glob:TI-TuneProc:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['BO-Glob:TI-TuneProc:DeltaDelayRaw-SP', 30*[0, ], 0], ['BO-Glob:TI-TuneProc:LowLvlLock-Sel', 0, 0.0], ['LI-01:TI-Osc-Modltr:DelayRaw-SP', 0, 0], @@ -434,7 +410,7 @@ def get_dict(): ['LI-01:TI-Osc-Modltr:Polarity-Sel', 0, 0.0], ['LI-01:TI-Osc-Modltr:Src-Sel', 0, 0.0], ['LI-01:TI-Osc-Modltr:State-Sel', 0, 0.0], - ['LI-01:TI-Osc-Modltr:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-01:TI-Osc-Modltr:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-01:TI-Osc-Modltr:LowLvlLock-Sel', 0, 0.0], ['LI-01:TI-EGun-MultBun:DelayRaw-SP', 0, 0], @@ -444,7 +420,7 @@ def get_dict(): ['LI-01:TI-EGun-MultBun:RFDelayType-Sel', 0, 0.0], ['LI-01:TI-EGun-MultBun:Src-Sel', 0, 0.0], ['LI-01:TI-EGun-MultBun:State-Sel', 0, 0.0], - ['LI-01:TI-EGun-MultBun:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-01:TI-EGun-MultBun:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-01:TI-EGun-MultBun:LowLvlLock-Sel', 0, 0.0], ['LI-01:TI-EGun-MultBunPre:DelayRaw-SP', 0, 0], @@ -454,7 +430,7 @@ def get_dict(): ['LI-01:TI-EGun-MultBunPre:RFDelayType-Sel', 0, 0.0], ['LI-01:TI-EGun-MultBunPre:Src-Sel', 0, 0.0], ['LI-01:TI-EGun-MultBunPre:State-Sel', 0, 0.0], - ['LI-01:TI-EGun-MultBunPre:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-01:TI-EGun-MultBunPre:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-01:TI-EGun-MultBunPre:LowLvlLock-Sel', 0, 0.0], ['LI-01:TI-EGun-SglBun:DelayRaw-SP', 0, 0], @@ -464,7 +440,7 @@ def get_dict(): ['LI-01:TI-EGun-SglBun:RFDelayType-Sel', 0, 0.0], ['LI-01:TI-EGun-SglBun:Src-Sel', 0, 0.0], ['LI-01:TI-EGun-SglBun:State-Sel', 0, 0.0], - ['LI-01:TI-EGun-SglBun:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-01:TI-EGun-SglBun:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-01:TI-EGun-SglBun:LowLvlLock-Sel', 0, 0.0], ['LI-01:TI-Modltr-1:DelayRaw-SP', 0, 0], @@ -473,7 +449,7 @@ def get_dict(): ['LI-01:TI-Modltr-1:Polarity-Sel', 0, 0.0], ['LI-01:TI-Modltr-1:Src-Sel', 0, 0.0], ['LI-01:TI-Modltr-1:State-Sel', 0, 0.0], - ['LI-01:TI-Modltr-1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-01:TI-Modltr-1:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-01:TI-Modltr-1:LowLvlLock-Sel', 0, 0.0], ['LI-01:TI-Modltr-2:DelayRaw-SP', 0, 0], @@ -482,7 +458,7 @@ def get_dict(): ['LI-01:TI-Modltr-2:Polarity-Sel', 0, 0.0], ['LI-01:TI-Modltr-2:Src-Sel', 0, 0.0], ['LI-01:TI-Modltr-2:State-Sel', 0, 0.0], - ['LI-01:TI-Modltr-2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-01:TI-Modltr-2:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-01:TI-Modltr-2:LowLvlLock-Sel', 0, 0.0], ['LI-Fam:TI-BPM:DelayRaw-SP', 0, 0], @@ -492,7 +468,7 @@ def get_dict(): ['LI-Fam:TI-BPM:RFDelayType-Sel', 0, 0.0], ['LI-Fam:TI-BPM:Src-Sel', 0, 0.0], ['LI-Fam:TI-BPM:State-Sel', 0, 0.0], - ['LI-Fam:TI-BPM:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Fam:TI-BPM:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Fam:TI-BPM:LowLvlLock-Sel', 0, 0.0], ['LI-Fam:TI-ICT:DelayRaw-SP', 0, 0], @@ -502,7 +478,7 @@ def get_dict(): ['LI-Fam:TI-ICT:RFDelayType-Sel', 0, 0.0], ['LI-Fam:TI-ICT:Src-Sel', 0, 0.0], ['LI-Fam:TI-ICT:State-Sel', 0, 0.0], - ['LI-Fam:TI-ICT:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Fam:TI-ICT:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Fam:TI-ICT:LowLvlLock-Sel', 0, 0.0], ['LI-Fam:TI-Scrn:DelayRaw-SP', 0, 0], @@ -512,7 +488,7 @@ def get_dict(): ['LI-Fam:TI-Scrn:RFDelayType-Sel', 0, 0.0], ['LI-Fam:TI-Scrn:Src-Sel', 0, 0.0], ['LI-Fam:TI-Scrn:State-Sel', 0, 0.0], - ['LI-Fam:TI-Scrn:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Fam:TI-Scrn:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Fam:TI-Scrn:LowLvlLock-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-Kly1:DelayRaw-SP', 0, 0], @@ -521,7 +497,7 @@ def get_dict(): ['LI-Glob:TI-LLRF-Kly1:Polarity-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-Kly1:Src-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-Kly1:State-Sel', 0, 0.0], - ['LI-Glob:TI-LLRF-Kly1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Glob:TI-LLRF-Kly1:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Glob:TI-LLRF-Kly1:LowLvlLock-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-Kly2:DelayRaw-SP', 0, 0], @@ -530,7 +506,7 @@ def get_dict(): ['LI-Glob:TI-LLRF-Kly2:Polarity-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-Kly2:Src-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-Kly2:State-Sel', 0, 0.0], - ['LI-Glob:TI-LLRF-Kly2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Glob:TI-LLRF-Kly2:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Glob:TI-LLRF-Kly2:LowLvlLock-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-SHB:DelayRaw-SP', 0, 0], @@ -539,7 +515,7 @@ def get_dict(): ['LI-Glob:TI-LLRF-SHB:Polarity-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-SHB:Src-Sel', 0, 0.0], ['LI-Glob:TI-LLRF-SHB:State-Sel', 0, 0.0], - ['LI-Glob:TI-LLRF-SHB:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Glob:TI-LLRF-SHB:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Glob:TI-LLRF-SHB:LowLvlLock-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-Kly1:DelayRaw-SP', 0, 0], @@ -548,7 +524,7 @@ def get_dict(): ['LI-Glob:TI-SSAmp-Kly1:Polarity-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-Kly1:Src-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-Kly1:State-Sel', 0, 0.0], - ['LI-Glob:TI-SSAmp-Kly1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Glob:TI-SSAmp-Kly1:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Glob:TI-SSAmp-Kly1:LowLvlLock-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-Kly2:DelayRaw-SP', 0, 0], @@ -557,7 +533,7 @@ def get_dict(): ['LI-Glob:TI-SSAmp-Kly2:Polarity-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-Kly2:Src-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-Kly2:State-Sel', 0, 0.0], - ['LI-Glob:TI-SSAmp-Kly2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Glob:TI-SSAmp-Kly2:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Glob:TI-SSAmp-Kly2:LowLvlLock-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-SHB:DelayRaw-SP', 0, 0], @@ -566,7 +542,7 @@ def get_dict(): ['LI-Glob:TI-SSAmp-SHB:Polarity-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-SHB:Src-Sel', 0, 0.0], ['LI-Glob:TI-SSAmp-SHB:State-Sel', 0, 0.0], - ['LI-Glob:TI-SSAmp-SHB:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['LI-Glob:TI-SSAmp-SHB:DeltaDelayRaw-SP', 30*[0, ], 0], ['LI-Glob:TI-SSAmp-SHB:LowLvlLock-Sel', 0, 0.0], ['SI-01SA:TI-InjDpKckr:DelayRaw-SP', 0, 0], @@ -575,7 +551,7 @@ def get_dict(): ['SI-01SA:TI-InjDpKckr:Polarity-Sel', 0, 0.0], ['SI-01SA:TI-InjDpKckr:Src-Sel', 0, 0.0], ['SI-01SA:TI-InjDpKckr:State-Sel', 0, 0.0], - ['SI-01SA:TI-InjDpKckr:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-01SA:TI-InjDpKckr:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-01SA:TI-InjDpKckr:LowLvlLock-Sel', 0, 0.0], ['SI-01SA:TI-InjNLKckr:DelayRaw-SP', 0, 0], @@ -584,7 +560,7 @@ def get_dict(): ['SI-01SA:TI-InjNLKckr:Polarity-Sel', 0, 0.0], ['SI-01SA:TI-InjNLKckr:Src-Sel', 0, 0.0], ['SI-01SA:TI-InjNLKckr:State-Sel', 0, 0.0], - ['SI-01SA:TI-InjNLKckr:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-01SA:TI-InjNLKckr:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-01SA:TI-InjNLKckr:LowLvlLock-Sel', 0, 0.0], ['SI-01SA:TI-PingH:DelayRaw-SP', 0, 0], @@ -593,7 +569,7 @@ def get_dict(): ['SI-01SA:TI-PingH:Polarity-Sel', 0, 0.0], ['SI-01SA:TI-PingH:Src-Sel', 0, 0.0], ['SI-01SA:TI-PingH:State-Sel', 0, 0.0], - ['SI-01SA:TI-PingH:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-01SA:TI-PingH:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-01SA:TI-PingH:LowLvlLock-Sel', 0, 0.0], ['SI-13C4:TI-DCCT:DelayRaw-SP', 0, 0], @@ -603,7 +579,7 @@ def get_dict(): ['SI-13C4:TI-DCCT:RFDelayType-Sel', 0, 0.0], ['SI-13C4:TI-DCCT:Src-Sel', 0, 0.0], ['SI-13C4:TI-DCCT:State-Sel', 0, 0.0], - ['SI-13C4:TI-DCCT:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-13C4:TI-DCCT:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-13C4:TI-DCCT:LowLvlLock-Sel', 0, 0.0], ['SI-14C4:TI-DCCT:DelayRaw-SP', 0, 0], @@ -613,7 +589,7 @@ def get_dict(): ['SI-14C4:TI-DCCT:RFDelayType-Sel', 0, 0.0], ['SI-14C4:TI-DCCT:Src-Sel', 0, 0.0], ['SI-14C4:TI-DCCT:State-Sel', 0, 0.0], - ['SI-14C4:TI-DCCT:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-14C4:TI-DCCT:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-14C4:TI-DCCT:LowLvlLock-Sel', 0, 0.0], ['SI-19C4:TI-PingV:DelayRaw-SP', 0, 0], @@ -623,7 +599,7 @@ def get_dict(): ['SI-19C4:TI-PingV:RFDelayType-Sel', 0, 0.0], ['SI-19C4:TI-PingV:Src-Sel', 0, 0.0], ['SI-19C4:TI-PingV:State-Sel', 0, 0.0], - ['SI-19C4:TI-PingV:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-19C4:TI-PingV:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-19C4:TI-PingV:LowLvlLock-Sel', 0, 0.0], ['SI-Fam:TI-BPM:DelayRaw-SP', 0, 0], @@ -632,9 +608,18 @@ def get_dict(): ['SI-Fam:TI-BPM:Polarity-Sel', 0, 0.0], ['SI-Fam:TI-BPM:Src-Sel', 0, 0.0], ['SI-Fam:TI-BPM:State-Sel', 0, 0.0], - ['SI-Fam:TI-BPM:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Fam:TI-BPM:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Fam:TI-BPM:LowLvlLock-Sel', 0, 0.0], + ['SI-Fam:TI-FOFB:DelayRaw-SP', 0, 0], + ['SI-Fam:TI-FOFB:Duration-SP', 0, 0.0], # [us] + ['SI-Fam:TI-FOFB:NrPulses-SP', 0, 0.0], + ['SI-Fam:TI-FOFB:Polarity-Sel', 0, 0.0], + ['SI-Fam:TI-FOFB:Src-Sel', 0, 0.0], + ['SI-Fam:TI-FOFB:State-Sel', 0, 0.0], + ['SI-Fam:TI-FOFB:DeltaDelayRaw-SP', 30*[0, ], 0], + ['SI-Fam:TI-FOFB:LowLvlLock-Sel', 0, 0.0], + ['SI-Glob:TI-BbBProcH-Fid:DelayRaw-SP', 0, 0], ['SI-Glob:TI-BbBProcH-Fid:Duration-SP', 0, 0.0], # [us] ['SI-Glob:TI-BbBProcH-Fid:NrPulses-SP', 0, 0.0], @@ -642,7 +627,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcH-Fid:RFDelayType-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Fid:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Fid:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcH-Fid:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcH-Fid:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcH-Fid:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Trig1:DelayRaw-SP', 0, 0], @@ -651,7 +636,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcH-Trig1:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Trig1:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Trig1:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcH-Trig1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcH-Trig1:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcH-Trig1:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Trig2:DelayRaw-SP', 0, 0], @@ -660,7 +645,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcH-Trig2:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Trig2:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcH-Trig2:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcH-Trig2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcH-Trig2:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcH-Trig2:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Fid:DelayRaw-SP', 0, 0], @@ -670,7 +655,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcL-Fid:RFDelayType-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Fid:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Fid:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcL-Fid:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcL-Fid:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcL-Fid:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Trig1:DelayRaw-SP', 0, 0], @@ -679,7 +664,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcL-Trig1:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Trig1:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Trig1:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcL-Trig1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcL-Trig1:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcL-Trig1:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Trig2:DelayRaw-SP', 0, 0], @@ -688,7 +673,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcL-Trig2:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Trig2:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcL-Trig2:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcL-Trig2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcL-Trig2:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcL-Trig2:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Fid:DelayRaw-SP', 0, 0], @@ -698,7 +683,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcV-Fid:RFDelayType-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Fid:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Fid:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcV-Fid:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcV-Fid:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcV-Fid:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Trig1:DelayRaw-SP', 0, 0], @@ -707,7 +692,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcV-Trig1:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Trig1:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Trig1:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcV-Trig1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcV-Trig1:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcV-Trig1:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Trig2:DelayRaw-SP', 0, 0], @@ -716,7 +701,7 @@ def get_dict(): ['SI-Glob:TI-BbBProcV-Trig2:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Trig2:Src-Sel', 0, 0.0], ['SI-Glob:TI-BbBProcV-Trig2:State-Sel', 0, 0.0], - ['SI-Glob:TI-BbBProcV-Trig2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-BbBProcV-Trig2:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-BbBProcV-Trig2:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-LLRF-PsMtn:DelayRaw-SP', 0, 0], @@ -725,7 +710,7 @@ def get_dict(): ['SI-Glob:TI-LLRF-PsMtn:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-LLRF-PsMtn:Src-Sel', 0, 0.0], ['SI-Glob:TI-LLRF-PsMtn:State-Sel', 0, 0.0], - ['SI-Glob:TI-LLRF-PsMtn:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-LLRF-PsMtn:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-LLRF-PsMtn:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-LLRF-Rmp:DelayRaw-SP', 0, 0], @@ -734,7 +719,7 @@ def get_dict(): ['SI-Glob:TI-LLRF-Rmp:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-LLRF-Rmp:Src-Sel', 0, 0.0], ['SI-Glob:TI-LLRF-Rmp:State-Sel', 0, 0.0], - ['SI-Glob:TI-LLRF-Rmp:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-LLRF-Rmp:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-LLRF-Rmp:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Bends:DelayRaw-SP', 0, 0], @@ -743,7 +728,7 @@ def get_dict(): ['SI-Glob:TI-Mags-Bends:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Bends:Src-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Bends:State-Sel', 0, 0.0], - ['SI-Glob:TI-Mags-Bends:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-Mags-Bends:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-Mags-Bends:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Corrs:DelayRaw-SP', 0, 0], @@ -752,7 +737,7 @@ def get_dict(): ['SI-Glob:TI-Mags-Corrs:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Corrs:Src-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Corrs:State-Sel', 0, 0.0], - ['SI-Glob:TI-Mags-Corrs:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-Mags-Corrs:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-Mags-Corrs:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Quads:DelayRaw-SP', 0, 0], @@ -761,7 +746,7 @@ def get_dict(): ['SI-Glob:TI-Mags-Quads:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Quads:Src-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Quads:State-Sel', 0, 0.0], - ['SI-Glob:TI-Mags-Quads:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-Mags-Quads:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-Mags-Quads:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-Mags-QTrims:DelayRaw-SP', 0, 0], @@ -770,7 +755,7 @@ def get_dict(): ['SI-Glob:TI-Mags-QTrims:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-Mags-QTrims:Src-Sel', 0, 0.0], ['SI-Glob:TI-Mags-QTrims:State-Sel', 0, 0.0], - ['SI-Glob:TI-Mags-QTrims:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-Mags-QTrims:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-Mags-QTrims:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Sexts:DelayRaw-SP', 0, 0], @@ -779,7 +764,7 @@ def get_dict(): ['SI-Glob:TI-Mags-Sexts:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Sexts:Src-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Sexts:State-Sel', 0, 0.0], - ['SI-Glob:TI-Mags-Sexts:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-Mags-Sexts:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-Mags-Sexts:LowLvlLock-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Skews:DelayRaw-SP', 0, 0], @@ -788,7 +773,7 @@ def get_dict(): ['SI-Glob:TI-Mags-Skews:Polarity-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Skews:Src-Sel', 0, 0.0], ['SI-Glob:TI-Mags-Skews:State-Sel', 0, 0.0], - ['SI-Glob:TI-Mags-Skews:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['SI-Glob:TI-Mags-Skews:DeltaDelayRaw-SP', 30*[0, ], 0], ['SI-Glob:TI-Mags-Skews:LowLvlLock-Sel', 0, 0.0], # NOTE: This trigger is not present yet in timing IOC: @@ -799,7 +784,7 @@ def get_dict(): # ['SI-Glob:TI-StrkCam-Trig1:RFDelayType-Sel', 0, 0.0], # ['SI-Glob:TI-StrkCam-Trig1:Src-Sel', 0, 0.0], # ['SI-Glob:TI-StrkCam-Trig1:State-Sel', 0, 0.0], - # ['SI-Glob:TI-StrkCam-Trig1:DeltaDelay-SP', 30*[0.0, ], 0.0], + # ['SI-Glob:TI-StrkCam-Trig1:DeltaDelayRaw-SP', 30*[0, ], 0], # ['SI-Glob:TI-StrkCam-Trig1:LowLvlLock-Sel', 0, 0.0], # ['SI-Glob:TI-StrkCam-Trig2:DelayRaw-SP', 0, 0], @@ -809,7 +794,7 @@ def get_dict(): # ['SI-Glob:TI-StrkCam-Trig2:RFDelayType-Sel', 0, 0.0], # ['SI-Glob:TI-StrkCam-Trig2:Src-Sel', 0, 0.0], # ['SI-Glob:TI-StrkCam-Trig2:State-Sel', 0, 0.0], - # ['SI-Glob:TI-StrkCam-Trig2:DeltaDelay-SP', 30*[0.0, ], 0.0], + # ['SI-Glob:TI-StrkCam-Trig2:DeltaDelayRaw-SP', 30*[0, ], 0], # ['SI-Glob:TI-StrkCam-Trig2:LowLvlLock-Sel', 0, 0.0], ['TB-04:TI-InjSept:DelayRaw-SP', 0, 0], @@ -818,7 +803,7 @@ def get_dict(): ['TB-04:TI-InjSept:Polarity-Sel', 0, 0.0], ['TB-04:TI-InjSept:Src-Sel', 0, 0.0], ['TB-04:TI-InjSept:State-Sel', 0, 0.0], - ['TB-04:TI-InjSept:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TB-04:TI-InjSept:DeltaDelayRaw-SP', 30*[0, ], 0], ['TB-04:TI-InjSept:LowLvlLock-Sel', 0, 0.0], ['TB-Fam:TI-BPM:DelayRaw-SP', 0, 0], @@ -827,7 +812,7 @@ def get_dict(): ['TB-Fam:TI-BPM:Polarity-Sel', 0, 0.0], ['TB-Fam:TI-BPM:Src-Sel', 0, 0.0], ['TB-Fam:TI-BPM:State-Sel', 0, 0.0], - ['TB-Fam:TI-BPM:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TB-Fam:TI-BPM:DeltaDelayRaw-SP', 30*[0, ], 0], ['TB-Fam:TI-BPM:LowLvlLock-Sel', 0, 0.0], ['TB-Fam:TI-ICT-Digit:DelayRaw-SP', 0, 0], @@ -836,7 +821,7 @@ def get_dict(): ['TB-Fam:TI-ICT-Digit:Polarity-Sel', 0, 0.0], ['TB-Fam:TI-ICT-Digit:Src-Sel', 0, 0.0], ['TB-Fam:TI-ICT-Digit:State-Sel', 0, 0.0], - ['TB-Fam:TI-ICT-Digit:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TB-Fam:TI-ICT-Digit:DeltaDelayRaw-SP', 30*[0, ], 0], ['TB-Fam:TI-ICT-Digit:LowLvlLock-Sel', 0, 0.0], ['TB-Fam:TI-ICT-Integ:DelayRaw-SP', 0, 0], @@ -845,7 +830,7 @@ def get_dict(): ['TB-Fam:TI-ICT-Integ:Polarity-Sel', 0, 0.0], ['TB-Fam:TI-ICT-Integ:Src-Sel', 0, 0.0], ['TB-Fam:TI-ICT-Integ:State-Sel', 0, 0.0], - ['TB-Fam:TI-ICT-Integ:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TB-Fam:TI-ICT-Integ:DeltaDelayRaw-SP', 30*[0, ], 0], ['TB-Fam:TI-ICT-Integ:LowLvlLock-Sel', 0, 0.0], ['TB-Glob:TI-Mags:DelayRaw-SP', 0, 0], @@ -854,7 +839,7 @@ def get_dict(): ['TB-Glob:TI-Mags:Polarity-Sel', 0, 0.0], ['TB-Glob:TI-Mags:Src-Sel', 0, 0.0], ['TB-Glob:TI-Mags:State-Sel', 0, 0.0], - ['TB-Glob:TI-Mags:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TB-Glob:TI-Mags:DeltaDelayRaw-SP', 30*[0, ], 0], ['TB-Glob:TI-Mags:LowLvlLock-Sel', 0, 0.0], ['TS-01:TI-EjeSeptF:DelayRaw-SP', 0, 0], @@ -864,7 +849,7 @@ def get_dict(): ['TS-01:TI-EjeSeptF:RFDelayType-Sel', 0, 0.0], ['TS-01:TI-EjeSeptF:Src-Sel', 0, 0.0], ['TS-01:TI-EjeSeptF:State-Sel', 0, 0.0], - ['TS-01:TI-EjeSeptF:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-01:TI-EjeSeptF:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-01:TI-EjeSeptF:LowLvlLock-Sel', 0, 0.0], ['TS-01:TI-EjeSeptG:DelayRaw-SP', 0, 0], @@ -874,7 +859,7 @@ def get_dict(): ['TS-01:TI-EjeSeptG:RFDelayType-Sel', 0, 0.0], ['TS-01:TI-EjeSeptG:Src-Sel', 0, 0.0], ['TS-01:TI-EjeSeptG:State-Sel', 0, 0.0], - ['TS-01:TI-EjeSeptG:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-01:TI-EjeSeptG:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-01:TI-EjeSeptG:LowLvlLock-Sel', 0, 0.0], ['TS-04:TI-InjSeptF:DelayRaw-SP', 0, 0], @@ -883,7 +868,7 @@ def get_dict(): ['TS-04:TI-InjSeptF:Polarity-Sel', 0, 0.0], ['TS-04:TI-InjSeptF:Src-Sel', 0, 0.0], ['TS-04:TI-InjSeptF:State-Sel', 0, 0.0], - ['TS-04:TI-InjSeptF:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-04:TI-InjSeptF:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-04:TI-InjSeptF:LowLvlLock-Sel', 0, 0.0], ['TS-04:TI-InjSeptG-1:DelayRaw-SP', 0, 0], @@ -892,7 +877,7 @@ def get_dict(): ['TS-04:TI-InjSeptG-1:Polarity-Sel', 0, 0.0], ['TS-04:TI-InjSeptG-1:Src-Sel', 0, 0.0], ['TS-04:TI-InjSeptG-1:State-Sel', 0, 0.0], - ['TS-04:TI-InjSeptG-1:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-04:TI-InjSeptG-1:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-04:TI-InjSeptG-1:LowLvlLock-Sel', 0, 0.0], ['TS-04:TI-InjSeptG-2:DelayRaw-SP', 0, 0], @@ -901,7 +886,7 @@ def get_dict(): ['TS-04:TI-InjSeptG-2:Polarity-Sel', 0, 0.0], ['TS-04:TI-InjSeptG-2:Src-Sel', 0, 0.0], ['TS-04:TI-InjSeptG-2:State-Sel', 0, 0.0], - ['TS-04:TI-InjSeptG-2:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-04:TI-InjSeptG-2:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-04:TI-InjSeptG-2:LowLvlLock-Sel', 0, 0.0], ['TS-Fam:TI-BPM:DelayRaw-SP', 0, 0], @@ -910,7 +895,7 @@ def get_dict(): ['TS-Fam:TI-BPM:Polarity-Sel', 0, 0.0], ['TS-Fam:TI-BPM:Src-Sel', 0, 0.0], ['TS-Fam:TI-BPM:State-Sel', 0, 0.0], - ['TS-Fam:TI-BPM:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-Fam:TI-BPM:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-Fam:TI-BPM:LowLvlLock-Sel', 0, 0.0], ['TS-Fam:TI-ICT-Digit:DelayRaw-SP', 0, 0], @@ -919,7 +904,7 @@ def get_dict(): ['TS-Fam:TI-ICT-Digit:Polarity-Sel', 0, 0.0], ['TS-Fam:TI-ICT-Digit:Src-Sel', 0, 0.0], ['TS-Fam:TI-ICT-Digit:State-Sel', 0, 0.0], - ['TS-Fam:TI-ICT-Digit:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-Fam:TI-ICT-Digit:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-Fam:TI-ICT-Digit:LowLvlLock-Sel', 0, 0.0], ['TS-Fam:TI-ICT-Integ:DelayRaw-SP', 0, 0], @@ -928,7 +913,7 @@ def get_dict(): ['TS-Fam:TI-ICT-Integ:Polarity-Sel', 0, 0.0], ['TS-Fam:TI-ICT-Integ:Src-Sel', 0, 0.0], ['TS-Fam:TI-ICT-Integ:State-Sel', 0, 0.0], - ['TS-Fam:TI-ICT-Integ:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-Fam:TI-ICT-Integ:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-Fam:TI-ICT-Integ:LowLvlLock-Sel', 0, 0.0], ['TS-Fam:TI-Scrn:DelayRaw-SP', 0, 0], @@ -938,7 +923,7 @@ def get_dict(): ['TS-Fam:TI-Scrn:RFDelayType-Sel', 0, 0.0], ['TS-Fam:TI-Scrn:Src-Sel', 0, 0.0], ['TS-Fam:TI-Scrn:State-Sel', 0, 0.0], - ['TS-Fam:TI-Scrn:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-Fam:TI-Scrn:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-Fam:TI-Scrn:LowLvlLock-Sel', 0, 0.0], ['TS-Glob:TI-Mags:DelayRaw-SP', 0, 0], @@ -947,7 +932,7 @@ def get_dict(): ['TS-Glob:TI-Mags:Polarity-Sel', 0, 0.0], ['TS-Glob:TI-Mags:Src-Sel', 0, 0.0], ['TS-Glob:TI-Mags:State-Sel', 0, 0.0], - ['TS-Glob:TI-Mags:DeltaDelay-SP', 30*[0.0, ], 0.0], + ['TS-Glob:TI-Mags:DeltaDelayRaw-SP', 30*[0, ], 0], ['TS-Glob:TI-Mags:LowLvlLock-Sel', 0, 0.0], ] @@ -1029,7 +1014,7 @@ def get_dict(): ['BR-RF-DLLRF-01:AMPREF:INCRATE:S', 0, 0.0], # mV ['BR-RF-DLLRF-01:PHSREF:INCRATE:S', 0, 0.0], # Deg ['BR-RF-DLLRF-01:mV:AL:REF-SP', 0, 0.0], # mV - ['BR-RF-DLLRF-01:PL:REF:S', 0, 0.0],# Deg + ['BR-RF-DLLRF-01:PL:REF:S', 0, 0.0], # Deg ['BR-RF-DLLRF-01:TUNE:MARGIN:HI:S', 0, 0.0], # Deg ['BR-RF-DLLRF-01:TUNE:MARGIN:LO:S', 0, 0.0], # Deg ['BR-RF-DLLRF-01:DTune-SP', 0, 0.0], # Deg @@ -1053,7 +1038,7 @@ def get_dict(): ['SR-RF-DLLRF-01:AMPREF:INCRATE:S', 0, 0.0], # mV ['SR-RF-DLLRF-01:PHSREF:INCRATE:S', 0, 0.0], # Deg ['SR-RF-DLLRF-01:mV:AL:REF-SP', 0, 0.0], # mV - ['SR-RF-DLLRF-01:PL:REF:S', 0, 0.0],# Deg + ['SR-RF-DLLRF-01:PL:REF:S', 0, 0.0], # Deg ['SR-RF-DLLRF-01:TUNE:MARGIN:HI:S', 0, 0.0], # Deg ['SR-RF-DLLRF-01:TUNE:MARGIN:LO:S', 0, 0.0], # Deg ['SR-RF-DLLRF-01:DTune-SP', 0, 0.0], # Deg diff --git a/siriuspy/siriuspy/clientweb/implementation.py b/siriuspy/siriuspy/clientweb/implementation.py index 8b1e201ea..2e98bdba3 100644 --- a/siriuspy/siriuspy/clientweb/implementation.py +++ b/siriuspy/siriuspy/clientweb/implementation.py @@ -134,7 +134,7 @@ def crates_mapping(timeout=_TIMEOUT): """Return the crates mapping.""" url = _DIAG_FOLDER + 'microTCA-vs-BPMs-mapping/' text = read_url(url, timeout=timeout) - pat = _re.compile('>(names.crate[a-zA-Z_0-9]*.cfg)<') + pat = _re.compile('"(names_crate[a-zA-Z_0-9]*.cfg)"') files = pat.findall(text) txt = '' for fi in files: diff --git a/siriuspy/siriuspy/devices/injsys.py b/siriuspy/siriuspy/devices/injsys.py index c8fc4877a..b8b08fb62 100644 --- a/siriuspy/siriuspy/devices/injsys.py +++ b/siriuspy/siriuspy/devices/injsys.py @@ -512,11 +512,11 @@ def __init__(self): def cmd_turn_off(self): """Turn off.""" # disable injbo - self.injboevt.mode = 'Disabled' + self.injboevt.mode = 'Disable' # wait for injbo to be disabled retval = self._wait_devices_propty( - self.injboevt, 'Mode-Sts', Event.MODES.index('Disabled'), + self.injboevt, 'Mode-Sts', Event.MODES.index('Disable'), timeout=3, return_prob=True) if not retval[0]: text = 'Check for InjBO Event to be disabled timed '\ @@ -1000,7 +1000,7 @@ def _do_procedures(self, procedures): for fun, msg in procedures: if self._check_abort(): return False - if not fun(): + if not fun(timeout=2): self._update_status('ERR:Could not ' + msg) return False _time.sleep(0.5) diff --git a/siriuspy/siriuspy/devices/timing.py b/siriuspy/siriuspy/devices/timing.py index 5eb0b096d..21b9fdc2c 100644 --- a/siriuspy/siriuspy/devices/timing.py +++ b/siriuspy/siriuspy/devices/timing.py @@ -194,7 +194,10 @@ def mode(self, value): @property def mode_str(self): """.""" - return Event.MODES[self['Mode-Sts']] + mode = self['Mode-Sts'] + if mode is not None: + return Event.MODES[mode] + return None @property def code(self): @@ -213,7 +216,10 @@ def delay_type(self, value): @property def delay_type_str(self): """.""" - return Event.DELAYTYPES[self['DelayType-Sts']] + dlytyp = self['DelayType-Sts'] + if dlytyp is not None: + return Event.DELAYTYPES[dlytyp] + return None @property def delay(self): diff --git a/siriuspy/siriuspy/optics/lattice_survey.py b/siriuspy/siriuspy/optics/lattice_survey.py index cd27e15d8..dec0a14b9 100644 --- a/siriuspy/siriuspy/optics/lattice_survey.py +++ b/siriuspy/siriuspy/optics/lattice_survey.py @@ -101,48 +101,47 @@ def generate_bpm_static_table(): f.write('\n\n#BPMs data \n') f.write('#-----------') - crates = _get_crates_mapping() + all_bpms = _get_all_bpms() model = pymodels.si acc = model.create_accelerator() - _append_bpm_data_bl(filename, acc, crates, 'Beam Lines (BL)') - _append_bpm_data(filename, model, acc, crates, 'Storage Ring (SR)', 'SI') + _append_bpm_data_bl(filename, acc, all_bpms, 'Beam Lines (BL)') + _append_bpm_data(filename, model, acc, 'Storage Ring (SR)', 'SI') model = pymodels.bo acc = model.create_accelerator() - _append_bpm_data(filename, model, acc, crates, 'Booster (BO)', 'BO') + _append_bpm_data(filename, model, acc, 'Booster (BO)', 'BO') model = pymodels.tb acc, *_ = model.create_accelerator() - _append_bpm_data(filename, model, acc, crates, 'BO Transport Line', 'TB') + _append_bpm_data(filename, model, acc, 'BO Transport Line', 'TB') model = pymodels.ts acc, *_ = model.create_accelerator() - _append_bpm_data(filename, model, acc, crates, 'SR Transport Line', 'TS') + _append_bpm_data(filename, model, acc, 'SR Transport Line', 'TS') -def _append_bpm_data(filename, model, acc, crates, label, section): +def _append_bpm_data(filename, model, acc, label, section): fam_data = model.get_family_data(acc) pos = pyaccel.lattice.find_spos(acc) inds = [i[0] for i in fam_data['BPM']['index']] subs = fam_data['BPM']['subsection'] insts = fam_data['BPM']['instance'] - bpms, tims, bpos = [], [], [] + bpms, bpos = [], [] for ind, inst, sub in zip(inds, insts, subs): name = _join_name(sec=section, dis='DI', dev='BPM', sub=sub, idx=inst) bpms.append(name) - tims.append(crates[name]) bpos.append(pos[ind]) - _write_to_file(filename, bpms, bpos, tims, label) + _write_to_file(filename, bpms, bpos, label) -def _append_bpm_data_bl(filename, acc, crates, label): +def _append_bpm_data_bl(filename, acc, all_bpms, label): pos = pyaccel.lattice.find_spos(acc) mcs = pyaccel.lattice.find_indices(acc, 'fam_name', 'mc') - bpms_bc = [bpm for bpm in crates if bpm.sub.endswith('BCFE')] + bpms_bc = [bpm for bpm in all_bpms if bpm.sub.endswith('BCFE')] secs = [int(bpm.sub[:2]) for bpm in bpms_bc] bpos_bc = [pos[mcs[ss-1]] for ss in secs] @@ -152,7 +151,7 @@ def _append_bpm_data_bl(filename, acc, crates, label): mis = sorted(mia + mib + mip) end = ('SAFE', 'SBFE', 'SPFE') - bpms_mi = sorted([bpm for bpm in crates if bpm.sub.endswith(end)]) + bpms_mi = sorted([bpm for bpm in all_bpms if bpm.sub.endswith(end)]) secs = [int(bpm.sub[:2]) for bpm in bpms_mi] bpos_mi = [pos[mis[ss-1]] for ss in secs] @@ -160,39 +159,29 @@ def _append_bpm_data_bl(filename, acc, crates, label): bpos = bpos_mi + bpos_bc data = sorted(zip(bpos, bpms)) bpos, bpms = list(zip(*data)) - tims = [crates[b] for b in bpms] - _write_to_file(filename, bpms, bpos, tims, label) + _write_to_file(filename, bpms, bpos, label) -def _get_crates_mapping(): +def _get_all_bpms(): data = _crates_mapping() - crates = dict() - mapping = dict() + bpms = set() for line in data.splitlines(): line = line.strip() if not line or line[0] == '#': continue # empty line - crate, dev, *_ = line.split() + _, dev, *_ = line.split() dev = _PVName(dev) - if crate not in mapping and dev.dev == 'AMCFPGAEVR': - crates[crate] = dev - mapping[crates[crate]] = list() - else: - mapping[crates[crate]].append(dev) + if dev.dev in ('BPM', 'PBPM'): + bpms.add(dev) + return bpms - inv_mapping = dict() - for k, values in mapping.items(): - for value in values: - inv_mapping[value] = k - return inv_mapping - -def _write_to_file(fname, bpms, pos, tims, label): +def _write_to_file(fname, bpms, pos, label): with open(fname, 'a') as fil: fil.write('\n\n\n# '+label+'\n') fil.write('#'+57*'-' + '\n') - fil.write("#{bpm:20s} {pos:^15s} {timing:20s}\n".format( - bpm='Name', pos='Position [m]', timing='Timing')) + fil.write("#{bpm:20s} {pos:^15s}\n".format( + bpm='Name', pos='Position [m]')) fil.write('#'+57*'-' + '\n') - for bpm, p, t in zip(bpms, pos, tims): - fil.write(f"{bpm:20s} {p:^15.4f} {t:20s}\n") + for bpm, p in zip(bpms, pos): + fil.write(f"{bpm:20s} {p:^15.4f}\n") diff --git a/siriuspy/siriuspy/ramp/conn.py b/siriuspy/siriuspy/ramp/conn.py index 2083f3374..92654c292 100644 --- a/siriuspy/siriuspy/ramp/conn.py +++ b/siriuspy/siriuspy/ramp/conn.py @@ -66,11 +66,6 @@ class Const(_csdev.Const): 'EvtInjBO': Const.EVG + ':InjBO', 'EvtInjSI': Const.EVG + ':InjSI', 'EvtRmpBO': Const.EVG + ':RmpBO', - 'EvtDigLI': Const.EVG + ':DigLI', - 'EvtDigTB': Const.EVG + ':DigTB', - 'EvtDigBO': Const.EVG + ':DigBO', - 'EvtDigTS': Const.EVG + ':DigTS', - 'EvtDigSI': Const.EVG + ':DigSI', 'EvtStudy': Const.EVG + ':Study'} evt_propties = ('Mode-Sel', 'DelayType-Sel', 'Delay-SP') @@ -339,11 +334,6 @@ def _define_properties(self, prefix, connection_callback, callback): c.EvtInjBO_Delay: None, # [us] c.EvtRmpBO_Delay: None, # [us] c.EvtInjSI_Delay: None, # [us] - c.EvtDigLI_Delay: None, # [us] - c.EvtDigTB_Delay: None, # [us] - c.EvtDigBO_Delay: None, # [us] - c.EvtDigTS_Delay: None, # [us] - c.EvtDigSI_Delay: None, # [us] c.EvtStudy_Delay: None, # [us] c.TrgInjKckr_Delay: None, # [us] # Mags trigger diff --git a/siriuspy/siriuspy/ramp/reconst_factory.py b/siriuspy/siriuspy/ramp/reconst_factory.py index bba5149d0..4313aeee6 100644 --- a/siriuspy/siriuspy/ramp/reconst_factory.py +++ b/siriuspy/siriuspy/ramp/reconst_factory.py @@ -685,8 +685,7 @@ class BOTIRampFactory: } _events = { _EVG+':Linac', _EVG+':InjBO', _EVG+':RmpBO', _EVG+':InjSI', - _EVG+':DigLI', _EVG+':DigTB', _EVG+':DigBO', _EVG+':DigTS', - _EVG+':DigSI', _EVG+':Study', + _EVG+':Study', } _PVs = dict() diff --git a/siriuspy/siriuspy/search/bpms_search.py b/siriuspy/siriuspy/search/bpms_search.py index a704abef3..df70220c7 100644 --- a/siriuspy/siriuspy/search/bpms_search.py +++ b/siriuspy/siriuspy/search/bpms_search.py @@ -15,7 +15,6 @@ class BPMSearch: """ _mapping = None - _timing_mapping = None _lock = _Lock() @@ -88,12 +87,6 @@ def get_positions(cls, names=None, filters=None, sorting=None): names = cls.get_names(filters=filters, sorting=sorting) return [cls._mapping[k]['position'] for k in names] - @classmethod - def get_timing_mapping(cls): - """Return a dictionary with the power supply to beaglebone mapping.""" - cls._get_data() - return _dcopy(cls._timing_mapping) - @classmethod def _get_data(cls): with cls._lock: @@ -103,7 +96,6 @@ def _get_data(cls): raise Exception('could not read data from web server!') text = _web.bpms_data(timeout=_timeout) cls._build_mapping(text) - cls._build_timing_to_bpm_mapping() @classmethod def _build_mapping(cls, text): @@ -113,23 +105,11 @@ def _build_mapping(cls, text): line = line.strip() if not line or line[0] == '#': continue # empty line - key, pos, timing, *_ = line.split() + key, pos, *_ = line.split() key = _PVName(key) - timing = _PVName(timing) if key in mapping.keys(): raise Exception('BPM {0:s} double entry.'.format(key)) else: - mapping[key] = {'position': float(pos), 'timing': timing} + mapping[key] = {'position': float(pos)} cls._mapping = mapping cls._names = sorted(cls._mapping.keys()) - - @classmethod - def _build_timing_to_bpm_mapping(cls): - timing_mapping = dict() - for k, v in cls._mapping.items(): - k2 = v['timing'] - if k2 in timing_mapping.keys(): - timing_mapping[k2] += (k, ) - else: - timing_mapping[k2] = (k, ) - cls._timing_mapping = timing_mapping diff --git a/siriuspy/siriuspy/search/hl_time_search.py b/siriuspy/siriuspy/search/hl_time_search.py index 4370a7aff..0daf38bb8 100644 --- a/siriuspy/siriuspy/search/hl_time_search.py +++ b/siriuspy/siriuspy/search/hl_time_search.py @@ -15,6 +15,7 @@ class HLTimeSearch: _hl_triggers = dict() _hl_events = dict() + COMMOM_EVTS = ('Dsbld', 'RmpBO', 'Linac', 'Study') _lock = _Lock() @@ -43,8 +44,8 @@ def get_hl_trigger_predef_db(cls, hl_trigger): """Return the default database of the high level trigger.""" cls._init() dic_ = _dcopy(cls._hl_triggers[hl_trigger]['database']) - dic_['Src']['enums'] = ('Dsbl', ) + dic_['Src']['enums'] - dic_['Src']['value'] += 1 + src = dic_['Src'] + src['enums'] = cls.COMMOM_EVTS + src['enums'] return dic_ @classmethod diff --git a/siriuspy/siriuspy/search/ll_time_search.py b/siriuspy/siriuspy/search/ll_time_search.py index e3f56a122..0a1cfa7a7 100644 --- a/siriuspy/siriuspy/search/ll_time_search.py +++ b/siriuspy/siriuspy/search/ll_time_search.py @@ -7,7 +7,6 @@ from .. import clientweb as _web from ..namesys import SiriusPVName as _PVName, Filter as _Filter -from .bpms_search import BPMSearch as _BPMSearch from .ps_search import PSSearch as _PSSearch _TIMEOUT = 1.0 @@ -280,6 +279,18 @@ def get_relations_twds_evg(cls): @classmethod def has_clock(cls, ll_trigger): + """Check whether a low level trigger has access to EVG clocks. + + Args: + ll_trigger (SiriusPVName): Trigger name. + + Raises: + Exception: When trigger receiver is not recognized. + + Returns: + bool: True or False. + + """ name = _PVName(ll_trigger) if name.dev == 'AMCFPGAEVR': return True @@ -290,11 +301,21 @@ def has_clock(cls, ll_trigger): @classmethod def has_delay_type(cls, ll_trigger): + """Check whether a low level trigger has delay type. + + Args: + ll_trigger (SiriusPVName): Trigger name. + + Returns: + bool: True or False. + + """ name = _PVName(ll_trigger) return name.dev in {'EVR', 'EVE'} and name.propty.startswith('OUT') @classmethod def get_trigger_name(cls, channel): + """Get name of the trigger associated with channel.""" chan_tree = cls.get_device_tree(channel) for up_chan in chan_tree: if up_chan.device_name in cls._trig_src_devs: @@ -302,6 +323,7 @@ def get_trigger_name(cls, channel): @classmethod def get_fout_channel(cls, channel): + """Get name of the FOUT channel associated with channel.""" chan_tree = cls.get_device_tree(channel) for up_chan in chan_tree: if up_chan.device_name in cls._fout_devs: @@ -309,6 +331,7 @@ def get_fout_channel(cls, channel): @classmethod def get_evg_channel(cls, channel): + """Get name of the EVG channel associated with channel.""" chan_tree = cls.get_device_tree(channel) for up_chan in chan_tree: if up_chan.device_name in cls._evg_devs: @@ -377,7 +400,7 @@ def _add_crates_info(cls): conns = tuple(cls.In2OutMap['AMCFPGAEVR'].values())[0] conns = [v for v in conns if not v.startswith('FMC')] - conn_dict = _BPMSearch.get_timing_mapping() + conn_dict = cls._get_crates_mapping() used = set() twds_evg = _dcopy(cls._conn_twds_evg) for chan in twds_evg.keys(): @@ -395,6 +418,24 @@ def _add_crates_info(cls): ele1=bpm, ele2=chan.device_name) # print(conn_dict.keys() - used) + @classmethod + def _get_crates_mapping(cls): + data = _web.crates_mapping() + crates = dict() + mapping = dict() + for line in data.splitlines(): + line = line.strip() + if not line or line[0] == '#': + continue # empty line + crate, dev, *_ = line.split() + dev = _PVName(dev) + if crate not in mapping and dev.dev == 'AMCFPGAEVR': + crates[crate] = dev + mapping[crates[crate]] = list() + else: + mapping[crates[crate]].append(dev) + return mapping + @classmethod def _add_udc_info(cls): """Add the information of bbb to PS to timing map.""" diff --git a/siriuspy/siriuspy/timesys/csdev.py b/siriuspy/siriuspy/timesys/csdev.py index e45c6d210..3b8d88e76 100644 --- a/siriuspy/siriuspy/timesys/csdev.py +++ b/siriuspy/siriuspy/timesys/csdev.py @@ -15,7 +15,7 @@ class ETypes(_csdev.ETypes): """Local enumerate types.""" - EVT_MODES = ('Disabled', 'Continuous', 'Injection', 'OneShot', 'External') + EVT_MODES = ('Disable', 'Continuous', 'Injection', 'OneShot', 'External') TRIG_SRC_LL = ( 'Dsbl', 'Trigger', 'Clock0', 'Clock1', 'Clock2', 'Clock3', 'Clock4', 'Clock5', 'Clock6', 'Clock7') @@ -66,10 +66,10 @@ class Const(_csdev.Const): __EvtHL2LLMap = None __EvtLL2HLMap = None - evt_ll_codes = list(range(64)) + [124] + evt_ll_codes = list(range(64)) + [117, 124] evt_ll_names = ['Evt{0:02d}'.format(i) for i in evt_ll_codes] EvtLL = _csdev.Const.register( - 'EventsLL', evt_ll_names, values=evt_ll_codes) + 'EventsLL', evt_ll_names, values=evt_ll_codes) del evt_ll_codes, evt_ll_names # cleanup class namespace ClkHL2LLMap = { diff --git a/siriuspy/siriuspy/timesys/hl_classes.py b/siriuspy/siriuspy/timesys/hl_classes.py index 466c3edf9..189a91a82 100644 --- a/siriuspy/siriuspy/timesys/hl_classes.py +++ b/siriuspy/siriuspy/timesys/hl_classes.py @@ -265,15 +265,18 @@ def write(self, prop_name, value): with self._hldelay_lock: self._hldelay = int(round(value / self._ll_objs[0].base_del)) value = self._hldelay + self._hldeltadelay - elif prop_name.startswith('DeltaDelay'): - prop_name = prop_name.replace('DeltaDelay', 'DelayRaw') + elif prop_name.startswith('DeltaDelayRaw'): + prop_name = prop_name.replace('DeltaDelayRaw', 'DelayRaw') with self._hldelay_lock: - value = _np.round(value / self._ll_objs[0].base_del) + value = _np.array(value, dtype=int, ndmin=1) self._update_deltadelay(value) value = self._hldelay + self._hldeltadelay - elif prop_name.startswith('DeltaDelayRaw'): - prop_name = prop_name.replace('DeltaDelayRaw', 'DelayRaw') + elif prop_name.startswith('DeltaDelay'): + prop_name = prop_name.replace('DeltaDelay', 'DelayRaw') with self._hldelay_lock: + value = _np.array(value, ndmin=1) + value = _np.round(value / self._ll_objs[0].base_del) + value = _np.array(value, dtype=int) self._update_deltadelay(value) value = self._hldelay + self._hldeltadelay else: @@ -315,13 +318,8 @@ def get_ll_channels(self): return _HLSearch.get_hl_trigger_channels(self.prefix[:-1]) def _update_deltadelay(self, value): - if not hasattr(value, '__len__'): - value = _np.array([value, ]) - value = _np.array(value, dtype=int) - if len(value) <= len(self._hldeltadelay): - self._hldeltadelay[:len(value)] = value - elif len(value) > len(self._hldeltadelay): - self._hldeltadelay = value[:len(self._hldelay)] + siz = min(value.size, self._hldeltadelay.size) + self._hldeltadelay[:siz] = value[:siz] mini = self._hldeltadelay.min() self._hldelay += mini self._hldeltadelay -= mini diff --git a/siriuspy/siriuspy/timesys/ll_classes.py b/siriuspy/siriuspy/timesys/ll_classes.py index b6511bfb9..4195708d0 100644 --- a/siriuspy/siriuspy/timesys/ll_classes.py +++ b/siriuspy/siriuspy/timesys/ll_classes.py @@ -59,9 +59,7 @@ def __init__(self, channel, prefix): self._locked = False self._lock_threads_dict = dict() - evts = _HLSearch.get_hl_events() - evts.pop('Dsbl') - evts.pop('PsMtn') + evts = _HLSearch.get_configurable_hl_events() self._events = {evt: _Event(evt) for evt in evts} evg_name = _PVName(_LLSearch.get_evg_name()) @@ -96,7 +94,8 @@ def connected(self): """.""" pvs = list(self._readpvs.values()) + list(self._writepvs.values()) pvs += [self._base_freq_pv, ] - pvs += list(self._events.values()) + for evt in self._events.values(): + pvs += [evt.pv_object(p) for p in evt.properties] conn = True for pv in pvs: conn &= pv.connected @@ -108,7 +107,8 @@ def wait_for_connection(self, timeout=None): """.""" pvs = list(self._readpvs.values()) + list(self._writepvs.values()) pvs += [self._base_freq_pv, ] - pvs += list(self._events.values()) + for evt in self._events.values(): + pvs += [evt.pv_object(p) for p in evt.properties] for pv in pvs: if not pv.wait_for_connection(timeout=timeout): _log.info(pv.pvname + ' not connected.') @@ -431,6 +431,7 @@ def _define_dict_for_write(self): 'Delay': _partial(self._set_delay, raw=False), 'DelayRaw': _partial(self._set_delay, raw=True), 'RFDelayType': _partial(self._set_simple, 'RFDelayType'), + 'RFDelayType': self._set_rfdelaytype, 'LowLvlLock': self._set_locked, } return map_ @@ -489,7 +490,6 @@ def _get_status(self, prop, is_sp, value=None): dic_['Network'] = self._get_from_pvs(False, 'Network', def_val=0) dic_['Link'] = self._get_from_pvs(False, 'Link', def_val=0) dic_['PVsConn'] = self.connected - dic_['PVsConn'] &= all([x.connected for x in self._events.values()]) dic_['Intlk'] = 0 if 'Intlk' not in self._REMOVE_PROPS: @@ -568,12 +568,15 @@ def _get_total_delay(self, dic): if src_str in self._events: evt = self._events[src_str] evt_del = evt.delay_raw if evt.is_in_inj_table else 0 + evt_del = evt_del or 0 # in case event PV is disconnected dic['TotalDelayRaw'] = dic['DelayRaw'] + evt_del dic['TotalDelay'] = dic['Delay'] + evt_del*self.base_del return dic def _set_delay(self, value, raw=False): dic_ = {'RFDelay': 0, 'FineDelay': 0} + if self._config_ok_values.get('RFDelayType', False): + dic_['RFDelay'] = 31 if value is None: return dic_ value = value if raw else round(value / self.base_del) @@ -711,6 +714,19 @@ def _set_nrpulses(self, pul): dic.update(self._set_duration(self._duration, pul=pul)) return dic + def _set_rfdelaytype(self, value): + """Simple setting of Low Level IOC PVs. + + Function called by write when no conversion is needed between + high and low level properties. + """ + if value is None: + return dict() + dic = {'RFDelayType': value, 'RFDelay': 0} + if value: + dic['RFDelay'] = 31 + return dic + class _EVROTP(_EVROUT): _REMOVE_PROPS = { diff --git a/siriuspy/tests/test_data/servweb/timesys/high-level-events.py b/siriuspy/tests/test_data/servweb/timesys/high-level-events.py index d1b6c738a..d01d502b4 100644 --- a/siriuspy/tests/test_data/servweb/timesys/high-level-events.py +++ b/siriuspy/tests/test_data/servweb/timesys/high-level-events.py @@ -7,14 +7,12 @@ # This file maps the aliases of the events used in Sirius # operation system with their code name. { - 'Dsbl': 'Evt00', 'Linac': 'Evt01', 'InjBO': 'Evt02', 'InjSI': 'Evt03', 'RmpBO': 'Evt04', - 'MigSI': 'Evt05', 'DigLI': 'Evt06', - 'DigTB': 'Evt07', 'DigBO': 'Evt08', - 'DigTS': 'Evt09', 'DigSI': 'Evt10', - 'OrbSI': 'Evt11', 'CplSI': 'Evt12', - 'TunSI': 'Evt13', 'Study': 'Evt14', - 'OrbBO': 'Evt15', 'Cycle': 'Evt16', - 'PsMtn': 'Evt124' + 'Cycle': 'Evt05', 'Study': 'Evt06', + 'OrbSI': 'Evt07', 'CplSI': 'Evt08', + 'TunSI': 'Evt09', 'FOFBS': 'Evt10', + + 'Dsbld': 'Evt00', + 'Intlk': 'Evt117', 'PsMtn': 'Evt124', } diff --git a/siriuspy/tests/test_data/servweb/timesys/high-level-triggers.py b/siriuspy/tests/test_data/servweb/timesys/high-level-triggers.py index 3cd597709..9c956a990 100644 --- a/siriuspy/tests/test_data/servweb/timesys/high-level-triggers.py +++ b/siriuspy/tests/test_data/servweb/timesys/high-level-triggers.py @@ -9,7 +9,7 @@ { 'SI-Glob:TI-Mags-Corrs': { 'database': { - 'Src': {'value': 0, 'enums': ('MigSI', 'OrbSI', 'Cycle', 'Study')}, + 'Src': {'enums': ('OrbSI', 'Cycle', 'Study')}, 'Delay': {'value': 0.0, 'hilim': 1.0, 'high': 1.0, 'hihi': 1.0}, 'RFDelayType': {'value': 1, 'states': (2, 0)}, 'NrPulses': {