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

tests and std::sort

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-05 16:24:28 +02:00
parent f11db00aef
commit cbacf471d6
10 changed files with 213 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -5,6 +5,8 @@
#include "gitInfoLib.h"
#include "logger.h"
#include "sls_detector_defs.h"
class slsDetector;
class ZmqSocket;
class detectorData;
@ -1283,7 +1285,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns OK or FAIL
*/
ROI *getROI(int &n, int detPos = -1);
const ROI *getROI(int &n, int detPos = -1);
/**
* Write to ADC register (Gotthard, Jungfrau, ChipTestBoard). For expert

2
slsDetectorSoftware/include/slsDetector.h
View File

@ -1134,7 +1134,7 @@ class slsDetector : public virtual slsDetectorDefs{
* @param n number of rois
* @returns OK or FAIL
*/
slsDetectorDefs::ROI *getROI(int &n);
const slsDetectorDefs::ROI * getROI(int &n);
/**
* Returns number of rois

2
slsDetectorSoftware/include/slsDetectorUsers.h
View File

@ -545,7 +545,7 @@ public:
* @param detPos -1 for all detectors in list or specific detector position
* @returns pointer to array of ROI structure
*/
slsDetectorDefs::ROI* getROI(int &n, int detPos = -1);
const slsDetectorDefs::ROI* getROI(int &n, int detPos = -1);