pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sfop
2016-07-06 10:19:12 +02:00
parent 350810e285
commit 62b92b7bac
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
script/Alignment/Gun_solenoid_alignment.py
View File

@@ -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()

2
script/camtool.py
View File

@@ -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())