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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-12 18:57:53 +02:00
parent 99dc9bd44d
commit 25eccdffab
8 changed files with 649 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -2910,16 +2910,15 @@ int64_t multiSlsDetector::getRateCorrection(int detPos) {
return sls::minusOneIfDifferent(r);
}
void multiSlsDetector::printReceiverConfiguration(TLogLevel level, int detPos) {
std::string multiSlsDetector::printReceiverConfiguration(int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->printReceiverConfiguration(level);
return detectors[detPos]->printReceiverConfiguration();
}
// multi
for (auto &d : detectors) {
d->printReceiverConfiguration(level);
}
auto r = parallelCall(&slsDetector::printReceiverConfiguration);
return sls::concatenateIfDifferent(r);
}
bool multiSlsDetector::getUseReceiverFlag(int detPos) {
@ -3761,24 +3760,14 @@ int multiSlsDetector::setReceiverSilentMode(int i, int detPos) {
return sls::minusOneIfDifferent(r);
}
int multiSlsDetector::setPattern(const std::string &fname, int detPos) {
void multiSlsDetector::setPattern(const std::string &fname, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->setPattern(fname);
}
FILE *fd = fopen(fname.c_str(), "r");
if (fd == nullptr) {
throw RuntimeError("multiSlsDetector::setPattern: Could not open file");
} else {
int addr{0};
uint64_t word{0};
while (fread(&word, sizeof(word), 1, fd) != 0u) {
serialCall(&slsDetector::setPatternWord, addr, word);
++addr;
}
fclose(fd);
return addr;
detectors[detPos]->setPattern(fname);
}
// multi
parallelCall(&slsDetector::setPattern, fname);
}
uint64_t multiSlsDetector::setPatternIOControl(uint64_t word, int detPos) {