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

uncommented WIP

Browse Source
This commit is contained in:
maliakal_d 2020-11-27 12:45:16 +01:00
parent 0eb204bfd3
commit e8fedfa55f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/src/Detector.cpp
View File

@ -5,11 +5,11 @@
#include "CmdProxy.h" #include "CmdProxy.h"
#include "DetectorImpl.h" #include "DetectorImpl.h"
#include "Module.h" #include "Module.h"
#include "sls/Pattern.h"
#include "sls/container_utils.h" #include "sls/container_utils.h"
#include "sls/logger.h" #include "sls/logger.h"
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#include "sls/versionAPI.h" #include "sls/versionAPI.h"
#include "sls/Pattern.h"
#include <chrono> #include <chrono>
#include <fstream> #include <fstream>
@ -1755,15 +1755,17 @@ void Detector::setLEDEnable(bool enable, Positions pos) {
// Pattern // Pattern
void Detector::savePattern(const std::string &fname) { void Detector::savePattern(const std::string &fname) {
// auto t = pimpl->Parallel(&Module::getPattern, {}); auto t = pimpl->Parallel(&Module::getPattern, {});
// auto pat = t.tsquash("Inconsistent pattern parameters between modules"); auto pat = t.tsquash("Inconsistent pattern parameters between modules");
// pat->save(fname); pat.validate();
} // namespace sls pat->save(fname);
}
void Detector::setPattern(const std::string &fname, Positions pos) { void Detector::setPattern(const std::string &fname, Positions pos) {
// Pattern pat; Pattern pat;
// pat.load(fname); pat.load(fname);
// setPattern(pat, pos); pat.validate();
setPattern(pat, pos);
} }
void Detector::setPattern(const Pattern &pat, Positions pos) { void Detector::setPattern(const Pattern &pat, Positions pos) {