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

WIP

Browse Source
This commit is contained in:
maliakal_d 2019-08-08 16:18:04 +02:00
parent 23ea16f4b8
commit a77964e1dd
5 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
slsDetectorSoftware/include/Detector.h
View File

@ -295,46 +295,46 @@ 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 = {});
/**
* 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 = {});
void setReceiverPort(int value, Positions pos = {});

8
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -534,7 +534,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @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 +542,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 +550,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

2
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

24
slsDetectorSoftware/src/Detector.cpp
View File

@ -209,7 +209,7 @@ Result<defs::coordinates> Detector::getDetectorOffsets(Positions pos) const {
}
void Detector::setDetectorOffsets(defs::coordinates value, Positions pos) {
return pimpl->Parallel(&slsDetector::setDetectorOffset, pos, value);
return pimpl->Parallel(&slsDetector::setDetectorOffsets, pos, value);
}
Result<bool> Detector::getQuad(Positions pos) const {
@ -228,7 +228,29 @@ void Detector::setReadNLines(const int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReadNLines, pos, value);
}
Result<int> Detector::getControlPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getControlPort, pos);
}
void Detector::setControlPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setControlPort, pos, value);
}
Result<int> Detector::getStopPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getStopPort, pos);
}
void Detector::setStopPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setStopPort, pos, value);
}
Result<int> Detector::getReceiverPort(Positions pos) const {
return pimpl->Parallel(&slsDetector::getReceiverPort, pos);
}
void Detector::setReceiverPort(int value, Positions pos) {
pimpl->Parallel(&slsDetector::setReceiverPort, pos, value);
}
// Erik
Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const {

2
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -706,7 +706,7 @@ void slsDetector::setDetectorOffset(dimension d, int off) {
}
}
void slsDetector::setDetectorOffset(slsDetectorDefs::coordinates value) {
void slsDetector::setDetectorOffsets(slsDetectorDefs::coordinates value) {
shm()->offset[X] = value.x;
shm()->offset[Y] = value.y;
}