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

cfg/main/jtccr.cfg

@@ -0,0 +1,111 @@
+[NODE]
+description = CCR with JT-stage
+id = jtccr.config.sea.psi.ch
+
+[sea_main]
+class = secop_psi.sea.SeaClient
+description = main sea connection for jtccr.config
+config = jtccr.config
+service = main
+
+[tt]
+class = secop_psi.sea.SeaDrivable
+io = sea_main
+sea_object = tt
+
+[T_ccr]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = tt
+rel_paths = ccr
+
+[jtccr]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+sea_object = jtccr
+extra_modules = v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,vm
+
+[v1]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v1
+
+[v2]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v2
+
+[v3]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v3
+
+[v4]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v4
+
+[v5]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v5
+
+[v6]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v6
+
+[v7]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v7
+
+[v8]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v8
+
+[v9]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v9
+
+[v10]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.v10
+
+[vm]
+class = secop_psi.sea.SeaWritable
+io = sea_main
+single_module = jtccr.vm
+
+[p1]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = p1
+
+[p2]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = p2
+
+[p3]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = p3
+
+[p4]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = p4
+
+[pressreg]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = pressreg
+
+[epc]
+class = secop_psi.sea.SeaReadable
+io = sea_main
+sea_object = epc

cfg/main/ma02.cfg

@@ -39,7 +39,7 @@ io = sea_main
 sea_object = hemot
 
 [mf]
-class = secop_psi.sea.SeaReadable
+class = secop_psi.sea.SeaDrivable
 io = sea_main
 sea_object = mf
 

cfg/main/ma6.cfg

@@ -45,7 +45,7 @@ io = sea_main
 sea_object = hefill
 
 [mf]
-class = secop_psi.sea.SeaReadable
+class = secop_psi.sea.SeaDrivable
 io = sea_main
 sea_object = mf
 
@@ -57,7 +57,7 @@ sea_object = lev
 [om_io]
 description = dom motor IO
 class = secop_psi.phytron.PhytronIO
-uri = ma6-ts.psi.ch:3001
+uri = ma6-ts.psi.ch:3003
 
 [om]
 description = stick rotation, typically used for omega

cfg/main/ma7.cfg

@@ -45,7 +45,7 @@ io = sea_main
 sea_object = ln2fill
 
 [mf]
-class = secop_psi.sea.SeaReadable
+class = secop_psi.sea.SeaDrivable
 io = sea_main
 sea_object = mf
 

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
-slot = DB6.T1,DB1.H1
+needle_valve = p_stat
+slot = DB6.T1
 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
-slot = DB7.T1,DB2.H1
+needle_valve = p_dyn
+slot = DB7.T1
 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
@@ -88,8 +98,9 @@ io = ips
 class = secop_psi.mercury.TemperatureLoop
 description = neck heater 1 temperature
 output_module = htr_neck1
-slot = MB1.T1,MB0.H1
+slot = MB1.T1
 io = itc2
+tolerance = 1
 
 [htr_neck1]
 class = secop_psi.mercury.HeaterOutput
@@ -101,8 +112,9 @@ io = itc2
 class = secop_psi.mercury.TemperatureLoop
 description = neck heater 2 temperature
 output_module = htr_neck2
-slot = DB6.T1,DB1.H1
+slot = DB6.T1
 io = itc2
+tolerance = 1
 
 [htr_neck2]
 class = secop_psi.mercury.HeaterOutput
@@ -114,8 +126,9 @@ io = itc2
 class = secop_psi.mercury.TemperatureLoop
 description = static needle valve temperature
 output_module = htr_nvs
-slot = DB7.T1,DB2.H1
+slot = DB7.T1
 io = itc2
+tolerance = 0.1
 
 [htr_nvs]
 class = secop_psi.mercury.HeaterOutput
@@ -127,8 +140,9 @@ io = itc2
 class = secop_psi.mercury.TemperatureLoop
 description = dynamic needle valve heater temperature
 output_module = htr_nvd
-slot = DB8.T1,DB3.H1
+slot = DB8.T1
 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