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

refactor receiver client interface, moved defs into one sls_detector_defs.h

Browse Source
This commit is contained in:
maliakal_d
2018-10-11 12:25:18 +02:00
parent d0950ba001
commit 5a356534e6
56 changed files with 1155 additions and 2386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2766,7 +2766,7 @@ int multiSlsDetector::setReceiverFramesPerFile(int f, int detPos) {
}
slsReceiverDefs::frameDiscardPolicy multiSlsDetector::setReceiverFramesDiscardPolicy(
slsDetectorDefs::frameDiscardPolicy multiSlsDetector::setReceiverFramesDiscardPolicy(
frameDiscardPolicy f, int detPos) {
// single
if (detPos >= 0) {
@ -2791,7 +2791,7 @@ int multiSlsDetector::setReceiverPartialFramesPadding(int f, int detPos) {
}
slsReceiverDefs::fileFormat multiSlsDetector::getFileFormat(int detPos) {
slsDetectorDefs::fileFormat multiSlsDetector::getFileFormat(int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->getFileFormat();
@ -2803,7 +2803,7 @@ slsReceiverDefs::fileFormat multiSlsDetector::getFileFormat(int detPos) {
}
slsReceiverDefs::fileFormat multiSlsDetector::setFileFormat(fileFormat f, int detPos) {
slsDetectorDefs::fileFormat multiSlsDetector::setFileFormat(fileFormat f, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->setFileFormat(f);

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -7,7 +7,8 @@
* @author Anna Bergamaschi
*/
#include "slsDetectorBase.h"
#include "sls_detector_defs.h"
#include "error_defs.h"
class slsDetector;
class SharedMemory;
@ -24,7 +25,7 @@ class detectorData;
#define SHORT_STRING_LENGTH 50
#define DATE_LENGTH 30
class multiSlsDetector : public slsDetectorBase {
class multiSlsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
private:
@ -294,7 +295,7 @@ public:
void addMultipleDetectors(const char* name);
using slsDetectorBase::getDetectorType;
using slsDetectorDefs::getDetectorType;
/**
* Get Detector type for a particular sls detector or get the first one
* @param detPos -1 for all detectors in list or specific detector position