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

WIP

Browse Source
This commit is contained in:
maliakal_d
2020-11-26 14:13:04 +01:00
parent 2e669c585b
commit baff0518bb
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/src/Detector.cpp
View File

@ -1755,9 +1755,9 @@ void Detector::setLEDEnable(bool enable, Positions pos) {
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");
// auto pat = t[0]; auto pat = t[0];
pat->save(fname); // pat->save(fname);
} // namespace sls } // namespace sls
void Detector::setPattern(const std::string &fname, Positions pos) { void Detector::setPattern(const std::string &fname, Positions pos) {

3
slsDetectorSoftware/src/Module.cpp
View File

@ -1919,8 +1919,7 @@ void Module::setPattern(const defs::patternParameters *pat) {
} }
std::unique_ptr<defs::patternParameters> Module::getPattern() { std::unique_ptr<defs::patternParameters> Module::getPattern() {
std::unique_ptr<defs::patternParameters> pat = auto pat = sls::make_unique<defs::patternParameters>();
sls::make_unique<defs::patternParameters>();
*pat = sendToDetector<defs::patternParameters>(F_GET_PATTERN); *pat = sendToDetector<defs::patternParameters>(F_GET_PATTERN);
pat->validate(); pat->validate();
return pat; return pat;