detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 00:58:01 +02:00
Code Issues Actions Packages Releases Activity

updated ctb and moench, moench not tested

Browse Source
This commit is contained in:
maliakal_d
2019-03-05 09:38:10 +01:00
parent 08bd2378f4
commit c56561bc9f
17 changed files with 433 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -183,7 +183,7 @@ int checkType() {
u_int32_t testFpga(void) {
int testFpga() {
#ifdef VIRTUAL
return OK;
#endif
@ -699,6 +699,16 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val + ACQ_TIME_MIN_CLOCK) / (1E-3 * CLK_RUN);
if (val != retval)
return FAIL;
break;
case STORAGE_CELL_DELAY:
// convert to freq
val *= (1E-3 * CLK_RUN);
if(val < 0) val = 0;
// convert back to timer
val = val / (1E-3 * CLK_RUN);
if (val != retval)
return FAIL;
break;
case FRAME_PERIOD:
case DELAY_AFTER_TRIGGER:
// convert to freq
@ -707,6 +717,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val) / (1E-3 * CLK_SYNC);
if (val != retval)
return FAIL;
break;
default:
break;
}