Merge branch 'main-rc' into b4.0.0

* not done. The 'setsockopt(SO_RECVBUF)' system call cannot set the socket buffer
  size lager than the specified in net.core.rmem_max. The requested value
  was 2 GB (commit 3b0e2e6), which is far too large for this application,
  so it was restored to the acceptable 100 MB value.

* The syscall does not fail if the requested buffer size is larger than
  net.core.rmem_max. Use 'setsockopt(SO_RECVBUFFORCE)' to actually force a
  value larger than the system limit, which can be done if run in a
  privileged context (capability CAP_NET_ADMIN set).

* The real value is read with 'getsockopt(SO_RECVBUF)'. If it
  corresponds to twice the requested value (see 'man 7 socket'), it is
  printed in green, otherwise it is signalled in red.

* The 'setsockopt(SO_RECVBUFFORCE)' syscall removes the need to write to
  /proc/sys/net/core/rmem_max, so this was was suppressed in the
  'UDPStandardImplementation' constructor.

* The test on EIGER detectors before setting the system
  buffers was removed. Was there for 9m/2m eiger, but one can take care of
  memory requirements using a customizable max socket buffer size(only with
  permissions). to be implmented later.

* The file /proc/sys/net/core/netdev_max_backlog is first read by the
  receiver to check is the current value is OK. If it is not, the receiver
  directly writes the good value into the file (instead of delegating to
  the system shell), printing a red error message if there is an access
  error (non-privileged user).

.gitignore

@@ -8,3 +8,4 @@ bin/
 *.toc
 build
 docs/
+RELEASE.txt

.travis.yml

@@ -0,0 +1,45 @@
+sudo: false
+
+language: cpp
+
+matrix:
+  include:
+    - os: linux
+      env: CONDA_PY=3.6
+
+dist: trusty
+
+install:
+  - sudo apt-get update
+  - ldd --version
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - rm -f miniconda.sh
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda config --add channels conda-forge
+  - conda config --add channels slsdetectorgroup
+  - conda update conda
+  - conda update --all
+  - conda install conda-build anaconda-client
+
+  # Useful for debugging any issues with conda
+  - conda info -a
+
+
+  # Replace dep1 dep2 ... with your dependencies
+  - conda create -q -n test-environment python=$CONDA_PY
+  - source activate test-environment
+  - conda-build .
+
+script:
+ - echo "No test scripts to be run!"
+
+
+deploy:
+  provider: script
+  script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
+  on:
+    branch: 4.0.0
+

CMakeLists.txt

@@ -1,25 +1,50 @@
 cmake_minimum_required(VERSION 2.8)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
-set (REST OFF)
 set (CALIBRATE OFF)
-option (USE_HDF5 "HDF5 File format" OFF)
 
+option (USE_HDF5 "HDF5 File format" OFF)
+option (USE_TEXTCLIENT "Text Client" OFF)
+option (USE_RECEIVER "Receiver" OFF)
+option (USE_GUI "GUI" OFF)
+
+
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
+	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -std=c++98 -Wno-misleading-indentation")
+else ()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98")
+endif ()
 
 find_package(Qt4)
 find_package(Qwt 6)
 find_package(CBF)
 find_package(Doxygen)
+# find_package(PNG REQUIRED)
+
 if (USE_HDF5)
 	find_package(HDF5 1.10 COMPONENTS CXX)
 endif (USE_HDF5)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_subdirectory(slsDetectorSoftware)
+set(CMAKE_INSTALL_RPATH "$ORIGIN")
-add_subdirectory(slsReceiverSoftware)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-if (QT4_FOUND AND QWT_FOUND)
+
-    add_subdirectory(slsDetectorGui)
+
-endif()
+if (USE_TEXTCLIENT)
+       add_subdirectory(slsDetectorSoftware)
+endif (USE_TEXTCLIENT)
+
+if (USE_RECEIVER)
+       add_subdirectory(slsReceiverSoftware)
+       add_subdirectory(manual/manual-api)    
+endif (USE_RECEIVER)
+               
+               
+if (USE_GUI)   
+       if (QT4_FOUND AND QWT_FOUND)
+       add_subdirectory(slsDetectorGui)
+       endif()
+endif (USE_GUI)
 
 
 if (CALIBRATE)

Makefile

@@ -19,11 +19,12 @@ RECEIVERDIR		=	$(LIBRARYRXRDIR)
 CALWIZDIR		=	$(WD)/calibrationWizards
 MANDIR			=	$(WD)/manual
 CALIBDIR		=	$(WD)/slsDetectorCalibration
+MANAPIDIR		=	$(MANDIR)/manual-api
 
 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)
+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$(LIBRARYDIR)/sharedMemory -I$(ASM)
 
 INCLUDESRXR += -I. -I$(LIBRARYRXRDIR)/include -I$(CALIBDIR) -I$(ASM) 
 #LIBFLAGRXR += 
@@ -79,6 +80,7 @@ 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)'
+	cd  $(MANAPIDIR) && $(MAKE) slsMultiReceiver
 	@echo ""
 	@echo "#######################################"
 	@echo "# Back in slsDetectorPackage Makefile #"
@@ -151,6 +153,7 @@ clean:
 	cd $(DOCDIR) && rm -rf * 
 	rm -rf 	slsDetectorPackageDocs;
 	rm -rf $(DETAILDOC)
+	rm -rf $(MANAPIDIR)/slsMultiReceiver
 
 
 #install_lib: 
@@ -221,7 +224,6 @@ help:
 	@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 ""

Makefile.include

@@ -33,26 +33,6 @@ ifeq ($(HDF5),yes)
 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

README.md

@@ -1,48 +1,91 @@
-# slsDetector package
+### Documentation
+Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)
 
+### Binaries
+Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui)
 
-## Installation
+### Source code
-
+One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
-### Get source
+```
-The source code is organised into several submodules, and the top level module is
+git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
-sls_detectors_package.
 
 ```
-    $ git clone git@git.psi.ch:sls_detectors_software/sls_detectors_package.git
+#### Setup dependencies 
-    $ cd sls_detectors_package
+* Gui Client <br>
-    $ ./checkout.sh
+Requirements: Qt 4.8 and Qwt 6.0
-```
-
-### 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
+* Advanced user Calibration wizards<br>
+Requirements: ROOT
 ```
     export ROOTSYS=/usr/local/root-5.34
 ```
 
-### Compile
+#### Compilation 
-Use cmake to create out-of-source builds, by creating an build folder parallel to source directory.
+
+Compiling can be done in two ways.
+
+**1. Compile using script cmk.sh**<br>
+
+After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>
+
+Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
+ * -[no option]: only make<br>
+ * -c: Clean<br>
+ * -b: Builds/Rebuilds CMake files normal mode<br>
+ * -h: Builds/Rebuilds Cmake files with HDF5 package<br>
+ * -d: HDF5 Custom Directory<br>
+ * -t: Build/Rebuilds only text client<br>
+ * -r: Build/Rebuilds only receiver<br>
+ * -g: Build/Rebuilds only gui<br>
+ * -j: Number of threads to compile through<br>
+ * -e: Debug mode
+ 
+Basic Option:
+./cmk.sh -b
+ 
+For only make:
+./cmk.sh
+
+For make clean;make:
+./cmk.sh -c
+
+For using hdf5 without custom dir /blabla:
+./cmk.sh -h -d /blabla
+
+For rebuilding cmake without hdf5 
+./cmk.sh -b
+
+For using multiple cores to compile faster:
+./cmk.sh -j9<br>
+
+
+For rebuilding only certain sections<br>
+./cmk.sh -tg #only text client and gui<br>
+./cmk.sh -r #only receiver<br>
+
+
+**2. Compile without script**<br>
+Use cmake to create out-of-source builds, by creating a build folder parallel to source directory.
 ```
     $ cd ..
-    $ mkdir sls_detectors_package-build
+    $ mkdir slsDetectorPackage-build
-    $ cd sls_detectors_package-build
+    $ cd slsDetectorPackage-build
-    $ cmake ../sls_detectors_package
+    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=OFF 
     $ 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
+    $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DUSE_HDF5=ON
  ```  
-The libraries and executables will be found at `bin` directory
+After compiling, 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
+    sls_detector_acquire  sls_detector_get  slsDetectorGui  sls_detector_help  sls_detector_put  slsReceiver slsMultiReceiver
 ```

RELEASE.txt

@@ -1,229 +1,508 @@
-SLS Detector Package 3.0.0 released on 2017-08-25
+SLS Detector Package 4.0.0 released on 27.09.2018
-================================================================================
+=================================================
 
 
 
 INTRODUCTION
 
-This document describes the differences between previous versions and 3.0.0 releases.
+	This document describes the differences between 4.0.0 and 3.1.4 releases.
 
-Manual (both HTML and pdf versions) are provided in
+	Download
-	manual/docs/
+	--------
-
-Documentation from Source Code can be found for the Command Line and for the API in
-	html:
-		manual/docs/html/slsDetectorClientDocs/index.html
-		manual/docs/html/slsDetectorUsersDocs/index.html
-	pdf:
-		manual/docs/pdf/slsDetectorClientDocs.pdf
-		manual/docs/pdf/slsDetectorUsersDocs.pdf
-
-Example including binaries for detector and receiver user classes can be found in 
-
-	manual/manual-api
 	
-User documentation can also be accessed directly at this location:
+	The Source Code (Default C++ API):
+		 https://github.com/slsdetectorgroup/slsDetectorPackage
+		 
+	The Conda Lib Package:
+		https://github.com/slsdetectorgroup/sls_detector_lib
+		
+	The Conda GUI Package:
+		https://github.com/slsdetectorgroup/sls_detector_gui	
+		
+	The Python Interface (including the package):
+    	https://github.com/slsdetectorgroup/sls_detector
+	
+	
+	Documentation
+	-------------
+	
+	Manual (HTML & PDF):
+		https://www.psi.ch/detectors/documentation
+		slsDetectorPackage/manual/docs/
+		
+	Command Line Documentation:
+		manual/docs/html/slsDetectorClientDocs/index.html
+		manual/docs/pdf/slsDetectorClientDocs.pdf
+		
+	C++ API Documentation:
+		manual/docs/html/slsDetectorUsersDocs/index.html
+		manual/docs/pdf/slsDetectorUsersDocs.pdf
+		
+	C++ API Example:
+		manual/manual-api/mainClient.cpp
+		manual/manual-api/mainReceiver.cpp
+		
+	Python API Documentation:
+		https://slsdetectorgroup.github.io/sls_detector/
+		
+	Further Documentation:
+		https://www.psi.ch/detectors/users-support
+		
+	
+	Support
+	-------
 
