From e364032902189db152a3c87bc28678af48faeb17 Mon Sep 17 00:00:00 2001
From: gac-iss <gac-iss@MPC2631.psi.ch>
Date: Tue, 10 Mar 2020 10:48:36 +0100
Subject: [PATCH] Binding evergy scan

---
 src/main/java/Scienta.java | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Scienta.java b/src/main/java/Scienta.java
index 075fc77..ebe1c27 100644
--- a/src/main/java/Scienta.java
+++ b/src/main/java/Scienta.java
@@ -21,7 +21,7 @@ import java.util.logging.Logger;
  * Implementation of Scienta spectrometer analyser.
  */
 public class Scienta extends AreaDetector {
-
+    final ChannelInteger acquire2;
     final ChannelInteger slices, frames;
     final ChannelDouble lowEnergy, centerEnergy, highEnergy, stepSize, stepTime, energyWidth;
     final ChannelDoubleArray spectrum, image, extio, spectrumX;
@@ -40,6 +40,9 @@ public class Scienta extends AreaDetector {
     public Scienta(String name, String channelCtrl, String channelData) {
         super(name, channelCtrl, channelData);
         this.channelCtrl = channelCtrl;
+        
+        acquire2 = new ChannelInteger(name + " aquire2", channelCtrl + ":Acquire2", false);
+                
         slices = new ChannelInteger(name + " slices", channelCtrl + ":SLICES", false);
         frames = new ChannelInteger(name + " frames", channelCtrl + ":FRAMES", false);
 
@@ -109,7 +112,7 @@ public class Scienta extends AreaDetector {
         totalPoints = new ChannelDouble(name + " total points", channelCtrl + ":TOTAL_POINTS_RBV", 0, false);
         totalPoints.setAccessType(AccessType.Read);
 
-        addChildren(new Device[]{slices, frames,
+        addChildren(new Device[]{acquire2, slices, frames,
             lowEnergy, centerEnergy, highEnergy, stepSize, stepTime, energyWidth,
             spectrum, image, extio, spectrumX, 
             currentChannel, totalPoints, totalDataPoints, 
@@ -192,6 +195,7 @@ public class Scienta extends AreaDetector {
     @Override
     protected void doSetSimulated() {
         super.doSetSimulated();
+        setCache(acquire2, 1);
         setCache(channelBegin, 50.0);
         setCache(channelEnd, 150.0);
         setCache(sliceBegin, -20.0);
@@ -217,9 +221,17 @@ public class Scienta extends AreaDetector {
 
     }
 
+    @Override
+    protected void doStart() throws IOException, InterruptedException {
+        
+        acquire2.write(1);        
+    }    
+    
+    
     @Override
     protected void doUpdate() throws IOException, InterruptedException {
         super.doUpdate();
+        acquire2.update();
         numChannels.update();
         currentChannel.update();
         slices.update();
@@ -244,6 +256,7 @@ public class Scienta extends AreaDetector {
     @Override
     protected void doSetMonitored(boolean value) {
         super.doSetMonitored(value);
+        acquire2.setMonitored(value);
         numChannels.setMonitored(value);
         currentChannel.setMonitored(value);
         slices.setMonitored(value);
@@ -437,6 +450,10 @@ public class Scienta extends AreaDetector {
     }
 
     //Direct register access
+    public ChannelInteger getAcquire2() {
+        return acquire2;
+    }
+    
     public ChannelInteger getSlices() {
         return slices;
     }