dil5: fix config file after change of frappy_psi/picontrol
+ fixes in frappy_psi/picontrol.py
This commit is contained in:
parent
ad15ef3cdb
commit
a281583cd2
@ -11,7 +11,7 @@ Mod('triton',
|
||||
timeout=25.0,
|
||||
)
|
||||
|
||||
Mod('ts',
|
||||
Mod('T_mix',
|
||||
'frappy_psi.triton.TemperatureLoop',
|
||||
'mix. chamber temperature',
|
||||
slot='T5',
|
||||
@ -24,9 +24,21 @@ Mod('htr_mix',
|
||||
'mix. chamber heater',
|
||||
slot='H1,T5',
|
||||
io='triton',
|
||||
resistivity = 100
|
||||
resistivity = 100,
|
||||
)
|
||||
|
||||
Mod('ts',
|
||||
'frappy_psi.picontrol.PI',
|
||||
'softloop controlled Temperature mixing chamber',
|
||||
meaning=['temperature', 20],
|
||||
input_module = 'T_mix',
|
||||
output_module = 'htr_mix',
|
||||
control_active = 1,
|
||||
output_range = (0, 100000),
|
||||
p = 20000,
|
||||
i = 100,
|
||||
)
|
||||
|
||||
Mod('htr_sorb',
|
||||
'frappy_psi.triton.HeaterOutput',
|
||||
'sorb heater',
|
||||
@ -124,12 +136,12 @@ Mod('T_still_wup',
|
||||
io='itc',
|
||||
)
|
||||
|
||||
Mod('htr_still_wup',
|
||||
'frappy_psi.mercury.HeaterOutput',
|
||||
'still warmup heater',
|
||||
slot='MB0.H1',
|
||||
io='itc',
|
||||
)
|
||||
#Mod('htr_still_wup',
|
||||
# 'frappy_psi.mercury.HeaterOutput',
|
||||
# 'still warmup heater',
|
||||
# slot='MB0.H1',
|
||||
# io='itc',
|
||||
#)
|
||||
|
||||
Mod('T_one_K',
|
||||
'frappy_psi.mercury.TemperatureLoop',
|
||||
|
@ -125,7 +125,8 @@ class PImixin(HasOutputModule, Writable):
|
||||
self.activate_control()
|
||||
|
||||
|
||||
class PI(Writable):
|
||||
# quick fix by Marek:
|
||||
class PIobsolete(Writable):
|
||||
"""temporary, but working version from Marek"""
|
||||
input = Attached(Readable, 'the input module')
|
||||
output = Attached(Writable, 'the output module')
|
||||
@ -181,7 +182,7 @@ class PI(Writable):
|
||||
# - tries to determine the output limits automatically
|
||||
# unchecked!
|
||||
|
||||
class PIproposed(HasConvergence, PImixin):
|
||||
class PI(HasConvergence, PImixin):
|
||||
input_module = Attached(Readable, 'the input module')
|
||||
|
||||
def read_value(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user