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

scan works in config now
Build on RHEL9 / build (push) Failing after 2m51s
Details
Build on RHEL8 / build (push) Failing after 4m40s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-07-27 17:10:54 +02:00
parent 2cb234a649
commit 09f5212e94
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/jungfrauDetectorServer/config_jungfrau.txt
+1 -1
View File
@@ -6,4 +6,4 @@
#"v1.2 HDR"
#"v1.3 Burst Mode"
chipindex "v1.2 Normal"
chipversion "v1.2 Normal"
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
+4 -9
View File
@@ -343,7 +343,6 @@ int findChipIndex(enum CHIPINDEX *ind, char *cval, char *mess) {
LOG(logERROR, (mess));
return FAIL;
}
const int vals[] = CHIP_VALS;
char *chip_names[] = {CHIP_NAMES};
for (enum CHIPINDEX ichip = v1_0; ichip != NUM_CHIP_INDICES; ++ichip) {
if (strcmp(chip_names[ichip], cval) == 0) {
@@ -359,18 +358,14 @@ int findChipIndex(enum CHIPINDEX *ind, char *cval, char *mess) {
/** For backwards compatibility */
int setChipVersionIntFromConfigFile(int val, char *mess) {
// validations
const int vals[] = CHIP_VALS;
int v1_0_val = vals[(int)v1_0];
int v1_1_val = vals[(int)v1_1];
switch (val) {
case v1_0_val:
if (val == vals[(int)v1_0])
return setChipIndex(v1_0, mess);
case v1_1_val:
else if (val == vals[(int)v1_1])
return setChipIndex(v1_1, mess);
default:
else {
sprintf(mess, "Invalid chip version %d. Options: %d and %d.\n", val,
v1_0_val, v1_1_val);
vals[(int)v1_0], vals[(int)v1_1]);
LOG(logERROR, (mess));
return FAIL;
}