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

compiles, but doesnt run

Browse Source
This commit is contained in:
maliakal_d
2018-10-29 15:23:52 +01:00
parent 33ac63d14a
commit 92fc837eb4
11 changed files with 1034 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -7,7 +7,6 @@
#include "multiSlsDetectorCommand.h"
#include "utilities.h"
#include "detectorData.h"
#include "logger.h"
#include <sys/types.h>
#include <iostream>
@ -2497,7 +2496,8 @@ void multiSlsDetector::printReceiverConfiguration(int detPos) {
}
// multi
parallelCall(&slsDetector::printReceiverConfiguration);
for (auto& d : detectors)
d->printReceiverConfiguration();
}

1
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -9,6 +9,7 @@
#include "sls_detector_defs.h"
#include "error_defs.h"
#include "logger.h"
class slsDetector;
class SharedMemory;

1524
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

19
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -11,6 +11,8 @@
#include "sls_detector_defs.h"
#include "error_defs.h"
#include "logger.h"
#include "math.h"
class multiSlsDetector;
@ -1261,7 +1263,7 @@ public:
* @param retval is the array with the trimbits
* @returns total number of channels for the detector
*/
int getChanRegs(double* retval,bool fromDetector);
int getChanRegs(double* retval);
/**
* Configure Module (Eiger)
@ -1300,7 +1302,7 @@ public:
* Prints receiver configuration
* #param level print level
*/
void printReceiverConfiguration(int level = logINFO);
void printReceiverConfiguration(TLogLevel level = logINFO);
/**
* Checks if receiver is online and set flag
@ -1486,12 +1488,6 @@ public:
*/
int getFramesCaughtByReceiver();
/**
* Gets the number of frames caught by any one receiver (to avoid using threadpool)
* @returns number of frames caught by any one receiver (master receiver if exists)
*/
int getFramesCaughtByAnyReceiver();
/**
* Gets the current frame index of receiver
* @returns current frame index of receiver
@ -1538,13 +1534,6 @@ public:
*/
int setReceiverStreamingTimer(int time_in_ms=500);
/**
* Enable data streaming to client
* @param enable 0 to disable, 1 to enable, -1 to get the value
* @returns data streaming to client enable
*/
int enableDataStreamingToClient(int enable=-1);
/**
* Enable or disable streaming data from receiver to client
* @param enable 0 to disable 1 to enable -1 to only get the value

5
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2723,7 +2723,7 @@ string slsDetectorCommand::cmdRateCorr(int narg, char *args[], int action, int d
myDet->setOnline(ONLINE_FLAG, detPos);
if (action==PUT_ACTION) {
sscanf(args[1],"%lld",&ival);
sscanf(args[1], "%ld",&ival);
myDet->setRateCorrection(ival, detPos);
}
sprintf(answer,"%lld",myDet->getRateCorrection(detPos));
@ -4908,7 +4908,8 @@ string slsDetectorCommand::cmdConfiguration(int narg, char *args[], int action,
myDet->setReceiverOnline(ONLINE_FLAG, detPos);
if (action==PUT_ACTION)
return string("cannot put");
return string(""+myDet->printReceiverConfiguration(detPos));
myDet->printReceiverConfiguration(detPos);
return string("");
}else if (cmd=="parameters") {
myDet->setReceiverOnline(ONLINE_FLAG, detPos);
if (action==PUT_ACTION) {