detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 16:27:13 +02:00
Code Issues Actions Packages Releases Activity

merge from developer (without the additional json header implementations)

Browse Source
This commit is contained in:
maliakal_d
2019-02-12 09:35:24 +01:00
parent 985b2eba4d
commit a64b34610a
28 changed files with 903 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -1,7 +1,7 @@
#include "slsDetectorUsers.h"
#include "detectorData.h"
#include "multiSlsDetector.h"
#include "multiSlsDetectorClient.h"
@ -57,7 +57,7 @@ int slsDetectorUsers::dumpDetectorSetup(const std::string& fname){
}
int64_t slsDetectorUsers::getDetectorFirmwareVersion(int detPos){
return detector.getId(slsDetectorDefs::DETECTOR_FIRMWARE_VERSION);
return detector.getId(slsDetectorDefs::DETECTOR_FIRMWARE_VERSION, detPos);
}
int64_t slsDetectorUsers::getDetectorSerialNumber(int detPos){
@ -234,6 +234,13 @@ int slsDetectorUsers::setFlowControl10G(int i, int detPos) {
return detector.setFlowControl10G(i, detPos);
}
int slsDetectorUsers::setROI(int n, slsDetectorDefs::ROI roiLimits[], int detPos) {
return myDetector->setROI(n, roiLimits, detPos);
}
slsDetectorDefs::ROI* slsDetectorUsers::getROI(int &n, int detPos) {
return myDetector->getROI(n, detPos);
}
/************************************************************************