From 62b92b7bac26ecbebc9b934e9bd17eec9b73cb5b Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 6 Jul 2016 10:19:12 +0200 Subject: [PATCH] Closedown --- script/Alignment/Gun_solenoid_alignment.py | 6 +++--- script/camtool.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 0e4d66a..005bfbf 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -43,8 +43,8 @@ multiple_background = True number_backgrounds = 5 -cam_x =camtool.cam_x # Channel("SINEG01-DSCR190:profile.X_stats.com", alias = "cam_x") -cam_y = camtool.cam_y #Channel("SINEG01-DSCR190:profile.Y_stats.com", alias = "cam_y") +com_x =camtool.com_x +com_y = camtool.com_y def ccr(mag): @@ -101,7 +101,7 @@ def ar(): r = None laser_on() try: - sensors = [cam_x, cam_y, camtool.image] if plot_image else [cam_x, cam_y] + sensors = [com_x, com_y, camtool.image] if plot_image else [com_x, com_y] r = lscan(gun_solenoid, sensors , I1, I2, dI, settling_time, before_read = br, after_read = ar) finally: laser_off() diff --git a/script/camtool.py b/script/camtool.py index 0ae074d..9e33f85 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -12,7 +12,7 @@ class CamToolImage(ReadableMatrix): self._height = shape[0] #len(camtool.(profile_y.read()) def read(self): - raw = self.camtool.cam_data.read() + raw = self.camtool.data.read() return Matrix(mono_to_bidi(raw, self.getHeight(), self.getWidth())).transpose().getData() #data is transposed #return mono_to_bidi(raw, self.getWidth(), self.getHeight())