From 104e63321795af96a2fce0ddbddd85bf170b43b8 Mon Sep 17 00:00:00 2001
From: x07maop <x07maop@x07ma-cons-2.psi.ch>
Date: Tue, 23 Jun 2015 11:12:54 +0200
Subject: [PATCH] Closedown

---
 plugins/EnergyScan.java | 4 +++-
 script/EnergyScan.py    | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java
index e376bb3..055d992 100644
--- a/plugins/EnergyScan.java
+++ b/plugins/EnergyScan.java
@@ -93,6 +93,7 @@ public class EnergyScan extends Panel {
                     if (result instanceof Exception ){
                         batchIndex=0;
                         batch=null;
+                        evalAsync("caput('START', 'STOP')");
                         throw ((Exception)result);
                     }
                     if (batch!=null){
@@ -169,7 +170,7 @@ public class EnergyScan extends Panel {
         void plot() {
             try {                
                 if ((scanPlot!=null) && (scanSeries!=null) &&  scanPlot.isShowing()&& (count!=null)){                
-                    scanPlot.setTitle("hhh");
+                    //buttonGroupPlot.getSelection().                    
                     Integer c = count.take();
                     if (c == null) {
                         scanSeries.clear();      
@@ -342,6 +343,7 @@ public class EnergyScan extends Panel {
             args.put("DELAY", (Double) spinnerDelay.getValue());
             args.put("MODE", comboMode.getSelectedItem().toString());
             args.put("OFFSET", (Double) spinnerOffset.getValue());
+            args.put("ALPHA", (Double) spinnerAlpha.getValue());            
 
             String file = expandPath(textFile.getText());
             args.put("FILE", file);
diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index 1814392..7f4fdb4 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -23,17 +23,19 @@ FOLDER = '2015_04/20150417'
 FILE = 'Fe_plus'
 """
 
+print "Scan"
+print E1,E2,TIME,DELAY,MODE ,OFFSET ,FOLDER ,FILE ,ALPHA
 
-
+"""
 #Pre-actions
 #cawait('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's')
 caput('X07MA-ID:MODE', MODE)
 time.sleep(1.0)
 if MODE == 'LINEAR':
     caput('X07MA-ID:ALPHA', ALPHA)
-cawait('X07MA-ID:DONE', 'DONE', type = 's')
+#cawait('X07MA-ID:DONE', 'DONE', type = 's')
 caput('X07MA-ID:ENERGY-OFFS', OFFSET)
-cawait('X07MA-ID:DONE', 'DONE', type = 's')
+#cawait('X07MA-ID:DONE', 'DONE', type = 's')
 caput('E1', E1)
 caput('E2', E2)
 caput('TIME', TIME)
@@ -51,4 +53,5 @@ caput('START', '1')
 
 #Post-actions
 cawait('START', 'STOP', type = 's')
+"""
 time.sleep(2.0)