From a38389bcdc51b2d14db308efb73b3d177354f421 Mon Sep 17 00:00:00 2001
From: Mark Rivers <rivers@cars.uchicago.edu>
Date: Thu, 12 Mar 2015 14:03:53 -0500
Subject: [PATCH] New version from SDK 2.99.3

---
 andorSupport/ATMCD32D.h    | 6 ++++++
 andorSupport/ShamrockCIF.h | 6 +++++-
 andorSupport/atmcdLXd.h    | 6 ++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/andorSupport/ATMCD32D.h b/andorSupport/ATMCD32D.h
index c213c87..c081b64 100755
--- a/andorSupport/ATMCD32D.h
+++ b/andorSupport/ATMCD32D.h
@@ -397,6 +397,8 @@ unsigned int WINAPI SetFanMode(int mode);
 unsigned int WINAPI SetFastExtTrigger(int mode);
 unsigned int WINAPI SetFastKinetics(int exposedRows, int seriesLength, float time, int mode, int hbin, int vbin);
 unsigned int WINAPI SetFastKineticsEx(int exposedRows, int seriesLength, float time, int mode, int hbin, int vbin, int offset);
+unsigned int WINAPI SetSuperKinetics(int exposedRows, int seriesLength, float time, int mode, int hbin, int vbin, int offset);
+unsigned int WINAPI SetTimeScan(int rows, int tracks, int mode);
 unsigned int WINAPI SetFilterMode(int mode);
 unsigned int WINAPI SetFilterParameters(int width, float sensitivity, int range, float accept, int smooth, int noise);
 unsigned int WINAPI SetFKVShiftSpeed(int index);
@@ -475,6 +477,7 @@ unsigned int WINAPI SetVSSpeed(int index);
 unsigned int WINAPI ShutDown(void);
 unsigned int WINAPI StartAcquisition(void);
 unsigned int WINAPI UnMapPhysicalAddress(void);
+unsigned int WINAPI UpdateDDGTimings(void);
 unsigned int WINAPI WaitForAcquisition(void);
 unsigned int WINAPI WaitForAcquisitionByHandle(long cameraHandle);
 unsigned int WINAPI WaitForAcquisitionByHandleTimeOut(long cameraHandle, int iTimeOutMs);
