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

code refactor in slsdet: prevval for setnumtriggers

Browse Source
This commit is contained in:
maliakal_d
2020-02-26 11:27:24 +01:00
parent 80304c2eaf
commit d9cfc59df6
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -1239,12 +1239,11 @@ void slsDetector::sendTotalNumFramestoReceiver() {
} }
int64_t slsDetector::getNumberOfFrames() { int64_t slsDetector::getNumberOfFrames() {
int64_t prevVal = shm()->nFrames;
int64_t retval = -1; int64_t retval = -1;
sendToDetector(F_GET_NUM_FRAMES, nullptr, retval); sendToDetector(F_GET_NUM_FRAMES, nullptr, retval);
FILE_LOG(logDEBUG1) << "number of frames :" << retval; FILE_LOG(logDEBUG1) << "number of frames :" << retval;
if (shm()->nFrames != retval) {
shm()->nFrames = retval; shm()->nFrames = retval;
if (prevVal != retval) {
sendTotalNumFramestoReceiver(); sendTotalNumFramestoReceiver();
} }
return shm()->nFrames; return shm()->nFrames;
@ -1258,12 +1257,11 @@ void slsDetector::setNumberOfFrames(int64_t value) {
} }
int64_t slsDetector::getNumberOfTriggers() { int64_t slsDetector::getNumberOfTriggers() {
int64_t prevVal = shm()->nTriggers;
int64_t retval = -1; int64_t retval = -1;
sendToDetector(F_GET_NUM_TRIGGERS, nullptr, retval); sendToDetector(F_GET_NUM_TRIGGERS, nullptr, retval);
FILE_LOG(logDEBUG1) << "number of triggers :" << retval; FILE_LOG(logDEBUG1) << "number of triggers :" << retval;
if (shm()->nTriggers != retval) {
shm()->nTriggers = retval; shm()->nTriggers = retval;
if (prevVal != retval) {
sendTotalNumFramestoReceiver(); sendTotalNumFramestoReceiver();
} }
return shm()->nTriggers; return shm()->nTriggers;
@ -1277,12 +1275,11 @@ void slsDetector::setNumberOfTriggers(int64_t value) {
} }
int64_t slsDetector::getNumberOfBursts() { int64_t slsDetector::getNumberOfBursts() {
int64_t prevVal = shm()->nBursts;
int64_t retval = -1; int64_t retval = -1;
sendToDetector(F_GET_NUM_BURSTS, nullptr, retval); sendToDetector(F_GET_NUM_BURSTS, nullptr, retval);
FILE_LOG(logDEBUG1) << "number of bursts :" << retval; FILE_LOG(logDEBUG1) << "number of bursts :" << retval;
if (shm()->nBursts != retval) {
shm()->nBursts = retval; shm()->nBursts = retval;
if (prevVal != retval) {
sendTotalNumFramestoReceiver(); sendTotalNumFramestoReceiver();
} }
return shm()->nBursts; return shm()->nBursts;