diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index e3b523034..f0e37b0ae 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -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 */ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 8f4188562..19c7a35cc 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -1797,37 +1797,37 @@ private: int detId; /** Shared Memory object */ - SharedMemory* sharedMemory; + SharedMemory* sharedMemory {nullptr}; /** Shared memory structure */ - sharedSlsDetector *thisDetector; + sharedSlsDetector *thisDetector {nullptr}; /** control socket interface */ - ClientInterface *thisDetectorControl; + ClientInterface *thisDetectorControl {nullptr}; /** stop socket interface */ - ClientInterface *thisDetectorStop; + ClientInterface *thisDetectorStop {nullptr}; /** receiver interface */ - ClientInterface *thisReceiver; + ClientInterface *thisReceiver {nullptr}; /** socket for control commands */ - MySocketTCP *controlSocket; + MySocketTCP *controlSocket {nullptr}; /** socket for emergency stop */ - MySocketTCP *stopSocket; + MySocketTCP *stopSocket {nullptr}; /** socket for data acquisition */ - MySocketTCP *dataSocket; + MySocketTCP *dataSocket {nullptr}; /** pointer to detector module structures in shared memory */ - sls_detector_module *detectorModules; + sls_detector_module *detectorModules {nullptr}; /** pointer to dac valuse in shared memory */ - int *dacs; + int *dacs {nullptr}; /** pointer to channal registers in shared memory */ - int *chanregs; + int *chanregs {nullptr}; }; #endif