detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +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:13:31 +02:00
parent 2108bbda66
commit 518c6783cc
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5147,19 +5147,20 @@ void multiSlsDetector::readFrameFromReceiver() {
//send data to callback
if (data) {
int nCompletePixelsX = thisMultiDetector->numberOfChannelInclGapPixels[X];
int nCompletePixelsY = thisMultiDetector->numberOfChannelInclGapPixels[Y];
// 4bit gap pixels
if (dynamicRange == 4 && gappixelsenable) {
int n = processImageWithGapPixels(multiframe, multigappixels);
nPixelsX = thisMultiDetector->numberOfChannelInclGapPixels[X];
nPixelsY = thisMultiDetector->numberOfChannelInclGapPixels[Y];
thisData = new detectorData(NULL, NULL, NULL, getCurrentProgress(),
currentFileName.c_str(), nPixelsX, nPixelsY,
currentFileName.c_str(), nCompletePixelsX, nCompletePixelsY,
multigappixels, n, dynamicRange, currentFileIndex);
}
// normal pixels
else {
thisData = new detectorData(NULL, NULL, NULL, getCurrentProgress(),
currentFileName.c_str(), nPixelsX, nPixelsY,
currentFileName.c_str(), nCompletePixelsX, nCompletePixelsY,
multiframe, multisize, dynamicRange, currentFileIndex);
}
dataReady(thisData, currentFrameIndex,

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4041,7 +4041,7 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
t=RECEIVER_UDP_SCKT_BUF_SIZE;
if (action==PUT_ACTION){
uint64_t ival = -1;
if (!(sscanf(args[1],"%ld",&i)))
if (!(sscanf(args[1],"%ld",&ival)))
return ("cannot parse argument") + string(args[1]);
}
} else if (cmd=="rx_realudpsocksize") {