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

removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)

Browse Source
This commit is contained in:
maliakal_d
2019-02-12 11:09:19 +01:00
parent a64b34610a
commit 031a11c4f7
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2123,7 +2123,7 @@ int multiSlsDetector::setROI(int n, ROI roiLimits[], int detPos) {
ymin = roiLimits[i].ymin;
ymax = roiLimits[i].ymax;
if (getDetectorsType() != JUNGFRAUCTB || getNumberOfDetectors() > 1) {
if (getNumberOfDetectors() > 1) {
// check roi max values
idet = decodeNChannel(xmax, ymax, channelX, channelY);
FILE_LOG(logDEBUG1) << "Decoded Channel max vals: " << std::endl

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1569,7 +1569,7 @@ public:
* @param addr wait address, -1 gets
* @returns actual value
*/
uint64_t setCTBPatWaitAddr(uint64_t level, uint64_t addr=-1);
int setCTBPatWaitAddr(uint64_t level, uint64_t addr=-1);
/**
* Sets the wait time in the CTB

6
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -1,7 +1,5 @@
#include "slsDetectorUsers.h"
#include "detectorData.h"
#include "multiSlsDetector.h"
#include "multiSlsDetectorClient.h"
@ -235,11 +233,11 @@ int slsDetectorUsers::setFlowControl10G(int i, int detPos) {
}
int slsDetectorUsers::setROI(int n, slsDetectorDefs::ROI roiLimits[], int detPos) {
return myDetector->setROI(n, roiLimits, detPos);
return detector.setROI(n, roiLimits, detPos);
}
slsDetectorDefs::ROI* slsDetectorUsers::getROI(int &n, int detPos) {
return myDetector->getROI(n, detPos);
return detector.getROI(n, detPos);
}
/************************************************************************

2
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -14,7 +14,7 @@
class detectorData;
class multiSlsDetector;
#include "multiSlsDetector.h"
#include <cstdint>
#include <string>