mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 12:57:13 +02:00
G2: reconfigure chip (#927)
* changed common.c readADCFromFile to make it more general and move temperature calculation for Eiger out of this function and inside whereever it is called. * g2 and m2: gethighvoltage was just a variable set in server, it is now moved to a get inside DAC5671 implementation (but not reading a measured value, instead what is set from a file), high voltage variable used inside DAC5671 for virtual servers * g2: switching off hv (ifrom non zero to zero value) will wait for 10s; powering on chip reconfigures chip; powering off chip unconfigures chip; powering off chip also includes check if hv = 0, if not throw exception; chip configuration checked before acquring; at start up: hv switched off and chip powered on, so does not wait 10s to switch off hv; * included test to check powering off chip when hv is on should throw an exception * g2: check if chip configured before acquiring * nios: read hv value set from file and virtual still goes into DAC5671 for conversions to and fro dac to V, change common readadc to readparameter to generalize, make sethighvoltage into a get and set to catch errors in get as well, g2: if not at startup, remmeber hv value before setting it and after check if value was being switched off (from a non zero value) and wait 10s if it was (10s wait only for switching off from non zero and not at startup)
This commit is contained in:
@ -1506,6 +1506,23 @@ TEST_CASE("CALLER::powerchip", "[.cmdcall]") {
|
||||
caller.call("powerchip", {"0"}, -1, PUT, oss);
|
||||
REQUIRE(oss.str() == "powerchip 0\n");
|
||||
}
|
||||
// powering off chip throws if hv on (only test virtualserver - safety
|
||||
if (det_type == defs::GOTTHARD2 &&
|
||||
det.isVirtualDetectorServer().tsquash(
|
||||
"Inconsistent virtual detector "
|
||||
"server to test powerchip command")) {
|
||||
det.setPowerChip(1);
|
||||
int hv = det.getHighVoltage().tsquash(
|
||||
"Inconsistent high voltage to test "
|
||||
"powerchip command");
|
||||
|
||||
det.setHighVoltage(100);
|
||||
REQUIRE_THROWS(caller.call("powerchip", {"0"}, -1, PUT));
|
||||
|
||||
// previous settings
|
||||
det.setHighVoltage(hv);
|
||||
det.setPowerChip(0);
|
||||
}
|
||||
{
|
||||
std::ostringstream oss;
|
||||
caller.call("powerchip", {}, -1, GET, oss);
|
||||
|
Reference in New Issue
Block a user