Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5

slsDetectorSoftware/.gitignore

@@ -0,0 +1,3 @@
+*.o
+*~
+#*#

slsDetectorSoftware/Makefile

@@ -0,0 +1,96 @@
+include ../Makefile.include
+
+DESTDIR		?=	../bin
+LIBDIR	 	?= 	$(DESTDIR)
+DOCDIR 		?= 	docs
+
+
+CFLAGS= -g -DC_ONLY -fPIC
+#FLAGS+=  #-DVERBOSE -DVERYVERBOSE
+
+DFLAGS= -g -DDACS_INT 
+
+INCLUDES?= -IcommonFiles -IslsDetector -I../slsReceiverSoftware/MySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -I../slsReceiverSoftware/include -IthreadFiles -I$(ASM)
+
+#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
+
+
+SRC_CLNT=slsDetectorAnalysis/fileIO.cpp  usersFunctions/usersFunctions.cpp slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/angularConversion.cpp slsDetectorAnalysis/angularConversionStatic.cpp slsDetectorAnalysis/energyConversion.cpp slsDetector/slsDetectorActions.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsDetectorAnalysis/postProcessingFuncs.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp  threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp   #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp 
+
+
+$(info )
+$(info #######################################)
+$(info #    Compiling slsDetectorSoftware    #)
+$(info #######################################)
+$(info )
+
+
+
+
+OBJS = $(SRC_CLNT:.cpp=.o) 
+
+.PHONY: all intdoc doc htmldoc package clean
+
+all: package $(SRC_CLNT)
+
+intdoc: $(SRC_H) $(SRC_CLNT) 
+	doxygen doxy.config
+
+doc: $(DOCDIR)/pdf/slsDetectorUsersDocs.pdf
+
+$(DOCDIR)/pdf/slsDetectorUsersDocs.pdf: slsDetectorUsersDocs
+	cd slsDetectorUsersDocs/latex && make 
+	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
+	$(shell test -d $(DOCDIR)/pdf || mkdir -p $(DOCDIR)/pdf)
+	cp slsDetectorUsersDocs/latex/refman.pdf $(DOCDIR)/pdf/slsDetectorUsersDocs.pdf
+
+
+htmldoc: $(DOCDIR)/html/slsDetectorUsersDocs
+
+$(DOCDIR)/html/slsDetectorUsersDocs: slsDetectorUsersDocs
+	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
+	$(shell test -d $(DOCDIR)/html || mkdir -p $(DOCDIR)/html)
+	$(shell test -d $(DOCDIR)/html/slsDetectorUsersDocs && rm -r $(DOCDIR)/html/slsDetectorUsersDocs)
+	cp -r slsDetectorUsersDocs/html $(DOCDIR)/html/slsDetectorUsersDocs
+
+slsDetectorUsersDocs: slsDetectorUsers.doxy slsDetector/slsDetectorUsers.h slsDetector/slsDetectorUsers.cpp slsDetectorAnalysis/detectorData.h
+	doxygen slsDetectorUsers.doxy
+
+
+mythenVirtualServer:  $(SRC_MYTHEN_SVC) 
+	cd mythenDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR) 
+
+gotthardVirtualServer:  $(SRC_MYTHEN_SVC) 
+	cd gotthardDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR) 
+
+
+
+%.o : %.cpp %.h Makefile
+	$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC  $(EPICSFLAGS) -lpthread #$(FLAGS)
+
+
+package:  $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a 
+
+
+$(DESTDIR)/libSlsDetector.so: $(OBJS) 
+	$(CXX)  -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so  $(OBJS)  -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS)  -L/usr/lib64 -lpthread
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	mv libSlsDetector.so $(DESTDIR)
+
+$(DESTDIR)/libSlsDetector.a: $(OBJS) 
+	ar  rcs libSlsDetector.a  $(OBJS) 
+	mv libSlsDetector.a $(DESTDIR)
+
+clean:
+	rm -rf  $(DESTDIR)/libSlsDetector.a   $(DESTDIR)/libSlsDetector.so core  docs/* slsDetectorUsersDocs $(OBJS)
+	cd 
+
+#-------------------------------------------------------------------------------
+
+install: package
+
+install_inc:
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	cp -P slsDetector/slsDetectorUsers.h slsDetectorAnalysis/detectorData.h  $(DESTDIR)
+
+

slsDetectorSoftware/Makefile.Standalone

@@ -0,0 +1,68 @@
+CFLAGS= -DC_ONLY 
+#FLAGS= -DVERBOSE -DVERYVERBOSE
+INCLUDES= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis 
+
+#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86  -lca -lCom 
+CC=gcc
+CXX=g++
+
+SRC_CLNT= slsDetectorAnalysis/FileIO_Standalone.cpp MySocketTCP/MySocketTCP.cpp usersFunctions/usersFunctions.cpp slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/AngularConversion_Standalone.cpp slsDetectorAnalysis/energyConversion.cpp slsDetector/slsDetectorActions.cpp slsDetectorAnalysis/postProcessingFileIO_Standalone.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp  
+
+OBJS = $(SRC_CLNT:.cpp=.o) 
+
+HEADERS = $(SRC_CLNT:.cpp=.h) commonFiles/sls_detector_defs.h slsDetectorAnalysis/detectorData.h slsDetector/slsDetectorBase.h slsDetector/slsDetectorUsers.h multiSlsDetector/multiSlsDetectorCommand.h  
+
+
+
+SRC_MYTHEN_SVC = mythenDetectorServer/server.c mythenDetectorServer/server_funcs.c mythenDetectorServer/communication_funcs.c mythenDetectorServer/firmware_funcs.c mythenDetectorServer/mcb_funcs.c mythenDetectorServer/trimming_funcs.c 
+
+all: package $(SRC_CLNT)
+	echo "compiling all"
+
+doc: $(SRC_H) $(SRC_CLNT) 
+	doxygen doxy.config
+
+
+
+mythenServer:  $(SRC_MYTHEN_SVC) 
+	$(CC)  $(SRC_MYTHEN_SVC)  $(CFLAGS) $(FLAGS) $(INCLUDES) -ImythenDetectorServer -DVIRTUAL -lm -D MCB_FUNCS -DC_ONLY -DVERBOSE
+	mv a.out mythenServer
+
+
+picassoServer:  $(SRC_MYTHEN_SVC) 
+	$(CC)  $(SRC_MYTHEN_SVC)  $(CFLAGS) $(FLAGS) $(INCLUDES) -ImythenDetectorServer -D VIRTUAL -lm -DMCB_FUNCS -DPICASSOD -DC_ONLY
+	mv a.out  picassoServer
+
+
+
+
+
+%.o : %.cpp %.h
+	$(CXX) -Wall -o $@ -c $< $(INCLUDES) $(FLAGS)  $(EPICSFLAGS)
+
+
+package: $(OBJS)
+	$(CXX) -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so  $(OBJS)  -lc $(INCLUDES) $(FLAGS) $(EPICSFLAGS)
+	ar  rcs libSlsDetector.a  $(OBJS)
+
+clean:
+	rm -rf libSlsDetector.a  libSlsDetector.so core  docs/* $(OBJS)
+
+
+#-------------------------------------------------------------------------------
+lib:    package
+
+
+# added install target, HBl
+install_lib: lib
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	cp -P libSlsDetector.so $(DESTDIR)
+
+install_inc:
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	cp -P $(HEADERS) $(DESTDIR)
+
+
+install_doc: doc
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	cp -Pr docs/* $(DESTDIR)  

slsDetectorSoftware/Makefile.x04sa

@@ -0,0 +1,87 @@
+CFLAGS= -DC_ONLY -fPIC
+#FLAGS+=  #-DVERBOSE -DVERYVERBOSE
+
+DFLAGS= -DDACS_INT -DTHIS_PATH='"$(shell pwd)"' -DSLS_RECEIVER_FUNCTION_LIST
+
+#ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
+
+INCLUDES?= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis -IslsReceiverInterface -IslsReceiver -I$(ASM)
+
+EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86  -lca -lCom 
+CC=g++
+
+
+SRC_CLNT= slsDetectorAnalysis/fileIO.cpp MySocketTCP/MySocketTCP.cpp usersFunctions/usersFunctions.cpp slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/angularConversion.cpp slsDetectorAnalysis/angularConversionStatic.cpp slsDetectorAnalysis/energyConversion.cpp slsDetector/slsDetectorActions.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsDetector/slsDetectorUsers.cpp slsDetectorAnalysis/postProcessingFuncs.cpp slsReceiverInterface/receiverInterface.cpp slsReceiver/slsReceiverFunctionList.cpp  slsReceiver/slsReceiver_funcs.cpp  slsReceiver/slsReceiverUsers.cpp
+
+OBJS = $(SRC_CLNT:.cpp=.o) 
+
+HEADERS = $(SRC_CLNT:.cpp=.h) commonFiles/sls_detector_defs.h slsDetectorAnalysis/detectorData.h slsDetector/slsDetectorBase.h multiSlsDetector/multiSlsDetectorCommand.h   slsDetectorAnalysis/enCalLogClass.h  slsDetectorAnalysis/angCalLogClass.h slsDetectorAnalysis/angleConversionConstant.h  usersFunctions/angleFunction.h slsReceiverInterface/receiverInterface.h slsDetector/svnInfoLib.h slsReceiver/circularFifo.h        slsReceiver/slsReceiver_funcs.h        slsReceiver/svnInfoReceiverTmp.h slsReceiver/receiver_defs.h       slsReceiver/slsReceiverFunctionList.h  slsReceiver/slsReceiverUsers.h slsReceiver/svnInfoReceiver.h
+
+
+
+DESTDIR ?= bin
+DOCDIR ?= docs
+
+
+all: package $(SRC_CLNT)
+	echo "compiling all"
+
+intdoc: $(SRC_H) $(SRC_CLNT) 
+	doxygen doxy.config
+
+doc: $(DOCDIR)/pdf/slsDetectorUsersDocs.pdf
+
+$(DOCDIR)/pdf/slsDetectorUsersDocs.pdf: slsDetectorUsersDocs
+	cd slsDetectorUsersDocs/latex && make 
+	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
+	$(shell test -d $(DOCDIR)/pdf || mkdir -p $(DOCDIR)/pdf)
+	cp slsDetectorUsersDocs/latex/refman.pdf $(DOCDIR)/pdf/slsDetectorUsersDocs.pdf
+
+
+htmldoc: $(DOCDIR)/html/slsDetectorUsersDocs
+
+$(DOCDIR)/html/slsDetectorUsersDocs: slsDetectorUsersDocs
+	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
+	$(shell test -d $(DOCDIR)/html || mkdir -p $(DOCDIR)/html)
+	$(shell test -d $(DOCDIR)/html/slsDetectorUsersDocs && rm -r $(DOCDIR)/html/slsDetectorUsersDocs)
+	cp -r slsDetectorUsersDocs/html $(DOCDIR)/html/slsDetectorUsersDocs
+
+slsDetectorUsersDocs: slsDetectorUsers.doxy slsDetector/slsDetectorUsers.h slsDetector/slsDetectorUsers.cpp slsDetectorAnalysis/detectorData.h
+	doxygen slsDetectorUsers.doxy
+
+
+mythenVirtualServer:  $(SRC_MYTHEN_SVC) 
+	cd mythenDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR) 
+
+gotthardVirtualServer:  $(SRC_MYTHEN_SVC) 
+	cd gotthardDetectorServer && make -f Makefile.virtual DESTDIR=$(DESTDIR) 
+
+
+
+%.o : %.cpp %.h Makefile
+	$(CXX) -Wall -o $@ -c $< $(INCLUDES) $(DFLAGS) $(FLAGS)  -fPIC  $(EPICSFLAGS) -L/usr/lib64/
+
+package: $(OBJS) $(DESTDIR)/libSlsDetector.so $(DESTDIR)/libSlsDetector.a 
+
+$(DESTDIR)/libSlsDetector.so: $(OBJS) 
+	$(CXX)  -shared -Wl,-soname,libSlsDetector.so -o libSlsDetector.so  $(OBJS)  -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS)  -L/usr/lib64/
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	mv libSlsDetector.so $(DESTDIR)
+
+$(DESTDIR)/libSlsDetector.a: $(OBJS) 
+	ar  rcs libSlsDetector.a  $(OBJS) 
+	mv libSlsDetector.a $(DESTDIR)
+
+clean:
+	rm -rf libSlsDetector.a  libSlsDetector.so core  docs/* slsDetectorUsersDocs $(OBJS)
+
+
+#-------------------------------------------------------------------------------
+
+install: package
+
+install_inc:
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	cp -P slsDetector/slsDetectorUsers.h slsDetectorAnalysis/detectorData.h  $(DESTDIR) slsReceiver/slsReceiverUsers.h 
+
+

slsDetectorSoftware/README

@@ -0,0 +1,21 @@
+This subversion repository contains 
+
+Common directories
+Please inform Anna, Beat and Ian if you make modifications to these directories
+- MySocketTCP : socket class
+- commonFiles : header file common to server and client
+- slsDetector : base class with all main detector functionalities (client side)
+
+
+Mythen specific directories
+Please inform Anna if you make modifications to these directories
+- mythenDetector : mythen specific funcs (mainly files I/O and angular conversion)
+- mythenDetectorServer : mythen server (for etrax compiler)
+- firmware lib might be added in the future
+
+Eiger specific directories
+Please inform Beat and Ian if you make modifications to these directories
+- eigerDetector : eiger specific funcs (mainly files I/O and ..)
+- eigerDetectorServer : eiger server
+
+make doc