diff --git a/cfg/main/fftf_cfg.py b/cfg/main/fftf_cfg.py index 58e8e09..ea63ac5 100644 --- a/cfg/main/fftf_cfg.py +++ b/cfg/main/fftf_cfg.py @@ -25,7 +25,7 @@ Mod('p', Mod('gasflow', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['p.gasflow'], + single_module='p.gasflow', ) Mod('vacuumpump', diff --git a/cfg/main/flamp_cfg.py b/cfg/main/flamp_cfg.py index 83f8e26..4e10f63 100644 --- a/cfg/main/flamp_cfg.py +++ b/cfg/main/flamp_cfg.py @@ -33,25 +33,25 @@ Mod('current', Mod('i1', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['current.i1'], + single_module='current.i1', ) Mod('i2', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['current.i2'], + single_module='current.i2', ) Mod('i3', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['current.i3'], + single_module='current.i3', ) Mod('i4', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['current.i4'], + single_module='current.i4', ) Mod('pv', diff --git a/cfg/main/ill1_cfg.py b/cfg/main/ill1_cfg.py index fb543f7..3c6231c 100644 --- a/cfg/main/ill1_cfg.py +++ b/cfg/main/ill1_cfg.py @@ -26,7 +26,7 @@ Mod('cc', Mod('lev', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['cc.h'], + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/ill3_cfg.py b/cfg/main/ill3_cfg.py index 165f069..4bb9216 100644 --- a/cfg/main/ill3_cfg.py +++ b/cfg/main/ill3_cfg.py @@ -28,7 +28,7 @@ Mod('cc', Mod('lev', 'secop_psi.sea.SeaReadable', '', io='sea_main', - single_module=['cc.h'], + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/ill4_cfg.py b/cfg/main/ill4_cfg.py index a779044..c04910d 100644 --- a/cfg/main/ill4_cfg.py +++ b/cfg/main/ill4_cfg.py @@ -26,7 +26,7 @@ Mod('cc', Mod('lev', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['cc.h'], + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/ill5_cfg.py b/cfg/main/ill5_cfg.py index 3ba82fd..86ec252 100644 --- a/cfg/main/ill5_cfg.py +++ b/cfg/main/ill5_cfg.py @@ -26,7 +26,7 @@ Mod('cc', Mod('lev', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['cc.h'], + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/ill5pgas5_cfg.py b/cfg/main/ill5pgas5_cfg.py index dda6e7f..a0ddf1b 100644 --- a/cfg/main/ill5pgas5_cfg.py +++ b/cfg/main/ill5pgas5_cfg.py @@ -38,7 +38,7 @@ Mod('cc', Mod('lev', 'frappy_psi.sea.SeaReadable', '', io='sea_main', - single_module=['cc.h'], + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/jtccr_cfg.py b/cfg/main/jtccr_cfg.py index c3a0bad..8842112 100644 --- a/cfg/main/jtccr_cfg.py +++ b/cfg/main/jtccr_cfg.py @@ -27,73 +27,73 @@ Mod('jtccr', 'frappy_psi.sea.SeaWritable', '', io='sea_main', sea_object='jtccr', - extra_modules=['v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,vm'], + extra_modules=['v1','v2','v3','v4','v5','v6','v7','v8','v9','v10','vm'], ) Mod('v1', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v1'], + single_module='jtccr.v1', ) Mod('v2', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v2'], + single_module='jtccr.v2', ) Mod('v3', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v3'], + single_module='jtccr.v3', ) Mod('v4', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v4'], + single_module='jtccr.v4', ) Mod('v5', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v5'], + single_module='jtccr.v5', ) Mod('v6', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v6'], + single_module='jtccr.v6', ) Mod('v7', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v7'], + single_module='jtccr.v7', ) Mod('v8', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v8'], + single_module='jtccr.v8', ) Mod('v9', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v9'], + single_module='jtccr.v9', ) Mod('v10', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.v10'], + single_module='jtccr.v10', ) Mod('vm', 'frappy_psi.sea.SeaWritable', '', io='sea_main', - single_module=['jtccr.vm'], + single_module='jtccr.vm', ) Mod('p1', diff --git a/cfg/main/ma10_cfg.py b/cfg/main/ma10_cfg.py index a106bc0..c77768a 100644 --- a/cfg/main/ma10_cfg.py +++ b/cfg/main/ma10_cfg.py @@ -79,6 +79,7 @@ Mod('om', 'frappy_psi.phytron.Motor', 'stick rotation, typically used for omega', io='om_io', - sign=-1, + target_min = -180, + target_max = 360, encoder_mode='READ', ) diff --git a/cfg/main/ma6_cfg.py b/cfg/main/ma6_cfg.py index 546c5b9..20145c3 100644 --- a/cfg/main/ma6_cfg.py +++ b/cfg/main/ma6_cfg.py @@ -74,5 +74,6 @@ Mod('om', 'frappy_psi.phytron.Motor', 'stick rotation, typically used for omega', io='om_io', - encoder_mode='NO', + target_min=-180, + target_max=360, ) diff --git a/cfg/main/mb11_cfg.py b/cfg/main/mb11_cfg.py index 8133c58..a7de8ca 100644 --- a/cfg/main/mb11_cfg.py +++ b/cfg/main/mb11_cfg.py @@ -203,7 +203,8 @@ Mod('om', 'frappy_psi.phytron.Motor', 'stick rotation, typically used for omega', io='om_io', - sign=-1, + target_min=-180, + target_max=360, encoder_mode='NO', target=Param(min=-180, max=360) ) diff --git a/cfg/main/mb11std_cfg.py b/cfg/main/mb11std_cfg.py index bcae4d2..b58b512 100644 --- a/cfg/main/mb11std_cfg.py +++ b/cfg/main/mb11std_cfg.py @@ -219,6 +219,7 @@ Mod('om', 'frappy_psi.phytron.Motor', 'stick rotation, typically used for omega', io='om_io', - sign=-1, + target_min=-180, + target_max=360, encoder_mode='NO', ) diff --git a/cfg/main/ori3_cfg.py b/cfg/main/ori3_cfg.py index f0217c5..82486de 100644 --- a/cfg/main/ori3_cfg.py +++ b/cfg/main/ori3_cfg.py @@ -19,6 +19,13 @@ Mod('cc', 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='cc', + extra_modules=['h'], +) + +Mod('lev', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/ori4_cfg.py b/cfg/main/ori4_cfg.py index 6cb9a4d..072a631 100644 --- a/cfg/main/ori4_cfg.py +++ b/cfg/main/ori4_cfg.py @@ -26,6 +26,14 @@ Mod('cc', 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='cc', + extra_modules=['h'], + visibility=2, +) + +Mod('lev', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + single_module='cc.h', ) Mod('nv', diff --git a/cfg/main/ori6_cfg.py b/cfg/main/ori6_cfg.py index da3bbb7..6312add 100644 --- a/cfg/main/ori6_cfg.py +++ b/cfg/main/ori6_cfg.py @@ -19,6 +19,14 @@ Mod('cc', 'frappy_psi.sea.SeaReadable', '', io='sea_main', sea_object='cc', + extra_modules=['h'], + visibility=2, +) + +Mod('lev', + 'frappy_psi.sea.SeaReadable', '', + io='sea_main', + single_module='cc.h', ) Mod('nv',