diff --git a/cfg/main/mb11_cfg.py b/cfg/main/mb11_cfg.py index 9821051..cdf4c96 100644 --- a/cfg/main/mb11_cfg.py +++ b/cfg/main/mb11_cfg.py @@ -2,6 +2,8 @@ Node('mb11.psi.ch', 'MB11 11 Tesla - 100 mm cryomagnet', ) +sea_cfg = 'mb11.config' + Mod('itc1', 'frappy_psi.mercury.IO', 'ITC for heat exchanger and pressures', @@ -28,6 +30,7 @@ Mod('T_stat', slot='DB6.T1', io='itc1', tolerance=0.1, + flowpars=((1,5), (2, 20)), ) Mod('htr_stat', @@ -202,8 +205,8 @@ Mod('om', 'frappy_psi.phytron.Motor', 'stick rotation, typically used for omega', io='om_io', - target_min=-180, + target_min=-360, target_max=360, encoder_mode='NO', - target=Param(min=-180, max=360) + target=Param(min=-360, max=360), ) diff --git a/cfg/main/mb11std_cfg.py b/cfg/main/mb11std_cfg.py index 7ae3e8e..8217342 100644 --- a/cfg/main/mb11std_cfg.py +++ b/cfg/main/mb11std_cfg.py @@ -28,6 +28,7 @@ Mod('T_stat', slot='DB6.T1', io='itc1', tolerance=0.1, + flowpars=((1,5), (2, 20)), ) Mod('htr_stat', @@ -58,7 +59,7 @@ Mod('p_stat', 'static needle valve pressure', output_module='pos_stat', settling_time=60.0, - slot='DB5.P1,DB3.G1', + slot='DB5.P1', io='itc1', tolerance=1.0, value=Param( @@ -95,7 +96,7 @@ Mod('p_dyn', 'dynamic needle valve pressure', output_module='pos_dyn', settling_time=60.0, - slot='DB8.P1,DB4.G1', + slot='DB8.P1', io='itc1', tolerance=1.0, value=Param( @@ -132,7 +133,7 @@ Mod('lev', Mod('n2lev', 'frappy_psi.mercury.N2Level', - 'LHe level', + 'LN2 level', slot='DB1.L1', io='ips', ) @@ -218,7 +219,8 @@ Mod('om', 'frappy_psi.phytron.Motor', 'stick rotation, typically used for omega', io='om_io', - target_min=-180, + target_min=-360, target_max=360, encoder_mode='NO', + target=Param(min=-360, max=360), ) diff --git a/cfg/stick/dil5_cfg.py b/cfg/stick/dil5_cfg.py index 8081928..7239fe5 100644 --- a/cfg/stick/dil5_cfg.py +++ b/cfg/stick/dil5_cfg.py @@ -2,6 +2,8 @@ Node('triton.psi.ch', 'triton test', ) +sea_cfg = 'dil5.stick' + Mod('triton', 'frappy_psi.mercury.IO', 'connection to triton software',