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

replaced initializer list with vector for CmdProxy

Browse Source
This commit is contained in:
Erik Frojdh
2020-09-17 12:11:19 +02:00
parent 74edb6a1c1
commit 511c206787
2 changed files with 159 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -420,7 +420,7 @@ std::string CmdProxy::Exptime(int action) {
// vector of exptimes
if (gateIndex == -1 &&
det->getDetectorType().squash() == defs::MYTHEN3) {
auto t = det->getExptimeForAllGates({det_id});
auto t = det->getExptimeForAllGates(std::vector<int>{det_id});
if (args.empty()) {
os << OutString(t) << '\n';
} else if (args.size() == 1) {
@ -431,9 +431,9 @@ std::string CmdProxy::Exptime(int action) {
else {
Result<ns> t;
if (gateIndex == -1) {
t = det->getExptime({det_id});
t = det->getExptime(std::vector<int>{det_id});
} else {
t = det->getExptime(gateIndex, {det_id});
t = det->getExptime(gateIndex, std::vector<int>{det_id});
}
if (args.empty()) {
os << OutString(t) << '\n';
@ -448,16 +448,16 @@ std::string CmdProxy::Exptime(int action) {
std::string unit = RemoveUnit(time_str);
auto t = StringTo<time::ns>(time_str, unit);
if (type == defs::MYTHEN3) {
det->setExptime(gateIndex, t, {det_id});
det->setExptime(gateIndex, t, std::vector<int>{det_id});
} else {
det->setExptime(t, {det_id});
det->setExptime(t, std::vector<int>{det_id});
}
} else if (args.size() == 2) {
auto t = StringTo<time::ns>(args[0], args[1]);
if (type == defs::MYTHEN3) {
det->setExptime(gateIndex, t, {det_id});
det->setExptime(gateIndex, t, std::vector<int>{det_id});
} else {
det->setExptime(t, {det_id});
det->setExptime(t, std::vector<int>{det_id});
}
} else {
WrongNumberOfParameters(2);