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

added eiger virtual class. eiger server minor bug fix. 1. copying local trimbits over from module (in effect same thing)2.rate correction table calculated each time and now only when period is different

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-30 15:29:58 +02:00
parent 91fece87b2
commit 56aa4be358
10 changed files with 1038 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorSoftware/eigerDetectorServer/Makefile.virtual
View File

@ -1,24 +1,26 @@
CC = gcc
CFLAGS += -Wall -DDACS_INT -DEIGERD -DDACS_INT -DPCCOMPILE -DSLS_DETECTOR_FUNCTION_LIST #-DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE
LDLIBS += -lm -lstdc++
CC = gcc
CFLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DPCCOMPILE -DSTOP_SERVER #-DVERBOSE
CFLAGS += -DVIRTUAL -DVIRTUAL_9M -DVIRTUAL_MASTER
PROGS = eigerDetectorServerVirtual
DESTDIR ?= bin
INSTMODE = 0777
LDLIBS += -lm -lstdc++ -pthread
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c
#SRC_CLNT2 = Eiger.cxx HardwareIO.cxx LocalLinkInterface.cxx Feb.cxx
OBJS = $(SRC_CLNT:.c=.o)
OBJS2 = $(SRC_CLNT2:.cpp=.o)
PROGS = eigerDetectorServerVirtual
DESTDIR ?= bin
INSTMODE = 0777
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList_virtual.c
OBJS = $(SRC_CLNT:.c=.o)
all: clean $(PROGS)
boot: $(OBJS) $(OBJS2)
boot: $(OBJS)
$(PROGS):
echo $(OBJS) $(OBJS2)
$(PROGS): $(OBJS)
# echo $(CFLAGS)
# echo $(OBJS)
mkdir -p $(DESTDIR)
$(CC) -o $@ $(SRC_CLNT) $(CFLAGS) $(LDLIBS)
mv $(PROGS) $(DESTDIR)