Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip

2023-09-22 13:29:23 +02:00
parent 612295d360 f6c4090b96
commit 3b997d7d86
29 changed files with 1010 additions and 813 deletions
--- a/cfg/main/eurotherm_cfg.py
+++ b/cfg/main/eurotherm_cfg.py
@ -4,7 +4,7 @@ Node('eurotherm.config.sea.psi.ch',
 Mod('sea_main',
    'frappy_psi.sea.SeaClient',
    'main sea connection for haakeuro.config',
-    config = 'haakeuro.config',
+    config = 'eurotherm.config',
    service = 'main',
    meaning=('temperature', 11),
 )
--- a/cfg/main/fftf_cfg.py
+++ b/cfg/main/fftf_cfg.py
@ -36,7 +36,7 @@ Mod('vacuumpump',
 )

 Mod('table',
-    'frappy_psi.sea.SeaModule',
+    'frappy_psi.sea.SeaModule', '',
    io='sea_main',
    sea_object='table',
 )
--- a/cfg/main/flamemag_cfg.py
+++ b/cfg/main/flamemag_cfg.py
@ -1,3 +1,8 @@
+Node('flamemag.psi.ch',
+     'flame magnet',
+     interface='tcp://5000'
+)
+
 Mod('cio',
    'frappy_psi.cryoltd.IO',
    'IO to cryo ltd software',
@ -14,6 +19,7 @@ Mod('B',
    'frappy_psi.cryoltd.MainField',
    'magnetic field',
    channel='Main',
+    main='main',
    constraint=80000.0,
    target=Param(
        max=35000.0,
@ -27,6 +33,8 @@ Mod('B',
    overshoot={'o': 1.0, 't': 180.0},
    degauss={'s': 500.0, 'd': 30.0, 'f': 5.0, 't': 120.0},
    tolerance=5.0,
+    wait_switch_on = 30,
+    wait_switch_off = 30,
    wait_stable_field=180.0,
 )

@ -34,6 +42,7 @@ Mod('Bx',
    'frappy_psi.cryoltd.ComponentField',
    'magnetic field x component',
    channel='VMX',
+    main='main',
    check_against='B',
    target=Param(
        max=200.0,
@ -50,6 +59,7 @@ Mod('By',
    'frappy_psi.cryoltd.ComponentField',
    'magnetic field y component',
    channel='VMY',
+    main='main',
    check_against='B',
    target=Param(
        max=100.0,
@ -66,6 +76,7 @@ Mod('Bz',
    'frappy_psi.cryoltd.ComponentField',
    'magnetic field z component',
    channel='VMZ',
+    main='main',
    check_against='B',
    target=Param(
        max=100.0,
@ -82,130 +93,132 @@ Mod('compressorA',
    'frappy_psi.cryoltd.Compressor',
    'compressor A',
    channel='A',
+    main='main',
 )

 Mod('compressorB',
    'frappy_psi.cryoltd.Compressor',
    'compressor B',
    channel='B',
+    main='main',
 )

 Mod('T_stage1_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='1st Stage A',
    main='main',
 )

 Mod('T_stage2_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='2nd Stage A',
    main='main',
 )

 Mod('T_stage1_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='1st Stage B',
    main='main',
 )

 Mod('T_stage2_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='2nd Stage B',
    main='main',
 )

 Mod('T_top_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Inner Magnet A (Top)',
    main='main',
 )

 Mod('T_bottom_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Inner Magnet A (Bottom)',
    main='main',
 )

 Mod('T_top_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Inner Magnet B (Top)',
    main='main',
 )

 Mod('T_bottom_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Inner Magnet B (Bottom)',
    main='main',
 )

 Mod('T_Z_shim',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Z Shim Former',
    main='main',
 )

 Mod('T_XY_shim',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='XY Shim Former',
    main='main',
 )

 Mod('T_XY_vector',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='XY Vector Former',
    main='main',
 )

 Mod('T_radiation_shield',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Radiation Shield',
    main='main',
 )

 Mod('T_persistent_joints',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Persistent Joints',
    main='main',
 )

 Mod('T_outer_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Outer Magnet A',
    main='main',
 )

 Mod('T_outer_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Outer Magnet B',
    main='main',
 )

 Mod('T_shim_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Z Shim Former B',
    main='main',
 )

 Mod('T_bore_shield',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Bore Radiation Shield',
    main='main',
 )

 Mod('T_XYZ_shim',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='XYZ Shim Plate',
    main='main',
 )

 Mod('T_Z_shim_switch',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Z Shim Switch',
    main='main',
 )

 Mod('T_main_switch',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
    channel='Main Coil Switch',
    main='main',
 )
--- a/cfg/main/haake_cfg.py
+++ b/cfg/main/haake_cfg.py
@ -4,7 +4,7 @@ Node('haakeuro.config.sea.psi.ch',
 Mod('sea_main',
    'frappy_psi.sea.SeaClient',
    'main sea connection for haakeuro.config',
-    config = 'haakeuro.config',
+    config = 'haake.config',
    service = 'main',
 )
 Mod('th',
--- a/cfg/main/varioxb_cfg.py
+++ b/cfg/main/varioxb_cfg.py
@ -0,0 +1,183 @@
+Node('varioxb.psi.ch',
+     'VarioxB - 100 mm cryostat (not tested!)',
+)
+
+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('T_stat',
+    'frappy_psi.mercury.TemperatureAutoFlow',
+    'static heat exchanger temperature',
+    output_module='htr_stat',
+    needle_valve='p_stat',
+    slot='DB6.T1',
+    io='itc1',
+    tolerance=0.1,
+)
+
+Mod('htr_stat',
+    'frappy_psi.mercury.HeaterOutput',
+    'static heat exchanger heater',
+    slot='DB1.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('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('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=-180,
+    target_max=360,
+    encoder_mode='NO',
+    target=Param(min=-180, max=360)
+)