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

jungfrau server fix (3.1.3): delay after trigger set at testbus

Browse Source
This commit is contained in:
maliakal_d
2018-06-28 16:19:19 +02:00
parent 144bd7124b
commit 14d227f8db
4 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2904,39 +2904,53 @@ int get_time_left(int file_des) {
printf("getting time left on timer %d \n",ind);
#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST
switch(ind) {
#ifdef JUNGFRAUD
if (ind == DELAY_AFTER_TRIGGER) {
ret = FAIL;
sprintf(mess,"Timer Left Index (%d) is not implemented for this release.\n", (int)ind);
cprintf(RED, "%s", mess);
} else {
#endif
switch(ind) {
#ifdef MYTHEND
case PROBES_NUMBER:
case PROBES_NUMBER:
#elif JUNGFRAUD
case FRAMES_FROM_START:
case FRAMES_FROM_START_PG:
case FRAMES_FROM_START:
case FRAMES_FROM_START_PG:
#elif MYTHEN3D
case GATES_NUMBER:
case PROBES_NUMBER:
case SAMPLES_JCTB:
case GATES_NUMBER:
case PROBES_NUMBER:
case SAMPLES_JCTB:
#endif
#ifndef JUNGFRAUD
case GATES_NUMBER:
case GATES_NUMBER:
#endif
case FRAME_NUMBER:
case ACQUISITION_TIME:
case FRAME_PERIOD:
case DELAY_AFTER_TRIGGER:
case CYCLES_NUMBER:
case PROGRESS:
case ACTUAL_TIME:
case MEASUREMENT_TIME:
retval=getTimeLeft(ind);
break;
default:
ret = FAIL;
sprintf(mess,"Timer Left Index (%d) is not implemented for this detector\n", (int)ind);
cprintf(RED, "%s", mess);
break;
}
case FRAME_NUMBER:
case ACQUISITION_TIME:
case FRAME_PERIOD:
case DELAY_AFTER_TRIGGER:
case CYCLES_NUMBER:
case PROGRESS:
case ACTUAL_TIME:
case MEASUREMENT_TIME:
retval=getTimeLeft(ind);
break;
default:
ret = FAIL;
sprintf(mess,"Timer Left Index (%d) is not implemented for this detector\n", (int)ind);
cprintf(RED, "%s", mess);
break;
}
#ifdef VERBOSE
printf("Time left on timer %d is %lld\n",ind, retval);
printf("Time left on timer %d is %lld\n",ind, retval);
#endif
#ifdef JUNGFRAUD
} // end of if (ind == DELAY_AFTER_TRIGGER)
#endif
#endif
if (ret==OK && differentClients)
ret=FORCE_UPDATE;