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

using default initializer arguments for multiSlsDetector

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-10 15:53:09 +01:00
parent 0f50b9f161
commit 230c335c29
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -27,12 +27,7 @@
#include <vector> #include <vector>
multiSlsDetector::multiSlsDetector(int id, bool verify, bool update) multiSlsDetector::multiSlsDetector(int id, bool verify, bool update)
: detId(id), sharedMemory(nullptr), thisMultiDetector(nullptr), : detId(id){
client_downstream(false), totalProgress(0), progressIndex(0),
jointhread(0), acquiringDone(0), fdata(nullptr), thisData(nullptr),
acquisition_finished(nullptr), acqFinished_p(nullptr), measurement_finished(nullptr),
measFinished_p(nullptr), progress_call(nullptr), pProgressCallArg(nullptr), dataReady(nullptr),
pCallbackArg(nullptr) {
setupMultiDetector(verify, update); setupMultiDetector(verify, update);
} }

34
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1702,22 +1702,22 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* Listen to key event to stop acquiring * Listen to key event to stop acquiring
* when using acquire command * when using acquire command
*/ */
int kbhit(void); int kbhit();
/** Multi detector Id */ /** Multi detector Id */
int detId; int detId;
/** Shared Memory object */ /** Shared Memory object */
SharedMemory *sharedMemory; SharedMemory *sharedMemory {nullptr};
/** Shared memory structure */ /** Shared memory structure */
sharedMultiSlsDetector *thisMultiDetector; sharedMultiSlsDetector *thisMultiDetector {nullptr};
/** pointers to the slsDetector structures */ /** pointers to the slsDetector structures */
std::vector<std::unique_ptr<slsDetector>> detectors; std::vector<std::unique_ptr<slsDetector>> detectors;
/** data streaming (down stream) enabled in client (zmq sckets created) */ /** data streaming (down stream) enabled in client (zmq sckets created) */
bool client_downstream; bool client_downstream {false};
/** ZMQ Socket - Receiver to Client */ /** ZMQ Socket - Receiver to Client */
std::vector<std::unique_ptr<ZmqSocket>> zmqSocket; std::vector<std::unique_ptr<ZmqSocket>> zmqSocket;
@ -1731,10 +1731,10 @@ class multiSlsDetector : public virtual slsDetectorDefs,
sem_t sem_endRTAcquisition; sem_t sem_endRTAcquisition;
/** Total number of frames/images for next acquisition */ /** Total number of frames/images for next acquisition */
int totalProgress; int totalProgress {0};
/** Current progress or frames/images processed in current acquisition */ /** Current progress or frames/images processed in current acquisition */
int progressIndex; int progressIndex {0};
/** mutex to synchronize main and data processing threads */ /** mutex to synchronize main and data processing threads */
mutable std::mutex mp; mutable std::mutex mp;
@ -1743,32 +1743,32 @@ class multiSlsDetector : public virtual slsDetectorDefs,
mutable std::mutex mg; mutable std::mutex mg;
/** sets when the acquisition is finished */ /** sets when the acquisition is finished */
bool jointhread; bool jointhread {false};
/** set when detector finishes acquiring */ /** set when detector finishes acquiring */
int acquiringDone; int acquiringDone {0};
/** the data processing thread */ /** the data processing thread */
// pthread_t dataProcessingThread; // pthread_t dataProcessingThread;
std::thread dataProcessingThread; std::thread dataProcessingThread;
/** gui data */ /** gui data */
double *fdata; double *fdata {nullptr};
/** detector data packed for the gui */ /** detector data packed for the gui */
detectorData *thisData; detectorData *thisData {nullptr};
int (*acquisition_finished)(double, int, void *); int (*acquisition_finished)(double, int, void *) {nullptr};
void *acqFinished_p; void *acqFinished_p {nullptr};
int (*measurement_finished)(int, int, void *); int (*measurement_finished)(int, int, void *) {nullptr};
void *measFinished_p; void *measFinished_p {nullptr};
int (*progress_call)(double, void *); int (*progress_call)(double, void *);
void *pProgressCallArg; void *pProgressCallArg {nullptr};
int (*dataReady)(detectorData *, int, int, void *); int (*dataReady)(detectorData *, int, int, void *){nullptr};
void *pCallbackArg; void *pCallbackArg {nullptr};
}; };
#endif #endif