From 9fddfd6b285b4f9f084bbf1f4ab3baa78b2c3d7e Mon Sep 17 00:00:00 2001 From: rivers Date: Tue, 7 Feb 2012 17:02:17 +0000 Subject: [PATCH] Fixed problem with triggerMode, it was always being set ATInternal; minor fix to debugging output git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14436 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/andorSrc/andorCCD.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ADApp/andorSrc/andorCCD.cpp b/ADApp/andorSrc/andorCCD.cpp index 04c1c5f..eb9e9a0 100755 --- a/ADApp/andorSrc/andorCCD.cpp +++ b/ADApp/andorSrc/andorCCD.cpp @@ -796,7 +796,7 @@ asynStatus AndorCCD::setupAcquisition() try { asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, "%s, SetTriggerMode(%d)\n", functionName, triggerMode); - checkStatus(SetTriggerMode(ATInternal)); + checkStatus(SetTriggerMode(triggerMode)); asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, "%s, SetADChannel(%d)\n", functionName, adcChannel); checkStatus(SetADChannel(adcChannel)); @@ -883,7 +883,7 @@ asynStatus AndorCCD::setupAcquisition() } else { checkStatus(GetAcquisitionTimings(&acquireTimeAct, &accumulatePeriodAct, &acquirePeriodAct)); asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, - "%s, GetAcquisitionTimings(exposure=%f, accumulate=%f, kinetic=%f\n", + "%s, GetAcquisitionTimings(exposure=%f, accumulate=%f, kinetic=%f)\n", functionName, acquireTimeAct, accumulatePeriodAct, acquirePeriodAct); } setDoubleParam(ADAcquireTime, acquireTimeAct);