-    https://www.psi.ch/detectors/users-support
+	General Software related:
+		dhanya.thattil@psi.ch
+		anna.bergamaschi@psi.ch
+		
+	Python related:
+		erik.frojdh@psi.ch
 
-If you have any software related questions or comments, please send them to:
-
-    dhanya.thattil@psi.ch
-    anna.bergamaschi@psi.ch
 
 
 CONTENTS
 
-- Changes in User Interface
+	1.	Firmware Requirements
-- New Features
+	2.	Changes in User Interface
-- Resolved Issues
+	3.	New/Modified Commands
-- Known Issues
+	4.	Other New Features
+	5.	Resolved Issues
+	6.	Known Issues
+	7.	Next Major Release Plans
 
 
 
-Changes in User Interface
+1. Firmware Requirements
-=========================
+========================
-This release has no changes in user interface from the previous 2.3 version.
-However, receiver data call backs have been redefined for the 
-standard image header.
 
-Reiterating, both 2.3 and 3.0 supports the following features:
+    	Gotthard
-  	
+    	========   
-	Receiver
+    	Minimum compatible version  : 11.01.2013
-	--------
+    	Latest version              : 08.02.2018 (50um and 25um Master)
-	1.	The files will be written in this format in the binary mode:
+                                      09.02.2018 (25 um Slave) 
-		* 1 ASCII file per measurement: header with measurement parameters
+    	Eiger
-		* binary files: series of images, each preceded by a 
+    	=====  
-		  	  Standard Image Header (header described below)
+    	Minimum compatible version  : 22
-	
+    	Latest version              : 22
-	2. 	Standard Image Header in file and call back
+        
-	 	arguments defined. It is in the following format defined as 
+    	Jungfrau
-	  	sls_detector_header defined in 
+    	========       
-	 	slsReceiverSoftware/include/sls_receiver_defs.h
+    	Minimum compatible version  : 15.06.2018
-	 	Mostly 0 if not applicatble or implemented, but updated in next release 
+    	Latest version              : 15.06.2018
-	  	from firmware.
+
-		
+    	
-		* Frame Number       : 8 bytes 	# Image Number
+    	Detector Upgrade
-		* Exposure Length    : 4 bytes  # Sub frame number in 32 bit mode (Eiger)
+    	================
-		  		       					  Real time exposre time in 100ns (Others) 
+    	Gotthard	Cannot be upgraded remotely. Requires programming via USB blaster
-		* Packet Number      : 4 bytes	# Number of packets caught in the image
+    	Eiger		Can be upgraded remotely via bit files
-		* Bunch ID           : 8 bytes  # Bunch Id in beamline (Jungfrau) 
+    	Jungfrau	Can be upgraded remotely using sls_detector_put programfpga <pof>
-		* Timestamp          : 8 bytes  # Not implemened. 
+    	
-										  Time stamp with 10MHz clock
+    	Instructions available at
-		* Module Id          : 2 bytes  # Not implemented. Unique module ID.
+    	https://www.psi.ch/detectors/installation-instructions
-		* X Coordinate       : 2 bytes  # Currently as Id of part of detector in 1D
+    	under Detector Upgrade -> [Detector Type] -> Firmware. 
-										  (Future Releases) as X coordinate 
+    	
-										  in complete detector system
+    	 
-		* Y Coordinate       : 2 bytes  # Not implemented 
+	Please refer to the link below for more details on the firmware versions.
-										  Y coordinate in complete detector system
+	https://www.psi.ch/detectors/firmware.
-		* Z Coordinate       : 2 bytes  # Not implemented
-										  Z coordinate in complete detector system
-		* Debug              : 4 bytes  # Not implemented
-										  For debugging purposes
-		* Round Robin Number : 2 bytes  # Not implemented
-										  Round Robin Number
-		* Detector Type      : 1 byte   # Detector type defined by enum
-				                          detectorType in slsReceiverSoftware
-						                  /include/sls_receiver_defs.h
-		* Header Version     : 1 byte   # 1.0 currently
-		
-	3.	The call back value for Start Acquisition Call back is insignificant at the 
-	 	 moment and left for future use. Instead, the following rules apply:
-		* If file write is enabled from the client, we will write the files.
-		* If callbacks are registered, they will be called.
-		For example, the user prefers to write the data himself, one must disable
-		file write (so we dont write) and register the callbacks (so the user gets 
-		the data).
-		
-	4.	Multiple Receivers have to be started as different processes, instead of threads
-		due to static variables being used. Please refer example code provided in the 
-		slsDetectorsPackage/manual/manual-api folder (mainReceiver.cpp).
 		
 
 
