From 0ca17bd236ae56d15dd746019efeb19adeaf06d2 Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 2 May 2017 08:54:48 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- script/users/EmpaMarco.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index dbb1b58b..dd51f9c0 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -109,7 +109,7 @@ ps1=ch.psi.pshell.epics.AreaDetector|X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1|||tru op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|||true OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats2:CentroidX_RBV|Read||true OpticsCameraSigmaX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats2:SigmaX_RBV|Read||true -#$dummy=ch.psi.pshell.epics.ProcessVariable|XXX|||false +$dummy=ch.psi.pshell.epics.ProcessVariable|XXX|||false img=ch.psi.pshell.imaging.CameraSource|Scienta|||true cam1=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-1/axis-cgi/mjpg/video.cgi||-200| cam2=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-2/axis-cgi/mjpg/video.cgi||-1000| diff --git a/script/users/EmpaMarco.py b/script/users/EmpaMarco.py index 936ffdb3..44fde5a0 100644 --- a/script/users/EmpaMarco.py +++ b/script/users/EmpaMarco.py @@ -6,7 +6,8 @@ SETTLING_TIME = 0.0 STEPS = 1000 SENSORS = [Counts, MachineCurrent, SampleCurrent, RefCurrent, EnergyDistribution, Scienta.getDataMatrix()] ENDSCAN = False -dummy.initialize() + +#dummy.initialize() setup_plotting(line_plots = (Counts, MachineCurrent, SampleCurrent, RefCurrent,)) try: