Merge branch 'main-rc' into b3.0.0

.gitignore

@@ -1,8 +1,10 @@
 .cproject
 .project
+bin/
 .settings
 *.aux
 *.log
 *.out
 *.toc
-
+build
+docs/

CMakeLists.txt

@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set (REST OFF)
+set (CALIBRATE OFF)
+option (USE_HDF5 "HDF5 File format" OFF)
+
+
+find_package(Qt4)
+find_package(Qwt 6)
+find_package(CBF)
+find_package(Doxygen)
+if (USE_HDF5)
+	find_package(HDF5 1.10 COMPONENTS CXX)
+endif (USE_HDF5)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+add_subdirectory(slsDetectorSoftware)
+add_subdirectory(slsReceiverSoftware)
+if (QT4_FOUND AND QWT_FOUND)
+    add_subdirectory(slsDetectorGui)
+endif()
+
+
+if (CALIBRATE)
+    if (DEFINED ENV{ROOTSYS})
+        find_package(ROOT)
+        if (ROOT_FOUND)
+            add_subdirectory(calibrationWizards)
+        endif()
+    endif()
+endif(CALIBRATE)

Makefile

@@ -0,0 +1,233 @@
+# do not change below this line#
+
+# Include common definitions
+include Makefile.include
+
+INSTALLROOT	?=	$(PWD)
+BINDIR	?=	$(INSTALLROOT)/bin
+DOCDIR	?=	$(INSTALLROOT)/manual/docs
+LIBDIR	?=	$(INSTALLROOT)/bin
+INCDIR	?=	$(INSTALLROOT)/include
+DETAILDOC	?=	$(INSTALLROOT)/docs
+ 
+WD				=	$(shell pwd)
+LIBRARYDIR		=	$(WD)/slsDetectorSoftware
+LIBRARYRXRDIR 		= 	$(WD)/slsReceiverSoftware
+CLIENTDIR		=	$(LIBRARYDIR)/slsDetectorClient
+GUIDIR			=	$(WD)/slsDetectorGui
+RECEIVERDIR		=	$(LIBRARYRXRDIR)
+CALWIZDIR		=	$(WD)/calibrationWizards
+MANDIR			=	$(WD)/manual
+CALIBDIR		=	$(WD)/slsDetectorCalibration
+
+TABSPACE		:=	"\t"
+
+ 
+INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface  -I$(LIBRARYRXRDIR)/include -I$(LIBRARYDIR)/threadFiles -I$(ASM)
+
+INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM) 
+#LIBFLAGRXR += 
+
+$(info )
+$(info #######################################)
+$(info #   In slsDetectorsPackage Makefile   #)
+$(info #######################################)
+$(info )
+
+
+.PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver
+
+#all: lib textclient  receiver gui 
+all: textclient  receiver gui 
+
+nonstatic: lib libreceiver textclient receiver  gui 
+
+static: lib  libreceiver stextclient sreceiver gui 
+
+
+lib:
+	cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
+
+libreceiver:
+	cd $(LIBRARYRXRDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
+
+
+stextclient: slsDetectorClient_static
+
+slsDetectorClient: textclient
+
+slsDetectorClient_static: #lib
+	cd  $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
+	@echo ""
+	@echo "#######################################"
+	@echo "# Back in slsDetectorPackage Makefile #"
+	@echo "#######################################"
+	@echo ""
+		
+textclient: #lib
+	cd  $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)'  LIBRARYDIR='$(LIBRARYDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)'
+	@echo ""
+	@echo "#######################################"
+	@echo "# Back in slsDetectorPackage Makefile #"
+	@echo "#######################################"
+	@echo ""
+	
+slsReceiver: receiver
+
+slsReceiver_static: receiver
+
+receiver: #libreceiver
+#	cd  $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)'  LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
+	cd  $(RECEIVERDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)'  LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
+	@echo ""
+	@echo "#######################################"
+	@echo "# Back in slsDetectorPackage Makefile #"
+	@echo "#######################################"
+	@echo ""
+		
+sreceiver: #libreceiver
+	cd  $(RECEIVERDIR) && $(MAKE)  static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)'  LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)' LIBDIR='$(LIBDIR)'
+	@echo ""
+	@echo "#######################################"
+	@echo "# Back in slsDetectorPackage Makefile #"
+	@echo "#######################################"
+	@echo ""
+
+slsDetectorGUI: #lib
+	cd  $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBRARYDIR='$(LIBRARYDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='$(LDFLAGDETONLY)' LIBDIR='$(LIBDIR)'
+	@echo ""
+	@echo "#######################################"
+	@echo "# Back in slsDetectorPackage Makefile #"
+	@echo "#######################################"
+	@echo ""
+	
+calWiz: 
+	cd  $(CALWIZDIR) && $(MAKE)  DESTDIR=$(BINDIR) #FLAGS=$(FLAGS)  LDFLAGDET=$(LDFLAGDET) INCLUDES=$(INCLUDES)
+
+
+
+gui: slsDetectorGUI
+
+
+doc:
+	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
+	cd manual && make all DESTDIR=$(DOCDIR)
+
+htmldoc:
+	make doc
+	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
+	cd manual && make html DESTDIR=$(DOCDIR)
+	
+detaildoc: createdocs docspdf docshtml removedocs
+
+createdocs: $(LIBRARYDIR)/doxy.config
+	doxygen $(LIBRARYDIR)/doxy.config	
+
+docspdf: 
+	cd slsDetectorPackageDocs/latex && make 
+	$(shell test -d $(DETAILDOC) || mkdir -p $(DETAILDOC))
+	$(shell test -d $(DETAILDOC)/pdf || mkdir -p $(DETAILDOC)/pdf)
+	mv slsDetectorPackageDocs/latex/refman.pdf $(DETAILDOC)/pdf/slsDetectorPackageDocs.pdf
+
+docshtml: 
+	$(shell test -d $(DETAILDOC) || mkdir -p $(DETAILDOC))
+	$(shell test -d $(DETAILDOC)/html || mkdir -p $(DETAILDOC)/html)
+	$(shell test -d $(DETAILDOC)/html/slsDetectorPackageDocs && rm -r $(DETAILDOC)/html/slsDetectorPackageDocs)
+	mv slsDetectorPackageDocs/html $(DETAILDOC)/html/slsDetectorPackageDocs
+	
+removedocs:
+	rm -rf 	slsDetectorPackageDocs;
+
+
+clean:
+	cd $(BINDIR) && rm -rf sls_detector_* slsDetectorGui slsReceiver angularCalibrationWizard energyCalibrationWizard 
+	cd $(LIBDIR) && rm -rf libSlsDetector.so libSlsDetector.a libSlsReceiver.so libSlsReceiver.a 
+	cd $(LIBRARYDIR) && $(MAKE) clean 
+	cd $(LIBRARYRXRDIR) && $(MAKE) clean 
+	cd $(CLIENTDIR) && $(MAKE) clean
+	cd $(GUIDIR) && $(MAKE) clean
+	cd $(CALWIZDIR) && $(MAKE) clean
+	cd manual && $(MAKE) clean
+	cd $(DOCDIR) && rm -rf * 
+	rm -rf 	slsDetectorPackageDocs;
+	rm -rf $(DETAILDOC)
+
+
+#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
+
+install_gui: gui
+
+confinstall:
+	make conf;\
+	make install
+
+install_lib: 
+	make lib;\
+	make libreceiver; \
+	make textclient; \
+	make slsReceiver; \
+	make doc; \
+	make htmldoc; \
+	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); \
+	cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
+
+install: 
+	make install_lib; \
+	make gui; \
+	make calWiz; \
+	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);\
+	cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
+
+conf:
+	set -e; \
+	. ./configure; \
+	@echo "INSTALLROOT is $(INSTALLROOT)"
+	@echo "BINDIR is $(BINDIR)"
+	@echo "LIBDIR is $(LIBDIR)"
+	@echo "INCDIR is $(INCDIR)"
+	@echo "DOCDIR is $(DOCDIR)"
+
+
+help:
+	@echo "Targets:"
+	@echo "make all 		compile library,  text clients, data reciever"
+	@echo "make lib 		compile library"
+	@echo "make libreceiver 		compile receiver library"
+	@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"
+	@echo "make htmldoc		compile html (and pdf) documentation"
+	@echo "make install_lib         installs the libraries, the text clients, the documentation and the includes for the API"
+	@echo "make install             installs all software, including the gui, the cal wizards and the includes for the API"
+	@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 ""
+	@echo ""
+	@echo "Makefile variables"
+	@echo "REST=yes		 compile REST-aware Receiver (POCO and JsonBox libraries required)"
+	@echo "DEBUG=1,2		 set debug level to 1 (VERBOSE) or 2 (VERYVERBOSE)"
+	@echo ""
+	@echo ""
+	@echo "Variables -  to change them run <source configure> :"
+	@echo "INSTALLROOT=<yourdir>:    installation root di	r, default $PWD"
+	@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"
+	@echo "DOCDIR=<yourdoc>:         documentation installation dir below INSTALLROOT, default doc"

Makefile.include

@@ -0,0 +1,78 @@
+##############################################################
+# Generic 
+##############################################################
+
+CC = g++
+CXX = $(CC)
+ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
+LDFLAGDETONLY = -L$(LIBDIR)  -Wl,-rpath=$(LIBDIR) -lSlsDetector 
+LDFLAGDET = -L$(LIBDIR)  -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
+LDFLAGRXR = -L$(LIBDIR)  -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
+FLAGS= -Wall  -pthread  #-DEIGER_DEBUG2
+# -DVERBOSE 
+
+# Setting up the verbose flags
+ifeq ($(DEBUG),1)
+     FLAGS = -Wall -DVERBOSE
+endif
+ifeq ($(DEBUG),2)
+     FLAGS = -Wall -DVERYVERBOSE
+endif
+
+##############################################################
+# HDF5 specific. Set this to yes, if you want to compile
+# HDF5 code: in this case, you need HDF5 libraries
+##############################################################   
+
+HDF5 = no
+HDF5_DIR = /opt/hdf5v1.10.0
+
+ifeq ($(HDF5),yes)
+	LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L$(HDF5_DIR)/lib  -Wl,-rpath=$(HDF5_DIR)/lib -lhdf5 -lhdf5_cpp -lsz -lz -DHDF5C -L/usr/lib64/ -pthread
+	INCLUDESRXR = -I$(HDF5_DIR)/include
+endif	
+
+
+##############################################################
+# EigerSLS specific. Set this to yes, if you want to compile
+# EigerSLS code: in this case, you need also POCO and JsonBox 
+# libraries
+##############################################################   
+
+REST = no
+
+
+POCODIR = /afs/psi.ch/user/s/sala/public/poco
+JSONBOXDIR = /opt/JsonBox-0.5
+
+RESTFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib  -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)  -lPocoNet -lPocoFoundation -lJsonBox
+
+ifeq ($(REST),yes)
+     LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver $(RESTFLAGS) -DREST
+     INCLUDESRXR = $(EIGERFLAGS) -I$(POCODIR)/include -I$(JSONBOXDIR)/include
+endif
+
+
+##############################################################
+# ROOTSLS specific. Set this to yes, if you want to compile
+# ROOTSLS code: in this case, you need also root libraries
+##############################################################   
+
+ROOTSLS = no
+
+ROOTFLAGS = $(shell root-config --cflags --glibs) -DMYROOT1   #-DALLFILE_DEBUG #-DMYROOT1 
+
+ifeq ($(ROOTSLS),yes)
+     LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(ROOTFLAGS) -DROOTSLS
+endif
+
+
+define colorecho
+      @tput setaf 6
+      @echo $1
+      @tput sgr0
+endef
+
+
+
+

README.md

@@ -0,0 +1,48 @@
+# slsDetector package
+
+
+## Installation
+
+### Get source
+The source code is organised into several submodules, and the top level module is
+sls_detectors_package.
+
+```
+    $ git clone git@git.psi.ch:sls_detectors_software/sls_detectors_package.git
+    $ cd sls_detectors_package
+    $ ./checkout.sh
+```
+
+### Setup dependencies
+The GUI client requires Qt 4.8 and Qwt 6.0
+```
+    export QTDIR=/usr/local/Trolltech/
+    export QWTDIR=/usr/local/qwt-6.0.1/
+```
+If either of them does not exist, the GUI client will not be built.
+
+The calibration wizards require ROOT
+```
+    export ROOTSYS=/usr/local/root-5.34
+```
+
+### Compile
+Use cmake to create out-of-source builds, by creating an build folder parallel to source directory.
+```
+    $ cd ..
+    $ mkdir sls_detectors_package-build
+    $ cd sls_detectors_package-build
+    $ cmake ../sls_detectors_package
+    $ make
+```
+
+Use the following as an example to compile statically and using specific hdf5 folder
+```
+    $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake -DHDF5_USE_STATIC_LIBRARIES=TRUE ../slsDetectorsPackage
+ ```  
+The libraries and executables will be found at `bin` directory
+```
+    $ ls bin/
+    gui_client  libSlsDetector.a  libSlsDetector.so  libSlsReceiver.a  libSlsReceiver.so
+    sls_detector_acquire  sls_detector_get  slsDetectorGui  sls_detector_help  sls_detector_put  slsReceiver
+```

checkout.sh

@@ -0,0 +1,17 @@
+#git clone $1@git.psi.ch:sls_det_software/sls_detectors_package.git slsDetectorsPackage
+
+#cd slsDetectorsPackage
+
+git clone $1@git.psi.ch:sls_detectors_software/sls_detector_software.git slsDetectorSoftware
+
+git clone $1@git.psi.ch:sls_detectors_software/sls_detector_gui.git slsDetectorGui
+
+git clone $1@git.psi.ch:sls_detectors_software/sls_receiver_software.git slsReceiverSoftware
+
+git clone $1@git.psi.ch:sls_detectors_software/sls_detector_calibration.git slsDetectorCalibration
+
+#git clone $1@git.psi.ch:sls_detectors_software/sls_image_reconstruction.git slsImageReconstruction
+
+git clone $1@git.psi.ch:sls_detectors_software/calibration_wizards.git calibrationWizards
+
+#git clone git@git.psi.ch:sls_detectors_software/tests.git tests

cleansharedmemory.sh

@@ -0,0 +1 @@
+for i in seq `ipcs -m | cut -d ' ' -f1`; do ipcrm -M $i; done;

cmake/FindCBF.cmake

@@ -0,0 +1,11 @@
+FIND_PATH (CBF_INCLUDE_DIR
+    ${CBF_DIR}/include
+    ${CBF_DIR}/include/cbflib
+)
+FIND_LIBRARY (CBF_LIBRARY
+    NAMES cbf
+    HINTS ${CBF_DIR}/lib
+)
+INCLUDE ( FindPackageHandleStandardArgs )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (CBF DEFAULT_MSG CBF_LIBRARY CBF_INCLUDE_DIR )
+

cmake/FindQwt.cmake

@@ -0,0 +1,118 @@
+# Qt Widgets for Technical Applications
+# available at http://www.http://qwt.sourceforge.net/
+#
+# The module defines the following variables:
+#  QWT_FOUND - the system has Qwt
+#  QWT_INCLUDE_DIR - where to find qwt_plot.h
+#  QWT_INCLUDE_DIRS - qwt includes
+#  QWT_LIBRARY - where to find the Qwt library
+#  QWT_LIBRARIES - aditional libraries
+#  QWT_MAJOR_VERSION - major version
+#  QWT_MINOR_VERSION - minor version
+#  QWT_PATCH_VERSION - patch version
+#  QWT_VERSION_STRING - version (ex. 5.2.1)
+#  QWT_ROOT_DIR - root dir (ex. /usr/local)
+
+#=============================================================================
+# Copyright 2010-2013, Julien Schueller
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met: 
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution. 
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies, 
+# either expressed or implied, of the FreeBSD Project.
+#=============================================================================
+
+
+find_path ( QWT_INCLUDE_DIR
+  NAMES qwt_plot.h
+  HINTS $ENV{QWTDIR} $ENV{QWTDIR}/src ${QT_INCLUDE_DIR}
+  PATH_SUFFIXES qwt qwt-qt3 qwt-qt4 qwt-qt5
+)
+
+set ( QWT_INCLUDE_DIRS ${QWT_INCLUDE_DIR} )
+
+# version
+set ( _VERSION_FILE ${QWT_INCLUDE_DIR}/qwt_global.h )
+if ( EXISTS ${_VERSION_FILE} )
+  file ( STRINGS ${_VERSION_FILE} _VERSION_LINE REGEX "define[ ]+QWT_VERSION_STR" )
+  if ( _VERSION_LINE )
+    string ( REGEX REPLACE ".*define[ ]+QWT_VERSION_STR[ ]+\"(.*)\".*" "\\1" QWT_VERSION_STRING "${_VERSION_LINE}" )
+    string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" QWT_MAJOR_VERSION "${QWT_VERSION_STRING}" )
+    string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" QWT_MINOR_VERSION "${QWT_VERSION_STRING}" )
+    string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3" QWT_PATCH_VERSION "${QWT_VERSION_STRING}" )
+  endif ()
+endif ()
+
+
+# check version
+set ( _QWT_VERSION_MATCH TRUE )
+if ( Qwt_FIND_VERSION AND QWT_VERSION_STRING )
+  if ( Qwt_FIND_VERSION_EXACT )
+    if ( NOT Qwt_FIND_VERSION VERSION_EQUAL QWT_VERSION_STRING )
+      set ( _QWT_VERSION_MATCH FALSE )
+    endif ()
+  else ()
+    if ( QWT_VERSION_STRING VERSION_LESS Qwt_FIND_VERSION )
+      set ( _QWT_VERSION_MATCH FALSE )
+    endif ()
+  endif ()
+endif ()
+
+
+find_library ( QWT_LIBRARY
+  NAMES qwt qwt-qt3 qwt-qt4 qwt-qt5
+  HINTS $ENV{QWTDIR}/lib ${QT_LIBRARY_DIR}
+)
+
+set ( QWT_LIBRARIES ${QWT_LIBRARY} )
+
+
+# try to guess root dir from include dir
+if ( QWT_INCLUDE_DIR )
+  string ( REGEX REPLACE "(.*)/include.*" "\\1" QWT_ROOT_DIR ${QWT_INCLUDE_DIR} )
+# try to guess root dir from library dir
+elseif ( QWT_LIBRARY )
+  string ( REGEX REPLACE "(.*)/lib[/|32|64].*" "\\1" QWT_ROOT_DIR ${QWT_LIBRARY} )
+endif ()
+
+
+# handle the QUIETLY and REQUIRED arguments
+include ( FindPackageHandleStandardArgs )
+if ( CMAKE_VERSION LESS 2.8.3 )
+  find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARY QWT_INCLUDE_DIR _QWT_VERSION_MATCH )
+else ()
+  find_package_handle_standard_args( Qwt REQUIRED_VARS QWT_LIBRARY QWT_INCLUDE_DIR _QWT_VERSION_MATCH VERSION_VAR QWT_VERSION_STRING )
+endif ()
+
+
+mark_as_advanced (
+  QWT_LIBRARY 
+  QWT_LIBRARIES
+  QWT_INCLUDE_DIR
+  QWT_INCLUDE_DIRS
+  QWT_MAJOR_VERSION
+  QWT_MINOR_VERSION
+  QWT_PATCH_VERSION
+  QWT_VERSION_STRING
+  QWT_ROOT_DIR
+)

cmake/FindROOT.cmake

