From 5949983dbb4a43ff93c2028a5180826a1d3e6725 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Thu, 16 Jul 2015 14:26:34 +0200
Subject: [PATCH] Closedown

---
 plugins/HoloScan.java        |  8 +++++++-
 plugins/ManipulatorScan.form | 15 ++++-----------
 plugins/ManipulatorScan.java |  8 +++++++-
 plugins/XPSSpectrum.java     |  7 ++++++-
 script/XPSSpectrum.py        |  4 +++-
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index 6d3f2738..b0ccf8e9 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -3,6 +3,7 @@
  */
 
 import ch.psi.pshell.dev.Motor;
+import ch.psi.pshell.epics.Scienta;
 import ch.psi.pshell.ui.Panel;
 import ch.psi.utils.State;
 import ch.psi.utils.swing.SwingUtils;
@@ -565,7 +566,12 @@ public class HoloScan extends Panel {
     }//GEN-LAST:event_buttonStartActionPerformed
 
     private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
-        abort();        
+        try {
+            abort();
+            ((Scienta) getDevice("scienta")).stop();
+        } catch (Exception ex) {
+            showException(ex);
+        }        
     }//GEN-LAST:event_buttonAbortActionPerformed
 
     private void radioStepSizeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioStepSizeActionPerformed
diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form
index d3e63957..449ae58b 100644
--- a/plugins/ManipulatorScan.form
+++ b/plugins/ManipulatorScan.form
@@ -93,18 +93,11 @@
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Group type="102" alignment="1" attributes="0">
                                   <Group type="103" groupAlignment="1" attributes="0">
-                                      <Group type="102" attributes="0">
-                                          <Group type="103" groupAlignment="0" attributes="0">
-                                              <Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
-                                              <Component id="jLabel5" alignment="1" min="-2" max="-2" attributes="0"/>
-                                          </Group>
-                                          <EmptySpace max="-2" attributes="0"/>
-                                      </Group>
-                                      <Group type="102" alignment="1" attributes="0">
-                                          <Component id="jLabel7" min="-2" max="-2" attributes="0"/>
-                                          <EmptySpace max="-2" attributes="0"/>
-                                      </Group>
+                                      <Component id="jLabel4" alignment="1" min="-2" max="-2" attributes="0"/>
+                                      <Component id="jLabel5" alignment="1" min="-2" max="-2" attributes="0"/>
+                                      <Component id="jLabel7" alignment="1" min="-2" max="-2" attributes="0"/>
                                   </Group>
+                                  <EmptySpace max="-2" attributes="0"/>
                                   <Group type="103" groupAlignment="0" max="-2" attributes="0">
                                       <Component id="spinnerFrom" alignment="1" max="32767" attributes="0"/>
                                       <Component id="spinnerRange" linkSize="4" alignment="1" max="32767" attributes="0"/>
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index 467696be..85e74bde 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -3,6 +3,7 @@
  */
 
 import ch.psi.pshell.dev.Motor;
+import ch.psi.pshell.epics.Scienta;
 import ch.psi.pshell.ui.Panel;
 import ch.psi.utils.State;
 import ch.psi.utils.swing.SwingUtils;
@@ -533,7 +534,12 @@ public class ManipulatorScan extends Panel {
     }//GEN-LAST:event_buttonStartActionPerformed
 
     private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
-        abort();
+        try {
+            abort();
+            ((Scienta) getDevice("scienta")).stop();
+        } catch (Exception ex) {
+            showException(ex);
+        }        
     }//GEN-LAST:event_buttonAbortActionPerformed
 
     private void radioStepSizeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioStepSizeActionPerformed
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java
index 9304aca2..e5b5ebd1 100644
--- a/plugins/XPSSpectrum.java
+++ b/plugins/XPSSpectrum.java
@@ -458,7 +458,12 @@ public class XPSSpectrum extends Panel {
     }// </editor-fold>//GEN-END:initComponents
 
     private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
-        abort();
+        try {
+            abort();
+            scienta.stop();
+        } catch (Exception ex) {
+            showException(ex);
+        }        
     }//GEN-LAST:event_buttonAbortActionPerformed
 
     private void buttonInitialScanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonInitialScanActionPerformed
diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py
index 375003ba..8478787c 100644
--- a/script/XPSSpectrum.py
+++ b/script/XPSSpectrum.py
@@ -33,7 +33,7 @@ try:
         scienta.setIterations(1)
 
         #iterations done in script
-        xdata = scienta.spectrumX
+        xdata = None
         ydata = None
         for j in range(vars[2]):        
             trig_scienta()
@@ -43,6 +43,8 @@ try:
             else:
                 for k in range (len(spectrum_array)):
                     ydata[k] = ydata[k] + spectrum_array[k]
+            if xdata is None:
+                xdata = scienta.spectrumX
             plots[i].getSeries(0).setData(xdata, ydata)
             if skip_iteration: 
                 break