From b95805ca8b775655e06afb6e92fc98069d91d8ce Mon Sep 17 00:00:00 2001
From: X11MA <X11MA@x11ma-cons-1.psi.ch>
Date: Thu, 4 Feb 2016 16:32:24 +0100
Subject: [PATCH] Closedown

---
 config/devices.properties |  6 +++---
 plugins/EnergyScan.form   | 12 +++++++++++-
 plugins/EnergyScan.java   |  6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/config/devices.properties b/config/devices.properties
index 8f26899..1e5a236 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,7 +1,7 @@
-MCPArray1=ch.psi.pshell.epics.ChannelDoubleArray|X11MA-ES4:PHC-CTRWF1|Read||true
+MCPArray1=ch.psi.pshell.epics.ChannelIntegerArray|X11MA-ES4:PHC-CTRWF1|Read||true
 SamplingTime=ch.psi.pshell.epics.ChannelDouble|X11MA-ES4:SAMPLE-TIME|Read||true
-MCPArray2=ch.psi.pshell.epics.ChannelDoubleArray|X11MA-ES4:PHC-CTRWF2|Read||true
-NrCounters=ch.psi.pshell.epics.ChannelDouble|X11MA-ES4:NCTR|Read||true
+MCPArray2=ch.psi.pshell.epics.ChannelIntegerArray|X11MA-ES4:PHC-CTRWF2|Read||true
+NrCounters=ch.psi.pshell.epics.ChannelInteger|X11MA-ES4:NCTR|Read||true
 energy=ch.psi.pshell.epics.ChannelDouble|X11MA-PGM:rbkenergy|Read||true
 keithley_1a=ch.psi.pshell.epics.ChannelDouble|X11MA-ES1:CADC1|Read||true
 keithley_2a=ch.psi.pshell.epics.ChannelDouble|X11MA-ES1:CADC2|Read||true
diff --git a/plugins/EnergyScan.form b/plugins/EnergyScan.form
index 25023f3..b4f063a 100644
--- a/plugins/EnergyScan.form
+++ b/plugins/EnergyScan.form
@@ -347,7 +347,7 @@
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                              <Component id="jSpinner1" pref="54" max="32767" attributes="0"/>
+                              <Component id="jSpinner1" max="32767" attributes="0"/>
                               <Component id="jSpinner2" max="32767" attributes="0"/>
                           </Group>
                           <EmptySpace type="separate" max="-2" attributes="0"/>
@@ -490,8 +490,18 @@
           </Properties>
         </Component>
         <Component class="javax.swing.JSpinner" name="jSpinner1">
+          <Properties>
+            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+              <SpinnerModel initial="0" maximum="1000" minimum="0" numberType="java.lang.Integer" stepSize="1" type="number"/>
+            </Property>
+          </Properties>
         </Component>
         <Component class="javax.swing.JSpinner" name="jSpinner2">
+          <Properties>
+            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+              <SpinnerModel initial="0" maximum="1000" minimum="0" numberType="java.lang.Integer" stepSize="1" type="number"/>
+            </Property>
+          </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel9">
           <Properties>
diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java
index 48f03d6..883ddf9 100644
--- a/plugins/EnergyScan.java
+++ b/plugins/EnergyScan.java
@@ -420,6 +420,10 @@ public class EnergyScan extends Panel {
 
         jLabel7.setText("Save MCP data");
 
+        jSpinner1.setModel(new javax.swing.SpinnerNumberModel(0, 0, 1000, 1));
+
+        jSpinner2.setModel(new javax.swing.SpinnerNumberModel(0, 0, 1000, 1));
+
         jLabel9.setText("start");
 
         jLabel14.setText("end");
@@ -454,7 +458,7 @@ public class EnergyScan extends Panel {
                             .addComponent(jLabel14))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                            .addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 54, Short.MAX_VALUE)
+                            .addComponent(jSpinner1)
                             .addComponent(jSpinner2))
                         .addGap(18, 18, 18)
                         .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)