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

WIP

Browse Source
This commit is contained in:
Erik Frojdh
2019-08-08 16:48:03 +02:00
parent 40bc498e9a eaf0d8668b
commit ce9f76d017
9 changed files with 60 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
slsDetectorSoftware/include/Detector.h
View File

@ -295,46 +295,47 @@ class Detector {
void setReadNLines(const int value, Positions pos = {});
/**
* Get Receiver TCP port (for client communication with Receiver)
* Get Detector Control TCP port (for client communication with Detector control server)
* @param pos detector position
* @returns receiver port
* @returns control TCP port
*/
// int getControlort(Positions pos = {}) const;
Result<int> getControlPort(Positions pos = {}) const;
/**
* Set TCP Port of the detector (for client communication with Receiver)
* Set Detector Control TCP port (for client communication with Detector control server)
* @param value port number
* @param pos detector position
*/
// void setControlPort(int port_number, Positions pos = {});
void setControlPort(int value, Positions pos = {});
/**
* Get Detector Stop TCP port (for client communication with Detector Stop server)
* @param pos detector position
* @returns Stop TCP port
*/
Result<int> getStopPort(Positions pos = {}) const;
/**
* Set Detector Stop TCP port (for client communication with Detector Stop server)
* @param value port number
* @param pos detector position
*/
void setStopPort(int value, Positions pos = {});
/**
* Get Receiver TCP port (for client communication with Receiver)
* @param pos detector position
* @returns receiver port
* @returns Receiver TCP port
*/
// int getStopPort(Positions pos = {}) const;
Result<int> getReceiverPort(Positions pos = {}) const;
/**
* Set TCP Port of the detector (for client communication with Receiver)
* Set Receiver TCP port (for client communication with Receiver)
* @param value port number
* @param pos detector position
*/
// void setStopPort(int port_number, Positions pos = {});
void setReceiverPort(int value, Positions pos = {});
/**
* Get Receiver TCP port (for client communication with Receiver)
* @param pos detector position
* @returns receiver port
*/
// int getReceiverPort(Positions pos = {}) const;
/**
* Set TCP Port of the detector (for client communication with Receiver)
* @param value port number
* @param pos detector position
*/
// void setReceiverPort(int port_number, Positions pos = {});
// Erik

24
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -520,21 +520,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
int getReadNLines(int detPos = -1);//
/**
* Checks if each of the detectors are online/offline
* @param detPos -1 for all detectors in list or specific detector position
* @returns empty string if they are all online,
* else returns concatenation of strings of all detectors that are offline
*/
std::string checkOnline(int detPos = -1);
/**
* Set/Gets TCP Port of the detector
* @param port_number (-1 gets)
* @param detPos -1 for all detectors in list or specific detector position
* @returns port number
*/
int setControlPort(int port_number = -1, int detPos = -1);
int setControlPort(int port_number = -1, int detPos = -1);//
/**
* Set/Gets TCP STOP Port of the detector
@ -542,7 +534,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns port number
*/
int setStopPort(int port_number = -1, int detPos = -1);
int setStopPort(int port_number = -1, int detPos = -1);//
/**
* Set/Gets TCP Port of the receiver
@ -550,14 +542,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns port number
*/
int setReceiverPort(int port_number = -1, int detPos = -1);
int setReceiverPort(int port_number = -1, int detPos = -1);//
/**
* Get Receiver port
* @param detPos -1 for all detectors in list or specific detector position
* @returns vector of receiver port
*/
int getReceiverPort(int detPos = -1) const;
int getReceiverPort(int detPos = -1) const;//
/**
* Lock server for this client IP
@ -1761,14 +1753,6 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
bool getUseReceiverFlag(int detPos = -1); //
/**
* Checks if the receiver is really online
* @param detPos -1 for all detectors in list or specific detector position
* @returns empty string if all online, else concatenates hostnames of all
* detectors that are offline
*/
std::string checkReceiverOnline(int detPos = -1); //not needed
/**
* Locks/Unlocks the connection to the receiver
* @param lock sets (1), usets (0), gets (-1) the lock

14
slsDetectorSoftware/include/slsDetector.h
View File

@ -447,7 +447,7 @@ class slsDetector : public virtual slsDetectorDefs {
* Set Detector offset in shared memory
* @param value offset for detector
*/
void setDetectorOffset(slsDetectorDefs::coordinates value);
void setDetectorOffsets(slsDetectorDefs::coordinates value);
/**
* Set Detector offset in shared memory in dimension d
@ -456,12 +456,6 @@ class slsDetector : public virtual slsDetectorDefs {
*/
void updateMultiSize(int detx, int dety);
/**
* Checks if each of the detector is online/offline
* @returns empty string if it is online
* else returns hostname if it is offline
*/
std::string checkOnline();
int setControlPort(int port_number);
@ -1474,12 +1468,6 @@ class slsDetector : public virtual slsDetectorDefs {
*/
bool getUseReceiverFlag() const;
/**
* Checks if the receiver is really online
* @returns empty string if online, else returns receiver hostname
*/
std::string checkReceiverOnline();
/**
* Locks/Unlocks the connection to the receiver
* @param lock sets (1), usets (0), gets (-1) the lock