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

m3, individual chip index back in for hw 1.2, need the linux drivers for chipdac0-9 (#685)

Browse Source
This commit is contained in:
Dhanya Thattil 2023-02-23 09:13:31 +01:00 committed by GitHub
parent 403989e2f8
commit a74c9498e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -2393,8 +2393,7 @@ std::string CmdProxy::ConfigureADC(int action) {
std::ostringstream os; std::ostringstream os;
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[chip index 0-9 [setting individual chips not yet implemented], " os << "[chip index 0-9, -1 for all] [adc index 0-31, -1 for all] [7 "
"-1 for all] [adc index 0-31, -1 for all] [7 "
"bit configuration value in hex]\n\t[Gotthard2] Sets " "bit configuration value in hex]\n\t[Gotthard2] Sets "
"configuration for specific chip and adc, but configures 1 chip " "configuration for specific chip and adc, but configures 1 chip "
"(all adcs for that chip) at a time." "(all adcs for that chip) at a time."

7
slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
View File

@ -719,13 +719,12 @@ TEST_CASE("confadc", "[.cmd]") {
REQUIRE(oss.str() == "confadc 0x11\n"); REQUIRE(oss.str() == "confadc 0x11\n");
} }
// doesnt exist in hw yet to set individual chips (no file)
for (int i = 0; i != ndet; ++i) { for (int i = 0; i != ndet; ++i) {
// for (int j = 0; j != nchip; ++j) { for (int j = 0; j != nchip; ++j) {
for (int k = 0; k != nadc; ++k) { for (int k = 0; k != nadc; ++k) {
det.setADCConfiguration(-1, k, prev_val[i][0][k], {i}); det.setADCConfiguration(-1, k, prev_val[i][j][k], {i});
}
} }
//}
} }
} else { } else {
REQUIRE_THROWS(proxy.Call("confadc", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("confadc", {}, -1, GET));