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

Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya

Browse Source
This commit is contained in:
maliakal_d
2019-08-08 15:51:06 +02:00
parent d79447ed3a 0b006b5080
commit 373cfad645
3 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -1782,7 +1782,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns IP of last client connecting to receiver
*/
std::string getReceiverLastClientIP(int detPos = -1);
std::string getReceiverLastClientIP(int detPos = -1); //
/**
* Turns off the receiver server!
@ -1834,14 +1834,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns max frames per file in receiver
*/
int setFramesPerFile(int f = -1, int detPos = -1);
int setFramesPerFile(int f = -1, int detPos = -1); //
/**
* Gets the max frames per file in receiver
* @param detPos -1 for all detectors in list or specific detector position
* @returns max frames per file in receiver
*/
int getFramesPerFile(int detPos = -1) const;
int getFramesPerFile(int detPos = -1) const; //
/**
* Sets the frames discard policy in receiver
@ -1850,7 +1850,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @returns frames discard policy set in receiver
*/
frameDiscardPolicy setReceiverFramesDiscardPolicy(
frameDiscardPolicy f = GET_FRAME_DISCARD_POLICY, int detPos = -1);
frameDiscardPolicy f = GET_FRAME_DISCARD_POLICY, int detPos = -1); //
/**
* Sets the partial frames padding enable in receiver
@ -1858,16 +1858,16 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns partial frames padding enable in receiver
*/
int setPartialFramesPadding(bool padding, int detPos = -1);
int setPartialFramesPadding(bool padding, int detPos = -1); //
int getPartialFramesPadding(int detPos = -1) const;
int getPartialFramesPadding(int detPos = -1) const; //
/**
* Returns file format
* @param detPos -1 for all detectors in list or specific detector position
* @returns file name
*/
fileFormat getFileFormat(int detPos = -1);
fileFormat getFileFormat(int detPos = -1); //
/**
* Sets up the file format
@ -1875,7 +1875,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns file format
*/
fileFormat setFileFormat(fileFormat f, int detPos = -1);
fileFormat setFileFormat(fileFormat f, int detPos = -1); //
/**
* Sets up the file index
@ -1883,7 +1883,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns file index
*/
int setFileIndex(int i, int detPos = -1);
int setFileIndex(int i, int detPos = -1); //
/**
* Get File index
@ -1891,7 +1891,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* position
* @returns file index
*/
int getFileIndex(int detPos = -1) const;
int getFileIndex(int detPos = -1) const; //
/**
* Receiver starts listening to packets