From 6d2be9f6b0cbd3ed0b74205b0761ab9bd65bcd3c Mon Sep 17 00:00:00 2001
From: Michael Dunning <mdunning@slac.stanford.edu>
Date: Sun, 5 Nov 2017 19:46:29 -0800
Subject: [PATCH] Add try/catch block for call to SetBaselineClamp()

---
 andorApp/src/andorCCD.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp
index 1b6140e..47b1a52 100755
--- a/andorApp/src/andorCCD.cpp
+++ b/andorApp/src/andorCCD.cpp
@@ -668,7 +668,14 @@ asynStatus AndorCCD::writeInt32(asynUser *pasynUser, epicsInt32 value)
       status = setupShutter(-1);
     }
     else if (function == AndorBaselineClamp) {
-      checkStatus(SetBaselineClamp(value));
+      try {
+        checkStatus(SetBaselineClamp(value));
+      } catch (const std::string &e) {
+        asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
+          "%s:%s: %s\n",
+          driverName, functionName, e.c_str());
+        status = asynError;
+      }
     }
     else {
       status = ADDriver::writeInt32(pasynUser, value);