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

jungfrau server: changed delay to trigger delay to have better trigger being caught

Browse Source
This commit is contained in:
Dhanya Maliakal 2018-01-11 09:26:50 +01:00
parent beabd03be2
commit 8fc3d97e78
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
View File

@ -341,7 +341,8 @@
#define SET_EXPTIME_MSB_REG (0x69 << 11) #define SET_EXPTIME_MSB_REG (0x69 << 11)
/* Trigger Delay 32 bit register */ /* Trigger Delay 32 bit register */
#define SET_TRIGGER_DELAY_REG (0x70 << 11) #define SET_TRIGGER_DELAY_LSB_REG (0x70 << 11)
#define SET_TRIGGER_DELAY_MSB_REG (0x71 << 11)
/* Module Coordinates Register 0 */ /* Module Coordinates Register 0 */
#define COORD_0 (0x7C << 11) #define COORD_0 (0x7C << 11)

2
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -578,7 +578,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
printf("\nSetting delay to %lldns\n", (long long int)val); printf("\nSetting delay to %lldns\n", (long long int)val);
val *= (1E-3 * CLK_SYNC); val *= (1E-3 * CLK_SYNC);
} }
retval = set64BitReg(val, SET_DELAY_LSB_REG, SET_DELAY_MSB_REG) / (1E-3 * CLK_SYNC); retval = set64BitReg(val, SET_TRIGGER_DELAY_LSB_REG, SET_TRIGGER_DELAY_MSB_REG) / (1E-3 * CLK_SYNC);
printf("Getting delay: %lldns\n", (long long int)retval); printf("Getting delay: %lldns\n", (long long int)retval);
break; break;