-New Features
+2. Changes in User Interface
-============
+============================
-	Package
-	-------
-	1.	One can compile using cmake or the ./cmk.sh script(also uses cmake)
-	  	Run ./cmk.sh -help to get more info. This method does not touch the 
-	  	source files. Please start off with ./cmk.sh -bj9, where (9 is #cores+1)
-	  
-	2.	One can compile the normal way using Makefile (editing Makefile.include
-	  	for the hdf5 options), but this will modify other gitInfo files.
 	
-	
-	General
-	-------
-	3.	UDP Packets from all the detectors will contain the standard sls detector header. 
-		Jungfrau will have an extra 6 bytes preceding the standard header in the udp packets
-		only. X, Y and Z Coordinates define the position of the detector in 3d. These values
-		are not filled in the udp header at the moment, but will be in the files and receiver
-		call backs with only x in 1d at the moment.
-	  	
-	4.	When acquire has started, one can use sls_detector_get busy to check the status
-		of the acquire. 1 is running 0 is idle. This way one can start acqusition with &,
-		poll the busy command ( or framescaught or frameindex to get status from receiver).
-	  	
-	  	
-	Receiver
-	--------
-	4.	One can choose the file format using the command "fileformat binary/hdf5" from 
-	  	the client, but one must compile with the options as defined in README.md
-	
-	5.	Virtual HDF5 file maps all the files into a single file.
-	
-	6.	Gotthard, Propix and Moench also save data in the same way as Jungfrau and Eiger,
-	  	as described above (ie. without any packet headers, only standard image headers 
-	  	for each image data)
-	
-	7.	(Eiger) The ascii part of the file (file header with acquisition parameters) moved to 
-	  	a separate file called the master file. So one master file per acquisition.
-	  
-	  
-   	Client
-	------
-	8.	(Eiger) Can now set Threshold without uploading Trimbits.
-	
-	9. 	(Eiger)	Setting high voltage returns -999 for only slave and on the multi level gives
-		the value of the master only.
-		
-	10.	StartAcquisition (or sls_detector_put status start) parallelized.
-	
-	
-	Gui
-	---
-	10.	Set the data streaming port (individually/ a single one that calculates for the other
-	  	receiver streamer threads) via the command line
-	
-		
-	Users-API
-	-----
-	11.	manual-api example forks new child processes for every extra receiver object.
-
-
-
-Resolved Issues
-===============
 	Client
 	------
-	1.	 Memory Leak fixed when setting receiver parameters such as udp port or detector 
-	  	network parameter. The signature in slsDetector.cpp and corresponding files have 
-	  	changed, but does not change the slsDetectorUser API.
-	  
-	2.	Bug Fix: Has been made more threadsafe (strtok). Removed bug of configuring MAC 
-	  	correctly even in multiple thread mode.
-	  
-	3.	Bug Fix: Client crashing when rx_hostname is IP instead of a hostname has been fixed.
 	
+	1.	Shared Memory:
 	
-	
+		POSIX shared memory has been implemented and they are typically created in
-	Server
+		/dev/shm/ folder.
-	------
-	4.	(Eiger/Jungfrau) Bug Fix: Client crashing should not crash the server as SIGPIPE 
-	  	signal is caught.
-	  
-	5.	(Eiger) Bug Fix: Front End Temperature read out conversion fixed.
-	
-	6.	(Eiger) Bug Fix: sls_detector_get trimval(get all trimbits) would return only the first pixel 
-		value. Now it returns -1 if all the pixels are different.
-	  
-	  
-	Receiver
-	--------	  
-	6.	Bug Fix: Ctrl+C kills the receiver properly calling the appropriate destructors.
-	
-	7.	Acquire & Unblocking acquire (receiver start, status start, receiver stop) can work
-	  	also when switching from gui to command line and vice versa.
-	  
-	8.	Bug Fix: sls_detector_get frameindex was always returning 0.
-	
-	9.	Bug Fix: In the rare chance that the shut down socket is still processing in 
-		the genericsocket class, but the object is being deleted. 
 		
-	10.	(Eiger): When running independent(not slsReceiver) receiver, one needn't do receiver start
+		A multiSlsDetector object will create a shared memory segment with naming style:
-		to prepare acquisition. Prepare Acquisition has been moved to StartAcqusition and
+		slsDetectorPackage_x_[_z]
-		StartAndReadAll. 
+		and an slsDetector object will create a shared memory segment with naming style:
+		slsDetectorPackage_x_sls_y[_z]
+		 	
+		where
+		x is the multi detector id
+		y is the sls detector id
+		z is the environment variable SLSDETNAME, if set.
+		They can be deleted directly.
+		
+		Environment variable SLSDETNAME included for user-friendliness
+		of using 2 different detectors from the same client pc. One needn't use
+		different multi detector id if the SLSDETNAME is different for both consoles.
+		
+		Constructor will fail if shared memory size is different (different package
+		releases/detectors). Loading config file cleans shared memory.
+
+
+	2.	Exceptions in constructors:
 	
-	11.	(Gotthard): 639 pixels in first packet and 641 pixels in second packet. The first pixel in second 
+		All constructors that have an error throws an exception. For this release,
-		packet was unaccounted for. This is fixed now.
+		this is caught within the package and interfaced as error codes or messages
+		to the users using command line or API.
+		
+		As a result:
+		- slsDetectorsUsers constructor signature now includes a success flag.
+		- If one uses multiSlsDetector, slsDetector, ZmqSocket classes directly, 
+		  catch exceptions from constructors.
+		- In future releases, the exception will be thrown 
+		  outside the package for the users to handle it.
+		  
+		  
+	3.	API Compatibility:
+	
+		Client now checks API version of Detector Server - Client and Receiver - Client
+		when connecting for the first time to detector server or receiver server
+		and the online flags have not been set in shm. 
+		
+		Upon failure, error messages will ensue and further commands will not 
+		be executed. Detector servers referred to are only for Eiger, Jungfrau and Gotthard.
+		
+		Previously, the detector server would exit on mismatched Firmware-Detector
+		server mismatch. They now wait for client to ask for compatibility check,
+		which is done the first time client connects to the detector and the
+		online flag in shm has not been set.
+		
+		
+	4.	Commands "type", "id" and "replace" are removed.
+		  
+		  
+	Receiver
+	--------
+	
+	1.	Reciever Header Structure in file writing and call back:
+	
+		sls_receiver_header structure added to sls_receiver_defs.h for image headers 
+		in file writing. 
+		
+		#define MAX_NUM_PACKETS	512
+		typedef std::bitset<MAX_NUM_PACKETS> sls_bitset;
+		typedef struct {
+			sls_detector_header detHeader;	/**< is the detector header */
+			sls_bitset packetsMask;			/**< is the packets caught bit mask */
+		} sls_receiver_header;
+		
+		It includes the detector header structure + bitmask of 512 bits, 
+		where each bit represents a packet caught. This is useful in saving time 
+		in writing to file by not padding missing packets and still retaining useful data.
+		
+		The binary and HDF5 writer version number changed from 1.0 to 2.0. 
+		The detector header version remains as 1.0.
+		
+		registerCallBackRawDataReady modified to give this structure pointer,
+		instead of individual structure member pointers.
+		
+		
+	2.	ZmqSocket class:
+	
+		If one uses ZmqSocket.h, then the json header has to be parsed outside 
+		the class to allow the user to remove the restriction in extracting all data
+		from the json header.
+
+
+	3.	Receiver Call back with modified size:
+	
+		registerCallBackRawDataModifyReady call back that is similar to the receiver 
+		registerCallBackRawDataReady has been added to allow the call back to 
+		specify an updated size of image after call back. This is in view to process
+		an image in call back (including extract only a region of the image) and 
+		provide this updated size in callback. This new resized/processed image
+		will be written to file or streamed out via zmq. This is useful in ROI
+		selection in the receiver.
+
+		This also means that the call back is now called before writing to file.
 
 
 
-Known Issues
+3. New/Modified Commands 
-============
+========================
-	Server
+	
+	Client
 	------
-	1.	(Eiger) The hardware mac of the detector is used (not relayed back to the client). 
+
-	  	For 1 GbE, the hardware IP of the detector is used (also not relayed back to the 
+	1.	add (modified): 
-	  	client). 
+		appends detector to end of multi detector list.
-	  	
+
-	2.	Standard header fills x-coord in 1D. y-coord and z-coord is not implemented (3D).
+	2.	replace: 
+		sets hostname/ip address for a single detector.
+
+	3.	user: 
+		get user details from shared memory.
+
+	4.	checkdetversion: 
+		checks client version compatibility with detector server.
+
+	5.	checkrecversion: 
+		checks client version compatibility with receiver server.
+		
+	
+	Receiver
+	--------
+	
+	1.	rx_zmqip:	
+		sets/gets the zmq (TCP) ip of the receiver from where data is streamed 
+		out from. (Eg. to the gui or intermediate process). By default, it is 
+		the same as the zmqip.
+	
+	2.	zmqip: 
+		sets/gets the zmq (TCP) ip, where client listens to, to reconstuct images. 
+		(Eg. from receiver or intermediate process). By default, it is the same 
+		as rx_zmqip.
+	  		 	
+	3.	rx_jsonaddheader:
+		sets/gets additional json header to be streamed out with the zmq from 
+		receiver. Default is empty. Eg. p rx_jsonaddheader \"what\":\"nothing\"
+		
+	4.	r_discardpolicy:
+		sets/gets the frame discard policy in the receiver. 
+		nodiscard - no discard (default), 
+		discardempty - discard only empty frames, 
+		discardpartial - discard any partial frame(fastest)
+		
+	5.	r_padding:
+		sets/gets the frame padding in the receiver. 
+		0 does not pad partial frames(fastest), 
+		1 (default) pads partial frames.
+		One can look at bitmask in the sls_receiver_header to process the unpadded
+		partial	frames later.
+		
+	6.	activate (modified):
+		Extra option added to pad or unpad images in receivers when deactivated.
+		activate i [padding option], where i is activate/deactivate	and padding 
+		option is "padding" (default) or "nopadding".
+		
+	7.	rx_udpsocksize:
+		sets/gets the UDP socket buffer size. Already attempts to set by default 
+		to 100mb, 2gb for Jungfrau. Does not remember custom values	in client 
+		shared memory, so must be initialized each time after setting receiver 
+		hostname in config file.
+		
+	8.	rx_realudpsocksize:
+		gets the actual UDP socket buffer size. Usually double the set udp socket 
+		buffer size due to kernel bookkeeping.
+	
+	9.	r_framesperfile:
+		sets/gets the frames per file in receiver. 0 means infinite or all frames 
+		in a single file. Default of Eiger changed from 2k to 10k.
+		
+
+	Eiger Specific
+	--------------
+	
+	1.	status trigger:
+		To trigger internally via software, one can use "status trigger".
+		
+	2.	subdeadtime:
+		sets/gets sub frame dead time in s in 32 bit mode. Subperiod is	set in 
+		the detector by subexptime + subdeadtime. This value is	normally a 
+		constant set by an expert catered to individual detector modules in the 
+		config file. Receiver files writes master file metadata subperiod 
+		instead of subdeadtime.
+		
+	3.	gappixels:
+		enables/disables gap pixels in system (detector & receiver). 1 sets, 
+		0 unsets. In Receiver, 4 bit gap pixels mode is not implemented, but is 
+		implemented in client data call back. Gap pixels are at module level 
+		and not at multi module level.
+				
+	4.	measuredperiod:
+		gets the measured frame period (time between last frame and the	previous 
+		one) in s. Makes sense only for acquisitions of more than 1 frame.
+		
+	5.	measuredsubperiod:
+		gets the measured subframe period (time between last subframe and the 
+		previous one) in s in 32 bit mode.
+
+	6.	flags(modified):
+		extra flags "nooverflow" (default) and "overflow" for sub images in	32 
+		bit mode. If set to overflow, it will set MSB of pixel data high if 
+		there was any saturation in any of the sub images 32 bit mode.
+		
+				
+	Jungfrau Specific
+	-----------------
+	
+	1.	storagecells:
+		sets/gets number of additional storage cells per acquisition. For very 
+		advanced users only. Range: 0-15. Default: 0. 
+		The #images = #frames * #cycles * (#storagecells +1).
+		
+	2.	storage_start:
+		sets/gets the storage cell that stores the first acquisition of the	series. 
+		For very advanced users only. Range: 0-15. Default: 15(0xf).  
+
+
+
+4. Other New Features
+=====================
+
+	Client
+	------
+	
+	1.	(Jungfrau & Gotthard) Settingsdir and caldir is removed from config file.
+		Default dacs are stored in detector server. Hence, these folders
+		are also removed from slsDetectorPackage/settingsdir. Eiger and Mythen 
+		continue to have them.
+		
+	2.	Depending on 1d position of detectors and detsizechan in config file,
+		row and column (previously xcoord and ycoord) are given to detector 
+		servers (Eiger and Jungfrau) to encode into the udp header.
+		
+	3.	(Eiger) Setting threshold energy changes such as CAL dac is irrelevant 
+		when interpolating between two energies and VRS dac is interpolated, not copied.
+		
+	4.	Users API updated with the following functions:
+		-	setReceiverFramesDiscardPolicy
+		-	setReceiverPartialFramesPadding
+		-	setReceiverFramesPerFile
+		-	sendSoftwareTrigger
+		-	setSubFrameExposureDeadTime
+		-	setSubFrameExposureTime
+		-	enableGapPixels
+		-	getMeasuredPeriod
+		-	getMeasuredSubFramePeriod
+		-	setOverflowMode
+		-	setNumberOfStorageCells
+		-	setStoragecellStart
+		-	setThresholdEnergy (overloaded)
+		-	resetFramesCaughtInReceiver
+		-	setReceiverFifoDepth
+		-	setFlowControl10G
+		-	setTenGigabitEthernet
+		-	getNMods
+		-	setReceiverDataStreamingOutIP
+		-	setClientDataStreamingInIP
+		
+	SlsReceiver
+	-----------
+	
+	1.	slsMultiReceiver executable added that creates multiple receiver child processes.
+		./slsMultiReceiver [start_tcp_port] [num_receivers] [1 for call back, 0 for none]
+		
+	2.	Default row and column (previously xcoord and ycoord) are hardcoded 
+		for missing packets. (Eiger and Jungfrau)
+		
+
+	Gui
+	---
+	
+	1.	(Jungfrau) Gain plot included. Option under 2D options in Plot tab.
+	
+	2.	Option to maintain aspect ratio
+	
+	3.	Start and Stop separated to prevent multiple click syndrome.
+	
+
+	Detector Server
+	---------------
+	
+	1. 	(Jungfrau) To use programfpga command, one must start server with -update
+		mode and then restart server without -update mode.
+	
+	2.	(Jungfrau) ASIC Timer configured at server start up and changed a few
+		startup values for firmware v0.7 such as adc phase, ADC_PORT_INVERT_VAL
+		and ADC offset half speed value.
+		
+	3.	(Jungfrau) Minimum exposure time of 50 ns was implemented.
+	
+	4. 	(Eiger and Jungfrau) They can be configured to have x and y coord values
+		of the detector in their udp header.
+
+
+
+
+5. Resolved Issues
+==================
+
+	Client
+	------
+	memory leak for multi threading
+	
+	1.	Compiler flag -std=c++98 enforced. Debug flag removed.
+	
+	2.	If trimen gives different list from different detectors, it returns a -1.
+	
+	3.	Version format for each submodule of the package changed to just date YYMMDD.
+		Users class fixed to give correct version, instead of -1.
+		
+	4.	Getting settings in users class gave -1. Fixed now.
+
+	5.	(Jungfrau) Programming FPGA now creates the rawbin file from pof in tmp
+		rather than source file location (for permission issues).
+		
+	6.	(Gotthard) ROI segmentation fault fixed.
+		
+	Receiver
+	--------
+	
+	1.	Silent feature of receiver fixed.
+	
+	2. 	Socket descriptor misused earlier for success flag, instead exceptions
+		used that are handled inside the package.
+
+	3.	Global optind variable initialized to instantiate multiple receivers 
+		in same process. Also removed static members to enable this feature.
+		
+	4.	Socket buffer size attempts to set for each acquiistion and provide
+		warning if no capabilities. Warnings can be removed using instruction with
+		error provided. Default Jungfrau UDP socket buffer size if 2 GB, default is 
+		100 MB.
+		
+	5.	Refactored code a bit for performance and robustness, blocking push 
+		in buffer between listener and dataprocessor
+
+	
+	Detector Server
+	---------------
+	
+	1.	(Jungfrau) Stop server also mapped during a reset. Reading power status
+		instead of user input register for power.
+	
+	2.	(Eiger) Bug fix for saving trimbits to file (Advanced users).
+	
+	3.	(Gotthard 25um) config.txt is not read again after detector startup,
+		no matter the number of times the detector server is restarted. 
+
+	
+6. Known Issues
+===============
+
+	Receiver
+	--------
+	
+	1. 	HDF5 compression and filters are not implemented yet.
 	
 	
-	3. HDF5 compression and filters are not implemented yet.
+	Detector Server
-
+	---------------
-
+	
+	1.	(Eiger) Registers mapped differently between firmware v20 and v22.
+		So, please ensure correct on-board server before switching between
+		firmware versions. Else one cannot ping it anymore. Will need to flash firmware
+		again to recover.
+		
+	2.	(Gotthard) To switch back to all ADC from single ADC ROI, one must take
+		even number of images for the receiver to understand complete images.
+		This will be fixed in the next firmware upgrade.
+	
+	
+	
+7. Next Major Release Plans
+===========================
+
+	Client
+	------
+	
+	1.	Exceptions thrown to the user to be handled.
+	
+	2. 	Compilation using c++11.
+	
+	3.	Support of Mythen II restricted to this major and its minor releases.
+	
+	4.	Restructuring and refactoring of client code. 
 
 
 

checkout.sh

@@ -1,17 +0,0 @@
-#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

@@ -1 +1 @@
-for i in seq `ipcs -m | cut -d ' ' -f1`; do ipcrm -M $i; done;
+rm /dev/shm/slsDetectorPackage*;

cmk.sh

@@ -3,6 +3,11 @@ BUILDDIR="build"
 HDF5DIR="/opt/hdf5v1.10.0"
 HDF5=0
 COMPILERTHREADS=0
+TEXTCLIENT=0
+RECEIVER=0
+GUI=0
+DEBUG=0
+
 
 CLEAN=0
 REBUILD=0
@@ -16,7 +21,11 @@ Usage: $0 [-c] [-b] [-h] [-d <HDF5 directory>] [-j]
  -b: Builds/Rebuilds CMake files normal mode
  -h: Builds/Rebuilds Cmake files with HDF5 package
  -d: HDF5 Custom Directory
+ -t: Build/Rebuilds only text client
+ -r: Build/Rebuilds only receiver
+ -g: Build/Rebuilds only gui
  -j: Number of threads to compile through
+ -e: Debug mode
  
 For only make:
 ./cmk.sh
@@ -39,10 +48,14 @@ For using multiple cores to compile faster:
 ./cmk.sh -cj9 #with clean
 ./cmk.sh -hj9 #with hdf5
 ./cmk.sh -j9 -h #with hdf
+
+For rebuilding only certain sections
+./cmk.sh -tg #only text client and gui
+./cmk.sh -r #only receiver
  
  " ; exit 1; }
 
-while getopts ":bchd:j:" opt ; do
+while getopts ":bchd:j:trge" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
@@ -65,6 +78,25 @@ while getopts ":bchd:j:" opt ; do
 		echo "Number of compiler threads: $OPTARG" 
 		COMPILERTHREADS=$OPTARG
 		;;
+	t) 
+    	echo "Compiling Options: Text Client" 
+		TEXTCLIENT=1
+		REBUILD=1
+		;;      
+	r) 
+		echo "Compiling Options: Receiver" 
+		RECEIVER=1
+		REBUILD=1
+		;;      
+	g) 
+		echo "Compiling Options: GUI" 
+		GUI=1
+		REBUILD=1
+		;;  
+	e)
+		echo "Compiling Options: Debug" 
+		DEBUG=1
+		;;    
     \?)
      	echo "Invalid option: -$OPTARG" 
 		usage
