From 5ac3d236b0c41e17fa8c92897c6487cf644ea78e Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 12 Jul 2016 16:53:12 -0500 Subject: [PATCH] Fixed bug in setupAcquisition when setting minX and minY based on binning; there was an incorrect factor of 2 present --- andorApp/src/andorCCD.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp index 42ef9be..caae234 100755 --- a/andorApp/src/andorCCD.cpp +++ b/andorApp/src/andorCCD.cpp @@ -992,12 +992,12 @@ asynStatus AndorCCD::setupAcquisition() getIntegerParam(ADSizeY, &sizeY); getIntegerParam(ADMaxSizeX, &maxSizeX); getIntegerParam(ADMaxSizeY, &maxSizeY); - if (minX > (maxSizeX - 2*binX)) { - minX = maxSizeX - 2*binX; + if (minX > (maxSizeX - binX)) { + minX = maxSizeX - binX; setIntegerParam(ADMinX, minX); } - if (minY > (maxSizeY - 2*binY)) { - minY = maxSizeY - 2*binY; + if (minY > (maxSizeY - binY)) { + minY = maxSizeY - binY; setIntegerParam(ADMinY, minY); } if ((minX + sizeX) > maxSizeX) {