detectors/slsDetectorPackage
24
1 Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-11-05 21:43:12 +01:00
Code Issues Actions Packages Releases Activity

use chipindex and fix the cli put
Build on RHEL9 docker image / build (push) Successful in 3m44s
Details
Build on RHEL8 docker image / build (push) Successful in 4m54s
Details
Run Simulator Tests on local RHEL9 / build (push) Failing after 9m19s
Details
Run Simulator Tests on local RHEL8 / build (push) Failing after 11m15s
Details

Browse Source
This commit is contained in:
maliakal_d committed 2026-10-13 12:33:05 +02:00
1 parent 734eb7b51a
commit 39148679e0
4 files changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
+2
View File
@@ -404,6 +404,8 @@ int setChipIndex(enum CHIPINDEX ind, char *mess) {
return setChipVersionInFPGA(mess);
}
enum CHIPINDEX getChipIndex() { return chipIndex; }
int validateChipIndex(enum CHIPINDEX ind, char *mess) {
if (ind < 0 || ind >= NUM_CHIP_INDICES) {
sprintf(mess, "Invalid chip index %d. Options: %s\n", (int)ind,
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
+1
View File
@@ -102,6 +102,7 @@ int setChipVersionIntFromConfigFile(int val,
char *mess); // for backward compatibility
int setChipVersionStringFromConfigFile(char *cval, char *mess);
int setChipIndex(enum CHIPINDEX ind, char *mess);
enum CHIPINDEX getChipIndex();
int validateChipIndex(enum CHIPINDEX ind, char *mess);
void setChipIndexAllowedFeatures();
int setChipVersionInFPGA(char *mess);
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+1 -1
View File
@@ -2370,7 +2370,7 @@ int set_num_additional_storage_cells(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if (!hasStorageCellsFeature() || getChipVersionInFPGA() > 11) {
if (!hasStorageCellsFeature() || getChipIndex() > v1_1) {
ret = FAIL;
sprintf(mess, "Cannot set addl. number of storage cells for this "
"chip version\n");
slsDetectorSoftware/src/CallerSpecial.cpp
+7 -4
View File
@@ -1458,16 +1458,19 @@ std::string Caller::hdr(int action) {
if (sls::is_int(args[0])) {
auto val = StringTo<int>(args[0]);
if (val == 0) {
det->setHDR(defs::hdrParameters(), std::vector<int>{det_id});
auto disable = defs::hdrParameters();
det->setHDR(disable, std::vector<int>{det_id});
os << val << '\n';
} else {
throw RuntimeError("Did you mean to disable HDR? Then Please "
"use '0' to do so. Unknown argument: " +
args[0]);
}
} else {
auto val = StringTo<defs::operationMode>(args[0]);
det->setHDR(val, std::vector<int>{det_id});
os << ToString(val) << '\n';
}
auto val = StringTo<defs::hdrParameters>(args[0]);
det->setHDR(val, std::vector<int>{det_id});
os << ToString(val) << '\n';
} else {
throw RuntimeError("Unknown action");
}