diff --git a/Makefile b/Makefile index 88e152ba2..e087cd3ae 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,8 @@ lib: stextclient: slsDetectorClient_static +slsDetectorClient: textclient + slsDetectorClient_static: lib cd $(CLIENTDIR) && $(MAKE) static_clients FLAGS=$(FLAGS) LIBS=$(LDFLAG) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR) INCLUDES=$(INCLUDES) @@ -48,6 +50,7 @@ textclient: lib slsReceiver: receiver +slsReceiver_static: receiver receiver: lib cd $(RECEIVERDIR) && $(MAKE) receiver FLAGS=$(FLAGS) DESTDIR=$(BINDIR) LIBDIR=$(LIBDIR) LIBS=$(LDFLAG) INCLUDES=$(INCLUDES) @@ -91,10 +94,16 @@ clean: -install_lib: - cd $(LIBRARYDIR) && $(MAKE) install DESTDIR=$(LIBDIR) INCLUDES=$(INCLUDES) - cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR) +#install_lib: +# cd $(LIBRARYDIR) && $(MAKE) install DESTDIR=$(LIBDIR) INCLUDES=$(INCLUDES) +# cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR) +mythen_virtual: + cd $(LIBRARYDIR) && $(MAKE) mythenVirtualServer DESTDIR=$(BINDIR) + + +gotthard_virtual: + cd $(LIBRARYDIR) && $(MAKE) gotthardVirtualServer DESTDIR=$(BINDIR) install_client: textclient slsReceiver @@ -129,17 +138,15 @@ conf: @echo "INCDIR is $(INCDIR)" @echo "DOCDIR is $(DOCDIR)" -tar: - make clean - cd .. && tar czf newMythenSoftware.tgz newMythenSoftware help: @echo "Targets:" @echo "make all compile library, text clients, data reciever" @echo "make lib compile library" - @echo "make client compile the slsDetectorClient dynamically linking the libraries" - @echo "make sclient compile slsDetectorClient statically linking the libraries" + @echo "make textclient compile the slsDetectorClient dynamically linking the libraries" + @echo "make stextclient compile slsDetectorClient statically linking the libraries" @echo "make receiver compile the slsReciever dynamically linking the libraries" + @echo "make sreceiver compile the slsReciever statically linking the libraries" @echo "make gui compile slsDetectorGUI - requires a working Qt4 and Qwt installation" @echo "make calWiz compile the calibration wizards - requires a working Root installation" @echo "make doc compile pdf documentation" @@ -149,7 +156,6 @@ help: @echo "make confinstall installs all software, including the gui, the cal wizards and the includes for the API, prompting for the install paths" @echo "make clean remove object files and executables" @echo "make help lists possible targets" - @echo "make tar makes a compressed tar of the software package" @echo "" @echo "" @echo "Variables - to change them run :" diff --git a/manual/manual-main/singlePhotonCounting-FAQ.tex b/manual/manual-main/singlePhotonCounting-FAQ.tex index d0c4bdb1c..6686effa8 100644 --- a/manual/manual-main/singlePhotonCounting-FAQ.tex +++ b/manual/manual-main/singlePhotonCounting-FAQ.tex @@ -89,6 +89,8 @@ If the range where both requirements are satisfied is large, try to increase the \section{How does the flat field correction work?} + + \subsection{Why isn't my flat-field flat?} The main reasons of a non flat flat-field can be: @@ -190,9 +192,10 @@ Click on \textit{Trim} to start the noise trimming process. After the trimming h \end{center} \caption{The trimmed threshold scan.}\label{fig:thresholdscantrimmed} \end{figure} -\textbf{ -%\subsubsubsection{ -Improve the trimming using X-rays}\label{sec:improvetrimming}\\ + + + +\textbf{Improve the trimming using X-rays}\label{sec:improvetrimming}\\ The improvement of the trimming acquired with noise is not essential: at 12~keV an untrimmed module has a threshold dispersion which is about 1.4~keV and is already reduced to 200~eV at 12~keV by the noise trimming. At lower energies the noise trimming will be more effective, while the threshold dispesion will be still larger at higher energies. The trimming improvement reduces the threshold dispersion to 140~eV at 12~keV and is expected to be almost constant at all energies. For this reason it is suggested to perform the trimming improvement only when a small threshold dispersion is really important (e.g. to avoid flat field corrections or in presence of fluorescent lines close to the threshold value) and it will probably be not worthy at lower energies (i.e. threshold lower than 6~keV and X-ray energy lower than 12~keV). The procedure for the trimming improvement is as follows: diff --git a/manual/manual-main/slsDetectorInstall.tex b/manual/manual-main/slsDetectorInstall.tex index a6c6cde0a..f61a7c843 100644 --- a/manual/manual-main/slsDetectorInstall.tex +++ b/manual/manual-main/slsDetectorInstall.tex @@ -33,6 +33,7 @@ The complete software package is composed of several programs which can be insta \item The \textbf{data receiver (slsReceiver)}, which can be run on a different machine, receives the data from the detector and interfaces to the control software via TCP/IP for defining e.g. the file name, output path and return status and progress of the acquisition \item The \textbf{graphical user interface (slsDetectorGUI)} which provides a user friendly way of operating the detectors with online data preview \item The \textbf{calibration wizards (energyCalibrationWizard, angularCalibrationWizard)} to analyze the data and produce the energy or angular calibration files +\item The \textbf{GOTTHARD and MYTHEN virtual servers} to simulate the detectors behavior (however only control commands work, not the data acquisition itself) \end{itemize} Please refere to the SLS Detectors FAQ for additional documentation. @@ -137,12 +138,18 @@ http://root.cern.ch/drupal/content/production-version-534 If you simply want to install the software in the working directory you can: \begin{itemize} -\item[make] compile the library and command line interface +\item[make] compile the library, the command line interface and the receiver \item[make lib] compile only the library \item[make slsDetectorClient] compile the command line interface (and the library, since it is required) +\item[make slsDetectorClient\_static] compile the command line interface statically linking the library (and the library, since it is required) + +\item[make slsReceiver] compile the data reciever (and the library, since it is required) + +\item[make slsReceiver\_static] compile the data reciever statically linking the library (and the library, since it is required) + \item[make slsDetectorGUI] compile slsDetectorGUI - requires a working Qt4 and Qwt installation \item[make calWiz] compile the calibration wizards - requires a working root installation @@ -159,9 +166,11 @@ If you simply want to install the software in the working directory you can: \item[make clean] remove object files and executables -\item[make tar] makes a compressed tar of the software package - \item[make help] lists possible targets + +\item[make mythen\_virtual] compile a virtual MYTHEN detector server (works for control commands, not for data taking) + +\item[make gotthard\_virtual] compile a virtual GOTTHARD detector server (works for control commands, not for data taking) \end{itemize} The path where the files binaries, libraries, documentation and includes will be installed can either be defined interactively by sourcing the \verb=configure= script (not executing!) or during compilation using \verb=make confinstall= or defined on the command line deifning one (or all) the following variables (normally \verb=INSTALLROOT= is enough: diff --git a/manual/manual-main/slsDetectors-FAQ.tex b/manual/manual-main/slsDetectors-FAQ.tex index 20b7ac058..8bb86955e 100644 --- a/manual/manual-main/slsDetectors-FAQ.tex +++ b/manual/manual-main/slsDetectors-FAQ.tex @@ -112,17 +112,23 @@ \chapter{SLS Detectors Software} \input{slsDetector-softFAQ} +\begin{comment} \chapter{General questions about detectors} \input{generalDet-FAQ} - +\end{comment} \chapter{Single photon counting detectors} \input{singlePhotonCounting-FAQ} + + +\begin{comment} \chapter{Charge Integrating detectors} \input{chargeInt-FAQ} \chapter{Angular conversion} \input{angConv-FAQ} +\end{comment} + \end{document}