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

formatting

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-17 18:13:01 +02:00
parent 058de39d40
commit c95bc84458
1 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -208,17 +208,14 @@ void multiSlsDetector::setErrorMaskFromAllDetectors() {
} }
} }
void multiSlsDetector::setAcquiringFlag(bool b) { void multiSlsDetector::setAcquiringFlag(bool b) {
thisMultiDetector->acquiringFlag = b; thisMultiDetector->acquiringFlag = b;
} }
bool multiSlsDetector::getAcquiringFlag() const { bool multiSlsDetector::getAcquiringFlag() const {
return thisMultiDetector->acquiringFlag; return thisMultiDetector->acquiringFlag;
} }
bool multiSlsDetector::isAcquireReady() { bool multiSlsDetector::isAcquireReady() {
if (thisMultiDetector->acquiringFlag) { if (thisMultiDetector->acquiringFlag) {
std::cout << "Acquire has already started. " std::cout << "Acquire has already started. "
@ -230,26 +227,19 @@ bool multiSlsDetector::isAcquireReady() {
return OK; return OK;
} }
int multiSlsDetector::checkVersionCompatibility(portType t, int detPos) { int multiSlsDetector::checkVersionCompatibility(portType t, int detPos) {
// single if (detPos >= 0)
if (detPos >= 0) {
return detectors[detPos]->checkVersionCompatibility(t); return detectors[detPos]->checkVersionCompatibility(t);
}
// multi
auto r = parallelCall(&slsDetector::checkVersionCompatibility, t); auto r = parallelCall(&slsDetector::checkVersionCompatibility, t);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
} }
int64_t multiSlsDetector::getId(idMode mode, int detPos) { int64_t multiSlsDetector::getId(idMode mode, int detPos) {
// single if (detPos >= 0)
if (detPos >= 0) {
return detectors[detPos]->getId(mode); return detectors[detPos]->getId(mode);
}
// multi
auto r = parallelCall(&slsDetector::getId, mode); auto r = parallelCall(&slsDetector::getId, mode);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
} }
@ -292,13 +282,8 @@ void multiSlsDetector::freeSharedMemory(int detPos) {
} }
// multi // multi
// clear zmq vector
zmqSocket.clear(); zmqSocket.clear();
// should be done before the detector list is deleted
clearAllErrorMask(); clearAllErrorMask();
// clear sls detector vector shm
for (auto& d : detectors) { for (auto& d : detectors) {
d->freeSharedMemory(); d->freeSharedMemory();
} }
@ -321,29 +306,20 @@ void multiSlsDetector::freeSharedMemory(int detPos) {
std::string multiSlsDetector::getUserDetails() { std::string multiSlsDetector::getUserDetails() {
std::ostringstream sstream; if (detectors.empty())
if (!detectors.size()) {
return std::string("none"); return std::string("none");
}
std::ostringstream sstream;
//hostname
sstream << "\nHostname: " << getHostname(); sstream << "\nHostname: " << getHostname();
//type
sstream<< "\nType: "; sstream<< "\nType: ";
for (auto& d : detectors) { for (auto& d : detectors)
sstream<< d->sgetDetectorsType() << "+"; sstream<< d->sgetDetectorsType() << "+";
}
//PID
sstream << "\nPID: " << thisMultiDetector->lastPID sstream << "\nPID: " << thisMultiDetector->lastPID
//user
<< "\nUser: " << thisMultiDetector->lastUser << "\nUser: " << thisMultiDetector->lastUser
<< "\nDate: " << thisMultiDetector->lastDate << std::endl; << "\nDate: " << thisMultiDetector->lastDate << std::endl;
std::string s = sstream.str(); return sstream.str();
return s;
} }
/* /*
@ -430,7 +406,6 @@ void multiSlsDetector::initializeMembers(bool verify) {
updateOffsets(); updateOffsets();
} }
void multiSlsDetector::updateUserdetails() { void multiSlsDetector::updateUserdetails() {
thisMultiDetector->lastPID = getpid(); thisMultiDetector->lastPID = getpid();
memset(thisMultiDetector->lastUser, 0, SHORT_STRING_LENGTH); memset(thisMultiDetector->lastUser, 0, SHORT_STRING_LENGTH);
@ -446,7 +421,6 @@ void multiSlsDetector::updateUserdetails() {
} }
} }
std::string multiSlsDetector::exec(const char* cmd) { std::string multiSlsDetector::exec(const char* cmd) {
int bufsize = 128; int bufsize = 128;
char buffer[bufsize]; char buffer[bufsize];
@ -467,7 +441,6 @@ std::string multiSlsDetector::exec(const char* cmd) {
return result; return result;
} }
void multiSlsDetector::setHostname(const char* name, int detPos) { void multiSlsDetector::setHostname(const char* name, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
@ -486,7 +459,6 @@ void multiSlsDetector::setHostname(const char* name, int detPos) {
addMultipleDetectors(name); addMultipleDetectors(name);
} }
std::string multiSlsDetector::getHostname(int detPos) { std::string multiSlsDetector::getHostname(int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
@ -498,7 +470,6 @@ std::string multiSlsDetector::getHostname(int detPos) {
return sls::concatenateIfDifferent(r); return sls::concatenateIfDifferent(r);
} }
void multiSlsDetector::addMultipleDetectors(const char* name) { void multiSlsDetector::addMultipleDetectors(const char* name) {
size_t p1 = 0; size_t p1 = 0;
std::string temp = std::string(name); std::string temp = std::string(name);