@@ -0,0 +1,167 @@
+# - Finds ROOT instalation
+# This module sets up ROOT information 
+# It defines:
+# ROOT_FOUND          If the ROOT is found
+# ROOT_INCLUDE_DIR    PATH to the include directory
+# ROOT_LIBRARIES      Most common libraries
+# ROOT_GUI_LIBRARIES  Most common libraries + GUI
+# ROOT_LIBRARY_DIR    PATH to the library directory 
+
+
+find_program(ROOT_CONFIG_EXECUTABLE root-config
+  PATHS $ENV{ROOTSYS}/bin)
+
+if(NOT ROOT_CONFIG_EXECUTABLE)
+  set(ROOT_FOUND FALSE)
+else()    
+  set(ROOT_FOUND TRUE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --prefix 
+    OUTPUT_VARIABLE ROOTSYS 
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --version 
+    OUTPUT_VARIABLE ROOT_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --incdir
+    OUTPUT_VARIABLE ROOT_INCLUDE_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --libs
+    OUTPUT_VARIABLE ROOT_LIBRARIES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND ${ROOT_CONFIG_EXECUTABLE} --glibs
+    OUTPUT_VARIABLE ROOT_GUI_LIBRARIES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  #set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lThread -lMinuit -lHtml -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lProof)
+  #set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lProofPlayer -lMLP -lSpectrum -lEve -lRGL -lGed -lXMLParser -lPhysics)
+  set(ROOT_LIBRARY_DIR ${ROOTSYS}/lib)
+
+  # Make variables changeble to the advanced user
+  mark_as_advanced(ROOT_CONFIG_EXECUTABLE)
+
+  if(NOT ROOT_FIND_QUIETLY)
+    message(STATUS "Found ROOT ${ROOT_VERSION} in ${ROOTSYS}")
+  endif()
+endif()
+
+
+include(CMakeParseArguments)
+find_program(ROOTCINT_EXECUTABLE rootcint PATHS $ENV{ROOTSYS}/bin)
+find_program(GENREFLEX_EXECUTABLE genreflex PATHS $ENV{ROOTSYS}/bin)
+find_package(GCCXML)
+
+#----------------------------------------------------------------------------
+# function ROOT_GENERATE_DICTIONARY( dictionary   
+#                                    header1 header2 ... 
+#                                    LINKDEF linkdef1 ... 
+#                                    OPTIONS opt1...)
+function(ROOT_GENERATE_DICTIONARY dictionary)
+  CMAKE_PARSE_ARGUMENTS(ARG "" "" "LINKDEF;OPTIONS" "" ${ARGN})
+  #---Get the list of header files-------------------------
+  set(headerfiles)
+  foreach(fp ${ARG_UNPARSED_ARGUMENTS})
+    file(GLOB files ${fp})
+    if(files)
+      foreach(f ${files})
+        if(NOT f MATCHES LinkDef)
+          set(headerfiles ${headerfiles} ${f})
+        endif()
+      endforeach()
+    else()
+      set(headerfiles ${headerfiles} ${fp})
+    endif()
+  endforeach()
+  #---Get the list of include directories------------------
+  get_directory_property(incdirs INCLUDE_DIRECTORIES)
+  set(includedirs) 
+  foreach( d ${incdirs})    
+   set(includedirs ${includedirs} -I${d})
+  endforeach()
+  #---Get LinkDef.h file------------------------------------
+  set(linkdefs)
+  foreach( f ${ARG_LINKDEF})
+    if( IS_ABSOLUTE ${f})
+      set(linkdefs ${linkdefs} ${f})
+    else() 
+      if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/inc/${f})
+        set(linkdefs ${linkdefs} ${CMAKE_CURRENT_SOURCE_DIR}/inc/${f})
+      else()
+        set(linkdefs ${linkdefs} ${CMAKE_CURRENT_SOURCE_DIR}/${f})
+      endif()
+    endif()
+  endforeach()
+  #---call rootcint------------------------------------------
+  add_custom_command(OUTPUT ${dictionary}.cxx ${dictionary}.h
+                     COMMAND ${ROOTCINT_EXECUTABLE} -cint -f  ${dictionary}.cxx 
+                                          -c ${ARG_OPTIONS} ${includedirs} ${headerfiles} ${linkdefs} 
+                     DEPENDS ${headerfiles} ${linkdefs})
+endfunction()
+
+#----------------------------------------------------------------------------
+# function REFLEX_GENERATE_DICTIONARY(dictionary   
+#                                     header1 header2 ... 
+#                                     SELECTION selectionfile ... 
+#                                     OPTIONS opt1...)
+function(REFLEX_GENERATE_DICTIONARY dictionary)  
+  CMAKE_PARSE_ARGUMENTS(ARG "" "" "SELECTION;OPTIONS" "" ${ARGN})
+  #---Get the list of header files-------------------------
+  set(headerfiles)
+  foreach(fp ${ARG_UNPARSED_ARGUMENTS})
+    file(GLOB files ${fp})
+    if(files)
+      foreach(f ${files})
+        set(headerfiles ${headerfiles} ${f})
+      endforeach()
+    else()
+      set(headerfiles ${headerfiles} ${fp})
+    endif()
+  endforeach()
+  #---Get Selection file------------------------------------
+  if(IS_ABSOLUTE ${ARG_SELECTION})
+    set(selectionfile ${ARG_SELECTION})
+  else() 
+    set(selectionfile ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SELECTION})
+  endif()
+  #---Get the list of include directories------------------
+  get_directory_property(incdirs INCLUDE_DIRECTORIES)
+  set(includedirs) 
+  foreach( d ${incdirs})    
+    set(includedirs ${includedirs} -I${d})
+  endforeach()
+  #---Get preprocessor definitions--------------------------
+  get_directory_property(defs COMPILE_DEFINITIONS)
+  foreach( d ${defs})    
+   set(definitions ${definitions} -D${d})
+  endforeach()
+  #---Nanes and others---------------------------------------
+  set(gensrcdict ${dictionary}.cpp)
+  if(MSVC)
+    set(gccxmlopts "--gccxmlopt=\"--gccxml-compiler cl\"")
+  else()
+    #set(gccxmlopts "--gccxmlopt=\'--gccxml-cxxflags -m64 \'")
+    set(gccxmlopts)
+  endif()  
+  #set(rootmapname ${dictionary}Dict.rootmap)
+  #set(rootmapopts --rootmap=${rootmapname} --rootmap-lib=${libprefix}${dictionary}Dict)
+  #---Check GCCXML and get path-----------------------------
+  if(GCCXML)
+    get_filename_component(gccxmlpath ${GCCXML} PATH)
+  else()
+    message(WARNING "GCCXML not found. Install and setup your environment to find 'gccxml' executable")
+  endif()
+  #---Actual command----------------------------------------
+  add_custom_command(OUTPUT ${gensrcdict} ${rootmapname}     
+                     COMMAND ${GENREFLEX_EXECUTABLE} ${headerfiles} -o ${gensrcdict} ${gccxmlopts} ${rootmapopts} --select=${selectionfile}
+                             --gccxmlpath=${gccxmlpath} ${ARG_OPTIONS} ${includedirs} ${definitions}
+                     DEPENDS ${headerfiles} ${selectionfile})
+endfunction()
+  