@@ -666,6 +669,8 @@ unsigned int WINAPI PostProcessDataAveraging(at_32 * pInputImage, at_32 * pOutpu
 #define AC_ACQMODE_FRAMETRANSFER 16
 #define AC_ACQMODE_FASTKINETICS 32
 #define AC_ACQMODE_OVERLAP 64
+#define AC_ACQMODE_SUPERKINETICS 128
+#define AC_ACQMODE_TIMESCAN 256
 
 #define AC_READMODE_FULLIMAGE 1
 #define AC_READMODE_SUBIMAGE 2
@@ -716,6 +721,7 @@ unsigned int WINAPI PostProcessDataAveraging(at_32 * pInputImage, at_32 * pOutpu
 #define AC_CAMERATYPE_ALTA 26
 #define AC_CAMERATYPE_ALTAF 27
 #define AC_CAMERATYPE_IKONXL 28
+#define AC_CAMERATYPE_RES1 29
 
 #define AC_PIXELMODE_8BIT 1
 #define AC_PIXELMODE_14BIT 2
diff --git a/andorSupport/ShamrockCIF.h b/andorSupport/ShamrockCIF.h
index 8f03e65..3078133 100755
--- a/andorSupport/ShamrockCIF.h
+++ b/andorSupport/ShamrockCIF.h
@@ -6,6 +6,7 @@
 #define SHAMROCK_P2INVALID 20267
 #define SHAMROCK_P3INVALID 20268
 #define SHAMROCK_P4INVALID 20269
+#define SHAMROCK_P5INVALID 20270
 #define SHAMROCK_NOT_INITIALIZED 20275
 #define SHAMROCK_NOT_AVAILABLE 20292
 
@@ -46,7 +47,7 @@
 
 #define SHAMROCK_ERRORLENGTH 64
 
-#ifndef linux
+#ifndef __linux__
  #include "windows.h"
 #endif
 
@@ -76,6 +77,8 @@ unsigned int WINAPI ShamrockSetDetectorOffset(int device,int offset);
 unsigned int WINAPI ShamrockGetDetectorOffset(int device,int *offset);
 unsigned int WINAPI ShamrockSetDetectorOffsetPort2(int device,int offset);
 unsigned int WINAPI ShamrockGetDetectorOffsetPort2(int device,int *offset);
+unsigned int WINAPI ShamrockSetDetectorOffsetEx(int device, int entrancePort, int exitPort, int offset);
+unsigned int WINAPI ShamrockGetDetectorOffsetEx(int device, int entrancePort, int exitPort, int *offset);
 unsigned int WINAPI ShamrockSetGratingOffset(int device,int Grating, int offset);
 unsigned int WINAPI ShamrockGetGratingOffset(int device,int Grating, int *offset);
 unsigned int WINAPI ShamrockGratingIsPresent(int device,int *present);
@@ -160,6 +163,7 @@ unsigned int WINAPI ShamrockSetNumberPixels(int device, int NumberPixels);
 unsigned int WINAPI ShamrockGetPixelWidth(int device, float* Width);
 unsigned int WINAPI ShamrockGetNumberPixels(int device, int* NumberPixels);
 unsigned int WINAPI ShamrockGetCalibration(int device, float* CalibrationValues, int NumberPixels);
+unsigned int WINAPI ShamrockGetPixelCalibrationCoefficients(int device, float* A, float* B, float* C, float* D);
 #ifdef __cplusplus
 }
 #endif
diff --git a/andorSupport/atmcdLXd.h b/andorSupport/atmcdLXd.h
index 8d6a4e4..b34349b 100644
--- a/andorSupport/atmcdLXd.h
+++ b/andorSupport/atmcdLXd.h
@@ -410,6 +410,8 @@ unsigned int SetFanMode(int mode);
 unsigned int SetFastExtTrigger(int mode);
 unsigned int SetFastKinetics(int exposedRows, int seriesLength, float time, int mode, int hbin, int vbin);
 unsigned int SetFastKineticsEx(int exposedRows, int seriesLength, float time, int mode, int hbin, int vbin, int offset);
+unsigned int SetSuperKinetics(int exposedRows, int seriesLength, float time, int mode, int hbin, int vbin, int offset);
+unsigned int SetTimeScan(int rows, int tracks, int mode);
 unsigned int SetFilterMode(int mode);
 unsigned int SetFilterParameters(int width, float sensitivity, int range, float accept, int smooth, int noise);
 unsigned int SetFKVShiftSpeed(int index);
@@ -488,6 +490,7 @@ unsigned int SetVSSpeed(int index);
 unsigned int ShutDown();
 unsigned int StartAcquisition();
 unsigned int UnMapPhysicalAddress();
+unsigned int UpdateDDGTimings();
 unsigned int WaitForAcquisition();
 unsigned int WaitForAcquisitionByHandle(at_32 cameraHandle);
 unsigned int WaitForAcquisitionByHandleTimeOut(long cameraHandle, int iTimeOutMs);
@@ -679,6 +682,8 @@ unsigned int PostProcessDataAveraging(at_32 * pInputImage, at_32 * pOutputImage,
 #define AC_ACQMODE_FRAMETRANSFER 16
 #define AC_ACQMODE_FASTKINETICS 32
 #define AC_ACQMODE_OVERLAP 64
+#define AC_ACQMODE_SUPERKINETICS 128
+#define AC_ACQMODE_TIMESCAN 256
 
 #define AC_READMODE_FULLIMAGE 1
 #define AC_READMODE_SUBIMAGE 2
@@ -729,6 +734,7 @@ unsigned int PostProcessDataAveraging(at_32 * pInputImage, at_32 * pOutputImage,
 #define AC_CAMERATYPE_ALTA 26
 #define AC_CAMERATYPE_ALTAF 27
 #define AC_CAMERATYPE_IKONXL 28
+#define AC_CAMERATYPE_RES1 29
 
 #define AC_PIXELMODE_8BIT 1
 #define AC_PIXELMODE_14BIT 2