diff --git a/script/camtool.py b/script/camtool.py index fbed0b1..4f44511 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -64,17 +64,17 @@ class CamTool(DeviceBase): self.com_y_mean = CamToolComY(); self.com_y_mean.camtool = self class CamToolComXVar(Readable): def read(self): - return variance(self.camtool.com_x_samples) - self.com_x_var = CamToolComXVar(); self.com_x_var.camtool = self + return stdev(self.camtool.com_x_samples) + self.com_x_stdev = CamToolComXVar(); self.com_x_stdev.camtool = self class CamToolComXVar(Readable): def read(self): - return variance(self.camtool.com_y_samples) - self.com_y_var = CamToolComXVar(); self.com_y_var.camtool = self + return stdev(self.camtool.com_y_samples) + self.com_y_stdev = CamToolComXVar(); self.com_y_stdev.camtool = self set_device_alias(self.com_x_mean, name + " com x mean") set_device_alias(self.com_y_mean, name + " com y mean") - set_device_alias(self.com_x_var, name + " com x variance") - set_device_alias(self.com_y_var, name + " com y variance") + set_device_alias(self.com_x_stdev, name + " com x stdev") + set_device_alias(self.com_y_stdev, name + " com y stdev") def doInitialize(self): if self.latch: