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
This commit is contained in:
rivers
2012-02-07 17:02:17 +00:00
parent 9ff027cda4
commit 9fddfd6b28

View File

@@ -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);