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

Merge branch 'wip' into develop

Browse Source 
Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
This commit is contained in:
zolliker
2023-05-31 14:06:05 +02:00
parent 0771cb6899 726665ebd8
commit dc0cc590ed
167 changed files with 15251 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frappy_psi/lakeshore.py
View File

@ -20,12 +20,12 @@
# *****************************************************************************
import math
from frappy.core import Readable, Parameter, IntRange, EnumType, FloatRange, \
from frappy.core import Readable, Parameter, IntRange, FloatRange, \
StringIO, HasIO, StringType, Property, Writable, Drivable, IDLE, ERROR, \
Attached, StructOf, WARN, Done, BoolType, Enum
StructOf, WARN, Done, BoolType, Enum
from frappy.errors import RangeError
from frappy_psi.convergence import HasConvergence
from frappy_psi.mixins import HasOutputModule, HasControlledBy
from frappy.mixins import HasOutputModule, HasControlledBy
class Ls340IO(StringIO):
@ -233,7 +233,7 @@ class HeaterOutput336(HeaterOutput):
else:
self._range = 1
user_current = max_current * math.sqrt(100)
self.set_par(f'HTRSET {self.loop}', <1 or 2>, 0, user_current, 1)
self.set_par(f'HTRSET {self.loop}', 1 if self.resistance < 50 else 2, 0, user_current, 1)
max_power = max_current ** 2 * self.resistance
self._max_power = max_power
self.set_range()