From 74f2783b105175c8abfc5ed3a99db6d3ff5093a3 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 11 Apr 2019 16:21:25 +0200 Subject: [PATCH] Client (data call back API) and Gui (Eiger 4 bit mode with multiple images) bug fix: npixelsx and npixelsy was not updated to complete detector level when calling call back function to give complete image --- slsDetectorSoftware/src/multiSlsDetector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp index 09c4d9ca3..4ec08b834 100644 --- a/slsDetectorSoftware/src/multiSlsDetector.cpp +++ b/slsDetectorSoftware/src/multiSlsDetector.cpp @@ -3280,11 +3280,11 @@ void multiSlsDetector::readFrameFromReceiver() { // send data to callback if (data) { + int nCompletePixelsX = multi_shm()->numberOfChannelInclGapPixels[X]; + int nCompletePixelsY = multi_shm()->numberOfChannelInclGapPixels[Y]; // 4bit gap pixels if (dynamicRange == 4 && gappixelsenable) { int n = processImageWithGapPixels(multiframe, multigappixels); - nPixelsX = multi_shm()->numberOfChannelInclGapPixels[X]; - nPixelsY = multi_shm()->numberOfChannelInclGapPixels[Y]; thisData = new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX, nPixelsY, multigappixels, n, dynamicRange, currentFileIndex);