diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 8c08da572..362047d64 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 580e3d295..aaf8fd7fc 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -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) diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 34c7eda6a..1d6b51aef 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -10745,13 +10745,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(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp index 0d09c1f74..ede7c3671 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp @@ -524,10 +524,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); diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 489e4b038..73955104c 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -8,6 +8,6 @@ #define APIMOENCH "0.0.0 0x260424" #define APIEIGER "0.0.0 0x260807" #define APIXILINXCTB "0.0.0 0x260813" -#define APIJUNGFRAU "0.0.0 0x260814" +#define APIJUNGFRAU "0.0.0 0x260902" #define APIMYTHEN3 "0.0.0 0x260506" #define APIMATTERHORN "0.0.0 0x260529"