cmk.sh

@@ -0,0 +1,143 @@
+#!/bin/bash
+BUILDDIR="build"
+HDF5DIR="/opt/hdf5v1.10.0"
+HDF5=0
+COMPILERTHREADS=0
+
+CLEAN=0
+REBUILD=0
+CMAKE_PRE=""
+CMAKE_POST=""
+
+usage() { echo -e "
+Usage: $0 [-c] [-b] [-h] [-d <HDF5 directory>] [-j]
+ -[no option]: only make
+ -c: Clean
+ -b: Builds/Rebuilds CMake files normal mode
+ -h: Builds/Rebuilds Cmake files with HDF5 package
+ -d: HDF5 Custom Directory
+ -j: Number of threads to compile through
+ 
+For only make:
+./cmk.sh
+
+For make clean;make:
+./cmk.sh -c
+
+For using hdf5 without default dir /opt/hdf5v1.10.0:
+./cmk.sh -h
+
+For using hdf5 without custom dir /blabla:
+./cmk.sh -h -d /blabla
+
+For rebuilding cmake without hdf5 (Use this if you had previously run with hdf5 and now you dont want it)
+./cmk.sh -b
+
+For using multiple cores to compile faster:
+(all these options work)
+./cmk.sh -j9
+./cmk.sh -cj9 #with clean
+./cmk.sh -hj9 #with hdf5
+./cmk.sh -j9 -h #with hdf
+ 
+ " ; exit 1; }
+
+while getopts ":bchd:j:" opt ; do
+	case $opt in
+	b) 
+		echo "Building of CMake files Required"
+		REBUILD=1
+		;;
+	c) 
+		echo "Clean Required"
+		CLEAN=1
+		;;
+	h) 
+		echo "Building of CMake files with HDF5 option Required"
+		HDF5=1
+		REBUILD=1
+		;;
+	d) 
+		echo "New HDF5 directory: $OPTARG" 
+		HDF5DIR=$OPTARG
+		;;
+	j) 
+		echo "Number of compiler threads: $OPTARG" 
+		COMPILERTHREADS=$OPTARG
+		;;
+    \?)
+     	echo "Invalid option: -$OPTARG" 
+		usage
+      	exit 1
+      	;;
+    :)
+      	echo "Option -$OPTARG requires an argument."
+		usage
+      	exit 1
+      	;;	
+	esac
+done
+
+
+
+
+
+
+#build dir doesnt exist
+if [ ! -d "$BUILDDIR" ] ; then
+	echo "No Build Directory. Building of Cmake files required"
+	mkdir $BUILDDIR;
+	REBUILD=1
+else
+	#rebuild not requested, but no makefile
+	if [ $REBUILD -eq 0 ] && [ ! -f "$BUILDDIR/Makefile" ] ; then
+		echo "No Makefile. Building of Cmake files required"
+		REBUILD=1
+	fi
+fi
+
+
+#hdf5 rebuild
+if [ $HDF5 -eq 1 ]; then
+	CMAKE_PRE+="HDF5_ROOT="$HDF5DIR
+	CMAKE_POST+="-DUSE_HDF5=ON"
+#normal mode rebuild
+else
+	CMAKE_POST+="-DUSE_HDF5=OFF"
+fi
+
+
+#enter build dir
+cd $BUILDDIR;
+echo "in "$PWD
+
+
+
+#cmake
+if [ $REBUILD -eq 1 ]; then
+	rm -f CMakeCache.txt
+	BUILDCOMMAND="$CMAKE_PRE cmake $CMAKE_POST .."
+	echo $BUILDCOMMAND
+	eval $BUILDCOMMAND
+fi
+
+#make clean
+if [ $CLEAN -eq 1 ]; then
+	make clean;
+fi
+
+
+#make
+if [ $COMPILERTHREADS -gt 0 ]; then
+	BUILDCOMMAND="make -j$COMPILERTHREADS"
+	echo $BUILDCOMMAND
+	eval $BUILDCOMMAND
+else
+	make
+fi
+
+
+
+
+
+

commitVersions.sh

@@ -0,0 +1,15 @@
+sh updateSvnVersion.sh
+
+cd slsDetectorGui
+git commit -a -m "updating versions"
+git push origin developer:developer
+
+cd ../slsDetectorSoftware
+git commit -a -m "updating versions"
+git push origin developer:developer
+
+cd ../slsReceiverSoftware
+git commit -a -m "updating versions"
+git push origin developer:developer
+
+cd ..

configure

