From 8fb898f231c34fb20e0e139c2ae2bc8b5ae28de1 Mon Sep 17 00:00:00 2001 From: x03daop Date: Mon, 1 May 2017 18:05:04 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- script/users/EmpaMarco.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 08728ae5..d52a10d5 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.Motor|XXX|||true +dummy=ch.psi.pshell.device.DummyPositioner|XXX|||true 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 ecdc43a9..b88892a6 100644 --- a/script/users/EmpaMarco.py +++ b/script/users/EmpaMarco.py @@ -5,7 +5,7 @@ ENERGY_HIGH = 350.0 SETTLING_TIME = 0.0 STEPS = 1000 SENSORS = [Counts, MachineCurrent, SampleCurrent, RefCurrent, EnergyDistribution, Scienta.getDataMatrix()] -dummy.initialize() +#dummy.initialize() setup_plotting(line_plots = (Counts, MachineCurrent, SampleCurrent, RefCurrent,)) try: