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

merge with 3.0.1 conflicts resolved

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-03 14:52:53 +02:00
parent e0d82ad92d 6a8aad4c2b
commit 0b82aabd2b
20 changed files with 219 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -23,6 +23,8 @@ uint64_t DataStreamer::RunningMask(0x0);
pthread_mutex_t DataStreamer::Mutex = PTHREAD_MUTEX_INITIALIZER;
bool DataStreamer::SilentMode(false);
DataStreamer::DataStreamer(Fifo*& f, uint32_t* dr, int* sEnable) :
ThreadObject(NumberofDataStreamers),
@ -71,6 +73,11 @@ void DataStreamer::ResetRunningMask() {
RunningMask = 0x0;
}
void DataStreamer::SetSilentMode(bool mode) {
SilentMode = mode;
}
/** non static functions */
/** getters */
string DataStreamer::GetType(){