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

done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-16 12:49:27 +02:00
parent 1da4b07e73
commit 1263e80d21
11 changed files with 146 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3352,6 +3352,7 @@ char* multiSlsDetector::setNetworkParameter(networkParameter p, string s){
}
}
return getNetworkParameter(p);
}
@ -5421,7 +5422,7 @@ int multiSlsDetector::calibratePedestal(int frames){
return ret;
}
int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver,int i){
int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver, int freq){
int ret=-100, ret1;
if(!getFromReceiver)
@ -5429,7 +5430,7 @@ int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver,int i){
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->setReadReceiverFrequency(getFromReceiver,i);
ret1=detectors[idet]->setReadReceiverFrequency(getFromReceiver,freq);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret==-100)
@ -5446,6 +5447,24 @@ int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver,int i){
int multiSlsDetector::setDataStreamingFromReceiver(int enable){
int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->setDataStreamingFromReceiver(enable);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
}
return ret;
}
int multiSlsDetector::enableReceiverCompression(int i){
int ret=-100,ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++)

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1242,14 +1242,20 @@ class multiSlsDetector : public slsDetectorUtils {
int calibratePedestal(int frames = 0);
/** Sets the read receiver frequency
if Receiver read upon gui request, readRxrFrequency=0,
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 multislsdetecter
@param i is the receiver read frequency
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 i=-1);
int setReadReceiverFrequency(int getFromReceiver, int freq=-1);
/** Enable or disable streaming data from receiver to client
* @param enable 0 to disable 1 to enable -1 to only get the value
* @returns data streaming
*/
int setDataStreamingFromReceiver(int enable=-1);
/** updates the multidetector offsets */
void updateOffsets();