detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 13:01:12 +01:00
Code Issues Actions Packages Releases Activity

merge solved

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-23 18:24:24 +01:00
parent 8538604c0f 16e4fbf8dd
commit 65d7922286
8 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -206,7 +206,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;
@@ -3696,11 +3695,11 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
switch (p) {
case CLIENT_STREAMING_PORT:
prev_streaming = enableDataStreamingToClient();
enableDataStreamingToClient(0);
if (enableDataStreamingToClient()) enableDataStreamingToClient(0);
break;
case RECEIVER_STREAMING_PORT:
prev_streaming = enableDataStreamingFromReceiver();
enableDataStreamingFromReceiver(0);
if (enableDataStreamingFromReceiver()) enableDataStreamingFromReceiver(0);
break;
default: break;
}
@@ -6138,15 +6137,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)
@@ -6156,8 +6152,6 @@ int multiSlsDetector::setReadReceiverFrequency(int getFromReceiver, int freq){
}
}
thisMultiDetector->receiver_read_freq = ret;
return ret;
}

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -195,9 +195,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;
@@ -1328,12 +1325,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,