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

made displacement and force calibrations writable and updated capacitance channel descriptions

Browse Source
This commit is contained in:
Paul Neves
2024-06-17 20:19:33 +02:00
committed by Markus Zolliker
parent 48393b2332
commit e4eb5989c3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frappy_psi/ACM1219.py
View File

@ -16,10 +16,10 @@ class BothChannels(HasIO, Readable):
ioClass = ACM1219IO ioClass = ACM1219IO
# modifying a property of inherited parameters (unit is propagated to the FloatRange datatype) # modifying a property of inherited parameters (unit is propagated to the FloatRange datatype)
value = Parameter('output voltage', value = Parameter('Capacitance 1 and 2, and VT',
StructOf(C1=FloatRange(0, 21.096, unit='pF'), C2=FloatRange(0, 21.096, unit='pF'), VT=FloatRange(-1, 1000, unit='')), StructOf(C1=FloatRange(0, 21.096, unit='pF'), C2=FloatRange(0, 21.096, unit='pF'), VT=FloatRange(-1, 1000, unit='')),
readonly=True) readonly=True)
channels_enabled = Parameter('channel 1 on or off', BoolType(), readonly=False) channels_enabled = Parameter('channels on or off', BoolType(), readonly=False)
_ch_enabled = False _ch_enabled = False
def read_value(self): def read_value(self):
@ -73,16 +73,16 @@ class Displacement(Readable):
# modifying a property of inherited parameters (unit is propagated to the FloatRange datatype) # modifying a property of inherited parameters (unit is propagated to the FloatRange datatype)
value = Parameter('displacement', FloatRange(None, None, unit='um'), readonly=True) value = Parameter('displacement', FloatRange(None, None, unit='um'), readonly=True)
alpha290K = Parameter('capacitor constant at 290 K', FloatRange(None, None, unit='um pF'), readonly=True) alpha290K = Parameter('capacitor constant at 290 K', FloatRange(None, None, unit='um pF'), readonly=False)
d0 = Parameter('offset displacement', FloatRange(None, None, unit='um'), readonly=True) d0 = Parameter('offset displacement', FloatRange(None, None, unit='um'), readonly=False)
Cp = Parameter('parallel capacitance', FloatRange(None, None, unit='pF'), readonly=True) Cp = Parameter('parallel capacitance', FloatRange(None, None, unit='pF'), readonly=False)
d0_curve = Parameter('calibration curve for offset displacement', d0_curve = Parameter('calibration curve for offset displacement',
StructOf(a=FloatRange(None, None, unit='um'), StructOf(a=FloatRange(None, None, unit='um'),
b=FloatRange(None, None, unit='um/K'), b=FloatRange(None, None, unit='um/K'),
c=FloatRange(None, None, unit='um/K^2'), c=FloatRange(None, None, unit='um/K^2'),
d=FloatRange(None, None, unit='um/K^3'), d=FloatRange(None, None, unit='um/K^3'),
e=FloatRange(None, None, unit='um/K^4'),), e=FloatRange(None, None, unit='um/K^4'),),
readonly=True) readonly=False)
def read_value(self): def read_value(self):
# get temperature and capacitance # get temperature and capacitance
@ -108,16 +108,16 @@ class Force(Readable):
# modifying a property of inherited parameters (unit is propagated to the FloatRange datatype) # modifying a property of inherited parameters (unit is propagated to the FloatRange datatype)
value = Parameter('force', FloatRange(None, None, unit='N'), readonly=True) value = Parameter('force', FloatRange(None, None, unit='N'), readonly=True)
alpha290K = Parameter('capacitor constant at 290 K', FloatRange(None, None, unit='N pF'), readonly=True) alpha290K = Parameter('capacitor constant at 290 K', FloatRange(None, None, unit='N pF'), readonly=False)
f0 = Parameter('offset force', FloatRange(None, None, unit='N'), readonly=True) f0 = Parameter('offset force', FloatRange(None, None, unit='N'), readonly=False)
Cp = Parameter('parallel capacitance', FloatRange(None, None, unit='pF'), readonly=True) Cp = Parameter('parallel capacitance', FloatRange(None, None, unit='pF'), readonly=False)
f0_curve = Parameter('calibration curve for offset force', f0_curve = Parameter('calibration curve for offset force',
StructOf(a=FloatRange(None, None, unit='N'), StructOf(a=FloatRange(None, None, unit='N'),
b=FloatRange(None, None, unit='N/K'), b=FloatRange(None, None, unit='N/K'),
c=FloatRange(None, None, unit='N/K^2'), c=FloatRange(None, None, unit='N/K^2'),
d=FloatRange(None, None, unit='N/K^3'), d=FloatRange(None, None, unit='N/K^3'),
e=FloatRange(None, None, unit='N/K^4'),), e=FloatRange(None, None, unit='N/K^4'),),
readonly=True) readonly=False)
def read_value(self): def read_value(self):
# get temperature and capacitance # get temperature and capacitance