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

receiver read frequency from gui can be set now

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-05-21 13:43:25 +00:00
parent 3afbf35e0f
commit 0e73372cf8
11 changed files with 177 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -194,6 +194,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
thisMultiDetector->scanPrecision[iscan]=0;
}
thisMultiDetector->receiver_read_freq = 0;
thisMultiDetector->alreadyExisting=1;
}
@ -4658,12 +4659,15 @@ int multiSlsDetector::calibratePedestal(int frames){
return ret;
}
int multiSlsDetector::setReadReceiverFrequency(int i){
int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver,int i){
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(i);
ret1=detectors[idet]->setReadReceiverFrequency(getFromReceiver,i);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret==-100)
@ -4673,6 +4677,8 @@ int multiSlsDetector::setReadReceiverFrequency(int i){
}
}
thisMultiDetector->receiver_read_freq = ret;
return ret;
}

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -191,6 +191,9 @@ class multiSlsDetector : public slsDetectorUtils {
mysteps scanSteps[MAX_SCAN_LEVELS];
int scanPrecision[MAX_SCAN_LEVELS];
/* Receiver read frequency */
int receiver_read_freq;
};
@ -1190,9 +1193,12 @@ class multiSlsDetector : public slsDetectorUtils {
/** Sets the read receiver frequency
if Receiver read upon gui request, 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 multislsdetecter
@param i is the receiver read frequency
/returns read receiver frequency
*/
int setReadReceiverFrequency(int i=-1);
int setReadReceiverFrequency(int getFromReceiver, int i=-1);
/** updates the multidetector offsets */
void updateOffsets();
@ -1202,6 +1208,7 @@ class multiSlsDetector : public slsDetectorUtils {
*/
void waitForReceiverReadToFinish();
protected:
@ -1216,6 +1223,7 @@ class multiSlsDetector : public slsDetectorUtils {
};