various fixes on mb11/dil5

cfg/main/mb11.cfg

@@ -21,11 +21,13 @@ description = IPS for magnet and levels
 uri = mb11-ts:3003
 
 [T_stat]
-class = secop_psi.mercury.TemperatureLoop
+class = secop_psi.mercury.TemperatureAutoFlow
 description = static heat exchanger temperature
 output_module = htr_stat
+needle_valve = p_stat
 slot = DB6.T1,DB1.H1
 io = itc1
+tolerance = 0.1
 
 [htr_stat]
 class = secop_psi.mercury.HeaterOutput
@@ -37,8 +39,11 @@ io = itc1
 class = secop_psi.mercury.PressureLoop
 description = static needle valve pressure
 output_module = pos_stat
+settling_time = 60
 slot = DB5.P1,DB3.G1
 io = itc1
+tolerance = 1
+value.unit = mbar_flow
 
 [pos_stat]
 class = secop_psi.mercury.ValvePos
@@ -47,11 +52,13 @@ slot = DB5.P1,DB3.G1
 io = itc1
 
 [T_dyn]
-class = secop_psi.mercury.TemperatureLoop
+class = secop_psi.mercury.TemperatureAutoFlow
 description = dynamic heat exchanger temperature
 output_module = htr_dyn
+needle_valve = p_dyn
 slot = DB7.T1,DB2.H1
 io = itc1
+tolerance = 0.1
 
 [htr_dyn]
 class = secop_psi.mercury.HeaterOutput
@@ -63,8 +70,11 @@ io = itc1
 class = secop_psi.mercury.PressureLoop
 description = dynamic needle valve pressure
 output_module = pos_dyn
+settling_time = 60
 slot =  DB8.P1,DB4.G1
 io = itc1
+tolerance = 1
+value.unit = mbar_flow
 
 [pos_dyn]
 class = secop_psi.mercury.ValvePos
@@ -90,6 +100,7 @@ description = neck heater 1 temperature
 output_module = htr_neck1
 slot = MB1.T1,MB0.H1
 io = itc2
+tolerance = 1
 
 [htr_neck1]
 class = secop_psi.mercury.HeaterOutput
@@ -103,6 +114,7 @@ description = neck heater 2 temperature
 output_module = htr_neck2
 slot = DB6.T1,DB1.H1
 io = itc2
+tolerance = 1
 
 [htr_neck2]
 class = secop_psi.mercury.HeaterOutput
@@ -116,6 +128,7 @@ description = static needle valve temperature
 output_module = htr_nvs
 slot = DB7.T1,DB2.H1
 io = itc2
+tolerance = 0.1
 
 [htr_nvs]
 class = secop_psi.mercury.HeaterOutput
@@ -129,6 +142,7 @@ description = dynamic needle valve heater temperature
 output_module = htr_nvd
 slot = DB8.T1,DB3.H1
 io = itc2
+tolerance = 0.1
 
 [htr_nvd]
 class = secop_psi.mercury.HeaterOutput
@@ -149,15 +163,15 @@ slot = GRPZ
 io = ips
 target.max = 11
 
-#[om_io]
-#description = dom motor IO
-#class = secop_psi.phytron.PhytronIO
-#uri = mb11-ts.psi.ch:3004
+[om_io]
+description = dom motor IO
+class = secop_psi.phytron.PhytronIO
+uri = mb11-ts.psi.ch:3004
 
-#[om]
-#description = stick rotation, typically used for omega
-#class = secop_psi.phytron.Motor
-#io = om_io
-#sign = -1
-#encoder_mode = NO
+[om]
+description = stick rotation, typically used for omega
+class = secop_psi.phytron.Motor
+io = om_io
+sign = -1
+encoder_mode = NO
 

cfg/stick/dil5.cfg

@@ -10,11 +10,18 @@ class = secop_psi.mercury.IO
 description = connection to triton software
 uri = tcp://linse-dil5:33576
 
-[action]
-class = secop_psi.triton.Action
-description = higher level scripts
+#[ts]
+#class = secop_psi.switching_sensor.Sensor
+#description = either T_mix or T_mix_wup, depending on T
+#lower = T_mix
+#upper = T_mix_wup
+#switch_range = (1.5, 4)
+
+[ts]
+class = secop_psi.triton.TemperatureSensor
+description = mix. chamber temperature
+slot = T5
 io = triton
-slot = DR
 
 [T_sorb]
 class = secop_psi.triton.TemperatureSensor
@@ -40,11 +47,11 @@ description = cold plate temperature
 slot = T4
 io = triton
 
-[T_mix]
-class = secop_psi.triton.TemperatureSensor
-description = mix. chamber temperature
-slot = T5
+[action]
+class = secop_psi.triton.Action
+description = higher level scripts
 io = triton
+slot = DR
 
 [p_dump]
 class = secop_psi.mercury.PressureSensor
@@ -87,7 +94,7 @@ description = still warmup temperature
 slot = MB1.T1
 io = itc
 
-[P_still_wup]
+[htr_still_wup]
 class = secop_psi.mercury.HeaterOutput
 description = still warmup heater
 slot = MB0.H1
@@ -99,7 +106,7 @@ description = 1 K plate warmup temperature
 slot = DB5.T1
 io = itc
 
-[P_one_K]
+[htr_one_K]
 class = secop_psi.mercury.HeaterOutput
 description = 1 K plate warmup heater
 slot = DB3.H1
@@ -111,7 +118,7 @@ description = mix. chamber warmup temperature
 slot = DB6.T1
 io = itc
 
-[P_mix_wup]
+[htr_mix_wup]
 class = secop_psi.mercury.HeaterOutput
 description = mix. chamber warmup heater
 slot = DB1.H1
@@ -123,7 +130,7 @@ description = IVC warmup temperature
 slot = DB7.T1
 io = itc
 
-[P_ivc_wup]
+[htr_ivc_wup]
 class = secop_psi.mercury.HeaterOutput
 description = IVC warmup heater
 slot = DB2.H1
@@ -135,7 +142,7 @@ description = condenser temperature
 slot = DB8.T1
 io = itc
 
-[P_cond]
+[htr_cond]
 class = secop_psi.mercury.HeaterOutput
 description = condenser heater
 slot = DB3.H1