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

binaries in and updated api versioning

Browse Source
This commit is contained in:
maliakal_d
2021-10-07 19:11:37 +02:00
parent 6b0e6a72df
commit e3e3639829
17 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -637,25 +637,7 @@ std::string CmdProxy::ReadoutSpeed(int action) {
if (args.size() != 1) {
WrongNumberOfParameters(1);
}
defs::speedLevel t;
try {
int ival = StringTo<int>(args[0]);
switch (ival) {
case 0:
t = defs::FULL_SPEED;
break;
case 1:
t = defs::HALF_SPEED;
break;
case 2:
t = defs::QUARTER_SPEED;
break;
default:
throw sls::RuntimeError("Unknown speed " + args[0]);
}
} catch (...) {
t = sls::StringTo<defs::speedLevel>(args[0]);
}
defs::speedLevel t = sls::StringTo<defs::speedLevel>(args[0]);
det->setReadoutSpeed(t, std::vector<int>{det_id});
os << sls::ToString(t) << '\n'; // no args to convert 0,1,2 as well
} else {

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -793,7 +793,7 @@ class CmdProxy {
{"drlist", &CmdProxy::drlist},
{"timing", &CmdProxy::timing},
{"timinglist", &CmdProxy::timinglist},
{"speed", &CmdProxy::ReadoutSpeed},
{"readoutspeed", &CmdProxy::ReadoutSpeed},
{"adcphase", &CmdProxy::Adcphase},
{"maxadcphaseshift", &CmdProxy::maxadcphaseshift},
{"dbitphase", &CmdProxy::Dbitphase},

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -417,7 +417,7 @@ Result<defs::speedLevel> Detector::getReadoutSpeed(Positions pos) const {
}
void Detector::setReadoutSpeed(defs::speedLevel value, Positions pos) {
pimpl->Parallel(&Module::getReadoutSpeed, pos, value);
pimpl->Parallel(&Module::setReadoutSpeed, pos, value);
}

2
slsDetectorSoftware/src/Module.cpp
View File

@ -605,7 +605,7 @@ slsDetectorDefs::speedLevel Module::getReadoutSpeed() const {
}
void Module::setReadoutSpeed(speedLevel value) {
sendToDetector<int>(F_SET_READOUT_SPEED, value);
sendToDetector(F_SET_READOUT_SPEED, value, nullptr);
}
int Module::getClockDivider(int clkIndex) const {