detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-23 15:46:26 +01:00
Code Issues Actions Packages Releases Activity

default initializer for slsDetector

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-10 16:02:29 +01:00
parent 230c335c29
commit 15235ab4fc
2 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -24,18 +24,7 @@
slsDetector::slsDetector(detectorType type, int multiId, int id, bool verify)
: detId(id),
sharedMemory(nullptr),
thisDetector(nullptr),
thisDetectorControl(nullptr),
thisDetectorStop(nullptr),
thisReceiver(nullptr),
controlSocket(nullptr),
stopSocket(nullptr),
dataSocket(nullptr),
detectorModules(nullptr),
dacs(nullptr),
chanregs(nullptr) {
: detId(id){
/* called from put hostname command,
* so sls shared memory will be created */
@@ -55,18 +44,7 @@ slsDetector::slsDetector(detectorType type, int multiId, int id, bool verify)
slsDetector::slsDetector(int multiId, int id, bool verify)
: detId(id),
sharedMemory(nullptr),
thisDetector(nullptr),
thisDetectorControl(nullptr),
thisDetectorStop(nullptr),
thisReceiver(nullptr),
controlSocket(nullptr),
stopSocket(nullptr),
dataSocket(nullptr),
detectorModules(nullptr),
dacs(nullptr),
chanregs(nullptr) {
: detId(id){
/* called from multi constructor to populate structure,
* so sls shared memory will be opened, not created */