Commit df890ca8 authored by Daniel Brown's avatar Daniel Brown

Removing offset param for locks, setting this to just a normal variable. Loose...

Removing offset param for locks, setting this to just a normal variable. Loose end from when trying to have offsets tunable with xaxis and such
parent 9ab3e5d1
...@@ -38,7 +38,6 @@ class Command(object): ...@@ -38,7 +38,6 @@ class Command(object):
self.__removed = False self.__removed = False
self.__name = name.strip("*") self.__name = name.strip("*")
self._putters = [] self._putters = []
def __deepcopy__(self, memo): def __deepcopy__(self, memo):
""" """
...@@ -53,7 +52,7 @@ class Command(object): ...@@ -53,7 +52,7 @@ class Command(object):
for _ in result._putters: for _ in result._putters:
_._updateOwner(result) _._updateOwner(result)
result._freeze() result._freeze()
return result return result
...@@ -203,11 +202,10 @@ class lock(Command): ...@@ -203,11 +202,10 @@ class lock(Command):
def __init__(self, name, variable, gain, accuracy, offset=None, singleLock=False): def __init__(self, name, variable, gain, accuracy, offset=None, singleLock=False):
Command.__init__(self, name, False) Command.__init__(self, name, False)
self.__params = []
self.__variable = variable self.__variable = variable
self.__gain = gain self.__gain = gain
self.__accuracy = accuracy self.__accuracy = accuracy
self.__offset = Param("offset", self, SIfloat(offset)) self.__offset = offset
self.singleLock = singleLock self.singleLock = singleLock
self.enabled = True self.enabled = True
...@@ -217,9 +215,6 @@ class lock(Command): ...@@ -217,9 +215,6 @@ class lock(Command):
self._putters.append(self.output) self._putters.append(self.output)
self._freeze() self._freeze()
def _register_param(self, param):
self.__params.append(param)
@property @property
def offset(self): return self.__offset def offset(self): return self.__offset
...@@ -245,7 +240,7 @@ class lock(Command): ...@@ -245,7 +240,7 @@ class lock(Command):
gain=str(self.gain), gain=str(self.gain),
accuracy=str(self.accuracy)) accuracy=str(self.accuracy))
if self.offset.value is not None: if self.offset is not None:
cmds += " %s" % str(self.offset) cmds += " %s" % str(self.offset)
if self.singleLock: if self.singleLock:
...@@ -255,9 +250,6 @@ class lock(Command): ...@@ -255,9 +250,6 @@ class lock(Command):
rtn.extend(self.output._getPutFinesseText()) rtn.extend(self.output._getPutFinesseText())
for p in self.__params:
rtn.extend(p.getFinesseText())
return rtn return rtn
else: else:
return None return None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment