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

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

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-15 10:15:50 +01:00
parent 4943983d10 5fe7a86361
commit c153be95d1
10 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1958,7 +1958,7 @@ int multiSlsDetector::setDetectorMode(detectorModeType value, int detPos) {
return getDetectorModeType(result);
}
uint64_t multiSlsDetector::setReceiverUDPSocketBufferSize(uint64_t udpsockbufsize, int detPos) {
int64_t multiSlsDetector::setReceiverUDPSocketBufferSize(int64_t udpsockbufsize, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->setReceiverUDPSocketBufferSize(udpsockbufsize);
@ -1969,7 +1969,7 @@ uint64_t multiSlsDetector::setReceiverUDPSocketBufferSize(uint64_t udpsockbufsiz
return sls::minusOneIfDifferent(r);
}
uint64_t multiSlsDetector::getReceiverUDPSocketBufferSize(int detPos) {
int64_t multiSlsDetector::getReceiverUDPSocketBufferSize(int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->getReceiverUDPSocketBufferSize();
@ -1980,7 +1980,7 @@ uint64_t multiSlsDetector::getReceiverUDPSocketBufferSize(int detPos) {
return sls::minusOneIfDifferent(r);
}
uint64_t multiSlsDetector::getReceiverRealUDPSocketBufferSize(int detPos) {
int64_t multiSlsDetector::getReceiverRealUDPSocketBufferSize(int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->getReceiverRealUDPSocketBufferSize();

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1113,21 +1113,21 @@ class multiSlsDetector : public virtual slsDetectorDefs,
* @param detPos -1 for all detectors in list or specific detector position
* @returns receiver udp socket buffer size
*/
uint64_t setReceiverUDPSocketBufferSize(uint64_t udpsockbufsize = -1, int detPos = -1);
int64_t setReceiverUDPSocketBufferSize(int64_t udpsockbufsize = -1, int detPos = -1);
/**
* Returns the receiver UDP socket buffer size
* @param detPos -1 for all detectors in list or specific detector position
* @returns the receiver UDP socket buffer size
*/
uint64_t getReceiverUDPSocketBufferSize(int detPos = -1);
int64_t getReceiverUDPSocketBufferSize(int detPos = -1);
/**
* Returns the receiver real UDP socket buffer size
* @param detPos -1 for all detectors in list or specific detector position
* @returns the receiver real UDP socket buffer size
*/
uint64_t getReceiverRealUDPSocketBufferSize(int detPos = -1);
int64_t getReceiverRealUDPSocketBufferSize(int detPos = -1);
/** (users only)
* Set 10GbE Flow Control (Eiger)

14
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -541,7 +541,7 @@ slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multi_id,
if (!detector_shm.IsExisting()) {
FILE_LOG(logERROR) << "Shared memory " << detector_shm.GetName() << " does not exist.\n"
"Corrupted Multi Shared memory. Please free shared memory.";
throw SharedMemoryError("Could not read detector type from shared memory");
throw SharedMemoryError("Corrupted multi shared memory.");
}
// open, map, verify version
@ -2785,11 +2785,11 @@ std::string slsDetector::getAdditionalJsonParameter(const std::string &key) {
return std::string("");
}
uint64_t slsDetector::setReceiverUDPSocketBufferSize(uint64_t udpsockbufsize) {
int64_t slsDetector::setReceiverUDPSocketBufferSize(int64_t udpsockbufsize) {
int fnum = F_RECEIVER_UDP_SOCK_BUF_SIZE;
int ret = FAIL;
uint64_t arg = udpsockbufsize;
uint64_t retval = -1;
int64_t arg = udpsockbufsize;
int64_t retval = -1;
FILE_LOG(logDEBUG1) << "Sending UDP Socket Buffer size to receiver: " << arg;
if (detector_shm()->receiverOnlineFlag == ONLINE_FLAG) {
@ -2808,14 +2808,14 @@ uint64_t slsDetector::setReceiverUDPSocketBufferSize(uint64_t udpsockbufsize) {
return retval;
}
uint64_t slsDetector::getReceiverUDPSocketBufferSize() {
int64_t slsDetector::getReceiverUDPSocketBufferSize() {
return setReceiverUDPSocketBufferSize();
}
uint64_t slsDetector::getReceiverRealUDPSocketBufferSize() {
int64_t slsDetector::getReceiverRealUDPSocketBufferSize() {
int fnum = F_RECEIVER_REAL_UDP_SOCK_BUF_SIZE;
int ret = FAIL;
uint64_t retval = -1;
int64_t retval = -1;
FILE_LOG(logDEBUG1) << "Getting real UDP Socket Buffer size to receiver";
if (detector_shm()->receiverOnlineFlag == ONLINE_FLAG) {

6
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -971,19 +971,19 @@ class slsDetector : public virtual slsDetectorDefs, public virtual errorDefs {
* @param udpsockbufsize additional json header
* @returns receiver udp socket buffer size
*/
uint64_t setReceiverUDPSocketBufferSize(uint64_t udpsockbufsize = -1);
int64_t setReceiverUDPSocketBufferSize(int64_t udpsockbufsize = -1);
/**
* Returns the receiver UDP socket buffer size\sa sharedSlsDetector
* @returns the receiver UDP socket buffer size
*/
uint64_t getReceiverUDPSocketBufferSize();
int64_t getReceiverUDPSocketBufferSize();
/**
* Returns the receiver real UDP socket buffer size\sa sharedSlsDetector
* @returns the receiver real UDP socket buffer size
*/
uint64_t getReceiverRealUDPSocketBufferSize();
int64_t getReceiverRealUDPSocketBufferSize();
/**
* Execute a digital test (Gotthard, Mythen)

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2829,7 +2829,7 @@ std::string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int
return ans;
} else if (cmd == "rx_udpsocksize") {
if (action == PUT_ACTION) {
uint64_t ival = -1;
int64_t ival = -1;
if (!(sscanf(args[1], "%ld", &ival))) {
return ("cannot parse argument") + std::string(args[1]);
}