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

removing trailing _ for members of currentsrcParameters

Browse Source
This commit is contained in:
maliakal_d
2021-10-08 12:52:37 +02:00
parent 5905404955
commit 6394fba85d
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsSupportLib/src/ToString.cpp
View File

@ -116,25 +116,25 @@ std::ostream &operator<<(std::ostream &os,
std::string ToString(const slsDetectorDefs::currentSrcParameters &r) {
std::ostringstream oss;
if (r.fix_ < -1 || r.fix_ > 1 || r.normal_ < -1 || r.normal_ > 1) {
if (r.fix < -1 || r.fix > 1 || r.normal < -1 || r.normal > 1) {
throw sls::RuntimeError(
"Invalid current source parameters. Cannot print.");
}
oss << '[';
if (r.enable_) {
if (r.enable) {
oss << "enabled";
// [jungfrau]
if (r.fix_ != -1) {
oss << (r.fix_ == 1 ? ", fix" : ", nofix");
if (r.fix != -1) {
oss << (r.fix == 1 ? ", fix" : ", nofix");
}
// [jungfrau chip v1.1]
if (r.normal_ != -1) {
oss << ", " << ToStringHex(r.select_, 16);
oss << (r.normal_ == 1 ? ", normal" : ", low");
if (r.normal != -1) {
oss << ", " << ToStringHex(r.select, 16);
oss << (r.normal == 1 ? ", normal" : ", low");
}
// [jungfrau chip v1.0]
else {
oss << ", " << r.select_;
oss << ", " << r.select;
}
} else {
oss << "disabled";