From 5d9fdd83d44cd115331f8bb3b9017ad67de62f51 Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 5 Jul 2016 16:40:12 +0200 Subject: [PATCH] Closedown --- script/Alignment/Gun_solenoid_alignment.py | 19 ++++++++++++------- script/camtool.py | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 8847c17..3360675 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -13,6 +13,8 @@ import org.apache.commons.math3.linear.Array2DRowRealMatrix as Matrix import ch.psi.utils.Convert.toBidimensional as mono_to_bidi import datetime +#from camtool import CamTool +run("camtool") if get_context().source == CommandSource.ui: I1 = 95.0 @@ -34,13 +36,14 @@ print "Parameters: ", I1, I2, dI, settling_time, plot_image, number_images, use_ plot_name = datetime.datetime.fromtimestamp(time.time()).strftime('%H%M%S') -cam_x = Channel("SINEG01-DSCR190:profile.X_stats.com", alias = "cam_x") -cam_y = Channel("SINEG01-DSCR190:profile.Y_stats.com", alias = "cam_y") -profile_x = Channel("SINEG01-DSCR190:profile.X", alias = "profile_x") -profile_y = Channel("SINEG01-DSCR190:profile.Y", alias = "profile_y") +add_device(CamTool("camtool") , True) -cam_raw_data = Channel("SINEG01-DSCR190:data") +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") +profile_x = camtool.profile_x #Channel("SINEG01-DSCR190:profile.X", alias = "profile_x") +profile_y = camtool.profile_y #Channel("SINEG01-DSCR190:profile.Y", alias = "profile_y") +cam_raw_data = camtool.cam_image #Channel("SINEG01-DSCR190:data") class CameraImage(ReadableMatrix): @@ -67,10 +70,12 @@ def ccr(mag): n = caget(mag + ":I-COMP") def laser_on(): - caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 0) + pass + #caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 0) def laser_off(): - caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 1) + pass + #caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 1) def run_pipeline(): diff --git a/script/camtool.py b/script/camtool.py index 17845d2..d1cf91a 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -1,5 +1,5 @@ -import ch.psi.pshell.device.DeviceBase as DeviceBase -from startup import * +#$import ch.psi.pshell.device.DeviceBase as DeviceBase +#from startup import * class CamTool(DeviceBase): def __init__(self, name, prefix = "cam:", latch = False):