@@ -83,6 +115,29 @@ done
 
 
 
+if [ $TEXTCLIENT -eq 0 ] && [ $RECEIVER -eq 0 ]  && [ $GUI -eq 0 ]; then
+       CMAKE_POST+=" -DUSE_TEXTCLIENT=ON -DUSE_RECEIVER=ON -DUSE_GUI=ON "
+       echo "Compile Option: TextClient, Receiver and GUI"
+else 
+       if [ $TEXTCLIENT -eq 1 ]; then
+              CMAKE_POST+=" -DUSE_TEXTCLIENT=ON "
+               echo "Compile Option: TextClient"
+       fi
+       if [ $RECEIVER -eq 1 ]; then
+               CMAKE_POST+=" -DUSE_RECEIVER=ON "
+               echo "Compile Option: Receiver"
+       fi
+                               
+       if [ $GUI -eq 1 ]; then
+               CMAKE_POST+=" -DUSE_GUI=ON "
+               echo "Compile Option: GUI"
+       fi
+fi
+
+
+
+
+
 #build dir doesnt exist
 if [ ! -d "$BUILDDIR" ] ; then
 	echo "No Build Directory. Building of Cmake files required"
@@ -96,14 +151,20 @@ else
 	fi
 fi
 
+#Debug
+if [ $DEBUG -eq 1 ]; then
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
+	echo "Debug Option enabled"
+fi 
+
 
 #hdf5 rebuild
 if [ $HDF5 -eq 1 ]; then
 	CMAKE_PRE+="HDF5_ROOT="$HDF5DIR
-	CMAKE_POST+="-DUSE_HDF5=ON"
+	CMAKE_POST+=" -DUSE_HDF5=ON "
 #normal mode rebuild
 else
-	CMAKE_POST+="-DUSE_HDF5=OFF"
+	CMAKE_POST+=" -DUSE_HDF5=OFF "
 fi
 
 

examples/gotthard.config

@@ -3,16 +3,9 @@ hostname bchip007
 #0:port 1952
 #0:stopport 1953
 #0:rx_tcpport 1956 must also have this in receiver config file
-0:settingsdir /home/l_maliakal_d/mySoft/newMythenSoftware/settingsdir/gotthard
 0:angdir 1.000000
 0:moveflag 0.000000
-0:lock 0
-0:caldir /home/l_maliakal_d/mySoft/newMythenSoftware/settingsdir/gotthard
-0:ffdir /home/l_maliakal_d
 0:extsig:0 off
-0:extsig:1 off
-0:extsig:2 off
-0:extsig:3 off
 #0:detectorip 129.129.202.9
 0:detectormac 00:aa:bb:cc:dd:ee
 0:rx_udpport 50004
@@ -23,7 +16,6 @@ hostname bchip007
 master -1
 sync none
 outdir /bigRAID/datadir_gotthard/rec_test_data
-ffdir /home/l_maliakal_d
 headerbefore none
 headerafter none
 headerbeforepar none
@@ -32,4 +24,4 @@ badchannels none
 angconv none
 globaloff 0.000000
 binsize 0.001000
-threaded 1
+

examples/jungfrau.config

@@ -1,18 +1,15 @@
 hostname bchip038+
 
-settingsdir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
-caldir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
-lock 0
-
 0:rx_udpport 50004
 0:rx_udpip 10.1.1.100
 0:detectorip 10.1.1.10
-
 rx_hostname pcmoench01
 
 powerchip 1
-timing auto
+
+#extsig:0 trigger_in_rising_edge
+#timing trigger
 
 outdir /external_pool/jungfrau_data/softwaretest
-threaded 1
+
 

examples/jungfrau_two.config

@@ -1,11 +1,6 @@
 detsizechan 1024 1024
 hostname bchip048+bchip052+
 
-settingsdir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
-caldir /home/mySoft/slsDetectorsPackage/settingsdir/jungfrau
-lock 0
-
-
 0:rx_udpport 50004
 0:rx_udpip 10.1.1.100
 0:rx_udpmac F4:52:14:2F:32:00
@@ -22,9 +17,9 @@ lock 0
 rx_hostname pcmoench01
 
 powerchip 1
-extsig:0 trigger_in_rising_edge
+#extsig:0 trigger_in_rising_edge
-timing auto
+#timing trigger
 
 outdir /external_pool/jungfrau_data/softwaretest
-threaded 1
+
 

examples/two_gotthard.config

@@ -8,16 +8,11 @@ hostname bchip007+bchip009+
 #0:port 1952
 #0:stopport 1953
 #0:rx_tcpport 1956 
-0:settingsdir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
 0:angdir 1.000000
 0:moveflag 0.000000
-0:lock 0
-0:caldir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
 0:ffdir /home/l_msdetect
 0:extsig:0 off
-0:extsig:1 off
+
-0:extsig:2 off
-0:extsig:3 off
 0:detectorip 10.1.1.2
 #0:detectormac 00:aa:bb:cc:dd:ee
 #0:rx_udpport 50001
@@ -31,16 +26,11 @@ hostname bchip007+bchip009+
 #1:port 1952
 #1:stopport 1953
 1:rx_tcpport 1957
-1:settingsdir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
 1:angdir 1.000000
 1:moveflag 0.000000
-1:lock 0
-1:caldir /home/l_msdetect/dhanya/slsDetectorsPackage/settingsdir/gotthard
 1:ffdir /home/l_msdetect
 1:extsig:0 off
-1:extsig:1 off
+
-1:extsig:2 off
-1:extsig:3 off
 1:detectorip 10.1.2.2
 #1:detectormac 00:aa:bb:cc:dd:ee
 1:rx_udpport 50004
