From 6c74c957a82d197e2bd45c5f7acaef7a803a589d Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 10 Jun 2025 12:31:35 +0200 Subject: [PATCH] MB11: fix sample stick cfg - remove mb11std --- cfg/main/mb11std_cfg.py | 228 ------------------------------------- cfg/stick/mb11stick_cfg.py | 30 +++++ 2 files changed, 30 insertions(+), 228 deletions(-) delete mode 100644 cfg/main/mb11std_cfg.py diff --git a/cfg/main/mb11std_cfg.py b/cfg/main/mb11std_cfg.py deleted file mode 100644 index cc809f9..0000000 --- a/cfg/main/mb11std_cfg.py +++ /dev/null @@ -1,228 +0,0 @@ -Node('mb11.psi.ch', - 'MB11 11 Tesla - 100 mm cryomagnet', -) - -Mod('itc1', - 'frappy_psi.mercury.IO', - 'ITC for heat exchanger and pressures', - uri='mb11-ts:3001', -) - -Mod('itc2', - 'frappy_psi.mercury.IO', - 'ITC for neck and nv heaters', - uri='mb11-ts:3002', -) - -Mod('ips', - 'frappy_psi.mercury.IO', - 'IPS for magnet and levels', - uri='mb11-ts:3003', -) - -Mod('T_stat', - 'frappy_psi.mercury.TemperatureAutoFlow', - 'static heat exchanger temperature', - meaning=['temperature_regulation', 27], - output_module='htr_stat', - needle_valve='p_stat', - slot='DB6.T1', - io='itc1', - tolerance=0.1, - flowpars=((1,5), (2, 20)), -) - -Mod('htr_stat', - 'frappy_psi.mercury.HeaterOutput', - 'static heat exchanger heater', - slot='DB1.H1', - io='itc1', -) - -Mod('ts', - 'frappy_psi.mercury.TemperatureLoop', - 'sample temperature', - output_module='htr_sample', - slot='MB1.T1', - io='itc1', - tolerance=1.0, - visibility='expert', -) - -Mod('htr_sample', - 'frappy_psi.mercury.HeaterOutput', - 'sample stick heater power', - slot='MB0.H1', - io='itc1', -) - -Mod('p_stat', - 'frappy_psi.mercury.PressureLoop', - 'static needle valve pressure', - output_module='pos_stat', - settling_time=60.0, - slot='DB5.P1', - io='itc1', - tolerance=1.0, - value=Param( - unit='mbar_flow', - ), -) - -Mod('pos_stat', - 'frappy_psi.mercury.ValvePos', - 'static needle valve position', - slot='DB5.P1,DB3.G1', - io='itc1', -) - -Mod('T_dyn', - 'frappy_psi.mercury.TemperatureAutoFlow', - 'dynamic heat exchanger temperature', - output_module='htr_dyn', - needle_valve='p_dyn', - slot='DB7.T1', - io='itc1', - tolerance=0.1, -) - -Mod('htr_dyn', - 'frappy_psi.mercury.HeaterOutput', - 'dynamic heat exchanger heater', - slot='DB2.H1', - io='itc1', -) - -Mod('p_dyn', - 'frappy_psi.mercury.PressureLoop', - 'dynamic needle valve pressure', - output_module='pos_dyn', - settling_time=60.0, - slot='DB8.P1', - io='itc1', - tolerance=1.0, - value=Param( - unit='mbar_flow', - ), -) - -Mod('pos_dyn', - 'frappy_psi.mercury.ValvePos', - 'dynamic needle valve position', - slot='DB8.P1,DB4.G1', - io='itc1', -) - -Mod('mf', - 'frappy_psi.ips_mercury.Field', - 'magnetic field', - slot='GRPZ', - io='ips', - tolerance=0.001, - wait_stable_field=60.0, - target=Param( - max=11.0, - ), - persistent_limit=11.1, -) - -Mod('lev', - 'frappy_psi.mercury.HeLevel', - 'LHe level', - slot='DB1.L1', - io='ips', -) - -Mod('n2lev', - 'frappy_psi.mercury.N2Level', - 'LN2 level', - slot='DB1.L1', - io='ips', -) - -Mod('T_neck1', - 'frappy_psi.mercury.TemperatureLoop', - 'neck heater 1 temperature', - output_module='htr_neck1', - slot='MB1.T1', - io='itc2', - tolerance=1.0, -) - -Mod('htr_neck1', - 'frappy_psi.mercury.HeaterOutput', - 'neck heater 1 power', - slot='MB0.H1', - io='itc2', -) - -Mod('T_neck2', - 'frappy_psi.mercury.TemperatureLoop', - 'neck heater 2 temperature', - output_module='htr_neck2', - slot='DB6.T1', - io='itc2', - tolerance=1.0, -) - -Mod('htr_neck2', - 'frappy_psi.mercury.HeaterOutput', - 'neck heater 2 power', - slot='DB1.H1', - io='itc2', -) - -Mod('T_nvs', - 'frappy_psi.mercury.TemperatureLoop', - 'static needle valve temperature', - output_module='htr_nvs', - slot='DB7.T1', - io='itc2', - tolerance=0.1, -) - -Mod('htr_nvs', - 'frappy_psi.mercury.HeaterOutput', - 'static needle valve heater power', - slot='DB2.H1', - io='itc2', -) - -Mod('T_nvd', - 'frappy_psi.mercury.TemperatureLoop', - 'dynamic needle valve heater temperature', - output_module='htr_nvd', - slot='DB8.T1', - io='itc2', - tolerance=0.1, -) - -Mod('htr_nvd', - 'frappy_psi.mercury.HeaterOutput', - 'dynamic needle valve heater power', - slot='DB3.H1', - io='itc2', -) - -Mod('T_coil', - 'frappy_psi.mercury.TemperatureSensor', - 'coil temperature', - slot='MB1.T1', - io='ips', -) - -Mod('om_io', - 'frappy_psi.phytron.PhytronIO', - 'dom motor IO', - uri='mb11-ts.psi.ch:3004', -) - -Mod('om', - 'frappy_psi.phytron.Motor', - 'stick rotation, typically used for omega', - io='om_io', - target_min=-360, - target_max=360, - encoder_mode='NO', - target=Param(min=-360, max=360), -) diff --git a/cfg/stick/mb11stick_cfg.py b/cfg/stick/mb11stick_cfg.py index 02d8071..8e455a6 100644 --- a/cfg/stick/mb11stick_cfg.py +++ b/cfg/stick/mb11stick_cfg.py @@ -1,3 +1,33 @@ +import os + Node('mb11.stick.sea.psi.ch', 'MB11 standard sample stick (do not use)', ) + +frappy_main_port = os.environ.get('FRAPPY_MAIN_PORT', 0) + +Mod('itc1_', + 'frappy.core.Proxy', + 'itc1 on main frappy server', + remote_class = 'frappy_psi.mercury.IO', + uri = f'tcp://localhost:{frappy_main_port}', + module='itc1', + # export = False, +) + + +Mod('T_sample', + 'frappy_psi.mercury.TemperatureLoop', + 'T at sample stick sensor', + meaning=['temperature', 30], + io='itc1_', + slot='MB1.T1', +) + +Mod('htr_sample', + 'frappy_psi.mercury.HeaterOutput', + 'sample stick heater power', + slot='MB0.H1', + io='itc1_', +) +