From c9c43fcaa6878cc24bb096d4676b78f841793cb9 Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Tue, 14 May 2019 10:24:07 +0200
Subject: [PATCH] Closedown

---
 config/devices.properties      |  2 +-
 script/local.py                | 14 --------------
 script/templates/EnergyScan.py |  4 ++--
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/config/devices.properties b/config/devices.properties
index 7b3a341..41ad937 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -2,7 +2,7 @@ pol_mode=ch.psi.pshell.epics.DiscretePositioner|X11MA-ID2:MODE|||true
 pol_angle=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:ALPHA|||true
 pol_offset=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:ENERGY-OFFS|||true
 pol_done=ch.psi.pshell.epics.ChannelString|X11MA-ID2:DONE|Read||true
-energy=ch.psi.pshell.epics.ChannelDouble|X11MA-PHS:E_SP|||
+energy=ch.psi.pshell.epics.ChannelDouble|X11PHS-E:GO.A|||
 id_error=ch.psi.pshell.epics.ChannelInteger|X11MA-ID2-PLC:ERROR|||true
 beam_status=ch.psi.pshell.epics.DiscretePositioner|ACOAU-ACCU:OP-MODE|Read||true
 edata=ch.psi.pshell.epics.ChannelDoubleArray|EDATA 3|Read||
diff --git a/script/local.py b/script/local.py
index 8f63f75..1d6a717 100644
--- a/script/local.py
+++ b/script/local.py
@@ -108,25 +108,11 @@ def plot_file(file, ctxt = None):
     table = Table.load(file, sep, '#')
     plots = plot(table, title = ctxt)
 
-#If True, then wait_beam will not continue checking machine status
-maintenance_mode = True
-
 def has_beam():
     """
     """
     return beam_status.readback.read() !="Machine Down"
 
-def wait_beam():
-    """
-    """
-    print "Waiting for beam... ",            
-    while not has_beam():
-        if maintenance_mode:
-            print "Maintenence mode: disregarding beam state"
-            return
-        sleep(0.1)
-    print "Beam OK."
-
 def is_id_error():
     return (id_error.read()==0)
 
diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py
index 7e286db..acd026c 100644
--- a/script/templates/EnergyScan.py
+++ b/script/templates/EnergyScan.py
@@ -2,8 +2,8 @@
 
 #Parameters
 
-E1 = 500
-E2 = 600
+E1 = 510
+E2 = 590
 TIME = 1 #min
 DELAY = 2.0 #s
 MODE = 'CIRC +'