@@ -62,4 +52,4 @@ badchannels none
 angconv none
 globaloff 0.000000
 binsize 0.001000
-threaded 1
+

genVersionHeader.sh

@@ -21,5 +21,5 @@ echo "Updating $fout"
 #awk 'NR==FNR {if ($3=="Date:") {l[FNR]=$4; gsub("-","",l[FNR]);} else { if (match($0,"Rev")) {l[FNR]=$(NF);} else {l[FNR]="\""$(NF)"\"";};};next} {$0=$1" "$2" "l[FNR]}1' $fin $ftmp > $fout
 
 awk 'BEGIN {l[0]=0; "date +%Y%m%d" | getline l[1]; l[2]="\"/\""; l[3]="\"nobody\""; l[3]="\"nobody\""; l[4]="\"0000-0000-0000\"";} \
-NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";};next;} 
+NR==FNR {if (match($0,"Rev")) {l[0]="0x"$(NF);} else if (match($0,"Date")) {l[1]="0x"$4; gsub("-","",l[1]);} else if (match($0,"URL")) {l[2]="\""$(NF)"\"";} else if (match($0,"Author")) {l[3]="\""$(NF)"\"";} else if (match($0,"UUID")) {l[4]="\""$(NF)"\"";} else if (match($0,"Branch")) {l[5]="\""$(NF)"\"";};next;} 
-{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];}}1' $fin $ftmp > $fout
+{if (match($2,"REV")) {$0=$1" "$2" "l[0];} else if (match($2,"DATE")) {$0=$1" "$2" "l[1];} else if (match($2,"URL")) {$0=$1" "$2" "l[2];} else if (match($2,"AUTH")) {$0=$1" "$2" "l[3];} else if (match($2,"UUID")) {$0=$1" "$2" "l[4];} else if (match($2,"BRANCH")) {$0=$1" "$2" "l[5];}}1' $fin $ftmp > $fout

gitall.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-git $@
-for i in sls*/; do
-     cd $i
-     echo $i
-     git $@
-     cd ..
-done

manual/Makefile

@@ -5,7 +5,7 @@ DESTDIR?=docs
 
 
 
-MAINDIRS= manual-main 
+MAINDIRS= manual-main manual-api  manual-calwiz manual-client manual-gui
 #manual-calwiz manual-calwiz manual-gui manual-client manual-api
 CLEANDIRS=$(MAINDIRS:manual-%=clean-%)
 PDFDIRS=$(MAINDIRS:manual-%=pdf-%)

manual/docs/html/angularCalibrationHowTo/angularCalibrationHowTo.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>September 28, 2018</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/angularCalibrationHowTo/images.aux

@@ -0,0 +1 @@
+\relax 

manual/docs/html/angularCalibrationHowTo/images.log

