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

multidettype in one place

Browse Source
This commit is contained in:
maliakal_d 2019-08-07 15:33:55 +02:00
parent 6a71e61c12
commit dc1e01b444
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -332,11 +332,6 @@ void multiSlsDetector::initializeDetectorStructure() {
void multiSlsDetector::initializeMembers(bool verify) { void multiSlsDetector::initializeMembers(bool verify) {
// multiSlsDetector // multiSlsDetector
if (multi_shm()->numberOfDetectors == 0) {
multiDetType = GENERIC;
} else {
multiDetType = getDetectorTypeAsEnum();
}
zmqSocket.clear(); zmqSocket.clear();
// get objects from single det shared memory (open) // get objects from single det shared memory (open)
@ -470,6 +465,7 @@ void multiSlsDetector::addSlsDetector(const std::string &hostname) {
multi_shm()->numberOfChannels += detectors[pos]->getTotalNumberOfChannels(); multi_shm()->numberOfChannels += detectors[pos]->getTotalNumberOfChannels();
detectors[pos]->setHostname(hostname); detectors[pos]->setHostname(hostname);
multiDetType = getDetectorTypeAsEnum();
} }
void multiSlsDetector::addSlsDetector(std::unique_ptr<slsDetector> det) { void multiSlsDetector::addSlsDetector(std::unique_ptr<slsDetector> det) {
@ -867,12 +863,6 @@ void multiSlsDetector::readConfigurationFile(const std::string &fname) {
} }
} }
input_file.close(); input_file.close();
if (multi_shm()->numberOfDetectors == 0) {
multiDetType = GENERIC;
} else {
multiDetType = getDetectorTypeAsEnum();
}
} }
int multiSlsDetector::writeConfigurationFile(const std::string &fname) { int multiSlsDetector::writeConfigurationFile(const std::string &fname) {