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

merge resolved

Browse Source
This commit is contained in:
maliakal_d
2019-08-21 14:25:21 +02:00
parent 4b0fb5029f 5c393e6204
commit a98271f0c2
31 changed files with 600 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsReceiverSoftware/include/DataProcessor.h
View File

@ -18,6 +18,7 @@ class File;
class DataStreamer;
#include <vector>
#include <atomic>
class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
@ -305,7 +306,7 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
static const std::string TypeName;
/** Object running status */
bool runningFlag;
std::atomic<bool> runningFlag;
/** GeneralData (Detector Data) object */
const GeneralData* generalData;