detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 09:37:59 +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

9
slsReceiverSoftware/src/File.cpp
View File

@ -12,7 +12,8 @@ using namespace std;
File::File(int ind, uint32_t maxf, const uint32_t* ppf,
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno):
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
bool* smode):
index(ind),
maxFramesPerFile(maxf),
packetsPerFrame(ppf),
@ -26,7 +27,8 @@ File::File(int ind, uint32_t maxf, const uint32_t* ppf,
numUnitsPerDetector(nunits),
numImages(nf),
dynamicRange(dr),
udpPortNumber(portno)
udpPortNumber(portno),
silentMode(smode)
{
master = index?false:true;
@ -56,7 +58,8 @@ void File::PrintMembers() {
<< "Dynamic Range: " << *dynamicRange << endl
<< "UDP Port number: " << *udpPortNumber << endl
<< "Master File Name: " << masterFileName << endl
<< "Current File Name: " << currentFileName;
<< "Current File Name: " << currentFileName << endl
<< "Silent Mode: " << silentMode;
}