linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed errors during migration

Browse Source 
- reference.rst did still contain do_<something>
- trailing commas in secop_demo/cryo.py

Change-Id: I5bb8bd310576366c8cfe406f0ec770fa40bcab5b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25079
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2021-03-01 14:45:56 +01:00
parent 12b0549cc0
commit 76c6ebe92c
2 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/reference.rst
View File

@ -13,7 +13,7 @@ Module Base Classes
.. autoclass:: secop.modules.Writable .. autoclass:: secop.modules.Writable
.. autoclass:: secop.modules.Drivable .. autoclass:: secop.modules.Drivable
:members: Status, isBusy, isDriving, do_stop :members: Status, isBusy, isDriving, stop
Parameters, Commands and Properties Parameters, Commands and Properties
@ -47,11 +47,11 @@ Communication
.. autoclass:: secop.modules.Communicator .. autoclass:: secop.modules.Communicator
:show-inheritance: :show-inheritance:
:members: do_communicate :members: communicate
.. autoclass:: secop.stringio.StringIO .. autoclass:: secop.stringio.StringIO
:show-inheritance: :show-inheritance:
:members: do_communicate, do_multicomm :members: communicate, multicomm
.. autoclass:: secop.stringio.HasIodev .. autoclass:: secop.stringio.HasIodev
:show-inheritance: :show-inheritance:

57
secop_demo/cryo.py
View File

@ -48,86 +48,67 @@ class Cryostat(CryoBase):
jitter = Parameter("amount of random noise on readout values", jitter = Parameter("amount of random noise on readout values",
datatype=FloatRange(0, 1), unit="K", datatype=FloatRange(0, 1), unit="K",
default=0.1, readonly=False, export=False, default=0.1, readonly=False, export=False)
),
T_start = Parameter("starting temperature for simulation", T_start = Parameter("starting temperature for simulation",
datatype=FloatRange(0), default=10, datatype=FloatRange(0), default=10,
export=False, export=False)
),
looptime = Parameter("timestep for simulation", looptime = Parameter("timestep for simulation",
datatype=FloatRange(0.01, 10), unit="s", default=1, datatype=FloatRange(0.01, 10), unit="s", default=1,
readonly=False, export=False, readonly=False, export=False)
),
ramp = Parameter("ramping speed of the setpoint", ramp = Parameter("ramping speed of the setpoint",
datatype=FloatRange(0, 1e3), unit="K/min", default=1, datatype=FloatRange(0, 1e3), unit="K/min", default=1,
readonly=False, readonly=False)
),
setpoint = Parameter("current setpoint during ramping else target", setpoint = Parameter("current setpoint during ramping else target",
datatype=FloatRange(), default=1, unit='K', datatype=FloatRange(), default=1, unit='K')
),
maxpower = Parameter("Maximum heater power", maxpower = Parameter("Maximum heater power",
datatype=FloatRange(0), default=1, unit="W", datatype=FloatRange(0), default=1, unit="W",
readonly=False, readonly=False,
group='heater_settings', group='heater_settings')
),
heater = Parameter("current heater setting", heater = Parameter("current heater setting",
datatype=FloatRange(0, 100), default=0, unit="%", datatype=FloatRange(0, 100), default=0, unit="%",
group='heater_settings', group='heater_settings')
),
heaterpower = Parameter("current heater power", heaterpower = Parameter("current heater power",
datatype=FloatRange(0), default=0, unit="W", datatype=FloatRange(0), default=0, unit="W",
group='heater_settings', group='heater_settings')
),
target = Parameter("target temperature", target = Parameter("target temperature",
datatype=FloatRange(0), default=0, unit="K", datatype=FloatRange(0), default=0, unit="K",
readonly=False, readonly=False,)
),
value = Parameter("regulation temperature", value = Parameter("regulation temperature",
datatype=FloatRange(0), default=0, unit="K", datatype=FloatRange(0), default=0, unit="K",
test='TEST', test='TEST')
),
pid = Parameter("regulation coefficients", pid = Parameter("regulation coefficients",
datatype=TupleOf(FloatRange(0), FloatRange(0, 100), datatype=TupleOf(FloatRange(0), FloatRange(0, 100),
FloatRange(0, 100)), FloatRange(0, 100)),
default=(40, 10, 2), readonly=False, default=(40, 10, 2), readonly=False,
group='pid', group='pid')
),
# pylint: disable=invalid-name # pylint: disable=invalid-name
p = Parameter("regulation coefficient 'p'", p = Parameter("regulation coefficient 'p'",
datatype=FloatRange(0), default=40, unit="%/K", readonly=False, datatype=FloatRange(0), default=40, unit="%/K", readonly=False,
group='pid', group='pid')
),
i = Parameter("regulation coefficient 'i'", i = Parameter("regulation coefficient 'i'",
datatype=FloatRange(0, 100), default=10, readonly=False, datatype=FloatRange(0, 100), default=10, readonly=False,
group='pid', group='pid')
),
d = Parameter("regulation coefficient 'd'", d = Parameter("regulation coefficient 'd'",
datatype=FloatRange(0, 100), default=2, readonly=False, datatype=FloatRange(0, 100), default=2, readonly=False,
group='pid', group='pid')
),
mode = Parameter("mode of regulation", mode = Parameter("mode of regulation",
datatype=EnumType('mode', ramp=None, pid=None, openloop=None), datatype=EnumType('mode', ramp=None, pid=None, openloop=None),
default='ramp', default='ramp',
readonly=False, readonly=False)
),
pollinterval = Parameter("polling interval", pollinterval = Parameter("polling interval",
datatype=FloatRange(0), default=5, datatype=FloatRange(0), default=5)
),
tolerance = Parameter("temperature range for stability checking", tolerance = Parameter("temperature range for stability checking",
datatype=FloatRange(0, 100), default=0.1, unit='K', datatype=FloatRange(0, 100), default=0.1, unit='K',
readonly=False, readonly=False,
group='stability', group='stability')
),
window = Parameter("time window for stability checking", window = Parameter("time window for stability checking",
datatype=FloatRange(1, 900), default=30, unit='s', datatype=FloatRange(1, 900), default=30, unit='s',
readonly=False, readonly=False,
group='stability', group='stability')
),
timeout = Parameter("max waiting time for stabilisation check", timeout = Parameter("max waiting time for stabilisation check",
datatype=FloatRange(1, 36000), default=900, unit='s', datatype=FloatRange(1, 36000), default=900, unit='s',
readonly=False, readonly=False,
group='stability', group='stability')
),
def initModule(self): def initModule(self):
self._stopflag = False self._stopflag = False