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

format

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-30 14:57:30 +01:00
parent af550b4c70
commit 3d40d5d058
3 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -6,7 +6,7 @@ option (USE_HDF5 "HDF5 File format" OFF)
option (USE_TEXTCLIENT "Text Client" OFF) option (USE_TEXTCLIENT "Text Client" OFF)
option (USE_RECEIVER "Receiver" OFF) option (USE_RECEIVER "Receiver" OFF)
option (USE_GUI "GUI" OFF) option (USE_GUI "GUI" OFF)
option (USE_TESTS "TESTS" ON) option (USE_TESTS "TESTS" OFF)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Wno-misleading-indentation") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Wno-misleading-indentation")

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -8,8 +8,6 @@
#include "slsDetector.h" #include "slsDetector.h"
#include "sls_detector_exceptions.h" #include "sls_detector_exceptions.h"
#include "utilities.h" #include "utilities.h"
#include "detectorData.h"
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
@ -2348,11 +2346,11 @@ int multiSlsDetector::setAutoComparatorDisableMode(int ival, int detPos) {
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
} }
int multiSlsDetector::getChanRegs(double* retval, int detPos) { int multiSlsDetector::getChanRegs(double *retval, int detPos) {
int offset = 0; int offset = 0;
std::vector<int> r; std::vector<int> r;
for (auto& d : detectors) { for (auto &d : detectors) {
int nch = d->getTotalNumberOfChannels(); int nch = d->getTotalNumberOfChannels();
double result[nch]; double result[nch];
r.push_back(d->getChanRegs(result)); r.push_back(d->getChanRegs(result));
@ -2390,7 +2388,7 @@ void multiSlsDetector::printReceiverConfiguration(int detPos) {
} }
// multi // multi
for (auto& d : detectors) for (auto &d : detectors)
d->printReceiverConfiguration(); d->printReceiverConfiguration();
} }

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -7,10 +7,9 @@
* @short This is the base class for multi detector system functionalities * @short This is the base class for multi detector system functionalities
* @author Anna Bergamaschi * @author Anna Bergamaschi
*/ */
#include "sls_detector_defs.h"
#include "error_defs.h" #include "error_defs.h"
#include "logger.h" #include "logger.h"
#include "sls_detector_defs.h"
class slsDetector; class slsDetector;
class SharedMemory; class SharedMemory;
@ -1184,7 +1183,7 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* @param detPos -1 for all detectors in list or specific detector position * @param detPos -1 for all detectors in list or specific detector position
* @returns total number of channels for the detector * @returns total number of channels for the detector
*/ */
int getChanRegs(double* retval, int detPos = -1); int getChanRegs(double *retval, int detPos = -1);
/** /**
* Set Rate correction ( Eiger) * Set Rate correction ( Eiger)