frappy_psi.cryoltd: fixes after frappy upgrade

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',
 )