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

timing command added, several bugs concerning the synchronization of multiple detectors fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@134 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-02-28 13:59:28 +00:00
parent b755c533f0
commit 5e086b9ee6
10 changed files with 241 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c
View File

@ -431,7 +431,7 @@ int program_one_dac(int addr, int value, int imod) {
int im;
int idac;
int v=value;
int reg, mask;
// int reg, mask;
// sls_detector_module *myMod;
control=9+addr;
@ -660,7 +660,7 @@ float initDACbyIndexDACU(int ind, int val, int imod) {
int cs=daccs[ind];
int addr=dacaddr[ind];
int iv;
// int iv;
int im;
if (val>=0) {
@ -705,7 +705,7 @@ int getThresholdEnergy() {
float g[3]=DEFAULTGAIN;
float o[3]=DEFAULTOFFSET;
float myg=-1, myo=-1;
int dacu;
// int dacu;
int imod;
int ethr=-1;
int ret=FAIL;