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

changes to create the new receiver

Browse Source
This commit is contained in:
Maliakal Dhanya 2014-05-20 16:56:51 +02:00
parent 34598e9ff2
commit 96481b2b25
5 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
slsDetectorGui slsDetectorGui
slsDetectorSoftware slsDetectorSoftware
slsReceiverSoftware slsReceiverSoftware
.cproject
.project

53
Makefile
View File

@ -11,63 +11,69 @@ INCDIR ?= $(INSTALLROOT)/include
WD = $(shell pwd) WD = $(shell pwd)
LIBRARYDIR = $(WD)/slsDetectorSoftware LIBRARYDIR = $(WD)/slsDetectorSoftware
LIBRARYRXRDIR = $(WD)/slsReceiverSoftware
CLIENTDIR = $(LIBRARYDIR)/slsDetectorClient CLIENTDIR = $(LIBRARYDIR)/slsDetectorClient
GUIDIR = $(WD)/slsDetectorGui GUIDIR = $(WD)/slsDetectorGui
RECEIVERDIR = $(LIBRARYDIR)/slsReceiver RECEIVERDIR = $(LIBRARYRXRDIR)/slsReceiver
CALWIZDIR = $(WD)/calibrationWizards CALWIZDIR = $(WD)/calibrationWizards
MANDIR = $(WD)/manual MANDIR = $(WD)/manual
CALIBDIR = $(WD)/slsDetectorCalibration CALIBDIR = $(LIBRARYRXRDIR)/slsDetectorCalibration
INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsReceiver -I$(CALIBDIR) -I$(ASM) INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYRXRDIR)/includes -I$(ASM)
INCLUDESRXR=-I. -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYRXRDIR)/includes -I$(RECEIVERDIR) -I$(RECEIVERDIR)/eigerReceiver -I$(CALIBDIR) -I$(ASM) #-I$(LIBRARYDIR)/slsReceiverInterface
.PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver
.PHONY: all nonstatic static lib textclient receiver gui stextclient sreceiver
all: lib textclient receiver gui all: lib textclient receiver gui
nonstatic: lib textclient receiver gui nonstatic: lib libreceiver textclient receiver gui
static: lib libreceiver stextclient sreceiver gui
static: lib stextclient sreceiver gui
lib: lib:
cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
libreceiver:
cd $(LIBRARYRXRDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDESRXR)'
stextclient: slsDetectorClient_static stextclient: slsDetectorClient_static
slsDetectorClient: textclient slsDetectorClient: textclient
slsDetectorClient_static: lib slsDetectorClient_static: lib
cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' LIBS='$(LDFLAG)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' LIBS='$(LDFLAGDET)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
textclient: lib textclient: lib
cd $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' cd $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
slsReceiver: receiver slsReceiver: receiver
slsReceiver_static: receiver slsReceiver_static: receiver
receiver: lib receiver: libreceiver
cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
sreceiver: libreceiver
cd $(RECEIVERDIR) && $(MAKE) static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
sreceiver: lib
cd $(RECEIVERDIR) && $(MAKE) static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' LIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
slsDetectorGUI: lib slsDetectorGUI: lib
cd $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' cd $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='-L$(LIBDIR) -lSlsDetector'
calWiz: calWiz:
cd $(CALWIZDIR) && $(MAKE) FLAGS=$(FLAGS) LDFLAG=$(LDFLAG) DESTDIR=$(BINDIR) INCLUDES=$(INCLUDES) cd $(CALWIZDIR) && $(MAKE) FLAGS=$(FLAGS) LDFLAGDET=$(LDFLAGDET) DESTDIR=$(BINDIR) INCLUDES=$(INCLUDES)
gui: slsDetectorGUI gui: slsDetectorGUI
doc: doc:
$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR)) $(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
cd manual && make all DESTDIR=$(DOCDIR) cd manual && make all DESTDIR=$(DOCDIR)
@ -80,10 +86,10 @@ htmldoc:
clean: clean:
cd $(BINDIR) && rm -rf sls_detector_* slsDetectorGui slsReceiver angularCalibrationWizard energyCalibrationWizard cd $(BINDIR) && rm -rf sls_detector_* slsDetectorGui slsReceiver angularCalibrationWizard energyCalibrationWizard
cd $(LIBDIR) && rm -rf libSlsDetector.so libSlsDetector.a cd $(LIBDIR) && rm -rf libSlsDetector.so libSlsDetector.a libSlsReceiver.so libSlsReceiver.a
cd $(LIBRARYDIR) && $(MAKE) clean cd $(LIBRARYDIR) && $(MAKE) clean
cd $(LIBRARYRXRDIR) && $(MAKE) clean
cd $(CLIENTDIR) && $(MAKE) clean cd $(CLIENTDIR) && $(MAKE) clean
cd $(RECEIVERDIR) && $(MAKE) clean
cd $(GUIDIR) && $(MAKE) clean cd $(GUIDIR) && $(MAKE) clean
cd $(CALWIZDIR) && $(MAKE) clean cd $(CALWIZDIR) && $(MAKE) clean
cd manual && $(MAKE) clean cd manual && $(MAKE) clean
@ -113,18 +119,20 @@ confinstall:
install_lib: install_lib:
make lib;\ make lib;\
make libreceiver; \
make textclient; \ make textclient; \
make slsReceiver; \ make slsReceiver; \
make doc; \ make doc; \
make htmldoc; \ make htmldoc; \
cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); \
cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
install: install:
make install_lib; \ make install_lib; \
make gui; \ make gui; \
make calWiz; \ make calWiz; \
cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);\
cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
conf: conf:
set -e; \ set -e; \
@ -140,6 +148,7 @@ help:
@echo "Targets:" @echo "Targets:"
@echo "make all compile library, text clients, data reciever" @echo "make all compile library, text clients, data reciever"
@echo "make lib compile library" @echo "make lib compile library"
@echo "make libreceiver compile receiver library"
@echo "make textclient compile the slsDetectorClient dynamically linking the libraries" @echo "make textclient compile the slsDetectorClient dynamically linking the libraries"
@echo "make stextclient compile slsDetectorClient statically linking the libraries" @echo "make stextclient compile slsDetectorClient statically linking the libraries"
@echo "make receiver compile the slsReciever dynamically linking the libraries" @echo "make receiver compile the slsReciever dynamically linking the libraries"

