mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-10-29 22:21:41 +01:00
1010/fix jungfrau pedestal max loops (#1548)
* jf firmware already fixed max loops for pedestalmode. allow the max now. should have been in 9.1 firmware
* binary in
* fixed tests
* unnecessary checks
* binary in
* formatting
* Fix cmake workflow dependency installation for HDF5
Co-authored-by: AliceMazzoleni99 <201970197+AliceMazzoleni99@users.noreply.github.com>
* Revert "Fix cmake workflow dependency installation for HDF5"
This reverts commit fb03f1a7e8.
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AliceMazzoleni99 <201970197+AliceMazzoleni99@users.noreply.github.com>
Co-authored-by: Alice <alice.mazzoleni@psi.ch>
This commit is contained in:
6 files changed
+4
-10
No files matched your search
BIN
Binary file not shown.
Binary file not shown.
@@ -63,7 +63,6 @@
|
||||
#define DEFAULT_TIMING_INFO_DECODER (SWISSFEL)
|
||||
#define DEFAULT_ELECTRON_COLLECTION_MODE (0)
|
||||
|
||||
#define MAX_PEDESTAL_LOOPS (0xFF) // until fixed in firmware
|
||||
#define HIGHVOLTAGE_MIN (60)
|
||||
#define HIGHVOLTAGE_MAX (200)
|
||||
#define DAC_MIN_MV (0)
|
||||
|
||||
@@ -10832,13 +10832,6 @@ int set_pedestal_mode(int file_des) {
|
||||
"be 0. [%hhu, %hu].\n",
|
||||
frames, loops);
|
||||
LOG(logERROR, (mess));
|
||||
} else if (loops > MAX_PEDESTAL_LOOPS) {
|
||||
ret = FAIL;
|
||||
sprintf(mess,
|
||||
"Could not set pedestal mode. Loops [%hu] cannot be "
|
||||
"greater than %d.\n",
|
||||
loops, MAX_PEDESTAL_LOOPS);
|
||||
LOG(logERROR, (mess));
|
||||
} else {
|
||||
setPedestalMode(enable, frames, loops);
|
||||
int retvalEnable = getPedestalMode();
|
||||
|
||||
@@ -525,10 +525,12 @@ TEST_CASE("pedestalmode", "[.detectorintegration]") {
|
||||
|
||||
REQUIRE_THROWS(caller.call("pedestalmode", {"256", "10"}, -1, PUT));
|
||||
REQUIRE_THROWS(caller.call("pedestalmode", {"-1", "10"}, 0, PUT));
|
||||
REQUIRE_THROWS(caller.call("pedestalmode", {"20", "1000"}, 0, PUT));
|
||||
REQUIRE_THROWS(caller.call("pedestalmode", {"20", "65536"}, 0, PUT));
|
||||
REQUIRE_THROWS(caller.call("pedestalmode", {"2000", "100"}, 0, PUT));
|
||||
REQUIRE_THROWS(caller.call("pedestalmode", {"20", "-1"}, 0, PUT));
|
||||
|
||||
REQUIRE_NOTHROW(caller.call("pedestalmode", {"20", "4000"}, 0, PUT));
|
||||
|
||||
{
|
||||
std::ostringstream oss;
|
||||
caller.call("pedestalmode", {"30", "100"}, -1, PUT, oss);
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
#define APIMOENCH "10.0.0 0x250828"
|
||||
#define APIEIGER "10.1.0 0x260807"
|
||||
#define APIXILINXCTB "10.0.0 0x250828"
|
||||
#define APIJUNGFRAU "10.1.0 0x260814"
|
||||
#define APIJUNGFRAU "10.1.0 0x260902"
|
||||
#define APIMYTHEN3 "10.0.0 0x250828"
|
||||
Reference in new issue
Block a user