detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +02:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
maliakal_d 2019-04-11 16:21:25 +02:00
parent 4a5cb011f7
commit 74f2783b10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -3280,11 +3280,11 @@ void multiSlsDetector::readFrameFromReceiver() {
// send data to callback // send data to callback
if (data) { if (data) {
int nCompletePixelsX = multi_shm()->numberOfChannelInclGapPixels[X];
int nCompletePixelsY = multi_shm()->numberOfChannelInclGapPixels[Y];
// 4bit gap pixels // 4bit gap pixels
if (dynamicRange == 4 && gappixelsenable) { if (dynamicRange == 4 && gappixelsenable) {
int n = processImageWithGapPixels(multiframe, multigappixels); int n = processImageWithGapPixels(multiframe, multigappixels);
nPixelsX = multi_shm()->numberOfChannelInclGapPixels[X];
nPixelsY = multi_shm()->numberOfChannelInclGapPixels[Y];
thisData = thisData =
new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX, new detectorData(getCurrentProgress(), currentFileName.c_str(), nPixelsX,
nPixelsY, multigappixels, n, dynamicRange, currentFileIndex); nPixelsY, multigappixels, n, dynamicRange, currentFileIndex);