7
Makefile.include
View File

@ -5,7 +5,8 @@
CC = g++ CC = g++
CXX = $(CC) CXX = $(CC)
ASM=$(shell echo "/lib/modules/`uname -r`/build/include") ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
LDFLAG = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
FLAGS= -Wall -DVERBOSE FLAGS= -Wall -DVERBOSE
############################################################## ##############################################################
@ -26,7 +27,7 @@ JSONBOXDIR = /home/sala/Programs/JsonBox-ubuntu_13.10-64bit
EIGERFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I$(POCODIR)/include -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)/lib -I$(JSONBOXDIR)/include -lPocoNet -lPocoFoundation -lJsonBox EIGERFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I$(POCODIR)/include -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)/lib -I$(JSONBOXDIR)/include -lPocoNet -lPocoFoundation -lJsonBox
ifeq ($(EIGERSLS),yes) ifeq ($(EIGERSLS),yes)
LDFLAG = -L$(LIBDIR) -lSlsDetector $(EIGERFLAGS) -DEIGERSLS LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(EIGERFLAGS) -DEIGERSLS
endif endif
@ -40,7 +41,7 @@ ROOTSLS = no
ROOTFLAGS = $(shell root-config --cflags --glibs) -DMYROOT1 #-DALLFILE_DEBUG #-DMYROOT1 ROOTFLAGS = $(shell root-config --cflags --glibs) -DMYROOT1 #-DALLFILE_DEBUG #-DMYROOT1
ifeq ($(ROOTSLS),yes) ifeq ($(ROOTSLS),yes)
LDFLAG = -L$(LIBDIR) -lSlsDetector $(ROOTFLAGS) -DROOTSLS LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(ROOTFLAGS) -DROOTSLS
endif endif

