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

WIP

Browse Source
This commit is contained in:
maliakal_d 2020-11-26 10:29:09 +01:00
parent a12dd153ef
commit ca0bc3e0f3
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/src/Detector.cpp
View File

@ -1754,13 +1754,8 @@ void Detector::setLEDEnable(bool enable, Positions pos) {
// Pattern
void Detector::savePattern(const std::string &fname) {
Result<std::unique_ptr<defs::patternParameters>> patlist;
for (int i = 0; i < patlist.size(); ++i) {
patlist[i] = sls::make_unique<defs::patternParameters>();
}
Result<defs::patternParameters> pat;
= sls::make_unique<defs::patternParameters>();
pimpl->Parallel(&Module::getPattern, {}, pat.get());
auto t = pimpl->Parallel(&Module::getPattern, {});
auto pat = t.tsquash("Inconsistent pattern parameters between modules");
pat->save(fname);
/*

5
slsDetectorSoftware/src/Module.cpp
View File

@ -1918,9 +1918,12 @@ void Module::setPattern(const defs::patternParameters *pat) {
sendToDetector(F_SET_PATTERN, pat, sizeof(patternParameters), nullptr, 0);
}
void Module::getPattern(defs::patternParameters *pat) {
std::unique_ptr<defs::patternParameters> Module::getPattern() {
std::unique_ptr<defs::patternParameters> pat =
sls::make_unique<defs::patternParameters>();
*pat = sendToDetector<defs::patternParameters>(F_GET_PATTERN);
pat->validate();
return pat;
}
uint64_t Module::getPatternIOControl() const {

2
slsDetectorSoftware/src/Module.h
View File

@ -463,7 +463,7 @@ class Module : public virtual slsDetectorDefs {
* *
* ************************************************/
void setPattern(const defs::patternParameters *pat);
void getPattern(defs::patternParameters *pat);
std::unique_ptr<defs::patternParameters> getPattern();
uint64_t getPatternIOControl() const;
void setPatternIOControl(uint64_t word);
uint64_t getPatternWord(int addr) const;