@@ -0,0 +1,58 @@
+##!/bin/bash
+
+: ${INSTALLROOT=$PWD}
+read -p "Installation directory [default:\"$INSTALLROOT\"]:" -e t3
+if [ -z "$t3" ]
+then
+echo
+else
+	INSTALLROOT=$t3
+fi
+echo "INSTALLROOT will be  \"$INSTALLROOT\""	
+export INSTALLROOT
+
+: ${BINDIR="bin"}
+read -p "Binaries directory [default:\"$BINDIR\"]:" -e t4
+if [ -z "$t4" ]
+then
+	BINDIR=$INSTALLROOT/$BINDIR
+else
+	BINDIR=$INSTALLROOT/$t4
+fi
+echo "BINDIR will be  \"$BINDIR\""	
+export BINDIR
+
+: ${LIBDIR="bin"}
+read -p "Libraries directory [default:\"$LIBDIR\"]:" -e t5
+if [ -z "$t5" ]
+then
+	LIBDIR=$INSTALLROOT/$LIBDIR
+else
+	LIBDIR=$INSTALLROOT/$t5
+fi	
+echo "LIBDIR will be  \"$LIBDIR\""	
+export LIBDIR
+
+:  ${INCDIR="include"}
+read -p "Includes directory [default:\"$INCDIR\"]:" -e t6
+if [ -z "$t6" ]
+then
+	INCDIR=$INSTALLROOT/$INCDIR
+else
+	INCDIR=$INSTALLROOT/$t6
+fi	
+echo "INCDIR will be  \"$INCDIR\""	
+export INCDIR
+
+:  ${DOCDIR="doc"}
+read -p "Documentation directory [default:\"$DOCDIR\"]:" -e t7
+if [ -z "$t7" ]
+then
+	DOCDIR=$INSTALLROOT/$DOCDIR
+else	
+	DOCDIR=$INSTALLROOT/$t7
+fi
+echo "DOCDIR will be  \"$DOCDIR\""
+export DOCDIR
+
+

docs/html/slsDetectorClientDocs/acquisition.html

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.5"/>
-<title>My Project: Acquition commands</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="search/search.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="search/search.js"></script>
-<script type="text/javascript">
-  $(document).ready(function() { searchBox.OnSelectItem(0); });
-</script>
-<link href="doxygen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">My Project
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.5 -->
-<script type="text/javascript">
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
-</script>
-  <div id="navrow1" class="tabs">
-    <ul class="tablist">
-      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
-      <li class="current"><a href="pages.html"><span>Related&#160;Pages</span></a></li>
-      <li>
-        <div id="MSearchBox" class="MSearchBoxInactive">
-        <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.png"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
-               onfocus="searchBox.OnSearchFieldFocus(true)" 
-               onblur="searchBox.OnSearchFieldFocus(false)" 
-               onkeyup="searchBox.OnSearchFieldChange(event)"/>
-          </span><span class="right">
-            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
-          </span>
-        </div>
-      </li>
-    </ul>
-  </div>
-<!-- window showing the filter options -->
-<div id="MSearchSelectWindow"
-     onmouseover="return searchBox.OnSearchSelectShow()"
-     onmouseout="return searchBox.OnSearchSelectHide()"
-     onkeydown="return searchBox.OnSearchSelectKey(event)">
-<a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Pages</a></div>
-
-<!-- iframe showing the search results (closed by default) -->
-<div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
-</div>
-
-</div><!-- top -->
-<div class="header">
-  <div class="headertitle">
-<div class="title">Acquition commands </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>Commands to control the acquisition</p>
-<ul>
-<li><b>acquire</b> blocking acquisition (like calling sls_detector_acquire). Starts receiver and detector, writes and processes the data, stops detector. Only get! <code>Returns</code> (string)<code>"acquire unsuccessful"</code> if fails, else "" for MYTHEN, <code>"Acquired (int)"</code> for others, where int is number of frames caught.</li>
-<li><b> busy i</b> sets/gets acquiring flag. <code>1</code> the acquisition is active, <code>0</code> otherwise. Acquire command will set this flag to 1 at the beginning and to 0 at the end. Use this to clear flag if acquisition terminated unexpectedly. <code>Returns</code> <code></code>(int)</li>
-<li><b> status [s] </b> starts or stops acquisition in detector in non blocking mode. When using stop acquisition and if acquisition is done, it will restream the stop packet from receiver (if data streaming in receiver is on). Eiger can also provide an internal software trigger. <code>s:</code> [<code>start</code>, <code>stop</code>, <code>trigger(EIGER only)</code>]. <code>Returns</code> the detector status: [<code>running</code>, <code>error</code>, <code>transmitting</code>, <code>finished</code>, <code>waiting</code>, <code>idle</code>]. <code>Returns</code> <code></code>(string)</li>
-<li><b>data</b> gets all data from the detector (if any) processes them and writes them to file according to the preferences already setup (MYTHEN only). Only get!</li>
-<li><b>frame</b> gets a single frame from the detector (if any) processes it and writes it to file according to the preferences already setup (MYTHEN only). Only get!</li>
-<li><b>readctr </b> Reads the counters from the detector memory (analog detector returning values translated into number of photons - only GOTTHARD). Cannot put.</li>
-<li><b>resetctr i </b> Resets counter in detector, restarts acquisition if i=1(analog detector returning values translated into number of photons - only GOTTHARD). Cannot put.</li>
-<li><b>resmat i </b> sets/resets counter bit in detector.gets the counter bit in detector ???? </li>
-</ul>
-</div></div><!-- contents -->
-<!-- start footer part -->
-<hr class="footer"/><address class="footer"><small>
-Generated by &#160;<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/>
-</a> 1.8.5
-</small></address>
-</body>
-</html>