@@ -0,0 +1,232 @@
+This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23)  28 SEP 2018 11:35
+entering extended mode
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**./images.tex
+(./images.tex
+LaTeX2e <2011/06/27>
+Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, lo
+aded.
+
+(/usr/share/texlive/texmf-dist/tex/latex/base/article.cls
+Document Class: article 2007/10/19 v1.4h Standard LaTeX document class
+(/usr/share/texlive/texmf-dist/tex/latex/base/size10.clo
+File: size10.clo 2007/10/19 v1.4h Standard LaTeX file (size option)
+)
+\c@part=\count79
+\c@section=\count80
+\c@subsection=\count81
+\c@subsubsection=\count82
+\c@paragraph=\count83
+\c@subparagraph=\count84
+\c@figure=\count85
+\c@table=\count86
+\abovecaptionskip=\skip41
+\belowcaptionskip=\skip42
+\bibindent=\dimen102
+) (/usr/share/texlive/texmf-dist/tex/latex/base/ifthen.sty
+Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
+) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty
+Package: amssymb 2013/01/14 v3.01 AMS font symbols
+(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amsfonts.sty
+Package: amsfonts 2013/01/14 v3.01 Basic AMSFonts support
+\@emptytoks=\toks14
+\symAMSa=\mathgroup4
+\symAMSb=\mathgroup5
+LaTeX Font Info:    Overwriting math alphabet `\mathfrak' in version `bold'
+(Font)                  U/euf/m/n --> U/euf/b/n on input line 106.
+)) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty
+Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
+Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
+\KV@toks@=\toks15
+) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
+Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/trig.sty
+Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
+) (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/graphics.cfg
+File: graphics.cfg 2010/04/23 v1.9 graphics configuration of TeX Live
+)
+Package graphics Info: Driver file: dvips.def on input line 91.
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvips.def
+File: dvips.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
+))
+\Gin@req@height=\dimen103
+\Gin@req@width=\dimen104
+) (/usr/share/texlive/texmf-dist/tex/latex/tools/verbatim.sty
+Package: verbatim 2003/08/22 v1.5q LaTeX2e package for verbatim enhancements
+\every@verbatim=\toks16
+\verbatim@line=\toks17
+\verbatim@in@stream=\read1
+) (/usr/share/texlive/texmf-dist/tex/latex/graphics/color.sty
+Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
+(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/color.cfg
+File: color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive
+)
+Package color Info: Driver file: dvips.def on input line 130.
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvipsnam.def
+File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
+)) (/usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty
+Package: inputenc 2008/03/30 v1.1d Input encoding file
+\inpenc@prehook=\toks18
+\inpenc@posthook=\toks19
+)
+\sizebox=\box26
+\lthtmlwrite=\write3
+(./images.aux)
+\openout1 = `images.aux'.
+
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+
+latex2htmlLength hsize=349.0pt
+
+latex2htmlLength vsize=633.0pt
+
+latex2htmlLength hoffset=0.0pt
+
+latex2htmlLength voffset=0.0pt
+
+latex2htmlLength topmargin=0.0pt
+
+latex2htmlLength topskip=0.00003pt
+
+latex2htmlLength headheight=0.0pt
+
+latex2htmlLength headsep=0.0pt
+
+latex2htmlLength parskip=0.0pt plus 1.0pt
+
+latex2htmlLength oddsidemargin=62.0pt
+
+latex2htmlLength evensidemargin=62.0pt
+
+LaTeX Font Info:    Try loading font information for U+msa on input line 141.
+(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd
+File: umsa.fd 2013/01/14 v3.01 AMS symbols A
+)
+LaTeX Font Info:    Try loading font information for U+msb on input line 141.
+(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd
+File: umsb.fd 2013/01/14 v3.01 AMS symbols B
+)
+l2hSize :tex2html_wrap_inline84:6.94444pt::0.0pt::5.47226pt.
+[1
+
+
+
+]
+l2hSize :tex2html_wrap_inline86:7.33331pt::7.33331pt::24.82152pt.
+[2
+
+
+]
+l2hSize :tex2html_wrap_inline88:6.59525pt::0.0pt::3.94516pt.
+[3
+
+
+]
+l2hSize :tex2html_wrap_inline90:7.33331pt::7.33331pt::12.57195pt.
+[4
+
+
+]
+l2hSize :displaymath18:22.88544pt::0.0pt::349.0pt.
+[5
+
+
+]
+l2hSize :tex2html_wrap_inline94:8.76085pt::8.76085pt::12.72505pt.
+[6
+
+
+]
+l2hSize :tex2html_wrap_inline96:8.76085pt::8.76085pt::31.20164pt.
+[7
+
+
+]
+l2hSize :tex2html_wrap_inline98:8.26085pt::0.0pt::11.49947pt.
+[8
+
+
+]
+l2hSize :tex2html_wrap_inline102:6.95831pt::6.95831pt::47.00348pt.
+[9
+
+
+]
+l2hSize :tex2html_wrap_inline106:6.95831pt::6.95831pt::4.98616pt.
+[10
+
+
+]
+l2hSize :tex2html_wrap_inline108:6.95831pt::6.95831pt::6.52551pt.
+[11
+
+
+]
+l2hSize :tex2html_wrap_inline110:6.95831pt::6.95831pt::8.27783pt.
+[12
+
+
+]
+l2hSize :tex2html_wrap_inline120:8.76085pt::8.76085pt::21.53073pt.
+[13
+
+
+]
+File: enable_angcal.eps Graphic file (type eps)
+<enable_angcal.eps>
+l2hSize :tex2html_wrap330:378.81322pt::0.0pt::349.0pt.
+[14
+
+
+]
+File: position_scan.eps Graphic file (type eps)
+<position_scan.eps>
+l2hSize :tex2html_wrap334:378.81322pt::0.0pt::349.0pt.
+[15
+
+
+]
+File: setupAngcal.eps Graphic file (type eps)
+<setupAngcal.eps>
+l2hSize :tex2html_wrap340:444.03647pt::0.0pt::349.0pt.
+[16
+
+
+]
+File: peakFit.eps Graphic file (type eps)
+<peakFit.eps>
+l2hSize :tex2html_wrap344:444.03647pt::0.0pt::349.0pt.
+[17
+
+
+]
+File: angleFit.eps Graphic file (type eps)
+<angleFit.eps>
+l2hSize :tex2html_wrap348:444.03647pt::0.0pt::349.0pt.
+[18
+
+
+] (./images.aux) ) 
+Here is how much of TeX's memory you used:
+ 1150 strings out of 495064
+ 14686 string characters out of 3182224
+ 55704 words of memory out of 3000000
+ 4358 multiletter control sequences out of 15000+200000
+ 5339 words of font info for 22 fonts, out of 3000000 for 9000
+ 14 hyphenation exceptions out of 8191
+ 25i,6n,26p,206b,199s stack positions out of 5000i,500n,10000p,200000b,50000s
+
+Output written on images.dvi (18 pages, 4432 bytes).

manual/docs/html/angularCalibrationHowTo/images.pl

@@ -1,4 +1,4 @@
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # Associate images original text with physical files.
 
 
@@ -44,18 +44,18 @@ $cached_env_img{$key} = q|<IMG
  SRC="|."$dir".q|img9.png"
  ALT="$p=50&nbsp;\mu m$">|; 
 
-$key = q/_6;MSF=1.6;AAT/;
-$cached_env_img{$key} = q|<IMG
- WIDTH="12" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="|."$dir".q|img10.png"
- ALT="$_6$">|; 
-
 $key = q/C_{peak};MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
  WIDTH="43" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
  SRC="|."$dir".q|img2.png"
  ALT="$C_{peak}$">|; 
 
+$key = q/_6;MSF=1.6;AAT/;
+$cached_env_img{$key} = q|<IMG
+ WIDTH="12" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+ SRC="|."$dir".q|img10.png"
+ ALT="$_6$">|; 
+
 $key = q/includegraphics[width=textwidth]{peakFit.eps};AAT/;
 $cached_env_img{$key} = q|<IMG
  WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
@@ -74,18 +74,18 @@ $cached_env_img{$key} = q|<IMG
  SRC="|."$dir".q|img16.png"
  ALT="\includegraphics[width=\textwidth]{setupAngcal.eps}">|; 
 
-$key = q/pm;MSF=1.6;AAT/;
-$cached_env_img{$key} = q|<IMG
- WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="|."$dir".q|img12.png"
- ALT="$\pm$">|; 
-
 $key = q/includegraphics[width=textwidth]{angleFit.eps};AAT/;
 $cached_env_img{$key} = q|<IMG
  WIDTH="555" HEIGHT="707" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img18.png"
  ALT="\includegraphics[width=\textwidth]{angleFit.eps}">|; 
 
+$key = q/pm;MSF=1.6;AAT/;
+$cached_env_img{$key} = q|<IMG
+ WIDTH="17" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
+ SRC="|."$dir".q|img12.png"
+ ALT="$\pm$">|; 
+
 $key = q/{displaymath}Theta_e=Theta_o^i-arctanBig(frac{pcdot(C_{peak}-C_{center}^i)}{R^i}Big),{displaymath};MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
  WIDTH="291" HEIGHT="41" BORDER="0"
@@ -96,13 +96,13 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/theta;MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="12" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="12" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img1.png"
  ALT="$\theta$">|; 
 
 $key = q/R^i;MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="22" HEIGHT="16" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="22" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img8.png"
  ALT="$R^i$">|; 
 

manual/docs/html/angularCalibrationHowTo/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>September 28, 2018</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/angularCalibrationHowTo/internals.pl

@@ -1,4 +1,4 @@
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # Associate internals original text with physical files.
 
 

manual/docs/html/angularCalibrationHowTo/labels.pl

@@ -1,4 +1,4 @@
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # Associate labels original text with physical files.
 
 
@@ -29,7 +29,7 @@ $noresave{$key} = "$nosave";
 1;
 
 
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # labels from external_latex_labels array.
 
 

manual/docs/html/angularCalibrationHowTo/node1.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -55,7 +55,7 @@ Introduction</A>
 
 <P>
 In order to convert from strip number to 2<IMG
- WIDTH="12" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="12" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img1.png"
  ALT="$\theta$">-angle, an accurate angular calibration of the detector must be performed (for details see the paper Bergamaschi, A. et al. (2010). J. Synchrotron Rad. 17, 653-668). 
 <BR>
@@ -107,7 +107,7 @@ where the parameters <IMG
  WIDTH="53" HEIGHT="36" ALIGN="MIDDLE" BORDER="0"
  SRC="img7.png"
  ALT="$C_{center}^{i}$"> is the central channel  and <IMG
- WIDTH="22" HEIGHT="16" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="22" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
  SRC="img8.png"
  ALT="$R^i$"> is the distance of the module <IMG
  WIDTH="10" HEIGHT="17" ALIGN="BOTTOM" BORDER="0"
@@ -121,7 +121,7 @@ Finally, the global offset of the detector system is precisely determined by ref
 
 <P>
 The same function of equation&nbsp;<A HREF="#eq:angcal">1</A>, with the parameters obtained from the calibration, is used in order to convert from channel number to 2<IMG
- WIDTH="12" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="12" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img1.png"
  ALT="$\theta$">-angle.
 
@@ -180,7 +180,7 @@ These results show that  the angular calibration allows a resolution in determin
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/angularCalibrationHowTo/node2.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -211,7 +211,7 @@ Acquisition GUI window to setup the motor position scan.</CAPTION>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/angularCalibrationHowTo/node3.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -180,7 +180,7 @@ After fitting all modules you can click on the <I>Write Angular Calibration</I>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/angularCalibrationHowTo/node4.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -62,7 +62,7 @@ while for the GUI the file name should be specified in the configuration file (w
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/angularCalibrationHowTo/node5.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="angularCalibrationHowTo.css">
@@ -48,7 +48,7 @@ About this document ...</A>
 </H1>
  <STRONG>Angular calibration wizard manual</STRONG><P>
 This document was generated using the
-<A HREF="http://www.latex2html.org/"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A> translator Version 2008 (1.71)
+<A HREF="http://www.latex2html.org/"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A> translator Version 2012 (1.2)
 <P>
 Copyright &#169; 1993, 1994, 1995, 1996,
 <A HREF="http://cbl.leeds.ac.uk/nikos/personal.html">Nikos Drakos</A>, 
@@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
 The command line arguments were: <BR>
  <STRONG>latex2html</STRONG> <TT>-split 4 angularCalibrationHowTo.tex</TT>
 <P>
-The translation was initiated by Thattil Dhanya on 2017-08-24
+The translation was initiated by Thattil Dhanya on 2018-09-28
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/energyCalibrationHowTo.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>September 28, 2018</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/images.aux

@@ -0,0 +1 @@
+\relax 

manual/docs/html/energyCalibrationHowTo/images.log

@@ -0,0 +1,439 @@
+This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23)  28 SEP 2018 11:35
+entering extended mode
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**./images.tex
+(./images.tex
+LaTeX2e <2011/06/27>
+Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, lo
+aded.
+
+(/usr/share/texlive/texmf-dist/tex/latex/base/article.cls
+Document Class: article 2007/10/19 v1.4h Standard LaTeX document class
+(/usr/share/texlive/texmf-dist/tex/latex/base/size10.clo
+File: size10.clo 2007/10/19 v1.4h Standard LaTeX file (size option)
+)
+\c@part=\count79
+\c@section=\count80
+\c@subsection=\count81
+\c@subsubsection=\count82
+\c@paragraph=\count83
+\c@subparagraph=\count84
+\c@figure=\count85
+\c@table=\count86
+\abovecaptionskip=\skip41
+\belowcaptionskip=\skip42
+\bibindent=\dimen102
+) (/usr/share/texlive/texmf-dist/tex/latex/base/ifthen.sty
+Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
+) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty
+Package: amssymb 2013/01/14 v3.01 AMS font symbols
+(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amsfonts.sty
+Package: amsfonts 2013/01/14 v3.01 Basic AMSFonts support
+\@emptytoks=\toks14
+\symAMSa=\mathgroup4
+\symAMSb=\mathgroup5
+LaTeX Font Info:    Overwriting math alphabet `\mathfrak' in version `bold'
+(Font)                  U/euf/m/n --> U/euf/b/n on input line 106.
+)) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty
+Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
+Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
+\KV@toks@=\toks15
+) (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
+Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/trig.sty
+Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
+) (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/graphics.cfg
+File: graphics.cfg 2010/04/23 v1.9 graphics configuration of TeX Live
+)
+Package graphics Info: Driver file: dvips.def on input line 91.
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvips.def
+File: dvips.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
+))
+\Gin@req@height=\dimen103
+\Gin@req@width=\dimen104
+) (/usr/share/texlive/texmf-dist/tex/latex/tools/verbatim.sty
+Package: verbatim 2003/08/22 v1.5q LaTeX2e package for verbatim enhancements
+\every@verbatim=\toks16
+\verbatim@line=\toks17
+\verbatim@in@stream=\read1
+) (/usr/share/texlive/texmf-dist/tex/latex/graphics/color.sty
+Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
+(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/color.cfg
+File: color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive
+)
+Package color Info: Driver file: dvips.def on input line 130.
+(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvipsnam.def
+File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
+)) (/usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty
+Package: inputenc 2008/03/30 v1.1d Input encoding file
+\inpenc@prehook=\toks18
+\inpenc@posthook=\toks19
+)
+\sizebox=\box26
+\lthtmlwrite=\write3
+(./images.aux)
+\openout1 = `images.aux'.
+
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 116.
+LaTeX Font Info:    ... okay on input line 116.
+
+latex2htmlLength hsize=349.0pt
+
+latex2htmlLength vsize=633.0pt
+
+latex2htmlLength hoffset=0.0pt
+
+latex2htmlLength voffset=0.0pt
+
+latex2htmlLength topmargin=0.0pt
+
+latex2htmlLength topskip=0.00003pt
+
+latex2htmlLength headheight=0.0pt
+
+latex2htmlLength headsep=0.0pt
+
+latex2htmlLength parskip=0.0pt plus 1.0pt
+
+latex2htmlLength oddsidemargin=62.0pt
+
+latex2htmlLength evensidemargin=62.0pt
+
+LaTeX Font Info:    Try loading font information for U+msa on input line 140.
+(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd
+File: umsa.fd 2013/01/14 v3.01 AMS symbols A
+)
+LaTeX Font Info:    Try loading font information for U+msb on input line 140.
+(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd
+File: umsb.fd 2013/01/14 v3.01 AMS symbols B
+)
+l2hSize :tex2html_wrap_inline464:7.33331pt::7.33331pt::12.3681pt.
+[1
+
+
+
+]
+l2hSize :tex2html_wrap_inline466:7.33331pt::7.33331pt::13.02087pt.
+[2
+
+
+]
+l2hSize :tex2html_wrap_inline468:6.83331pt::0.0pt::25.4458pt.
+[3
+
+
+]
+l2hSize :tex2html_wrap_inline470:6.83331pt::0.0pt::25.62634pt.
+[4
+
+
+]
+l2hSize :tex2html_wrap_inline472:7.33331pt::7.33331pt::14.32782pt.
+[5
+
+
+]
+! Undefined control sequence.
+l.170 $CS={\begingroupN
+                       _S\endgroup\over N_0}$%
+The control sequence at the end of the top line
+of your error message was never \def'ed. If you have
+misspelled it (e.g., `\hobx'), type `I' and the correct
+spelling (e.g., `I\hbox'). Otherwise just continue,
+and I'll forget about whatever was undefined.
+
+! Missing } inserted.
+<inserted text> 
+                }
+l.170 $CS={\begingroupN_S\endgroup
+                                  \over N_0}$%
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
+
+! Missing $ inserted.
+<inserted text> 
+                $
+l.170 $CS={\begingroupN_S\endgroup
+                                  \over N_0}$%
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
+
+! Missing } inserted.
+<inserted text> 
+                }
+l.170 $CS={\begingroupN_S\endgroup
+                                  \over N_0}$%
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
+
+! Missing } inserted.
+<inserted text> 
+                }
+l.170 $CS={\begingroupN_S\endgroup
+                                  \over N_0}$%
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
+
+! Extra \endgroup.
+<recently read> \endgroup 
+                          
+l.170 $CS={\begingroupN_S\endgroup
+                                  \over N_0}$%
+Things are pretty mixed up, but I think the worst is over.
+
+! Missing $ inserted.
+<inserted text> 
+                $
+l.170 $CS={\begingroupN_S\endgroup\over
+                                        N_0}$%
+I've inserted a begin-math/end-math symbol since I think
+you left one out. Proceed, with fingers crossed.
+
+! Extra }, or forgotten $.
+l.170 $CS={\begingroupN_S\endgroup\over N_0}
+                                            $%
+I've deleted a group-closing symbol because it seems to be
+spurious, as in `$x}$'. But perhaps the } is legitimate and
+you forgot something else, as in `\hbox{$x}'. In such cases
+the way to recover is to insert both the forgotten and the
+deleted material, e.g., by typing `I$}'.
+
+! Too many }'s.
+\lthtmlinlinemathZ ->\egroup 
+                             \expandafter \ifdim \dp \sizebox >0pt \expandaf...
+l.171 \lthtmlinlinemathZ
+                        
+You've closed more groups than you opened.
+Such booboos are generally harmless, so keep going.
+
+l2hSize :tex2html_wrap_inline474:0.0pt::0.0pt::0.0pt.
+[6
+
+
+]
+! Too many }'s.
+l.172 \lthtmlcheckvsize\clearpage}
+                                  
+You've closed more groups than you opened.
+Such booboos are generally harmless, so keep going.
+
+l2hSize :tex2html_wrap_inline482:7.33331pt::7.33331pt::13.06606pt.
+[7
+
+
+]
+l2hSize :tex2html_wrap_inline486:8.0pt::8.0pt::22.36813pt.
+[8
+
+
+]
+l2hSize :tex2html_wrap_inline490:6.83331pt::0.0pt::19.3889pt.
+[9
+
+
+]
+l2hSize :tex2html_wrap_inline492:7.33331pt::7.33331pt::11.40282pt.
+[10
+
+
+]
+l2hSize :tex2html_wrap_inline494:7.33331pt::7.33331pt::51.00127pt.
+[11
+
+
+]
+l2hSize :tex2html_wrap_inline131:7.96227pt::0.0pt::11.90631pt.
+[12
+
+
+]
+l2hSize :tex2html_wrap_inline137:6.83331pt::0.0pt::9.05698pt.
+[13
+
+
+]
+l2hSize :tex2html_wrap_inline141:8.0pt::8.0pt::46.60414pt.
+[14
+
+
+]
+l2hSize :tex2html_wrap_inline143:6.83331pt::0.0pt::9.625pt.
+[15
+
+
+]
+l2hSize :tex2html_wrap_inline147:7.33331pt::7.33331pt::13.97807pt.
+[16
+
+
+]
+l2hSize :tex2html_wrap_inline149:7.33331pt::7.33331pt::13.66582pt.
+[17
+
+
+]
+l2hSize :displaymath17:22.95789pt::0.0pt::349.0pt.
+[18
+
+
+]
+l2hSize :tex2html_wrap_inline151:7.33331pt::7.33331pt::11.92157pt.
+[19
+
+
+]
+l2hSize :tex2html_wrap_inline153:7.33331pt::7.33331pt::50.08467pt.
+[20
+
+
+]
+l2hSize :tex2html_wrap_inline155:6.95831pt::6.95831pt::9.14589pt.
+[21
+
+
+]
+l2hSize :tex2html_wrap_inline157:6.83331pt::0.0pt::7.73268pt.
+[22
+
+
+]
+l2hSize :displaymath26:22.95789pt::0.0pt::349.0pt.
+[23
+
+
+]
+l2hSize :tex2html_wrap_inline165:7.33331pt::7.33331pt::52.6679pt.
+[24
+
+
+]
+l2hSize :tex2html_wrap_inline167:6.83331pt::0.0pt::8.40558pt.
+[25
+
+
+]
+l2hSize :tex2html_wrap_inline169:6.83331pt::0.0pt::8.36252pt.
+[26
+
+
+]
+l2hSize :tex2html_wrap_inline171:7.33331pt::7.33331pt::9.8542pt.
+[27
+
+
+]
+l2hSize :displaymath34:13.49998pt::0.0pt::349.0pt.
+[28
+
+
+]
+l2hSize :tex2html_wrap_inline175:6.59525pt::0.0pt::3.94516pt.
+[29
+
+
+]
+l2hSize :tex2html_wrap_inline177:7.33331pt::7.33331pt::11.45708pt.
+[30
+
+
+]
+l2hSize :tex2html_wrap_inline179:7.33331pt::7.33331pt::11.6918pt.
+[31
+
+
+]
+l2hSize :tex2html_wrap_inline191:9.38889pt::9.38889pt::42.17287pt.
+[32
+
+
+]
+File: fig4.eps Graphic file (type eps)
+<fig4.eps>
+l2hSize :tex2html_wrap559:338.53587pt::0.0pt::349.0pt.
+[33
+
+
+]
+File: fig5.eps Graphic file (type eps)
+<fig5.eps>
+l2hSize :tex2html_wrap563:338.53587pt::0.0pt::349.0pt.
+[34
+
+
+]
+File: fig7.eps Graphic file (type eps)
+<fig7.eps>
+l2hSize :tex2html_wrap585:347.15315pt::0.0pt::349.0pt.
+[35
+
+
+]
+File: fig8.eps Graphic file (type eps)
+<fig8.eps>
+l2hSize :tex2html_wrap589:338.53587pt::0.0pt::349.0pt.
+[36
+
+
+]
+File: GUI_Advanced.eps Graphic file (type eps)
+<GUI_Advanced.eps>
+l2hSize :tex2html_wrap595:378.81322pt::0.0pt::349.0pt.
+[37
+
+
+]
+File: GUI_ThresholdScan.eps Graphic file (type eps)
+<GUI_ThresholdScan.eps>
+l2hSize :tex2html_wrap599:378.81322pt::0.0pt::349.0pt.
+[38
+
+
+]
+File: addEnergy.eps Graphic file (type eps)
+<addEnergy.eps>
+l2hSize :tex2html_wrap605:436.2459pt::0.0pt::349.0pt.
+[39
+
+
+]
+File: calibrateModule.eps Graphic file (type eps)
+<calibrateModule.eps>
+l2hSize :tex2html_wrap609:436.2459pt::0.0pt::349.0pt.
+[40
+
+
+] (./images.aux) ) 
+Here is how much of TeX's memory you used:
+ 1161 strings out of 495064
+ 14835 string characters out of 3182224
+ 55704 words of memory out of 3000000
+ 4366 multiletter control sequences out of 15000+200000
+ 5339 words of font info for 22 fonts, out of 3000000 for 9000
+ 14 hyphenation exceptions out of 8191
+ 25i,6n,26p,836b,199s stack positions out of 5000i,500n,10000p,200000b,50000s
+
+Output written on images.dvi (40 pages, 9712 bytes).

