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

almost no changes - checking in for alba

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@263 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-09-20 08:57:44 +00:00
parent e0ad54dd46
commit d7bafd8072
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/mythenDetectorServer/Makefile
View File

@ -13,9 +13,9 @@ INSTMODE= 0777
SRCS= server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c
OBJS= $(SRCS:%.c=%.o)
CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE -DDACS_INT
#-DVERYVERBOSE
#-Werror
#VFLAGS= -DVERBOSE -DVERYVERBOSE
CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DDACS_INT $(VFLAGS)
#-Werror
LDLIBS+= -lm
@ -28,8 +28,6 @@ $(PROGS): $(OBJS)
echo $(OBJS)
$(CC) $(LDFLAGS) $^ $(LDLIBS) $(CFLAGS) -o $@
install: $(PROGS)
$(INSTALL) -d $(INSTDIR)
$(INSTALL) -m $(INSTMODE) $(PROGS) $(INSTDIR)

5
slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c
View File

@ -761,8 +761,11 @@ int getThresholdEnergy() {
}
#ifdef VERBOSE
//printf("module=%d gain=%f, offset=%f, dacu=%f\n",imod, myg, myo, detectorDacs[VTHRESH+imod*NDAC]);
#ifdef DACS_INT
printf("module=%d gain=%f, offset=%f, dacu=%d\n",imod, myg, myo,setDACRegister(VTHRESH,-1,imod));
#else
printf("module=%d gain=%f, offset=%f, dacu=%f\n",imod, myg, myo,setDACRegister(VTHRESH,-1,imod));
#endif
printf("Threshold energy of module %d is %d eV\n", imod, ethr);
#endif