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

Merge pull request #208 from slsdetectorgroup/m3trimbits

Browse Source 
M3trimbits
This commit is contained in:
Dhanya Thattil 2020-10-22 13:18:42 +02:00 committed by GitHub
commit 559b02e167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -1027,12 +1027,12 @@ std::string CmdProxy::Scan(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[dac_name|0|trimbit_scan] [start_val] [stop_val] " os << "[dac_name|0|trimbits] [start_val] [stop_val] "
"[step_size] [dac settling time ns|us|ms|s]\n\tEnables/ disables " "[step_size] [dac settling time ns|us|ms|s]\n\tEnables/ disables "
"scans for dac and trimbits \n\tEnabling scan sets number of " "scans for dac and trimbits \n\tEnabling scan sets number of "
"frames to number of steps in receiver. \n\tTo cancel scan " "frames to number of steps in receiver. \n\tTo cancel scan "
"configuration, set dac to '0', which also sets number of frames " "configuration, set dac to '0', which also sets number of frames "
"to 1. \n\t[Eiger][Mythen3] Use trimbit_scan as dac name for a " "to 1. \n\t[Eiger][Mythen3] Use trimbits as dac name for a "
"trimbit scan." "trimbit scan."
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {

6
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -1423,15 +1423,15 @@ TEST_CASE("scan", "[.cmd][.new]") {
if (det_type == defs::MYTHEN3 || defs::EIGER) { if (det_type == defs::MYTHEN3 || defs::EIGER) {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {"trimbit_scan", "0", "63", "16", "2s"}, -1, PUT, proxy.Call("scan", {"trimbits", "0", "63", "16", "2s"}, -1, PUT,
oss); oss);
CHECK(oss.str() == "scan [trimbit_scan, 0, 63, 16, 2s]\n"); CHECK(oss.str() == "scan [trimbits, 0, 63, 16, 2s]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {}, -1, GET, oss); proxy.Call("scan", {}, -1, GET, oss);
CHECK(oss.str() == CHECK(oss.str() ==
"scan [enabled\ndac trimbit_scan\nstart 0\nstop 48\nstep " "scan [enabled\ndac trimbits\nstart 0\nstop 48\nstep "
"16\nsettleTime 2s\n]\n"); "16\nsettleTime 2s\n]\n");
} }
} }

2
slsReceiverSoftware/src/Implementation.cpp
View File

@ -585,7 +585,7 @@ void Implementation::stopReceiver() {
// udp port number could be the second if selected interface is // udp port number could be the second if selected interface is
// 2 for jungfrau // 2 for jungfrau
"Summary of Port " << udpPortNum[i] "Summary of Port " << udpPortNum[i]
<< "\n\tMissing Packets\t\t: " << mp[i] << "\n\tMissing Packets\t\t: " << (int64_t)mp[i]
<< "\n\tComplete Frames\t\t: " << nf << "\n\tComplete Frames\t\t: " << nf
<< "\n\tLast Frame Caught\t: " << "\n\tLast Frame Caught\t: "
<< listener[i]->GetLastFrameIndexCaught(); << listener[i]->GetLastFrameIndexCaught();

4
slsSupportLib/src/ToString.cpp
View File

@ -488,7 +488,7 @@ std::string ToString(const defs::dacIndex s) {
case defs::ADC_VPP: case defs::ADC_VPP:
return std::string("adcvpp"); return std::string("adcvpp");
case defs::TRIMBIT_SCAN: case defs::TRIMBIT_SCAN:
return std::string("trimbit_scan"); return std::string("trimbits");
case defs::HIGH_VOLTAGE: case defs::HIGH_VOLTAGE:
return std::string("highvoltage"); return std::string("highvoltage");
case defs::IO_DELAY: case defs::IO_DELAY:
@ -848,7 +848,7 @@ template <> defs::dacIndex StringTo(const std::string &s) {
return defs::IBIAS_SFP; return defs::IBIAS_SFP;
if (s == "adcvpp") if (s == "adcvpp")
return defs::ADC_VPP; return defs::ADC_VPP;
if (s == "trimbit_scan") if (s == "trimbits")
return defs::TRIMBIT_SCAN; return defs::TRIMBIT_SCAN;
if (s == "highvoltage") if (s == "highvoltage")
return defs::HIGH_VOLTAGE; return defs::HIGH_VOLTAGE;