detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-10-13 17:40:26 +02:00
Code Issues Actions Packages Releases Activity

Dev/fix jungfrau pedestal max loops (#1549)
Build on RHEL9 docker image / build (push) Successful in 3m44s
Details
Build on RHEL8 docker image / build (push) Successful in 5m1s
Details
Build and Deploy on local RHEL9 / build (push) Successful in 2m1s
Details
Build and Deploy on local RHEL8 / build (push) Successful in 5m9s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 20m8s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 23m31s
Details

Browse Source 
* 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
This commit is contained in:
maliakal_d
2026-09-21 14:56:14 +02:00
committed by GitHub
parent b93520bba5
commit 01799a8773
5 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
BIN
View File
Binary file not shown.
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
-1
View File
@@ -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)
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
-7
View File
@@ -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();
slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp
+3 -1
View File
@@ -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);
slsSupportLib/include/sls/versionAPI.h
+1 -1
View File
@@ -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"