manual/docs/html/energyCalibrationHowTo/images.pl

@@ -1,4 +1,4 @@
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # Associate images original text with physical files.
 
 
@@ -10,7 +10,7 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/O;MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="17" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img25.png"
  ALT="$O$">|; 
 
@@ -28,7 +28,7 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/includegraphics[width=textwidth]{calibrateModule.eps};AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="555" HEIGHT="694" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="514" HEIGHT="654" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img40.png"
  ALT="\includegraphics[width=\textwidth]{calibrateModule.eps}">|; 
 
@@ -54,7 +54,7 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/ENC;MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="44" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img3.png"
  ALT="$ENC$">|; 
 
@@ -84,7 +84,7 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/G;MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="17" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img26.png"
  ALT="$G$">|; 
 
@@ -182,7 +182,7 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/includegraphics[width=textwidth]{addEnergy.eps};AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="555" HEIGHT="694" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="514" HEIGHT="654" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img39.png"
  ALT="\includegraphics[width=\textwidth]{addEnergy.eps}">|; 
 
@@ -194,13 +194,13 @@ $cached_env_img{$key} = q|<IMG
 
 $key = q/CS={begingroup{N_Sbegingroup{overN_0};MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="24" HEIGHT="11" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="24" HEIGHT="12" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img6.png"
  ALT="$CS={\begingroupN_S\endgroup\over N_0}$">|; 
 
 $key = q/CS=;MSF=1.6;AAT/;
 $cached_env_img{$key} = q|<IMG
- WIDTH="45" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="45" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="|."$dir".q|img4.png"
  ALT="$CS=$">|; 
 

manual/docs/html/energyCalibrationHowTo/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>September 28, 2018</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/internals.pl

@@ -1,4 +1,4 @@
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # Associate internals original text with physical files.
 
 
@@ -34,14 +34,14 @@ $key = q/fig:guiencallog/;
 $ref_files{$key} = "$dir".q|node2.html|; 
 $noresave{$key} = "$nosave";
 
-$key = q/fig:addenergy/;
-$ref_files{$key} = "$dir".q|node3.html|; 
-$noresave{$key} = "$nosave";
-
 $key = q/fig:thrscanexpl/;
 $ref_files{$key} = "$dir".q|node1.html|; 
 $noresave{$key} = "$nosave";
 
+$key = q/fig:addenergy/;
+$ref_files{$key} = "$dir".q|node3.html|; 
+$noresave{$key} = "$nosave";
+
 $key = q/fig:expthrscan/;
 $ref_files{$key} = "$dir".q|node1.html|; 
 $noresave{$key} = "$nosave";

manual/docs/html/energyCalibrationHowTo/labels.pl

@@ -1,4 +1,4 @@
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # Associate labels original text with physical files.
 
 
@@ -34,14 +34,14 @@ $key = q/fig:guiencallog/;
 $external_labels{$key} = "$URL/" . q|node2.html|; 
 $noresave{$key} = "$nosave";
 
-$key = q/fig:addenergy/;
-$external_labels{$key} = "$URL/" . q|node3.html|; 
-$noresave{$key} = "$nosave";
-
 $key = q/fig:thrscanexpl/;
 $external_labels{$key} = "$URL/" . q|node1.html|; 
 $noresave{$key} = "$nosave";
 
+$key = q/fig:addenergy/;
+$external_labels{$key} = "$URL/" . q|node3.html|; 
+$noresave{$key} = "$nosave";
+
 $key = q/fig:expthrscan/;
 $external_labels{$key} = "$URL/" . q|node1.html|; 
 $noresave{$key} = "$nosave";
@@ -49,7 +49,7 @@ $noresave{$key} = "$nosave";
 1;
 
 
-# LaTeX2HTML 2008 (1.71)
+# LaTeX2HTML 2012 (1.2)
 # labels from external_latex_labels array.
 
 
@@ -85,14 +85,14 @@ $key = q/fig:guiencallog/;
 $external_latex_labels{$key} = q|5|; 
 $noresave{$key} = "$nosave";
 
-$key = q/fig:addenergy/;
-$external_latex_labels{$key} = q|7|; 
-$noresave{$key} = "$nosave";
-
 $key = q/fig:thrscanexpl/;
 $external_latex_labels{$key} = q|1|; 
 $noresave{$key} = "$nosave";
 
+$key = q/fig:addenergy/;
+$external_latex_labels{$key} = q|7|; 
+$noresave{$key} = "$nosave";
+
 $key = q/fig:expthrscan/;
 $external_latex_labels{$key} = q|2|; 
 $noresave{$key} = "$nosave";

manual/docs/html/energyCalibrationHowTo/node1.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -78,21 +78,21 @@ The thick solid line represents the physical curve which also takes into account
 
 <P>
 The intrinsic noise on the electronic signal  is defined by the Equivalent Noise Charge (<IMG
- WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="44" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img3.png"
  ALT="$ENC$">). The <IMG
- WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="44" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img3.png"
  ALT="$ENC$"> describes noise in terms of the charge at the detector input needed to create the same output at the end of the analog chain and is normally expressed in electrons. For silicon sensors, it can be converted into energy units by considering 1&nbsp;<IMG
  WIDTH="23" HEIGHT="19" ALIGN="BOTTOM" BORDER="0"
  SRC="img12.png"
  ALT="$e^-$">=3.6&nbsp;eV.
 The value of the <IMG
- WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="44" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img3.png"
  ALT="$ENC$"> normally depends on the shaping settings of the analog chain and increases with shorter shaping times. 
 The resulting electronic signal spectrum is then  given by a convolution between the radiation spectrum and the noise i.e., a Gaussian of standard deviation <IMG
- WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="44" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img3.png"
  ALT="$ENC$">.  
 The S-curve for a monochromatic radiation beam is well described by a Gaussian cumulative distribution <IMG
@@ -204,10 +204,10 @@ Moreover, setting the threshold too close to the energy of the fluorescent light
 The comparator threshold is given by a global level which can be set on a module basis and adds to a component which is individually adjustable for each channel. In order to optimize the uniformity of the detector response it is important to properly adjust the threshold for all channels. 
 <BR>
 Since both the signal amplification stages and the comparator  are linear, it is necessary to calibrate the detector offset <IMG
- WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="17" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img25.png"
  ALT="$O$"> and gain <IMG
- WIDTH="17" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="17" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img26.png"
  ALT="$G$"> in order to correctly set its comparator threshold <IMG
  WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
@@ -258,10 +258,10 @@ Expected counts as a function of a threshold energy for a monochromatic beam of
  WIDTH="24" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
  SRC="img2.png"
  ALT="$N_0$">=10000 is the number of photons absorbed by the detector during the acquisition time. The dashed line represents the curve in an ideal case without electronic noise and charge sharing, the solid thin line with noise  <IMG
- WIDTH="44" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="44" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img3.png"
  ALT="$ENC$">=1&nbsp;keV but without charge sharing and the solid thick line is the physical case with noise and <IMG
- WIDTH="45" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="45" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
  SRC="img4.png"
  ALT="$CS=$">22&nbsp;% charge sharing. <IMG
  WIDTH="27" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
@@ -377,7 +377,7 @@ Median of the number of counts as a function of the threshold for X-rays of 12.5
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/node2.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -180,7 +180,7 @@ Acquisition GUI window to setup the threshold scan.</CAPTION>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/node3.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -107,7 +107,7 @@ Once you have uploaded at least 2 energies, you will be allowed to  <I>proceed t
 <CAPTION ALIGN="BOTTOM"><STRONG>Figure 7:</STRONG>
 Window to add energies to the calibration.</CAPTION>
 <TR><TD><IMG
- WIDTH="555" HEIGHT="694" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="514" HEIGHT="654" ALIGN="BOTTOM" BORDER="0"
  SRC="img39.png"
  ALT="\includegraphics[width=\textwidth]{addEnergy.eps}"></TD></TR>
 </TABLE>
@@ -153,7 +153,7 @@ The button <I>Finished</I> will be enebled only once the calibration files have
 <CAPTION ALIGN="BOTTOM"><STRONG>Figure 8:</STRONG>
 Window to calibrate the modules.</CAPTION>
 <TR><TD><IMG
- WIDTH="555" HEIGHT="694" ALIGN="BOTTOM" BORDER="0"
+ WIDTH="514" HEIGHT="654" ALIGN="BOTTOM" BORDER="0"
  SRC="img40.png"
  ALT="\includegraphics[width=\textwidth]{calibrateModule.eps}"></TD></TR>
 </TABLE>
@@ -184,7 +184,7 @@ Window to calibrate the modules.</CAPTION>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/node4.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -68,7 +68,7 @@ By reloading the default detector settings, the calibration coefficients will be
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/energyCalibrationHowTo/node5.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!--Converted with LaTeX2HTML 2008 (1.71)
+<!--Converted with LaTeX2HTML 2012 (1.2)
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
@@ -13,7 +13,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="global">
 
-<META NAME="Generator" CONTENT="LaTeX2HTML v2008">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2012">
 <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 
 <LINK REL="STYLESHEET" HREF="energyCalibrationHowTo.css">
@@ -48,7 +48,7 @@ About this document ...</A>
 </H1>
  <STRONG>Energy calibration wizard manual</STRONG><P>
 This document was generated using the
-<A HREF="http://www.latex2html.org/"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A> translator Version 2008 (1.71)
+<A HREF="http://www.latex2html.org/"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A> translator Version 2012 (1.2)
 <P>
 Copyright &#169; 1993, 1994, 1995, 1996,
 <A HREF="http://cbl.leeds.ac.uk/nikos/personal.html">Nikos Drakos</A>, 
@@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
 The command line arguments were: <BR>
  <STRONG>latex2html</STRONG> <TT>-split 4 energyCalibrationHowTo.tex</TT>
 <P>
-The translation was initiated by Thattil Dhanya on 2017-08-24
+The translation was initiated by Thattil Dhanya on 2018-09-28
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-24
+2018-09-28
 </ADDRESS>
 </BODY>
 </HTML>

manual/docs/html/slsDetectorClientDocs/acquisition.html

@@ -1,85 +1,98 @@
-<!-- This comment will put IE 6, 7 and 8 in quirks mode -->
 <!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"/>
-<title>Acquition commands</title>
+<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" src="search/search.js"></script>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript">
+  $(document).ready(function() { searchBox.OnSelectItem(0); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
-<body onload='searchBox.OnSelectItem(0);'>
+<body>
-<!-- Generated by Doxygen 1.6.1 -->
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<script type="text/javascript"><!--
+<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>
+</script>
-<div class="navigation" id="top">
+  <div id="navrow1" class="tabs">
-  <div class="tabs">
+    <ul class="tablist">
-    <ul>
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
-      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="pages.html"><span>Related&#160;Pages</span></a></li>
-      <li class="current"><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
       <li>
         <div id="MSearchBox" class="MSearchBoxInactive">
-        <img id="MSearchSelect" src="search/search.png"
+        <span class="left">
-             onmouseover="return searchBox.OnSearchSelectShow()"
+          <img id="MSearchSelect" src="search/mag_sel.png"
-             onmouseout="return searchBox.OnSearchSelectHide()"
+               onmouseover="return searchBox.OnSearchSelectShow()"
-             alt=""/>
+               onmouseout="return searchBox.OnSearchSelectHide()"
-        <input type="text" id="MSearchField" value="Search" accesskey="S"
+               alt=""/>
-             onfocus="searchBox.OnSearchFieldFocus(true)" 
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
-             onblur="searchBox.OnSearchFieldFocus(false)" 
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
-             onkeyup="searchBox.OnSearchFieldChange(event)"/>
+               onblur="searchBox.OnSearchFieldFocus(false)" 
-        <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+               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>
-</div>
+<!-- window showing the filter options -->
-<div class="contents">
-
-
-<h1><a class="anchor" id="acquisition">Acquition commands </a></h1><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>
-</ul>
-<ul>
-<li><b>busy</b> returns <code>1</code> if the acquisition is active, <code>0</code> otherwise. Works when the acquisition is started in blocking mode. Only get! <code>Returns</code> <code></code>(int)</li>
-</ul>
-<ul>
-<li><b> status [s] </b> starts or stops acquisition in detector in non blocking mode. <code>s:</code> [<code>start</code>, <code>stop</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>
-</ul>
-<ul>
-<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>
-</ul>
-<ul>
-<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>
-</ul>
-<ul>
-<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>
-</ul>
-<ul>
-<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>
-</ul>
-<ul>
-<li><b>resmat i </b> sets/resets counter bit in detector.gets the counter bit in detector ???? </li>
-</ul>
-</div>
-<!--- window showing the filter options -->
 <div id="MSearchSelectWindow"
      onmouseover="return searchBox.OnSearchSelectShow()"
      onmouseout="return searchBox.OnSearchSelectHide()"
      onkeydown="return searchBox.OnSearchSelectKey(event)">
-</div>
+<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="" frameborder="0" 
+<iframe src="javascript:void(0)" frameborder="0" 
         name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
+</div><!-- top -->
-<a href="http://www.doxygen.org/index.html">
+<div class="header">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
+  <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>