fix issue with non matching persistent field
This commit is contained in:
parent
7379ea91e5
commit
8a995aafed
@ -34,7 +34,7 @@ CURRENT_CHECK_SIZE = 2
|
|||||||
|
|
||||||
class Field(MercuryChannel, Magfield):
|
class Field(MercuryChannel, Magfield):
|
||||||
action = Parameter('action', EnumType(Action), readonly=False)
|
action = Parameter('action', EnumType(Action), readonly=False)
|
||||||
setpoint = Parameter('field setpoint', FloatRange(unit='T'), readonly=False, default=0)
|
setpoint = Parameter('field setpoint', FloatRange(unit='T'), default=0)
|
||||||
atob = Parameter('field to amp', FloatRange(0, unit='A/T'), default=0)
|
atob = Parameter('field to amp', FloatRange(0, unit='A/T'), default=0)
|
||||||
forced_persistent_field = Parameter(
|
forced_persistent_field = Parameter(
|
||||||
'manual indication that persistent field is bad', BoolType(), readonly=False, default=False)
|
'manual indication that persistent field is bad', BoolType(), readonly=False, default=False)
|
||||||
@ -95,9 +95,6 @@ class Field(MercuryChannel, Magfield):
|
|||||||
def read_setpoint(self):
|
def read_setpoint(self):
|
||||||
return self.query('PSU:SIG:FSET')
|
return self.query('PSU:SIG:FSET')
|
||||||
|
|
||||||
def write_setpoint(self, value):
|
|
||||||
return self.query('PSU:SIG:FSET', value)
|
|
||||||
|
|
||||||
def read_current(self):
|
def read_current(self):
|
||||||
if self.slave_currents is None:
|
if self.slave_currents is None:
|
||||||
self.slave_currents = [[] for _ in range(self.nslaves + 1)]
|
self.slave_currents = [[] for _ in range(self.nslaves + 1)]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user