docs/html/slsDetectorClientDocs/advanced.html

@@ -1,88 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.5"/>
-<title>My Project: Advanced Usage</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="search/search.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="search/search.js"></script>
-<script type="text/javascript">
-  $(document).ready(function() { searchBox.OnSelectItem(0); });
-</script>
-<link href="doxygen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">My Project
-   </div>
-  </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.5 -->
-<script type="text/javascript">
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
-</script>
-  <div id="navrow1" class="tabs">
-    <ul class="tablist">
-      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
-      <li class="current"><a href="pages.html"><span>Related&#160;Pages</span></a></li>
-      <li>
-        <div id="MSearchBox" class="MSearchBoxInactive">
-        <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.png"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
-               onfocus="searchBox.OnSearchFieldFocus(true)" 
-               onblur="searchBox.OnSearchFieldFocus(false)" 
-               onkeyup="searchBox.OnSearchFieldChange(event)"/>
-          </span><span class="right">
-            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
-          </span>
-        </div>
-      </li>
-    </ul>
-  </div>
-<!-- window showing the filter options -->
-<div id="MSearchSelectWindow"
-     onmouseover="return searchBox.OnSearchSelectShow()"
-     onmouseout="return searchBox.OnSearchSelectHide()"
-     onkeydown="return searchBox.OnSearchSelectKey(event)">
-<a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Pages</a></div>
-
-<!-- iframe showing the search results (closed by default) -->
-<div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
-</div>
-
-</div><!-- top -->
-<div class="header">
-  <div class="headertitle">
-<div class="title">Advanced Usage </div>  </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>This page is for advanced users. Make sure you have first read the introduction. </p>
-</div></div><!-- contents -->
-<!-- start footer part -->
-<hr class="footer"/><address class="footer"><small>
-Generated by &#160;<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/>
-</a> 1.8.5
-</small></address>
-</body>
-</html>

docs/html/slsDetectorClientDocs/dynsections.js

@@ -1,97 +0,0 @@
-function toggleVisibility(linkObj)
-{
- var base = $(linkObj).attr('id');
- var summary = $('#'+base+'-summary');
- var content = $('#'+base+'-content');
- var trigger = $('#'+base+'-trigger');
- var src=$(trigger).attr('src');
- if (content.is(':visible')===true) {
-   content.hide();
-   summary.show();
-   $(linkObj).addClass('closed').removeClass('opened');
-   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
- } else {
-   content.show();
-   summary.hide();
-   $(linkObj).removeClass('closed').addClass('opened');
-   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
- } 
- return false;
-}
-
-function updateStripes()
-{
-  $('table.directory tr').
-       removeClass('even').filter(':visible:even').addClass('even');
-}
-function toggleLevel(level)
-{
-  $('table.directory tr').each(function(){ 
-    var l = this.id.split('_').length-1;
-    var i = $('#img'+this.id.substring(3));
-    var a = $('#arr'+this.id.substring(3));
-    if (l<level+1) {
-      i.attr('src','ftv2folderopen.png');
-      a.attr('src','ftv2mnode.png');
-      $(this).show();
-    } else if (l==level+1) {
-      i.attr('src','ftv2folderclosed.png');
-      a.attr('src','ftv2pnode.png');
-      $(this).show();
-    } else {
-      $(this).hide();
-    }
-  });
-  updateStripes();
-}
-
-function toggleFolder(id)
-{
-  //The clicked row
-  var currentRow = $('#row_'+id);
-  var currentRowImages = currentRow.find("img");
-
-  //All rows after the clicked row
-  var rows = currentRow.nextAll("tr");
-
-  //Only match elements AFTER this one (can't hide elements before)
-  var childRows = rows.filter(function() {
-    var re = new RegExp('^row_'+id+'\\d+_$', "i"); //only one sub
-    return this.id.match(re);
-  });
-
-  //First row is visible we are HIDING
-  if (childRows.filter(':first').is(':visible')===true) {
-    currentRowImages.filter("[id^=arr]").attr('src', 'ftv2pnode.png');
-    currentRowImages.filter("[id^=img]").attr('src', 'ftv2folderclosed.png');
-    rows.filter("[id^=row_"+id+"]").hide();
-  } else { //We are SHOWING
-    //All sub images
-    var childImages = childRows.find("img");
-    var childImg = childImages.filter("[id^=img]");
-    var childArr = childImages.filter("[id^=arr]");
-
-    currentRow.find("[id^=arr]").attr('src', 'ftv2mnode.png'); //open row
-    currentRow.find("[id^=img]").attr('src', 'ftv2folderopen.png'); //open row
-    childImg.attr('src','ftv2folderclosed.png'); //children closed
-    childArr.attr('src','ftv2pnode.png'); //children closed
-    childRows.show(); //show all children
-  }
-  updateStripes();
-}
-
-
-function toggleInherit(id)
-{
-  var rows = $('tr.inherit.'+id);
-  var img = $('tr.inherit_header.'+id+' img');
-  var src = $(img).attr('src');
-  if (rows.filter(':first').is(':visible')===true) {
-    rows.css('display','none');
-    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
-  } else {
-    rows.css('display','table-row'); // using show() causes jump in firefox
-    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
-  }
-}
-