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

updates for merge for r_readfreq without reciever

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-23 18:30:48 +01:00
parent ab5229bcbf 16e4fbf8dd
commit 3439ccbec9
8 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -213,7 +213,6 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
thisMultiDetector->scanPrecision[iscan]=0;
}
thisMultiDetector->receiver_read_freq = 0;
thisMultiDetector->acquiringFlag = false;
thisMultiDetector->externalgui = false;
thisMultiDetector->receiver_datastream = false;
@ -6317,15 +6316,12 @@ int multiSlsDetector::calibratePedestal(int frames){
return ret;
}
int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver, int freq){
int multiSlsDetector::setReadReceiverFrequency(int freq){
int ret=-100, ret1;
if(!getFromReceiver)
return thisMultiDetector->receiver_read_freq;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
ret1=detectors[idet]->setReadReceiverFrequency(getFromReceiver,freq);
ret1=detectors[idet]->setReadReceiverFrequency(freq);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret==-100)
@ -6335,8 +6331,6 @@ int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver, int freq){
}
}
thisMultiDetector->receiver_read_freq = ret;
return ret;
}

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -207,9 +207,6 @@ class multiSlsDetector : public slsDetectorUtils {
mysteps scanSteps[MAX_SCAN_LEVELS];
int scanPrecision[MAX_SCAN_LEVELS];
/* Receiver read frequency */
int receiver_read_freq;
/** flag for acquiring */
bool acquiringFlag;
@ -1353,12 +1350,10 @@ class multiSlsDetector : public slsDetectorUtils {
/** Sets the read receiver frequency
if data required from receiver randomly readRxrFrequency=0,
else every nth frame to be sent to gui
@param getFromReceiver is 1 if it should ask the receiver,
0 if it can get it from multi structure
@param freq is the receiver read frequency
/returns read receiver frequency
*/
int setReadReceiverFrequency(int getFromReceiver, int freq=-1);
int setReadReceiverFrequency(int freq=-1);
/** Sets the read receiver timer
if data required from receiver randomly readRxrFrequency=0,