make file adjusted

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@14 08cae9ef-cb74-4d14-b03a-d7ea46f178d7

Makefile

@@ -16,71 +16,45 @@ LIBDOCDIR=$(WD)/slsDetectorSoftware
 
 
 all: lib  slsDetectorClient
-# mythenGUI 
+	
 
 lib:
 	cd $(LIBRARYDIR) && $(MAKE) lib FLAGS=$(FLAGS)
 
-Tlib:
-	cd $(TLIBRARYDIR) && $(MAKE) lib
-
-#mythenClient: lib
-#	cd $(CLIENTDIR) && $(MAKE) mythen
-#	mv $(CLIENTDIR)/bin/* bin/
-
-#gotthardClient: lib
-#	cd $(CLIENTDIR) && $(MAKE) gotthard
-#	mv $(CLIENTDIR)/bin/* bin/
-
 slsDetectorClient: lib
 	cd  $(CLIENTDIR) && $(MAKE)  FLAGS=$(FLAGS)
 	mv $(CLIENTDIR)/bin/* bin/
 
-mythenGUI: lib Tlib 
-	cd $(GUIDIR) && qmake mythenGUI.pro
-	cd $(GUIDIR) && $(MAKE)
-	mv $(GUIDIR)/bin/* bin/
 
 clean:
 	rm -rf bin/sls_detector_*
 	cd $(LIBRARYDIR) && $(MAKE) clean
-#	cd $(TLIBRARYDIR) && $(MAKE) clean
 	cd $(CLIENTDIR) && $(MAKE) clean
-#	cd $(GUIDIR) && $(MAKE) clean
-#	cd $(LIBDOCDIR) && $(MAKE) clean
 
 install_lib:
 	cd $(LIBRARYDIR) && $(MAKE) install_lib DESTDIR=$(INSTALLROOT)/$(LIBDIR)
 	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INSTALLROOT)/$(INCDIR)
 
-install_tlib:
-	cd $(TLIBRARYDIR) && $(MAKE) install_lib DESTDIR=$(INSTALLROOT)/$(LIBDIR)
-	cd $(TLIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INSTALLROOT)/$(INCDIR)
 
 install_client:
 	cd $(CLIENTDIR) && $(MAKE) install DESTDIR=$(INSTALLROOT)/$(BINDIR)
 
-install_gui:  
-	cd $(GUIDIR) && $(MAKE) install_target DESTDIR=$(INSTALLROOT)/$(BINDIR)
 
 install_libdoc: lib_doc
-	cd $(LIBDOCDIR)  && $(MAKE) install_doc DESTDIR=$(INSTALLROOT)/$(DOCDIR)/slsdetector
+	cd $(LIBDOCDIR)  && $(MAKE) install_doc DESTDIR=$(INSTALLROOT)/$(DOCDIR)/slsDetector
 
 install_clientdoc:
-	cd $(CLIENTDIR) && $(MAKE) install_doc DESTDIR=$(INSTALLROOT)/$(DOCDIR)/mythenClient
+	cd $(CLIENTDIR) && $(MAKE) install_doc DESTDIR=$(INSTALLROOT)/$(DOCDIR)/slsDetectorClient
-
-install_guidoc: 
-	cd $(GUIDIR) && doxygen doxy.config
-	cd $(GUIDIR) && qmake
-	cd $(GUIDIR) && $(MAKE) install_documentation INSTALL_ROOT=$(INSTALLROOT) DOCPATH=$(DOCDIR)/mythenGui
 
 lib_doc:
 	cd $(LIBDOCDIR)  && $(MAKE) doc
 
-install_doc: install_libdoc install_clientdoc install_guidoc
+install_doc: install_libdoc install_clientdoc 
+	cp -r manual $(INSTALLROOT)/$(DOCDIR)/
 
 
-install: configure install_lib install_client install_gui install_doc
+install: conf install_lib install_client install_doc
+	
 
 
 conf:
@@ -99,26 +73,18 @@ help:
 	@echo "Targets:"
 	@echo "make all           	compile library, mythenClient and mythenGUI"
 	@echo "make lib           	compile library"
-	@echo "make tlib           	compile Root/Qt library"
+	@echo "make slsDetectorClient  	compile slsDetectorClient"
-	@echo "make mythenClient  	compile mythenClient"
+	@echo "make install_client     install slsDetectorClient"
-	@echo "make gotthardClient  	compile gotthardClient"
-	@echo "make mythenGUI	   	compile mythenGUI"
-	@echo "make install_client     install mythenClient"
-	@echo "make install_gui        install mythenGUI"
 	@echo "make install_lib        install detector library and include files"
-	@echo "make install_tlib        install detector Root/Qt library and include files"
 	@echo "make install            install library, include files, mythenClient and mythenGUI"
 	@echo "make install_libdoc     install library documentaion"
 	@echo "make install_clientdoc  install mythenClient documentation"
-	@echo "make install_guidoc     install mythenGUI documentation"
 	@echo "make install_doc        install all documentation"
 	@echo "make clean              remove object files and executables"
 	@echo "make help               lists possible targets"
 	@echo ""
 	@echo "Variables:"
 	@echo "INSTALLROOT=</yourdir>:    installation root dir, default /usr/local"
-	@echo "QTDIR=</yourqtdir>:	   your qt3 installation, default /usr/lib/qt-3.3"
-	@echo "ROOTSYS=</yourroot>:	   your root installation, default /usr/local/root"
 	@echo "BINDIR=<yourbin>:          binary installation dir below INSTALLROOT, default bin"
 	@echo "LIBDIR=<yourlib>:          library installation dir below INSTALLROOT, default lib"
 	@echo "INCDIR=<yourincludes>:     header installation dir below INSTALLROOT, default include/slsdetector"

configure

@@ -1,29 +1,5 @@
 ##!/bin/bash
 
-: ${QTDIR="/usr/lib/qt-3.3"}
-read -p "Qt3.3 installation directory [default:\"$QTDIR\"]:" -e t1
-if [ -z "$t1" ]
-then
-echo
-else
-	
-	QTDIR=$t1
-fi
-echo "QTDIR will be  \"$QTDIR\""
-export QTDIR
-
-: ${ROOTSYS="/usr/local/root"}
-read -p "Root installation directory [default:\"$ROOTSYS\"]:" -e t1
-if [ -z "$t2" ]
-then
-echo
-else
-
-	ROOTSYS=$t2
-fi
-echo "ROOTSYS will be  \"$ROOTSYS\""	
-export ROOTSYS
-
 : ${INSTALLROOT="/usr/local/"}
 read -p "Installation directory [default:\"$INSTALLROOT\"]:" -e t3
 if [ -z "$t3" ]
@@ -57,7 +33,7 @@ fi
 echo "LIBDIR will be  \"$LIBDIR\""	
 export LIBDIR
 
-:  ${INCDIR="include/slsdetector"}
+:  ${INCDIR="include/slsDetector"}
 read -p "Includes directory [default:\"$INCDIR\"]:" -e t6
 if [ -z "$t6" ]
 then

manual/manual.tex

@@ -30,7 +30,7 @@ The complete software package is composed of several programs which can be insta
 
 \section{Requirements}
 
-For installing the slsDetector shared and static libraries and the mythenClient software, any Linux installation with a working gcc should be fine.\\
+For installing the slsDetector shared and static libraries and the slsDetectorClient software, any Linux installation with a working gcc should be fine.\\
 
 
 \begin{comment}
@@ -69,15 +69,15 @@ If you simply want to install the software in the working directory you can:
 \begin{itemize}
 \item \verb=make lib=     	compile slsDetector library
 %\item \verb=make tlib=          	compile Root/Qt TSlsDetector library
-\item \verb=make mythenClient=  	compile mythenClient package
+\item \verb=make slsDetectorClient=  	compile slsDetectorClient package
 %\item \verb=make mythenGUI=	compile mythenGUI
 %\item \verb=make all=	compile slsDetector and TSlsDetector libraries, the mythenClient package and the mythenGUI
-\item \verb=make all=	compile slsDetector libraries, the mythenClient package 
+\item \verb=make all=	compile slsDetector libraries, the slsDetectorClient package 
 \item \verb=make clean=              remove object files and executables
 \item \verb=make help=               lists possible targets
 \end{itemize}
 
-To be able to run the mythenClient and the mythenGUI as commands, add their location to your path.
+To be able to run the slsDetectorClient commands, add their location to your path.
 
 
 \section{Building}
@@ -496,7 +496,7 @@ Where to find some important parameters (should be set only once, then it should
 \chapter{Energy calibration} \label{sec:encal}
 The energy calibration should be performed by illuminating the detector with monochromatic radiation at at least 2 (better 3-4) energies larger than 8~keV. The energy calibration should be performed after trimming and the trim files used should be properly copied in the trimbits directory and used as default.
 
-The data can be acquired either with the mythenGUI (by using the calibration wizard or the threshold scan utility in the Action tab) or with the mythenClient (by scanning the threshold using mythen\_put 0:vthreshold), but since the analysis needs the use of root, the GUI must be used to finalize the calibration.
+The data can be acquired either with the mythenGUI (by using the calibration wizard or the threshold scan utility in the Action tab) or with the slsDetectorClient (by scanning the threshold using mythen\_put 0:vthreshold), but since the analysis needs the use of root, the GUI must be used to finalize the calibration.
 
 In the mythenGUI menu Utilities/Calibration wizard it is possible to simply and automatically perform the energy calibration of the detector:
 \begin{enumerate}