From b764f274d9f5c35dd04f2a29b786571382f942f4 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Wed, 1 Feb 2012 16:33:17 +0000
Subject: [PATCH] Removed AcquireTimeActual, etc. parameters, use RBV instead;
 remove shutter private variables, not needed; remove data array, not needed;
 add desired values of AcquireTime, etc. to store desired values even when SDK
 changes them; added setupShutter function

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14395 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/andorSrc/andorCCD.h | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/ADApp/andorSrc/andorCCD.h b/ADApp/andorSrc/andorCCD.h
index fa0d860..3c11dd2 100755
--- a/ADApp/andorSrc/andorCCD.h
+++ b/ADApp/andorSrc/andorCCD.h
@@ -49,9 +49,6 @@
 #define AndorShutterExTTLString            "ANDOR_SHUTTER_EXTTL"
 #define AndorPalFileNameString             "ANDOR_PAL_FILE_PATH"
 #define AndorAccumulatePeriodString        "ANDOR_ACCUMULATE_PERIOD"
-#define AndorAcquireTimeActualString       "ANDOR_ACQUIRE_TIME_ACTUAL"
-#define AndorAcquirePeriodActualString     "ANDOR_ACQUIRE_PERIOD_ACTUAL"
-#define AndorAccumulatePeriodActualString  "ANDOR_ACCUMULATE_PERIOD_ACTUAL"
 #define AndorAdcSpeedString                "ANDOR_ADC_SPEED"
 
 
@@ -84,9 +81,6 @@ class AndorCCD : public ADDriver {
   int AndorShutterExTTL;
   int AndorPalFileName;
   int AndorAccumulatePeriod;
-  int AndorAcquireTimeActual;
-  int AndorAcquirePeriodActual;
-  int AndorAccumulatePeriodActual;
   int AndorAdcSpeed;
   #define LAST_ANDOR_PARAM AndorAdcSpeed
 
@@ -94,6 +88,7 @@ class AndorCCD : public ADDriver {
 
   unsigned int checkStatus(unsigned int returnStatus) throw(std::string);
   asynStatus setupAcquisition();
+  asynStatus setupShutter(int command);
   void saveDataFrame();
   /**
    * Additional image mode to those in ADImageMode_t
@@ -166,15 +161,9 @@ class AndorCCD : public ADDriver {
   char *mInstallPath;
 
   //Shutter control parameters
-  epicsInt32 mShutterExTTL;
-  epicsInt32 mShutterMode;
-  epicsInt32 mShutterCloseTime;
-  epicsInt32 mShutterOpenTime;
-
-  //Data array
-  int mDataSize;
-  at_32 *mData;
-  
+  float mAcquireTime;
+  float mAcquirePeriod;
+  float mAccumulatePeriod;
 
 };