1
examples/receiver.config Normal file
View File

@ -0,0 +1 @@
dataport 1955

7
updateSvnVersion.sh
View File

@ -3,12 +3,14 @@
#folders #folders
MAINDIR=slsDetectorsPackage MAINDIR=slsDetectorsPackage
LIBDIR=slsDetectorSoftware LIBDIR=slsDetectorSoftware
RXRDIR=slsReceiverSoftware
GUIDIR=slsDetectorGui GUIDIR=slsDetectorGui
CALWIZDIR=calibrationWizards CALWIZDIR=calibrationWizards
SVNPATH=file:///afs/psi.ch/project/sls_det_software/svn SVNPATH=file:///afs/psi.ch/project/sls_det_software/svn
MAINDIRSVN=$SVNPATH/$MAINDIR MAINDIRSVN=$SVNPATH/$MAINDIR
LIBDIRSVN=$SVNPATH/$LIBDIR LIBDIRSVN=$SVNPATH/$LIBDIR
RXRDIRSVN=$SVNPATH/$RXRDIR
GUIDIRSVN=$SVNPATH/$GUIDIR GUIDIRSVN=$SVNPATH/$GUIDIR
CALWIZSVN=$SVNPATH/$GUIDIR CALWIZSVN=$SVNPATH/$GUIDIR
@ -17,6 +19,7 @@ CALWIZSVN=$SVNPATH/$GUIDIR
#svn export --force $MAINDIRSVN #svn export --force $MAINDIRSVN
#cd $MAINDIR #cd $MAINDIR
#svn export --force $LIBDIRSVN #svn export --force $LIBDIRSVN
#svn export --force $RXRDIRSVN
#svn export --force $GUIDIRSVN #svn export --force $GUIDIRSVN
#svn export --force $CALWIZSVN #svn export --force $CALWIZSVN
@ -38,8 +41,8 @@ svn info $LIBDIRSVN/eigerDetectorServer > $LIBDIR/eigerDetectorServer/svnInfo.tx
./genVersionHeader.sh $LIBDIR/eigerDetectorServer/svnInfo.txt $LIBDIR/eigerDetectorServer/svnInfoEigerTmp.h $LIBDIR/eigerDetectorServer/svnInfoEiger.h ./genVersionHeader.sh $LIBDIR/eigerDetectorServer/svnInfo.txt $LIBDIR/eigerDetectorServer/svnInfoEigerTmp.h $LIBDIR/eigerDetectorServer/svnInfoEiger.h
svn info $LIBDIRSVN/slsReceiver > $LIBDIR/slsReceiver/svnInfo.txt svn info $RXRDIRSVN/includes > $RXRDIR/includes/svnInfo.txt
./genVersionHeader.sh $LIBDIR/slsReceiver/svnInfo.txt $LIBDIR/slsReceiver/svnInfoReceiverTmp.h $LIBDIR/slsReceiver/svnInfoReceiver.h ./genVersionHeader.sh $RXRDIR/includes/svnInfo.txt $RXRDIR/includes/svnInfoReceiverTmp.h $RXRDIR/includes/svnInfoReceiver.h
svn info $GUIDIRSVN > $GUIDIR/svnInfo.txt svn info $GUIDIRSVN > $GUIDIR/svnInfo.txt
./genVersionHeader.sh $GUIDIR/svnInfo.txt $GUIDIR/include/svnInfoGuiTmp.h $GUIDIR/include/svnInfoGui.h ./genVersionHeader.sh $GUIDIR/svnInfo.txt $GUIDIR/include/svnInfoGuiTmp.h $GUIDIR/include/svnInfoGui.h