From d9212ac49c3bea6baa1197c76419b56c3b5d90fe Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 15 Jun 2016 14:14:28 +0200 Subject: [PATCH] Script execution --- script/Alignment/Gun_solenoid_alignment.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 6b6900b..133c744 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -28,18 +28,18 @@ cam_raw_data = Channel("SINEG01-DSCR190:data") class CameraImage(ReadableMatrix): def read(self): raw = cam_raw_data.read() - #m = Matrix(mono_to_bidi(raw, getHeight(), getWidth())) - #return m.transpose.getData() - ret = [] - for i in range (self.getHeight()): - ret.append(raw[i*self.getWidth() : (i+1)*self.getWidth()]) - return ret + m = Matrix(mono_to_bidi(raw, self.getHeight(), self.getWidth())) + return m.transpose.getData() + #ret = [] + #for i in range (self.getHeight()): + # ret.append(raw[i*self.getWidth() : (i+1)*self.getWidth()]) + #return ret def getWidth(self): - return 480 + return 640 def getHeight(self): - return 640 + return 480 cam_img = CameraImage() @@ -84,8 +84,8 @@ mag = [ "SINEG01-MCRX120","SINEG01-MCRY120", "SINEG01-MQUA320" ] for m in mag: caput(m + ":I-SET", 0.0) -#for m in mag: -# ccr(m) +for m in mag: + ccr(m) laser_on() # Scan using the screen