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

readErrorMessage

Browse Source
This commit is contained in:
Erik Frojdh 2020-07-31 13:32:53 +02:00
parent 459a715b9c
commit d5b893e452
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorSoftware/src/Module.cpp
View File

@ -1380,8 +1380,9 @@ void Module::setInjectChannel(const int offsetChannel,
sendToDetector(F_SET_INJECT_CHANNEL, args, nullptr); sendToDetector(F_SET_INJECT_CHANNEL, args, nullptr);
} }
void Module::sendVetoPhoton(const int chipIndex, const std::vector<int>& gainIndices, void Module::sendVetoPhoton(const int chipIndex,
const std::vector<int>& values) { const std::vector<int> &gainIndices,
const std::vector<int> &values) {
const int nch = gainIndices.size(); const int nch = gainIndices.size();
if (gainIndices.size() != values.size()) { if (gainIndices.size() != values.size()) {
throw RuntimeError("Number of Gain Indices and values do not match! " throw RuntimeError("Number of Gain Indices and values do not match! "
@ -1399,10 +1400,8 @@ void Module::sendVetoPhoton(const int chipIndex, const std::vector<int>& gainInd
client.Send(gainIndices); client.Send(gainIndices);
client.Send(values); client.Send(values);
if (client.Receive<int>() == FAIL) { if (client.Receive<int>() == FAIL) {
char mess[MAX_STR_LENGTH]{};
client.Receive(mess, MAX_STR_LENGTH);
throw RuntimeError("Detector " + std::to_string(moduleId) + throw RuntimeError("Detector " + std::to_string(moduleId) +
" returned error: " + std::string(mess)); " returned error: " + client.readErrorMessage());
} }
} }
@ -1413,10 +1412,8 @@ void Module::getVetoPhoton(const int chipIndex,
client.Send(F_GET_VETO_PHOTON); client.Send(F_GET_VETO_PHOTON);
client.Send(chipIndex); client.Send(chipIndex);
if (client.Receive<int>() == FAIL) { if (client.Receive<int>() == FAIL) {
char mess[MAX_STR_LENGTH]{};
client.Receive(mess, MAX_STR_LENGTH);
throw RuntimeError("Detector " + std::to_string(moduleId) + throw RuntimeError("Detector " + std::to_string(moduleId) +
" returned error: " + std::string(mess)); " returned error: " + client.readErrorMessage());
} }
auto nch = client.Receive<int>(); auto nch = client.Receive<int>();
@ -1647,10 +1644,8 @@ void Module::getBadChannels(const std::string &fname) const {
auto client = DetectorSocket(shm()->hostname, shm()->controlPort); auto client = DetectorSocket(shm()->hostname, shm()->controlPort);
client.Send(F_GET_BAD_CHANNELS); client.Send(F_GET_BAD_CHANNELS);
if (client.Receive<int>() == FAIL) { if (client.Receive<int>() == FAIL) {
char mess[MAX_STR_LENGTH]{};
client.Receive(mess, MAX_STR_LENGTH);
throw RuntimeError("Detector " + std::to_string(moduleId) + throw RuntimeError("Detector " + std::to_string(moduleId) +
" returned error: " + std::string(mess)); " returned error: " + client.readErrorMessage());
} }
// receive badchannels // receive badchannels
auto nch = client.Receive<int>(); auto nch = client.Receive<int>();
@ -1706,10 +1701,8 @@ void Module::setBadChannels(const std::string &fname) {
client.Send(badchannels); client.Send(badchannels);
} }
if (client.Receive<int>() == FAIL) { if (client.Receive<int>() == FAIL) {
char mess[MAX_STR_LENGTH]{};
client.Receive(mess, MAX_STR_LENGTH);
throw RuntimeError("Detector " + std::to_string(moduleId) + throw RuntimeError("Detector " + std::to_string(moduleId) +
" returned error: " + std::string(mess)); " returned error: " + client.readErrorMessage());
} }
} }
@ -2104,7 +2097,7 @@ void Module::startPattern() { sendToDetector(F_START_PATTERN); }
// Moench // Moench
std::map<std::string, std::string> Module::getAdditionalJsonHeader() const { std::map<std::string, std::string> Module::getAdditionalJsonHeader() const {
//TODO, refactor this function with a more robust sending. // TODO, refactor this function with a more robust sending.
// Now assuming whitespace separated key value // Now assuming whitespace separated key value
if (!shm()->useReceiverFlag) { if (!shm()->useReceiverFlag) {
throw RuntimeError("Set rx_hostname first to use receiver parameters " throw RuntimeError("Set rx_hostname first to use receiver parameters "
@ -2114,10 +2107,8 @@ std::map<std::string, std::string> Module::getAdditionalJsonHeader() const {
client.Send(F_GET_ADDITIONAL_JSON_HEADER); client.Send(F_GET_ADDITIONAL_JSON_HEADER);
auto ret = client.Receive<int>(); auto ret = client.Receive<int>();
if (ret == FAIL) { if (ret == FAIL) {
char mess[MAX_STR_LENGTH]{};
client.Receive(mess, MAX_STR_LENGTH);
throw RuntimeError("Receiver " + std::to_string(moduleId) + throw RuntimeError("Receiver " + std::to_string(moduleId) +
" returned error: " + std::string(mess)); " returned error: " + client.readErrorMessage());
} else { } else {
auto size = client.Receive<int>(); auto size = client.Receive<int>();
std::string buff(size, '\0'); std::string buff(size, '\0');
@ -2126,7 +2117,7 @@ std::map<std::string, std::string> Module::getAdditionalJsonHeader() const {
client.Receive(&buff[0], buff.size()); client.Receive(&buff[0], buff.size());
std::istringstream iss(buff); std::istringstream iss(buff);
std::string key, value; std::string key, value;
while(iss >> key){ while (iss >> key) {
iss >> value; iss >> value;
retval[key] = value; retval[key] = value;
} }
@ -2152,7 +2143,7 @@ void Module::setAdditionalJsonHeader(
} }
} }
std::ostringstream oss; std::ostringstream oss;
for (auto& it : jsonHeader) for (auto &it : jsonHeader)
oss << it.first << ' ' << it.second << ' '; oss << it.first << ' ' << it.second << ' ';
auto buff = oss.str(); auto buff = oss.str();
const auto size = static_cast<int>(buff.size()); const auto size = static_cast<int>(buff.size());

1
slsSupportLib/include/ClientSocket.h
View File

@ -15,6 +15,7 @@ class ClientSocket : public DataSocket {
int sendCommandThenRead(int fnum, const void *args, size_t args_size, int sendCommandThenRead(int fnum, const void *args, size_t args_size,
void *retval, size_t retval_size); void *retval, size_t retval_size);
std::string readErrorMessage();
private: private:
void readReply(int &ret, void *retval, size_t retval_size); void readReply(int &ret, void *retval, size_t retval_size);
struct sockaddr_in serverAddr {}; struct sockaddr_in serverAddr {};

1
slsSupportLib/include/DataSocket.h
View File

@ -48,6 +48,7 @@ class DataSocket {
return sum; return sum;
} }
int Receive(void *buffer, size_t size); int Receive(void *buffer, size_t size);
template <typename T> int Receive(T &arg) { template <typename T> int Receive(T &arg) {
return Receive(&arg, sizeof(arg)); return Receive(&arg, sizeof(arg));
} }

6
slsSupportLib/src/ClientSocket.cpp
View File

@ -101,4 +101,10 @@ void ClientSocket::readReply(int &ret, void *retval, size_t retval_size) {
} }
} }
std::string ClientSocket::readErrorMessage(){
std::string error_msg(MAX_STR_LENGTH, '\0');
Receive(&error_msg[0], error_msg.size());
return error_msg;
}
}; // namespace sls }; // namespace sls