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

Merge branch 'eigerserverlock' into developer

Browse Source
This commit is contained in:
maliakal_d
2020-09-22 18:48:35 +02:00
parent bb575c6017 65da9e701b
commit a4bdffd0b9
5 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -2109,8 +2109,8 @@ std::string CmdProxy::PatternWord(int action) {
os << cmd << ' ';
if (action == defs::HELP_ACTION) {
os << "[step or address] [64 bit mask]\n\t[Ctb][Moench][Mythen3] 64 "
"bit pattern at "
"address of pattern memory."
"bit pattern at address of pattern memory.\n\t[Ctb][Moench] read "
"is same as executing pattern"
<< '\n';
} else if (action == defs::GET_ACTION) {
if (args.size() != 1) {

6
slsDetectorSoftware/src/CmdProxy.h
View File

@ -2343,9 +2343,9 @@ class CmdProxy {
"[n]\n\tPort number of the stop server on detector for detector-client "
"tcp interface. Default is 1953. Normally unchanged.");
INTEGER_COMMAND_VEC_ID(lock, getDetectorLock, setDetectorLock,
StringTo<int>,
"[0, 1]\n\tLock detector to one IP, 1: locks");
INTEGER_COMMAND_VEC_ID(
lock, getDetectorLock, setDetectorLock, StringTo<int>,
"[0, 1]\n\tLock detector to one IP, 1: locks. Default is unlocked");
GET_COMMAND(
lastclient, getLastClientIP,

8
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -623,13 +623,13 @@ void DetectorImpl::readFrameFromReceiver() {
// send data to callback
if (data) {
char *image = multiframe;
char *callbackImage = multiframe;
int imagesize = multisize;
if (gapPixels) {
int n = InsertGapPixels(multiframe, multigappixels, quadEnable,
dynamicRange, nDetPixelsX, nDetPixelsY);
image = multigappixels;
callbackImage = multigappixels;
imagesize = n;
}
LOG(logDEBUG) << "Image Info:"
@ -640,8 +640,8 @@ void DetectorImpl::readFrameFromReceiver() {
thisData =
new detectorData(currentProgress, currentFileName, nDetPixelsX,
nDetPixelsY, image, imagesize, dynamicRange,
currentFileIndex, completeImage);
nDetPixelsY, callbackImage, imagesize,
dynamicRange, currentFileIndex, completeImage);
dataReady(
thisData, currentFrameIndex,