ultrasound.PulseEcho: fix issue with roi intervals
now it should be time +- 0.5 * size
This commit is contained in:
parent
0ef484e082
commit
e0ef6047e2
@ -54,7 +54,7 @@ class Roi(Readable):
|
||||
q = Attached(mandatory=False) # amplitude Readable
|
||||
|
||||
value = Parameter('i, q', TupleOf(FloatRange(), FloatRange()), default=(0, 0))
|
||||
time = Parameter('start time', FloatRange(unit='nsec'), readonly=False)
|
||||
time = Parameter('mid time', FloatRange(unit='nsec'), readonly=False)
|
||||
size = Parameter('interval (symmetric around time)', FloatRange(unit='nsec'), readonly=False)
|
||||
enable = Parameter('calculate this roi', BoolType(), readonly=False, default=True)
|
||||
pollinterval = Parameter(export=False)
|
||||
@ -64,22 +64,20 @@ class Roi(Readable):
|
||||
def initModule(self):
|
||||
super().initModule()
|
||||
self.main.register_roi(self)
|
||||
self.calc_interval()
|
||||
|
||||
def calc_interval(self):
|
||||
self.interval = (self.time - 0.5 * self.size, self.time + 0.5 * self.size)
|
||||
@property
|
||||
def interval(self):
|
||||
return self.time - 0.5 * self.size, self.time + 0.5 * self.size
|
||||
|
||||
def read_status(self):
|
||||
return (IDLE, '') if self.enable else (DISABLED, 'disabled')
|
||||
|
||||
def write_time(self, value):
|
||||
self.time = value
|
||||
self.calc_interval()
|
||||
return Done
|
||||
|
||||
def write_size(self, value):
|
||||
self.size = value
|
||||
self.calc_interval()
|
||||
return Done
|
||||
|
||||
|
||||
@ -295,7 +293,7 @@ class PulseEcho(Base, Readable):
|
||||
return
|
||||
gates, curves = data.gates_and_curves(
|
||||
freq, (self.time, self.time + self.size),
|
||||
[(r.time, r.time + r.size) for r in roilist], self.bw)
|
||||
[r.interval for r in roilist], self.bw)
|
||||
for i, roi in enumerate(roilist):
|
||||
a = gates[i][0]
|
||||
b = gates[i][1]
|
||||
|
Loading…
x
Reference in New Issue
Block a user