From 4ebe59246305f7de0937e9c1e3ec3d783a0ea5fb Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 23 Aug 2016 14:36:26 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 1 + script/camtool.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/devices.properties b/config/devices.properties index 7293843..aa33c97 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -15,3 +15,4 @@ gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSY #rf_ampl_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-AMPLT|Read||true image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/config/pshell_op/context/beam.jpg||| cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR350:FPICTURE Int16 5529600||| +matrix=ch.psi.pshell.epics.GenericMatrix|SINEG01-DSCR350:FPICTURE Int16 5529600||| diff --git a/script/camtool.py b/script/camtool.py index ff982f4..b1758ec 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -202,7 +202,7 @@ if __name__ == "__builtin__": #from camtool import CamTool camera_tool = CamTool("camtool", latch = False) add_device(camera_tool, True) -#camera_tool.enableBackground(False) +camera_tool.enableBackground(False) camera_tool.capture() print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read() \ No newline at end of file