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

added and fixed gotthard 25um file and zmq photon finder

Browse Source
This commit is contained in:
bergamaschi
2017-12-19 13:40:05 +01:00
parent 7602ffc5ac
commit 31589ce352
15 changed files with 925 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c
View File

@ -1346,11 +1346,11 @@ int64_t setDelay(int64_t value){
if (value!=-1) {
value*=(1E-3*clkDivider[1]);//(1E-9*CLK_FREQ);
}
return set64BitReg(value,SET_DELAY_LSB_REG, SET_DELAY_MSB_REG)/(1E-3*clkDivider[0]);//(1E-9*CLK_FREQ);
return set64BitReg(value,SET_DELAY_LSB_REG, SET_DELAY_MSB_REG)/(1E-3*clkDivider[1]);//(1E-9*CLK_FREQ);
}
int64_t getDelay(){
return get64BitReg(GET_DELAY_LSB_REG, GET_DELAY_MSB_REG)/(1E-3*clkDivider[0]);//(1E-9*CLK_FREQ);
return get64BitReg(GET_DELAY_LSB_REG, GET_DELAY_MSB_REG)/(1E-3*clkDivider[1]);//(1E-9*CLK_FREQ);
}
int64_t setTrains(int64_t value){