detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-01 08:35:05 +01: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

10
slsReceiverSoftware/src/DataProcessor.cpp
View File

@@ -30,6 +30,8 @@ uint64_t DataProcessor::RunningMask(0x0);
pthread_mutex_t DataProcessor::Mutex = PTHREAD_MUTEX_INITIALIZER;
bool DataProcessor::SilentMode(false);
DataProcessor::DataProcessor(Fifo*& f, fileFormat* ftype, bool* fwenable, bool* dsEnable,
uint32_t* freq, uint32_t* timer,
@@ -90,6 +92,10 @@ void DataProcessor::ResetRunningMask() {
RunningMask = 0x0;
}
void DataProcessor::SetSilentMode(bool mode) {
SilentMode = mode;
}
/** non static functions */
/** getters */
string DataProcessor::GetType(){
@@ -237,13 +243,13 @@ void DataProcessor::SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t*
file = new HDF5File(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame,
nd, fname, fpath, findex, owenable,
dindex, nunits, nf, dr, portno,
generalData->nPixelsX, generalData->nPixelsY);
generalData->nPixelsX, generalData->nPixelsY, &SilentMode);
break;
#endif
default:
file = new BinaryFile(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame,
nd, fname, fpath, findex, owenable,
dindex, nunits, nf, dr, portno);
dindex, nunits, nf, dr, portno, &SilentMode);
break;
}
}