detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 04:17:15 +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

13
slsDetectorSoftware/include/Detector.h
View File

@ -84,7 +84,7 @@ class Detector {
* CHIPTESTBOARD */
Result<defs::detectorType> getDetectorType(Positions pos = {}) const;
/** Gets the total number of detectors */
/** Gets the total number of modules in shared memory */
int size() const;
bool empty() const;
@ -1404,7 +1404,8 @@ class Detector {
* *
* ************************************************/
/** [CTB][Moench][Mythen3] */
/** [CTB][Moench][Mythen3] Loads ASCII pattern file directly to server
* (instead of executing line by line)*/
void setPattern(const std::string &fname, Positions pos = {});
/** [CTB][Moench][Mythen3] */
@ -1419,9 +1420,9 @@ class Detector {
/** [CTB][Moench][Mythen3] same as executing for ctb and moench */
Result<uint64_t> getPatternWord(int addr, Positions pos = {});
/** [CTB] Caution: If word is -1 reads the addr (same as
/** [CTB][Moench] Caution: If word is -1 reads the addr (same as
* executing the pattern)
* [Mythen3][Moench] */
* [Mythen3] */
void setPatternWord(int addr, uint64_t word, Positions pos = {});
/**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
@ -1437,9 +1438,7 @@ class Detector {
Positions pos = {});
/**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
* levels
* @returns number of loops
*/
* levels */
Result<int> getPatternLoopCycles(int level, Positions pos = {}) const;
/** [CTB][Moench][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2

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,