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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-25 17:56:32 +02:00
parent b76d123df1 2eac75aa0b
commit 714e456d7d
3 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -5381,7 +5381,7 @@ std::string slsDetectorCommand::cmdPattern(int narg, char *args[], int action, i
}
auto r = myDet->getPatternLoops(0, detPos);
os << std::hex << r[2];
os << std::dec << r[2];
} else if (cmd == "patnloop1") {
start = -1;
@ -5398,7 +5398,7 @@ std::string slsDetectorCommand::cmdPattern(int narg, char *args[], int action, i
}
auto r = myDet->getPatternLoops(1, detPos);
os << std::hex << r[2];
os << std::dec << r[2];
} else if (cmd == "patnloop2") {
@ -5416,7 +5416,7 @@ std::string slsDetectorCommand::cmdPattern(int narg, char *args[], int action, i
}
auto r = myDet->getPatternLoops(2, detPos);
os << std::hex << r[2];
os << std::dec << r[2];
} else if (cmd == "patwait0") {