binaries in

rxr chrono

.clang-format

@@ -3,4 +3,5 @@ IndentWidth: 4
 
 UseTab: Never
 ColumnLimit: 80
-AlignConsecutiveAssignments: false 
+AlignConsecutiveAssignments: false 
+AlignConsecutiveMacros: true

.clang-tidy

@@ -16,7 +16,9 @@ Checks:          '*,
                     -hicpp-braces-around-statements,
                     -google-runtime-references, 
                     -google-readability-todo, 
-                    -google-readability-braces-around-statements'
+                    -google-readability-braces-around-statements,
+                    -modernize-use-trailing-return-type,
+                    -readability-isolate-declaration'
 
 HeaderFilterRegex: \.h
 AnalyzeTemporaryDtors: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,60 @@
+---
+name: Bug Report
+about: Create a report to help us improve 
+title: New Bug Report
+labels: action - Bug, priority - Unclassified, status - Pending
+template: bug_report.md
+---
+
+<!--  Check an option by - [x], Uncheck an option by - [ ] -->
+<!-- Please preview to see your option has been selected -->
+
+<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
+
+##### *Distribution: 
+- [x] RHEL7
+- [ ] RHEL6
+- [ ] Fedora
+- [ ] Other
+
+##### *Detector type: 
+- [x] Not applicable
+- [ ] Eiger
+- [ ] Jungfrau
+- [ ] Mythen3
+- [ ] Gotthard2
+- [ ] Gotthard
+- [ ] Moench
+- [ ] ChipTestBoard
+
+##### *Software Package Version: 
+- [ ] developer
+- [ ] 4.2.0
+- [ ] 4.1.1
+<!-- If others, please describe -->
+
+##### Priority:
+- [ ] Super Low
+- [ ] Low
+- [ ] Medium
+- [ ] High
+- [ ] Super High
+
+##### *Describe the bug
+<!--  A clear and concise description of what the bug is -->
+
+##### Expected behavior
+<!--  A clear and concise description of what you expected to happen. -->
+
+##### To Reproduce
+<!--  Steps to reproduce the behavior: -->
+<!--  1. Go to '...' -->
+<!--  2. Click on '....' -->
+<!--  3. Scroll down to '....' -->
+<!--  4. See error -->
+
+##### Screenshots
+<!--  If applicable, add screenshots to help explain your problem. -->
+
+##### Additional context
+<!--  Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/change_request.md

@@ -0,0 +1,44 @@
+---
+name: Change Request
+about: Suggest a change to an existing feature
+title: New Change Request
+labels: action - Change, priority - Unclassified, status - Pending
+template: change_request.md
+---
+
+<!--  Check an option by - [x], Uncheck an option by - [ ] -->
+<!-- Please preview to see your option has been selected -->
+
+<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
+
+##### *Detector type: 
+- [x] Not applicable
+- [ ] Eiger
+- [ ] Jungfrau
+- [ ] Mythen3
+- [ ] Gotthard2
+- [ ] Gotthard
+- [ ] Moench
+- [ ] ChipTestBoard
+
+##### *Software Package Version: 
+- [ ] developer
+- [ ] 4.2.0
+- [ ] 4.1.1
+<!-- If others, please describe -->
+
+##### Priority:
+- [ ] Super Low
+- [ ] Low
+- [ ] Medium
+- [ ] High
+- [ ] Super High
+
+##### *State the change request:
+<!--  A clear and concise description of what the change is to an existing feature -->
+
+##### Is your change request related to a problem. Please describe:
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+##### Additional context:
+<!--  Add any other context about the feature here -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,50 @@
+---
+name: Feature Request
+about: Suggest a feature
+title: New Feature Request
+labels: action - Enhancement, priority - Unclassified, status - Pending
+template: feature_request.md
+---
+
+<!--  Check an option by - [x], Uncheck an option by - [ ] -->
+<!-- Please preview to see your option has been selected -->
+
+<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
+
+##### *Detector type: 
+- [x] Not applicable
+- [ ] Eiger
+- [ ] Jungfrau
+- [ ] Mythen3
+- [ ] Gotthard2
+- [ ] Gotthard
+- [ ] Moench
+- [ ] ChipTestBoard
+
+##### *Software Package Version: 
+- [ ] developer
+- [ ] 4.2.0
+- [ ] 4.1.1
+<!-- If others, please describe -->
+
+##### Priority:
+- [ ] Super Low
+- [ ] Low
+- [ ] Medium
+- [ ] High
+- [ ] Super High
+
+##### *State the feature:
+<!--  A clear and concise description of what the feature is -->
+
+##### Is your feature request related to a problem. Please describe:
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+##### Describe the solution you'd like:
+<!-- A clear and concise description of what you want to happen -->
+
+##### Describe alternatives you've considered:
+<!-- A clear and concise description of any alternative solutions or features you've considered -->
+
+##### Additional context:
+<!--  Add any other context about the feature here -->

.gitignore

@@ -7,11 +7,16 @@ bin/
 *.out
 *.toc
 *.o
+*.so
 .*
 build
 RELEASE.txt
 Testing/
 
+ctbDict.cpp
+ctbDict.h
+
+
 
 *.pyc
 */__pycache__/*

.travis.yml

@@ -4,38 +4,25 @@ language: cpp
 
 os: linux
 
-env: 
-  matrix: 
-     - CONDA_PY=3.6
-     - CONDA_PY=3.7
-
-
-dist: trusty
+dist: bionic
 
 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"
+  - source "$HOME/miniconda/etc/profile.d/conda.sh"
   - 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=3.17 
-  - conda install anaconda-client
-  - conda install conda-verify
-
-  # Useful for debugging any issues with conda
+  - conda update -q conda
   - conda info -a
 
-
-  # Replace dep1 dep2 ... with your dependencies
-  - conda create -q -n test-environment python=$CONDA_PY
-  - source activate test-environment
+  # Useful for debugging any issues with conda
+  - conda create -q -n testenv conda-build anaconda-client conda-verify
+  - conda activate testenv
   - conda-build .
 
 script:
@@ -44,7 +31,8 @@ script:
 
 deploy:
   provider: script
-  script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
+  script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
   on:
     branch: developer
+    tags: true
 

CMakeLists.txt

@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.12)
 project(slsDetectorPackage)
 set(PROJECT_VERSION 5.0.0)
-
 include(CheckIPOSupported)
-
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 
 cmake_policy(SET CMP0074 NEW)
 include(cmake/project_version.cmake)
@@ -42,6 +41,39 @@ option (SLS_USE_TESTS "TESTS" OFF)
 option (SLS_USE_INTEGRATION_TESTS "Integration Tests" OFF)
 option(SLS_USE_SANITIZER "Sanitizers for debugging" OFF)
 option(SLS_USE_PYTHON "Python bindings" OFF)
+option(SLS_USE_CTBGUI "ctb GUI" OFF)
+option(SLS_BUILD_DOCS "docs" OFF)
+option(SLS_BUILD_EXAMPLES "examples" OFF)
+option(SLS_TUNE_LOCAL "tune to local machine" OFF)
+option(SLS_DEVEL_HEADERS "install headers for devel" OFF)
+option(SLS_USE_MOENCH "compile zmq and post processing for Moench" OFF)
+
+# set(ClangFormat_BIN_NAME clang-format)
+set(ClangFormat_EXCLUDE_PATTERNS  "build/" 
+                                    "libs/" 
+                                    "slsDetectorCalibration/" 
+                                    "ctbGui/" 
+                                    "manual/"
+                                    "python/"
+                                    "sample/"
+                                    ${CMAKE_BINARY_DIR})
+find_package(ClangFormat)
+
+#Enable LTO if available
+check_ipo_supported(RESULT SLS_LTO_AVAILABLE)
+
+
+# Use ld.gold if it is available and isn't disabled explicitly
+option(SLS_USE_LD_GOLD "Use GNU gold linker" ON)
+if (SLS_USE_LD_GOLD)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+    if ("${LD_VERSION}" MATCHES "GNU gold")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+    else ()
+        message(WARNING "GNU gold linker isn't available, using the default system linker.")
+    endif ()
+endif ()
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -65,7 +97,9 @@ target_compile_options(slsProjectWarnings INTERFACE
                                             -Wformat=2
                                             -Wredundant-decls
                                             # -Wconversion
+                                            -Wvla
                                             -Wdouble-promotion
+                                            -Werror=return-type
 
                                  )
 
@@ -103,12 +137,16 @@ endif()
 
 if(SLS_USE_SANITIZER)
     target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined -fno-omit-frame-pointer)
-    #target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined)
     target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
     # target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
     # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
+if(SLS_TUNE_LOCAL)
+    target_compile_options(slsProjectOptions INTERFACE -mtune=native -march=native)
+endif()
+
+
 #rapidjson
 add_library(rapidjson INTERFACE)
 target_include_directories(rapidjson INTERFACE
@@ -124,7 +162,7 @@ install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
 )
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_INSTALL_RPATH "$ORIGIN")
+set(CMAKE_INSTALL_RPATH $ORIGIN)
 # set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
@@ -152,13 +190,12 @@ if (SLS_USE_RECEIVER)
     if (SLS_USE_HDF5)
         find_package(HDF5 1.10 COMPONENTS CXX REQUIRED)
     endif (SLS_USE_HDF5)
-    add_subdirectory(slsReceiverSoftware)
-    add_subdirectory(manual/manual-api)    
+    add_subdirectory(slsReceiverSoftware) 
 endif (SLS_USE_RECEIVER)
 
 if (SLS_USE_GUI)   
     find_package(Qt4 REQUIRED)
-    find_package(Qwt 6 REQUIRED)
+    find_package(Qwt 6.1 REQUIRED)
     if (QT4_FOUND AND QWT_FOUND)
         add_subdirectory(slsDetectorGui)
     endif()
@@ -173,25 +210,35 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
+    set(PYBIND11_CPP_STANDARD -std=c++11)
     add_subdirectory(libs/pybind11)
     add_subdirectory(python)
 endif(SLS_USE_PYTHON)
 
+if (SLS_USE_CTBGUI)
+    add_subdirectory(ctbGui)
+endif(SLS_USE_CTBGUI)
+
 configure_file( .clang-tidy  
     ${CMAKE_BINARY_DIR}/.clang-tidy  
 )
 
+if (SLS_BUILD_EXAMPLES)
+    add_subdirectory(sample)
+endif(SLS_BUILD_EXAMPLES)
 
-add_subdirectory(sample)
-
-add_subdirectory(docs)
-
+if(SLS_BUILD_DOCS)
+    add_subdirectory(docs)
+endif(SLS_BUILD_DOCS)
 
 
+if(SLS_USE_MOENCH)
+    add_subdirectory(slsDetectorCalibration/moenchExecutables)
+endif(SLS_USE_MOENCH)
 
 if(SLS_MASTER_PROJECT)
     # Set install dir CMake packages
-    set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/sls)
+    set(CMAKE_INSTALL_DIR "share/cmake/${PROJECT_NAME}")
     # Set the list of exported targets
     set(PROJECT_LIBRARIES slsSupportLib slsDetectorShared slsReceiverShared)
     # Generate and install package config file and version

README.md

@@ -2,90 +2,67 @@
 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)
+Binaries for the slsDetectorPackage are available through conda. 
+```
+#Add conda channels
+conda config --add channels conda-forge
+conda config --add channels slsdetectorgroup
+
+conda install slsdetlib   #only shared lib and command line
+conda install slsdet      #python bindings (includes slsdetlib)
+conda install slsdetgui   #gui (includes qt4)
+
+#Install specific version
+conda install slsdet=2020.03.02.dev0 #developer version from 3 March 2020
+
+```
 
 ### Source code
-One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
+One can also obtain the source code from this repository and compile.
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
 
 ```
-#### Setup dependencies 
-* Gui Client <br>
-Requirements: 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.
+#### Dependencies 
+* Lib: c++11 compiler (gcc=>4.8), ZeroMQ 4
+* Gui: Qt 4.8 and Qwt 6.0
+* Calibration wizards and ctbGUI: ROOT
+* Optional: HDF5
 
-* Advanced user Calibration wizards<br>
-Requirements: ROOT
-```
-    export ROOTSYS=/usr/local/root-5.34
-```
 
 #### Compilation 
 
-Compiling can be done in two ways.
+Compiling can be done in two ways. Either with the convenience script
+cmk.sh or directly with cmake for more control.
 
 **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>
-
+Usage: [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
+ -[no option]: only make
+ -c: Clean
+ -b: Builds/Rebuilds CMake files normal mode
+ -p: Builds/Rebuilds Python API
+ -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
+ -s: Simulator
+ -u: Chip Test Gui
+ -j: Number of threads to compile through
+ -e: Debug mode
+ -i: Builds tests
+  
+eg. Rebuild when you switch to a new build and compile in parallel:
+./cmk.sh -bj5
 
 **2. Compile without script**<br>
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory.
+Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. This would create a debug build with address sanitizers.
 ```
-    $ cd ..
-    $ mkdir slsDetectorPackage-build
-    $ cd slsDetectorPackage-build
-    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=OFF 
-    $ make
-```
-
-Use the following as an example to compile statically and using specific hdf5 folder
-```
-    $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=ON
- ```  
-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 slsMultiReceiver
+    $ mkdir build
+    $ cd build
+    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON
+    $ make -j12 #or whatever number of threads wanted
 ```

RELEASE.txt

@@ -0,0 +1,2 @@
+Draft
+- dr 4, 8, 16 in eiger -> speed 0, 32 stays same (speed 1)

cmake/FindClangFormat.cmake

@@ -0,0 +1,39 @@
+# Find Clang format
+if(NOT ClangFormat_BIN_NAME)
+	set(ClangFormat_BIN_NAME clang-format)
+endif()
+
+# if custom path check there first
+if(ClangFormat_ROOT_DIR)
+    find_program(ClangFormat_BIN 
+        NAMES
+        ${ClangFormat_BIN_NAME}
+        PATHS
+        "${ClangFormat_ROOT_DIR}"
+        NO_DEFAULT_PATH)
+endif()
+
+find_program(ClangFormat_BIN NAMES ${ClangFormat_BIN_NAME})
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    ClangFormat
+    DEFAULT_MSG 
+    ClangFormat_BIN)
+
+mark_as_advanced(
+    ClangFormat_BIN)
+
+if(ClangFormat_FOUND)
+    exec_program(${ClangFormat_BIN} ${CMAKE_CURRENT_SOURCE_DIR} ARGS --version OUTPUT_VARIABLE CLANG_VERSION_TEXT)
+    string(REGEX MATCH "([0-9]+)\\.[0-9]+\\.[0-9]+" CLANG_VERSION ${CLANG_VERSION_TEXT})
+    if((${CLANG_VERSION} GREATER "9") OR (${CLANG_VERSION} EQUAL "9"))
+        # A CMake script to find all source files and setup clang-format targets for them
+        message(STATUS "found clang-format \"${CLANG_VERSION}\" adding formatting targets")
+        include(clang-format)
+    else()
+        message(STATUS "clang-format version \"${CLANG_VERSION}\" found but need at least 9. Not setting up format targets")
+    endif()
+else()
+    message(STATUS "clang-format not found. Not setting up format targets")
+endif()

cmake/clang-format.cmake

@@ -0,0 +1,47 @@
+# A CMake script to find all source files and setup clang-format targets for them
+
+# Find all source files
+set(ClangFormat_CXX_FILE_EXTENSIONS ${ClangFormat_CXX_FILE_EXTENSIONS} *.cpp *.h *.cxx *.hxx *.hpp *.cc *.ipp *.c)
+file(GLOB_RECURSE ALL_SOURCE_FILES ${ClangFormat_CXX_FILE_EXTENSIONS})
+
+# Don't include some common build folders
+set(ClangFormat_EXCLUDE_PATTERNS ${ClangFormat_EXCLUDE_PATTERNS} "/CMakeFiles/" "cmake")
+
+# get all project files file
+foreach (SOURCE_FILE ${ALL_SOURCE_FILES}) 
+    foreach (EXCLUDE_PATTERN ${ClangFormat_EXCLUDE_PATTERNS})
+        string(FIND ${SOURCE_FILE} ${EXCLUDE_PATTERN} EXCLUDE_FOUND) 
+        if (NOT ${EXCLUDE_FOUND} EQUAL -1) 
+            list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+        endif () 
+    endforeach ()
+endforeach ()
+
+#target for formatting soruce files
+add_custom_target(format
+    COMMENT "Running clang-format to change files"
+    COMMAND ${ClangFormat_BIN}
+    -style=file
+    -i
+    ${ALL_SOURCE_FILES}
+)
+
+
+#target to check format on source files 
+add_custom_target(format-check
+    COMMENT "Checking clang-format changes"
+    # Use ! to negate the result for correct output
+    COMMAND !
+    ${ClangFormat_BIN}
+    -style=file
+    -output-replacements-xml
+    ${ALL_SOURCE_FILES}
+    | grep -q "replacement offset" 
+)
+
+# debug to check which file will be formatted
+add_custom_target(
+    listformatfiles
+    COMMAND
+    echo ${ALL_SOURCE_FILES}
+)

cmake/package_config.cmake

@@ -15,17 +15,20 @@ configure_package_config_file(
 write_basic_package_version_file(
   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake"
   VERSION ${PROJECT_VERSION}
-  COMPATIBILITY SameMajorVersion)
+  COMPATIBILITY SameMajorVersion
+)
 
 install(FILES
   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake"
   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake"
   COMPONENT devel
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER})
+  DESTINATION ${CMAKE_INSTALL_DIR}
+)
 
 if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES)
   install(
     EXPORT "${TARGETS_EXPORT_NAME}"
     FILE ${PROJECT_NAME_LOWER}-targets.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER})
+    DESTINATION ${CMAKE_INSTALL_DIR}
+    )
 endif ()

cmk.sh

@@ -10,6 +10,9 @@ DEBUG=0
 PYTHON=0
 TESTS=0
 SIMULATOR=0
+CTBGUI=0
+MANUALS=0
+MOENCHZMQ=0
 
 
 CLEAN=0
@@ -18,7 +21,7 @@ CMAKE_PRE=""
 CMAKE_POST=""
 
 usage() { echo -e "
-Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
+Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [-h] [z] [-d <HDF5 directory>] [-j] <Number of threads>
  -[no option]: only make
  -c: Clean
  -b: Builds/Rebuilds CMake files normal mode
@@ -29,9 +32,12 @@ Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [i] [-h] [-d <HDF5 directory>] [-j]
  -r: Build/Rebuilds only receiver
  -g: Build/Rebuilds only gui
  -s: Simulator
+ -u: Chip Test Gui
  -j: Number of threads to compile through
  -e: Debug mode
  -i: Builds tests
+ -m: Manuals
+ -z: Moench zmq processor
 
 Rebuild when you switch to a new build and compile in parallel:
 ./cmk.sh -bj5
@@ -67,7 +73,7 @@ For rebuilding only certain sections
  
  " ; exit 1; }
 
-while getopts ":bpchd:j:trgeis" opt ; do
+while getopts ":bpchd:j:trgeisumz" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
@@ -122,6 +128,18 @@ while getopts ":bpchd:j:trgeis" opt ; do
 		echo "Compiling Options: Simulator" 
 		SIMULATOR=1
 		;; 
+	m)	
+		echo "Compiling Manuals"
+		MANUALS=1
+		;;
+	z)	
+		echo "Compiling Moench Zmq Processor"
+		MOENCHZMQ=1
+		;;
+	u)
+		echo "Compiling Options: Chip Test Gui"
+		CTBGUI=1
+		;;
   \?)
     echo "Invalid option: -$OPTARG" 
 		usage
@@ -149,7 +167,7 @@ if [ $TEXTCLIENT -eq 0 ] && [ $RECEIVER -eq 0 ]  && [ $GUI -eq 0 ]; then
     echo "Enabling Compile Option: TextClient, Receiver and GUI"
 else 
     if [ $TEXTCLIENT -eq 1 ]; then
-        CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON "
+        CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=OFF "
         echo "Enabling Compile Option: TextClient"
     fi
     if [ $RECEIVER -eq 1 ]; then
@@ -181,21 +199,38 @@ fi
 
 #Debug
 if [ $DEBUG -eq 1 ]; then
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
-# CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
+#	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
 	echo "Debug Option enabled"
 fi 
 
 #Simulator
 if [ $SIMULATOR -eq 1 ]; then
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SIMULATOR=ON "
+	CMAKE_POST+=" -DSLS_USE_SIMULATOR=ON "
 	echo "Simulator Option enabled"
 fi 
 
+#Manuals
+if [ $MANUALS -eq 1 ]; then
+	CMAKE_POST+=" -DSLS_BUILD_DOCS=ON "
+	echo "Manuals Option enabled"
+fi 
+
+#Moench zmq processor
+if [ $MOENCHZMQ -eq 1 ]; then
+	CMAKE_POST+=" -DSLS_USE_MOENCH=ON "
+	echo "Moench Zmq Processor Option enabled"
+fi 
+
+#Chip Test Gui
+if [ $CTBGUI -eq 1 ]; then
+	CMAKE_POST+=" -DSLS_USE_CTBGUI=ON "
+	echo "CTB Gui Option enabled"
+fi 
 
 #Tests
 if [ $TESTS -eq 1 ]; then
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_TESTS=ON -DSLS_USE_INTEGRATION_TESTS=ON"
+	CMAKE_POST+=" -DSLS_USE_TESTS=ON -DSLS_USE_INTEGRATION_TESTS=ON"
 	echo "Tests Option enabled"
 fi 
 
@@ -236,8 +271,18 @@ if [ $COMPILERTHREADS -gt 0 ]; then
 	BUILDCOMMAND="make -j$COMPILERTHREADS"
 	echo $BUILDCOMMAND
 	eval $BUILDCOMMAND
+	if [ $MANUALS -eq 1 ]; then
+		BUILDCOMMAND="make docs -j$COMPILERTHREADS"
+		echo $BUILDCOMMAND
+		eval $BUILDCOMMAND
+	fi 
 else
+	echo "make"
 	make
+	if [ $MANUALS -eq 1 ]; then
+		echo "make docs"
+		make docs
+	fi 
 fi
 
 

conda-recepie/build.sh

@@ -1,3 +1,4 @@
+
 mkdir build
 mkdir install
 cd build
@@ -6,7 +7,7 @@ cmake .. \
       -DCMAKE_INSTALL_PREFIX=install \
       -DSLS_USE_TEXTCLIENT=ON \
       -DSLS_USE_RECEIVER=ON \
-      -DSLS_USE_GUI=OFF \
+      -DSLS_USE_GUI=ON \
       -DSLS_USE_TESTS=ON \
       -DSLS_USE_PYTHON=OFF \
       -DCMAKE_BUILD_TYPE=Release \

conda-recepie/build_pylib.sh

@@ -1,14 +1,4 @@
 
-# mkdir $PREFIX/lib
-# mkdir $PREFIX/include
-
-
-# #Shared and static libraries
-# cp build/bin/_sls_detector* $PREFIX/lib/.
-
-
-# #Binaries
-# cp -r build/bin/sls_detector $PREFIX/lib/.
-
+echo "|<-------- starting python build"
 cd python
-${PYTHON} setup.py install
+${PYTHON} setup.py install

conda-recepie/conda_build_config.yaml

@@ -0,0 +1,7 @@
+python:
+    - 3.6
+    - 3.7
+    - 3.8
+    
+numpy: 
+    - 1.17

conda-recepie/copy_ctbgui.sh

@@ -0,0 +1,9 @@
+mkdir $PREFIX/lib
+mkdir $PREFIX/bin
+mkdir $PREFIX/include
+
+
+
+cp build/bin/ctbGui $PREFIX/bin/.
+cp build/bin/libctbRootLib.so $PREFIX/lib/.
+

conda-recepie/copy_gui.sh

@@ -1,15 +1,3 @@
-
-mkdir $PREFIX/lib
+#Copy the GUI 
 mkdir $PREFIX/bin
-mkdir $PREFIX/include
-
-#No libs for gui?
-
-#Binaries
-cp build/bin/gui_client $PREFIX/bin/.
 cp build/bin/slsDetectorGui $PREFIX/bin/.
-
-
-#Which headers do we need for development??
-
-# cp include/some_lib.h $PREFIX/include/.

conda-recepie/copy_lib.sh

@@ -5,18 +5,20 @@ mkdir $PREFIX/include
 mkdir $PREFIX/include/slsDetectorPackage
 
 #Shared and static libraries
-cp build/bin/libSlsDetector.so $PREFIX/lib/.
-cp build/bin/libSlsReceiver.so $PREFIX/lib/.
-cp build/bin/libSlsSupport.so $PREFIX/lib/.
+# cp build/bin/libSlsDetector.so $PREFIX/lib/.
+# cp build/bin/libSlsReceiver.so $PREFIX/lib/.
+# cp build/bin/libSlsSupport.so $PREFIX/lib/.
+
+cp build/install/lib/* $PREFIX/lib/
 
 #Binaries
-cp build/bin/sls_detector_acquire $PREFIX/bin/.
-cp build/bin/sls_detector_get $PREFIX/bin/.
-cp build/bin/sls_detector_put $PREFIX/bin/.
-cp build/bin/sls_detector_help $PREFIX/bin/.
-cp build/bin/slsReceiver $PREFIX/bin/.
-cp build/bin/slsMultiReceiver $PREFIX/bin/.
+cp build/install/bin/sls_detector_acquire $PREFIX/bin/.
+cp build/install/bin/sls_detector_get $PREFIX/bin/.
+cp build/install/bin/sls_detector_put $PREFIX/bin/.
+cp build/install/bin/sls_detector_help $PREFIX/bin/.
+cp build/install/bin/slsReceiver $PREFIX/bin/.
+cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
 
-#Which headers do we need for development??
-cp build/install/include/* $PREFIX/include/slsDetectorPackage/
-# cp include/some_lib.h $PREFIX/include/.
+
+cp build/install/include/* $PREFIX/include/
+cp -r build/install/share/ $PREFIX/share

conda-recepie/meta.yaml

@@ -1,13 +1,14 @@
 
 package:
   name: sls_detector_software
-  version: "developer"
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
 
 source:
   - path: ..
 
 build:
-  number: 1
+  number: 0
+  binary_relocation: True
   rpaths:
     - lib/
 
@@ -16,10 +17,9 @@ requirements:
     - {{ compiler('c') }}
     - {{compiler('cxx')}}
     - cmake
-    # - qwt 6.* #require qt5 investigate befor activating gui
-    # - qt=4.8.7=7
-    - zeromq=4.2.5=hfc679d8_5
-    - pyzmq
+    - qwt 6.*
+    - qt 4.8.*
+    - zeromq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -37,6 +37,7 @@ requirements:
   host:
     - libstdcxx-ng
     - libgcc-ng
+    - zeromq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -46,75 +47,52 @@ requirements:
     - xorg-libxfixes
 
   run:
+    - zeromq
     - libstdcxx-ng
     - libgcc-ng 
 
 
 outputs:
-  - name: sls_detector_lib
+  - name: slsdetlib
     script: copy_lib.sh
 
-  - name: sls_detector
+    requirements:
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+        - zeromq
+
+  - name: slsdet
+
     script: build_pylib.sh
 
     requirements:
       build:
+        - python
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
-        - python {{ python }}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
         - setuptools
-        - sls_detector_lib
-        - pyzmq
-        - pybind11 2.2
+
       host:
         - python
-        - pybind11 2.2 
-        - pyzmq
-        - sls_detector_lib
+
+      run:
         - libstdcxx-ng
         - libgcc-ng
-      run:
         - python
         - numpy
-        - sls_detector_lib=developer
-        - pyzmq
-        - libstdcxx-ng
-        - libgcc-ng
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+
+
     test:
       imports:
-        - sls_detector
+        - slsdet
 
-    # requirements:
-    #   build:
-    #     - {{ compiler('c') }}
-    #     - {{compiler('cxx')}}
-
-  # - name: sls_detector_gui
-  #   version: "refactor"
-  #   script: copy_gui.sh
-  #   requirements:
-  #     build:
-  #     - {{ compiler('c') }}
-  #     - {{compiler('cxx')}}
-  #     - cmake
-  #     - qwt 6.*
-  #     - qt=4.8.7=7
-  #     - zeromq=4.2.5=hfc679d8_5
-  #     - pyzmq
-  #     - xorg-libx11
-  #     - xorg-libice
-  #     - xorg-libxext
-  #     - xorg-libsm
-  #     - xorg-libxau
-  #     - xorg-libxrender
-  #     - xorg-libxfixes
-  #     - {{ cdt('mesa-libgl-devel') }}      # [linux]
-  #     - {{ cdt('mesa-libegl-devel') }}     # [linux]
-  #     - {{ cdt('mesa-dri-drivers') }}      # [linux]
-  #     - {{ cdt('libselinux') }}      # [linux]
-  #     - {{ cdt('libxdamage') }}            # [linux]
-  #     - {{ cdt('libxxf86vm') }}            # [linux]
-  #     run:
-  #       - sls_detector_lib=refactor
-  #       - qwt 6.*
-  #       - qt=4.8.7=7
+  - name: slsdetgui
+    script: copy_gui.sh
+    requirements:
+      run:
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
+        - qwt 6.*
+        - qt 4.8.*

ctbGui/CMakeLists.txt

@@ -0,0 +1,89 @@
+
+
+find_package(ROOT CONFIG REQUIRED  COMPONENTS Core Gui)
+find_package(TIFF REQUIRED)
+
+target_include_directories(ROOT::Core INTERFACE "${ROOT_INCLUDE_DIRS}")
+add_library(ROOT::Flags_CXX IMPORTED INTERFACE)
+separate_arguments(ROOT_CXX_FLAGS)
+target_compile_options(ROOT::Flags_CXX INTERFACE ${ROOT_CXX_FLAGS})
+separate_arguments(ROOT_DEFINITIONS)
+target_compile_definitions(ROOT::Flags_CXX INTERFACE ${ROOT_DEFINITIONS})
+
+# This fixes a bug in the linker flags
+string(REPLACE "-L " "-L" ROOT_EXE_LINKER_FLAGS "${ROOT_EXE_LINKER_FLAGS}")
+separate_arguments(ROOT_EXE_LINKER_FLAGS)
+
+# Stuck into using old property method due to separate -L and -l arguments
+# (A full path to -l is better!)
+set_property(TARGET ROOT::Flags_CXX PROPERTY
+    INTERFACE_LINK_LIBRARIES ${ROOT_EXE_LINKER_FLAGS})
+set_property(TARGET ROOT::Core PROPERTY
+    INTERFACE_INCLUDE_DIRECTORIES "${ROOT_INCLUDE_DIRS}")
+
+
+add_executable(ctbGui 
+    ctbGui.cpp 
+    ctbMain.cpp
+    ctbDacs.cpp
+    ctbPowers.cpp
+    ctbSlowAdcs.cpp
+    ctbSignals.cpp
+    ctbAdcs.cpp
+    ctbPattern.cpp
+    ctbAcquisition.cpp
+    ${CMAKE_SOURCE_DIR}/slsDetectorCalibration/tiffIO.cpp
+)
+
+
+#TODO! Replace with target
+target_include_directories(ctbGui PRIVATE 
+    ${CMAKE_SOURCE_DIR}/slsDetectorCalibration/dataStructures
+    ${CMAKE_SOURCE_DIR}/slsDetectorCalibration/interpolations
+    ${CMAKE_SOURCE_DIR}/slsDetectorCalibration/
+)
+
+# Headders needed for ROOT dictionary generation
+set( HEADERS
+    ctbDefs.h
+    ctbMain.h 
+    ctbDacs.h   
+    ctbPattern.h  
+    ctbSignals.h  
+    ctbAdcs.h 
+    ctbAcquisition.h 
+    ctbPowers.h   
+    ctbSlowAdcs.h
+)
+
+#set(ROOT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
+# ROOT dictionary generation 
+include("${ROOT_DIR}/modules/RootNewMacros.cmake")
+root_generate_dictionary(ctbDict ${HEADERS} LINKDEF ctbLinkDef.h)
+add_library(ctbRootLib SHARED ctbDict.cxx)
+target_include_directories(ctbRootLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(ctbRootLib PUBLIC 
+    ROOT::Core 
+    slsDetectorShared
+    slsSupportLib
+    ${ROOT_LIBRARIES} 
+    ${ROOT_EXE_LINKER_FLAGS}
+)
+
+set_target_properties(
+    ctbRootLib PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+target_link_libraries(ctbGui PUBLIC 
+    slsDetectorShared
+    slsSupportLib
+    ctbRootLib
+    ${TIFF_LIBRARIES}
+)
+
+set_target_properties(ctbGui PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+
+)

ctbGui/Makefile.root5

@@ -1,17 +1,17 @@
 
 
 INCS=ctbMain.h ctbDacs.h   ctbPattern.h  ctbSignals.h  ctbAdcs.h ctbAcquisition.h ctbPowers.h   ctbSlowAdcs.h 
-SRC= $(SRC:.h=.cpp) ctbDict.cpp 
+SRC= $(INCS:.h=.cpp) ctbDict.cpp 
 LINKDEF=ctbLinkDef.h 
 ZMQLIB=../slsReceiverSoftware/include
 LIBRARYCBF=$(CBFLIBDIR)/lib/*.o
 
 INCDIR=-I../slsReceiverSoftware/include/ -I../slsDetectorSoftware/include/ -I../slsSupportLib/include/  -I../slsDetectorCalibration -I../slsDetectorCalibration/dataStructures  -I$(CBFLIBDIR)/include  -I../slsDetectorCalibration/interpolations
-LDFLAG=-L../bin -lSlsDetector -lSlsSupport  -L/usr/lib64/ -lpthread -lm  -lstdc++  -lzmq -pthread -lrt  -ltiff -L$(ZMQLIB) -L$(CBFLIBDIR)/lib/ -std=c++11
+LDFLAG=-L../build/bin -lSlsDetector -lSlsSupport  -L/usr/lib64/ -lpthread -lm  -lstdc++  -lzmq -pthread -lrt  -ltiff -L$(ZMQLIB) -L$(CBFLIBDIR)/lib/ -std=c++11
 #
 MAIN=ctbGui.cpp
 
-DESTDIR?=../bin
+DESTDIR?=../build/bin
 
 
 OBJS = $(SRC:.cpp=.o) $(MAIN:.cpp=.o)
@@ -30,13 +30,13 @@ ctbDict.cpp: $(INCS)  $(LINKDEF)
 
 %.o : %.cpp 
 	echo $@
-	g++ -DMYROOT `source root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG)  -o $@ -c $< $(INCDIR)
+	g++ -DMYROOT `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG)  -o $@ -c $< $(INCDIR)
 #$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC  $(EPICSFLAGS) -lpthread #$(FLAGS)
 
 
 
 $(DESTDIR)/ctbGui: $(OBJS) $(LINKDEF) 
-	g++ -DMYROOT `source root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS)  ../slsDetectorCalibration/tiffIO.cpp
+	g++ -DMYROOT `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS)  ../slsDetectorCalibration/tiffIO.cpp
 	mv ctbGui $(DESTDIR)	
 
 clean:

ctbGui/ctbAcquisition.cpp

@@ -24,13 +24,15 @@
 #include <fstream>
 
 #include "ctbAcquisition.h"
-#include "multiSlsDetector.h"
+#include "ctbDefs.h"
+#include "Detector.h"
 #include "sls_detector_defs.h"
 #include "ctbMain.h"
 #include "moench03CtbData.h" 
-#include "moench03TCtbData.h" 
-#include "moench03T1CtbData.h" 
+//#include "moench03TCtbData.h" 
+//#include "moench03T1CtbData.h" 
 #include "moench03CommonMode.h" 
+#include "moench03T1ZmqDataNew.h" 
 #include "moench02CtbData.h" 
 //#include "jungfrau10ModuleData.h" 
 #include "moenchCommonMode.h" 
@@ -39,15 +41,19 @@
 #include "Mythen3_02_jctbData.h"
 #include "adcSar2_jctbData.h"
 #include "moench04CtbZmqData.h"
+#include "moench04CtbZmq10GbData.h"
 #include "deserializer.h"
 #include "detectorData.h"
+#include "imageZmq16bit.h"
+#include "imageZmq32bit.h"
+
 
 using namespace std;
 
 
 
 
-ctbAcquisition::ctbAcquisition(TGVerticalFrame *page, multiSlsDetector *det) : TGGroupFrame(page,"Acquisition",kVerticalFrame),  myDet(det), myCanvas(NULL), globalPlot(0), nAnalogSamples(1), nDigitalSamples(1), dataStructure(NULL), photonFinder(NULL), cmSub(0), dBitMask(0xffffffffffffffff), deserializer(0) {
+ctbAcquisition::ctbAcquisition(TGVerticalFrame *page, sls::Detector *det) : TGGroupFrame(page,"Acquisition",kVerticalFrame),  myDet(det), myCanvas(NULL), globalPlot(0), tenG(0), nAnalogSamples(1), nDigitalSamples(1), dataStructure(NULL), photonFinder(NULL), cmSub(0), dBitMask(0xffffffffffffffff), deserializer(0) {
 
   adcFit=NULL;
   bitPlot=NULL;
@@ -70,8 +76,11 @@ ctbAcquisition::ctbAcquisition(TGVerticalFrame *page, multiSlsDetector *det) : T
    cFileSave->SetTextJustify(kTextRight);
    cFileSave->Connect("Toggled(Bool_t)","ctbAcquisition",this,"setFsave(Bool_t)");
 
-  
-   eFname = new TGTextEntry(hframe, (myDet->getFileName()).c_str());
+  std::string temp = "run";
+  try {
+    temp = myDet->getFileNamePrefix().tsquash("Different values");
+  } CATCH_DISPLAY ("Could not get file name prefix.", "ctbAcquisition::ctbAcquisition")
+  eFname = new TGTextEntry(hframe, temp.c_str());
 
    hframe->AddFrame(eFname,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
    eFname->MapWindow();
@@ -112,7 +121,11 @@ ctbAcquisition::ctbAcquisition(TGVerticalFrame *page, multiSlsDetector *det) : T
 
 
 
-   eOutdir = new TGTextEntry(hframe, (myDet->getFilePath()).c_str());
+  temp = "/tmp/";
+  try {
+    temp = myDet->getFilePath().tsquash("Different values");
+  } CATCH_DISPLAY ("Could not get file path.", "ctbAcquisition::ctbAcquisition")
+   eOutdir = new TGTextEntry(hframe, temp.c_str());
 
    hframe->AddFrame(eOutdir,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
    eOutdir->MapWindow();
@@ -223,7 +236,10 @@ hframe=new TGHorizontalFrame(this, 800,50);
   cbDetType->AddEntry("MOENCH02", MOENCH02);
   cbDetType->AddEntry("MOENCH04", MOENCH04);
   // cbDetType->AddEntry("JUNGFRAU1.0", 2);
-  //cbDetType->AddEntry("MOENCH03 T", iiii++);
+  cbDetType->AddEntry("MOENCH03",MOENCH03);
+  cbDetType->AddEntry("IMAGE32BIT",IMAGE32B);
+  cbDetType->AddEntry("IMAGE16BIT",IMAGE16B);
+
   //cbDetType->AddEntry("MOENCH03", iiii++);
   // cbDetType->AddEntry("MYTHEN3 0.1", MYTHEN301);
   // cbDetType->AddEntry("ADCSAR2", ADCSAR2);
@@ -262,7 +278,7 @@ hframe=new TGHorizontalFrame(this, 800,50);
 
 
 
-    cout << "off "<< endl;
+  //  cout << "off "<< endl;
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -281,8 +297,8 @@ hframe=new TGHorizontalFrame(this, 800,50);
                                                TGNumberFormat::kNEANonNegative, 
 			     TGNumberFormat::kNELLimitMinMax,0,16535);
    hframe->AddFrame(eSerOff,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eSerOff->MapWindow();;
-   eSerOff->SetNumber(5);
+   eSerOff->MapWindow();
+   eSerOff->SetNumber(0);
    e= eSerOff->TGNumberEntry::GetNumberEntry();
    eSerOff->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeSerialOffset(Long_t)");
    e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeSerialOffset()");
@@ -328,6 +344,53 @@ hframe=new TGHorizontalFrame(this, 800,50);
    
 
 
+  hframe=new TGHorizontalFrame(this, 800,50);
+  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
+  hframe->MapWindow();
+    
+ 
+
+  label=new TGLabel(hframe,"Image Pixels");
+  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
+  label->MapWindow();
+  label->SetTextJustify(kTextLeft);
+
+
+  label=new TGLabel(hframe,"X: ");
+  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
+  label->MapWindow();
+  label->SetTextJustify(kTextRight);
+
+
+  ePixX=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
+                                               TGNumberFormat::kNEANonNegative, 
+			     TGNumberFormat::kNELLimitMinMax,0,16535);
+   hframe->AddFrame(ePixX,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
+   ePixX->MapWindow();
+   ePixX->SetNumber(400);
+   e= ePixX->TGNumberEntry::GetNumberEntry();
+   ePixX->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
+   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
+
+
+
+  label=new TGLabel(hframe,"Y: ");
+  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
+  label->MapWindow();
+  label->SetTextJustify(kTextRight);
+
+
+  ePixY=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
+                                               TGNumberFormat::kNEANonNegative, 
+			     TGNumberFormat::kNELLimitMinMax,0,16535);
+   hframe->AddFrame(ePixY,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
+   ePixY->MapWindow();
+   ePixY->SetNumber(400);
+   e= ePixY->TGNumberEntry::GetNumberEntry();
+   ePixY->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
+   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
+
+
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -596,21 +659,14 @@ hframe=new TGHorizontalFrame(this, 800,50);
 
   acqThread = new TThread("acqThread",
 			  ctbAcquisition::ThreadHandle,(void*)this);
-  // acqThread->Run();
-  cout <<"Registering progress callback" << endl;
-  try {
-    myDet->registerProgressCallback(&progressCallback,(void*)this);
-  }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
   
   cout <<"Registering data callback" << endl;
-  try{
+  try {
     myDet->registerDataCallback(&dataCallback, (void*)this);
-  }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-  
+  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition") 
+      try {
+	myDet->setRxZmqDataStream(true); 
+      } CATCH_DISPLAY ("Could not get set RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
   cout <<"Done" << endl;
   
     //  mgAdcs=new TMultiGraph();
@@ -663,10 +719,6 @@ hframe=new TGHorizontalFrame(this, 800,50);
       countsHisto[i]=h1;
     }
 
-    int nx,ny;
-    int csize=3;
-    int nsigma=5;
-
     dataStructure=NULL;
     commonMode=NULL;
     photonFinder=NULL;
@@ -770,7 +822,7 @@ void ctbAcquisition::canvasClicked() {
 void ctbAcquisition::setCanvas(TCanvas* c) {
   myCanvas=c;  
   myCanvas->cd();
-  myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)0x%x)->canvasClicked()",this));
+  myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)%p)->canvasClicked()",this));
   // myCanvas->AddExec("ex","canvasClicked()");
 }
 void ctbAcquisition::dataCallback(detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) {
@@ -805,8 +857,6 @@ digital:
 sample0 (dbit0 + dbit1 +...)
 sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 
-        myDet->setReceiverOnline(ONLINE_FLAG, detPos);
-
         if (action == PUT_ACTION) {
             std::vector <int> dbitlist;
 
@@ -838,25 +888,24 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 
   //  cout <<"global plot is " << globalPlot << endl;
   // cout << "*******************************************" <<endl;
-  // cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
+   cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " nx:" << data->nx << " ny: " << data->ny << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
   if (globalPlot || cbGetPedestal->IsOn()) {
     //#ifdef TESTADC
     //  cout <<"------"<<  index << " " << ip << " " << data->npoints << endl;
     //#endif
   int ig=0;
-  int i, ii, ich=0, ib, vv;
+  int i, ii, ib;
   // TList *l= adcStack->GetHists();
   // TList *l1= countsStack->GetHists();
   TH1F *h;
   TH1F *h1;
   TH1F *hb;
-  int nb, x,y;
+  int x;
   double ped=0;
-  int vv1,vv2;
   int dsize=-1;
   int  *val=NULL;
-  int nx=1, ny=1, jj;
-  short unsigned int *va;
+  int nx=1, ny=1;
+
   if (dataStructure) { 
     dataStructure->getDetectorSize(nx,ny);
     cout << "Data structure: " << dataStructure << " size " << nx << " " << ny <<  endl;
@@ -866,13 +915,18 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
     nx=eNumCount->GetIntNumber();
     dr=eDynRange->GetIntNumber();
     soff=eSerOff->GetIntNumber();
+    // cout <<"deserializer: " << endl;
+    // cout << "Number of chans:\t" << nx << endl;
+    // cout << "Serial Offset:\t" << soff << endl;
+    // cout << "Dynamic range:\t" << dr << endl;
+    
   }
 
   i=0;
   int nadc;
   int ndbit;
 
-  
+  tenG = 0;
   
 
 
@@ -893,8 +947,18 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
     }
   } else  
     ndbit=dbitlist.size();
-
-  dsize=nadc*2*nAnalogSamples+ndbit*(nDigitalSamples-dBitOffset/8)/8;
+  if (tenG){
+   
+    if (nDigitalSamples && nAnalogSamples){
+      if (nDigitalSamples>nAnalogSamples)
+	dsize=nDigitalSamples*(32*2+8);
+      else
+	dsize=nAnalogSamples*(32*2+8);
+    } else
+      dsize=32*2*nAnalogSamples+8*nDigitalSamples;
+    
+  } else
+    dsize=nadc*2*nAnalogSamples+ndbit*(nDigitalSamples-dBitOffset/8)/8;
   
   cout << "dataBytes is " << data->databytes << " expected " << dsize << endl;
 
@@ -905,7 +969,11 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
   i=0;
 
 
-  char *d_data=	data->data+2*nadc*nAnalogSamples;
+  char *d_data;
+  if (tenG)
+    d_data=	data->data;
+  else
+    d_data =	data->data+2*nadc*nAnalogSamples;
   char dval;
 
 
@@ -916,7 +984,8 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
       for (int y=0; y<ny; y++) {
 	ped=0;
 	aval=dataStructure->getValue(data->data,x,y);
-      
+	//aval=dataStructure->getChannel(data->data,x,y);
+	cout << x << " " <<y << " "<< aval << endl;
 	if (cbGetPedestal->IsOn()) {
 	  if (photonFinder) {
 	    photonFinder->addToPedestal(aval,x,y);
@@ -967,7 +1036,11 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 	  ig=ii;
 	else
 	  ig=adclist.at(ii);
-	aval=data->getChannel(i);//*((uint16_t*)(data->cvalues+i*2));//
+
+	// if (tenG)
+	//   aval=data->getChannel(i);
+	// else
+	  aval=data->getChannel(i);//*((uint16_t*)(data->cvalues+i*2));//
       
 	if (plotFlag[ig]) {
 	  
@@ -979,10 +1052,11 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 	//	cout << data->getChannel(i) << endl;
 	  h->SetBinContent(ip+1,aval);	
 	  h1->Fill(aval);
-      } 
+	} 
 	
 	i++;
-    }
+      }
+      if (tenG) i+=4;
       
     }
     
@@ -992,8 +1066,10 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
     if (dbitlist.empty())  {
       for (ip=0; ip<nDigitalSamples; ip++) {
 	for (ig=0; ig<8; ig++) { 
-	  
-	  dval=*(d_data+ip*8+ig);
+	  if (tenG)
+	    dval=*(d_data+ip*(8+32*2)+32*2+ig);
+	  else
+	    dval=*(d_data+ip*8+ig);
 	  
 	  for (ib=(ig)*8; ib<(ig+1)*8; ib++) {
 	    if (bitPlotFlag[ib]) {
@@ -1010,7 +1086,6 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
     } else {
       ii=0;
       int iii=0;
-      int nb=dbitlist.size();
       for (const auto &value : dbitlist) {
 	ib=value;
 	hb=bitHisto[ib];  
@@ -1081,8 +1156,20 @@ void ctbAcquisition::Draw(){
 void ctbAcquisition::changePlot(){
   if (rbPlotOff->IsOn()) {
     adcPlot=0;
-    dbitPlot=0;
+    dbitPlot=0;   
+    try {
+      myDet->registerDataCallback(nullptr, this);  
+    } CATCH_DISPLAY ("Could not get unregister call back.", "ctbAcquisition::ctbAcquisition")   
+    try {
+      myDet->setRxZmqDataStream(false); 
+    } CATCH_DISPLAY ("Could not get unset RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
   } else {
+  try {
+    myDet->registerDataCallback(&dataCallback, (void*)this);
+  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition")   
+    try {
+      myDet->setRxZmqDataStream(true); 
+    } CATCH_DISPLAY ("Could not get set RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
     adcPlot=0;
     dbitPlot=0;
     for (int ii=0; ii<NADCS; ii++)
@@ -1176,10 +1263,10 @@ void ctbAcquisition::changeDetector(){
   photonFinder=NULL;
   dataStructure=NULL;
   commonMode=NULL;
-  TH2F *h2DMapOld=h2DMapAn;
+
   // TH2F *h2ScanOld=h2Scan;
-  TH1F *h1DMapOld=h1DMap;
-  int dim=2;
+
+
   int nx,ny;
   int csize=3;
   int nsigma=5;
@@ -1187,6 +1274,9 @@ void ctbAcquisition::changeDetector(){
    eNumCount->SetState(kFALSE);
   eDynRange->SetState(kFALSE);
   eSerOff->SetState(kFALSE);
+  ePixX->SetState(kFALSE);
+  ePixY->SetState(kFALSE);
+    
   deserializer=0;
   if (rb2D->IsOn() ) {//|| rbScan->IsOn()
     switch  (cbDetType->GetSelected()) {
@@ -1197,10 +1287,66 @@ void ctbAcquisition::changeDetector(){
       // commonMode=new moench03CommonMode();
       break;
      case MOENCH04:
-       dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
+      try {
+        auto retval = myDet->getTenGiga().tsquash("Different values");
+        if (retval) {
+          dataStructure=new moench04CtbZmq10GbData(nAnalogSamples, nDigitalSamples); 
+        } else {
+          dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
+        }
+      } CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
+
        cout << "MOENCH 0.4!" << endl;
        commonMode=new moench03CommonMode();
       break;
+     case MOENCH03:
+       //try {
+	// auto retval = myDet->getTenGiga().tsquash("Different values");
+	// if (retval) {
+          dataStructure=new moench03T1ZmqDataNew(nAnalogSamples); 
+        // } else {
+        //   dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
+        // }
+	  //} CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
+
+       cout << "MOENCH 0.3! USE JUNGFRAU MODULE!" << endl;
+       commonMode=new moench03CommonMode();
+      break;
+       case IMAGE32B:
+       //try {
+       	// auto retval = myDet->getTenGiga().tsquash("Different values");
+       	// if (retval) {
+       	// if (deserializer) {
+       	   ePixX->SetState(kTRUE);
+       	   ePixY->SetState(kTRUE);
+       	   // }
+       	 dataStructure=new imageZmq32bit(ePixX->GetIntNumber(),ePixY->GetIntNumber()); 
+        // } else {
+        //   dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
+        // }
+       	  //} CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
+
+       	 cout << "Image 32bit, no channel shuffling" << endl;
+       commonMode=NULL;
+       break;
+   
+       case IMAGE16B:
+       //try {
+	// auto retval = myDet->getTenGiga().tsquash("Different values");
+	// if (retval) {
+	// if (deserializer) {
+	   ePixX->SetState(kTRUE);
+	   ePixY->SetState(kTRUE);
+	   // }
+	 dataStructure=new imageZmq16bit(ePixX->GetIntNumber(),ePixY->GetIntNumber()); 
+        // } else {
+        //   dataStructure=new moench04CtbZmqData(nAnalogSamples, nDigitalSamples); 
+        // }
+	  //} CATCH_DISPLAY ("Could not get ten giga enable.", "ctbAcquisition::changeDetector")
+
+	 cout << "Image 16bit, no channel shuffling" << endl;
+       commonMode=NULL;
+       break;
    
     // case 1:
     //   cout << "************** T!!!!!!!!!!" << endl;
@@ -1264,6 +1410,7 @@ void ctbAcquisition::changeDetector(){
 	photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode 
 	//photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode
 	dataStructure->getDetectorSize(nx,ny);
+	
       }
       if (deserializer) {
 	ny=1;
@@ -1411,7 +1558,7 @@ void ctbAcquisition::setBitGraph(int i ,int en, Pixel_t col) {
   float off=0;
   for (int ii=0; ii<NSIGNALS; ii++) {
     if (bitPlotFlag[ii]) {bitOffset[ii]=off;
-      off+=1.5;
+      off+=static_cast<float>(1.5);
       cout << "bit " << ii << " offset " << bitOffset[ii] << endl;
     }
   }
@@ -1426,88 +1573,89 @@ void ctbAcquisition::setBitGraph(int i ,int en, Pixel_t col) {
 
 void ctbAcquisition::setOutdir() {
   try {
-  myDet->setFilePath(eOutdir->GetText());
- }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-//   //  cout << "setting dac! "<< id << endl;
-
-//   myDet->setDAC(dacsEntry->GetIntNumber(), (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn());
-
-//   getValue();
-
+    myDet->setFilePath(eOutdir->GetText());
+  } CATCH_DISPLAY ("Could not set file path", "ctbAcquisition::setOutdir")
 }
 
 void ctbAcquisition::setFname() {
   try {
-  myDet->setFileName(eFname->GetText());
- }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-//   int val=myDet->setDAC(-1, (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn());
-//   char s[100];
-
-//   sprintf(s,"%d",val);
-
-//   dacsValue->SetText(s);
-  
-
-//   return val;
-
+    myDet->setFileNamePrefix(eFname->GetText());
+  } CATCH_DISPLAY ("Could not set file name prefix", "ctbAcquisition::setFname")
 }
 
 void ctbAcquisition::setFindex() {
-
   try {
-  myDet->setFileIndex(eFindex->GetNumber()); 
-}  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-
+    myDet->setAcquisitionIndex(eFindex->GetNumber());
+  } CATCH_DISPLAY ("Could not set acquisition index", "ctbAcquisition::setFindex")
 }
 
-
 void ctbAcquisition::setFsave(Bool_t b) {
   try {
-  myDet->setFileWrite(b);
- }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-  eFname->SetState(b);
-  eOutdir->SetState(b);
-  
+    myDet->setFileWrite(b);
+    eFname->SetState(b);
+    eOutdir->SetState(b);
+  } CATCH_DISPLAY ("Could not set file write", "ctbAcquisition::setFsave")
 }
 
 void ctbAcquisition::update() {
-
+  try {
+    auto retval = myDet->getFileNamePrefix().tsquash("Different values");
+    eFname->SetText(retval.c_str());
+  } CATCH_DISPLAY ("Could not get file name prefix", "ctbAcquisition::update")
+  
+  try {
+    auto retval = myDet->getAcquisitionIndex().tsquash("Different values");
+    eFindex->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get acquisition index", "ctbAcquisition::update")
+  
+  try {
+    auto retval = myDet->getFileWrite().tsquash("Different values");
+    cFileSave->SetOn(retval);
+  } CATCH_DISPLAY ("Could not get file write", "ctbAcquisition::update")
   
-  eFname->SetText((myDet->getFileName()).c_str());
-  eOutdir->SetText((myDet->getFilePath()).c_str());
-  eFindex->SetNumber(myDet->getFileIndex()); 
-  cFileSave->SetOn(myDet->getFileWrite());
   eFname->SetState(cFileSave->IsOn());
   eOutdir->SetState(cFileSave->IsOn());
   eFindex->SetState(cFileSave->IsOn());
-  // eMeasurements->SetNumber(myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1));
-  setAnalogSamples(myDet->setTimer(slsDetectorDefs::ANALOG_SAMPLES,-1));
-  setDigitalSamples(myDet->setTimer(slsDetectorDefs::DIGITAL_SAMPLES,-1));
-  roMode=myDet->setReadOutFlags();
-  setReadoutMode(roMode);
- //nChannels=myDet->getTotalNumberOfChannels();
+  
+  try {
+    auto retval = myDet->getNumberOfAnalogSamples().tsquash("Different values");
+    setAnalogSamples(retval);
+  } CATCH_DISPLAY ("Could not get number of analog samples", "ctbAcquisition::update")
+  
+  try {
+    auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values");
+    setDigitalSamples(retval);
+  } CATCH_DISPLAY ("Could not get number of digital samples", "ctbAcquisition::update")
+  
+  try {
+    roMode = static_cast<int>(myDet->getReadoutMode().tsquash("Different values"));
+    setReadoutMode(roMode);
+  } CATCH_DISPLAY ("Could not get readout mode", "ctbAcquisition::update")
+
   updateChans();
 
    if (dataStructure) {
      cout << cbDetType->GetSelected()<< endl;
-    if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
-      cout << "settings deserialiation parameters for MYTHEN" << endl;
-      mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-      eSerOff->SetNumber( ms->setSerialOffset(-1));
-      eDynRange->SetNumber( ms->setDynamicRange(-1));
-      eNumCount->SetNumber( ms->setNumberOfCounters(-1));
-    }
+    // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+    //   cout << "settings deserialiation parameters for MYTHEN" << endl;
+    //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+    //   eSerOff->SetNumber( ms->setSerialOffset(-1));
+    //   eDynRange->SetNumber( ms->setDynamicRange(-1));
+    //   eNumCount->SetNumber( ms->setNumberOfCounters(-1));
+    // }
     
    }
-   dBitOffset=myDet->getReceiverDbitOffset();
+
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    dBitOffset = 0;
+  } else {
+    try {
+      dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
+    } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::update")
+  }
+  try {
+    tenG = myDet->getTenGiga().tsquash("Different values");
+  } CATCH_DISPLAY ("Could not get ten giga enable", "ctbAcquisition::update")
 
   // char aargs[10][100];
   // char *args[10];
@@ -1568,10 +1716,8 @@ void ctbAcquisition::loadPattern() {
 
     cout << "Load: " << fname << endl;
     try {
-      myDet->retrieveDetectorSetup(fname); 
-    }  catch (...) {
-      cout << "Do nothing for this error" << endl;
-    }
+      myDet->loadParameters(fname);
+    } CATCH_DISPLAY ("Could not load parameters", "ctbAcquisition::loadPattern")
   }
 }
 
@@ -1582,15 +1728,29 @@ void ctbAcquisition::toggleAcquisition() {
   if (acqThread->GetState()==1 || acqThread->GetState()==6) {
     /** update all infos useful for the acquisition! */
 
-    setAnalogSamples(myDet->setTimer(slsDetectorDefs::ANALOG_SAMPLES,-1));
-    setDigitalSamples(myDet->setTimer(slsDetectorDefs::DIGITAL_SAMPLES,-1));
-    dBitOffset=myDet->getReceiverDbitOffset();
-    roMode=myDet->setReadOutFlags();
+  try {
+    auto retval = myDet->getNumberOfAnalogSamples().tsquash("Different values");
+    setAnalogSamples(retval);
+  } CATCH_DISPLAY ("Could not get number of analog samples", "ctbAcquisition::toggleAcquisition")
+  
+  try {
+    auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values");
+    setDigitalSamples(retval);
+  } CATCH_DISPLAY ("Could not get number of digital samples", "ctbAcquisition::toggleAcquisition")
+  
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    dBitOffset = 0;
+  } else {
+  try {
+      dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
+    } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::toggleAcquisition")
+  }
+
+  try {
+    roMode = static_cast<int>(myDet->getReadoutMode().tsquash("Different values"));
     setReadoutMode(roMode);
+  } CATCH_DISPLAY ("Could not get readout mode", "ctbAcquisition::toggleAcquisition")
 
-
-
-    //  iScanStep=0;
   
       cout << "Run" << endl;
       bStatus->SetText("Stop");
@@ -1641,11 +1801,9 @@ void ctbAcquisition::toggleAcquisition() {
 
   } else {
     StopFlag=1; 
-    try {
-      myDet->stopAcquisition();
-    }  catch (...) {
-      cout << "Do nothing for this error" << endl;
-    }
+    try{
+      myDet->stopDetector();
+    } CATCH_DISPLAY ("Could not stop acquisition", "ctbAcquisition::toggleAcquisition")
     stop=1;
     bStatus->SetText("Start");
     //  acqThread->Kill();
@@ -1662,27 +1820,30 @@ void ctbAcquisition::acquisitionFinished() {
 void ctbAcquisition::startAcquisition(){
   cout << "Detector started " <<eMeasurements->GetNumber()<< endl;
   stop=0;
+
+  try {
+    tenG = myDet->getTenGiga().tsquash("Different values");
+  } CATCH_DISPLAY ("Could not get ten giga enable", "ctbAcquisition::startAcquisition")
+
   for (int im=0; im<eMeasurements->GetNumber(); im++) {
     try {
-      myDet->acquire(); 
-    }  catch (...) {
-      cout << "Do nothing for this error" << endl;
-    }
+      myDet->acquire();
+    } CATCH_DISPLAY ("Could not acquire", "ctbAcquisition::startAcquisition")
+    
     cout << im << endl;
-    if (stop) break;
+    if (stop) 
+      break;
   }
-
 }
 
 void* ctbAcquisition::ThreadHandle(void *arg)
 {
    ctbAcquisition *acq = static_cast<ctbAcquisition*>(arg);
-   int i=0;
 
    acq->startAcquisition();
    acq->acquisitionFinished();
 
-
+  return nullptr;
 }
  
  void ctbAcquisition::progressCallback(double f,void* arg) {
@@ -1715,12 +1876,6 @@ void ctbAcquisition::setPatternCompiler(const char* t) {
  }
 void ctbAcquisition::setMeasurements() {
 
-  
-
-  // myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,eMeasurements->GetNumber());
-  
-
-
 }
 
 void ctbAcquisition::setAnalogSamples(int n) {
@@ -1775,11 +1930,11 @@ void ctbAcquisition::setDigitalSamples(int n) {
 void ctbAcquisition::setReadoutMode(int f) {
   
   roMode=f;
-  slsDetectorDefs::readOutFlags flags=(slsDetectorDefs::readOutFlags)f;
-  if (flags&slsDetectorDefs::DIGITAL_ONLY) {
+  slsDetectorDefs::readoutMode flag=(slsDetectorDefs::readoutMode)f;
+  if (flag == slsDetectorDefs::DIGITAL_ONLY) {
     nAnalogSamples=0;
     adclist.clear();
-  }  else if (flags&slsDetectorDefs::ANALOG_AND_DIGITAL) {
+  }  else if (flag ==slsDetectorDefs::ANALOG_AND_DIGITAL) {
     ;
   }
   else {
@@ -1825,46 +1980,36 @@ void ctbAcquisition::setDbitEnable(Int_t reg){
 
 void ctbAcquisition::updateChans() {
 
-  /** dbitlist updated */ 
-  std::vector <int>  dbl;
-  try {
-    dbl = myDet->getReceiverDbitList();  
-  }  catch (...) {
-    cout << "Do nothing for this error" << endl;
+  // dbit list
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    dbitlist.clear();
+  } else {
+    try {
+      auto retval = myDet->getRxDbitList().tsquash("Different values");
+      dbitlist.clear();
+      if (!retval.empty()) {
+        for (const auto &value : retval) 
+          dbitlist.push_back(value);
+      }
+    } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbAcquisition::updateChans")
   }
-  dbitlist.clear();
-  if (dbl.empty()) 
-    ;
-  else {
-    for (const auto &value : dbl) 
-      dbitlist.push_back(value);
-  }
-  uint32_t reg;
-  try {
-    reg=myDet->getADCEnableMask();
-  }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-  /* adc updated */
-  adclist.clear();
-  // //  updateChans();
-  if (reg!=0xffffffff) {
-    for (int i=0; i<NADCS; i++) {
-      if (reg&(1<<i)) 
-	adclist.push_back(i);
-      //   // else enableFlag[i]=1;
+
+  // adc mask
+  try { 
+    auto retval = myDet->getADCEnableMask().tsquash("Different values");
+    adclist.clear();
+    if (retval!=0xffffffff) {
+      for (int i=0; i<NADCS; i++) {
+        if (retval&(1<<i)) {
+	        adclist.push_back(i);
+        }
+      }
     }
-  }
-
-
+  } CATCH_DISPLAY ("Could not get adc enable mask.", "ctbAcquisition::updateChans")
 }
 
 
 
-
-
-
-
 void ctbAcquisition::resetPedestal() {
   if (photonFinder) {
     photonFinder->newDataSet();
@@ -1968,20 +2113,22 @@ void ctbAcquisition::ChangeNumberOfChannels(Long_t a){
 
 
 void ctbAcquisition::ChangeSerialOffset(){
+  changeDetector();
   // if (dataStructure) {
 
-  //   //  cout << cbDetType->GetSelected()<< endl;
-  //   // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
-  //   //   cout << "settings offsets for MYTHEN" << endl;
-  //   //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-  //   //   ms->setSerialOffset(eSerOff->GetIntNumber());
+  //    cout << cbDetType->GetSelected()<< endl;
+  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
+  //     cout << "settings offsets for MYTHEN" << endl;
+  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //     ms->setSerialOffset(eSerOff->GetIntNumber());
       
-  //   // }
+  //   }
   // }
 };
 
 
 void ctbAcquisition::ChangeDynamicRange(){
+  changeDetector();
   // if (dataStructure) {
 
   //    cout << cbDetType->GetSelected()<< endl;
@@ -1995,6 +2142,7 @@ void ctbAcquisition::ChangeDynamicRange(){
 };
 
 void ctbAcquisition::ChangeNumberOfChannels(){
+  changeDetector();
   // if (dataStructure) {
   //    cout << cbDetType->GetSelected()<< endl;
   //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
@@ -2008,6 +2156,24 @@ void ctbAcquisition::ChangeNumberOfChannels(){
     changePlot();
 };
 
+void ctbAcquisition::ChangeImagePixels(Long_t a){
+  ChangeImagePixels();
+};
+
+void ctbAcquisition::ChangeImagePixels(){
+  changeDetector();
+  // if (dataStructure) {
+  //    cout << cbDetType->GetSelected()<< endl;
+  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+  //     cout << "settings number of channels for MYTHEN" << endl;
+  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //     ms->setNumberOfCounters(eNumCount->GetIntNumber());
+      
+  //   }
+  // }
+  // if (deserializer)
+  //  changePlot();
+};
 
 
 void ctbAcquisition::ChangeHistoLimitsPedSub(Long_t a){

ctbGui/ctbAcquisition.h

@@ -23,7 +23,10 @@ class TH1F;
 class TGLabel;
 class TGTextButton;
 
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 class detectorData;
 
 template <class dataType> class slsDetectorData;
@@ -39,7 +42,7 @@ using namespace std;
 class ctbAcquisition : public TGGroupFrame {
 
 
-  enum {DESERIALIZER, MOENCH04, MOENCH02, ADCSAR2, MYTHEN301, MYTHEN302};
+  enum {DESERIALIZER, MOENCH04, MOENCH02, MOENCH03, IMAGE32B, IMAGE16B, ADCSAR2, MYTHEN301, MYTHEN302};
 
 
  private:
@@ -54,6 +57,9 @@ class ctbAcquisition : public TGGroupFrame {
   TGNumberEntry *eNumCount;
 
 
+  TGNumberEntry *ePixX;
+  TGNumberEntry *ePixY;
+
   TGNumberEntry *eFitADC;
   TGNumberEntry *eBitPlot;
   TGNumberEntry *eMinRaw;
@@ -112,7 +118,7 @@ class ctbAcquisition : public TGGroupFrame {
   // TH1I *plotAdc[NADCS];
 
 
-  multiSlsDetector* myDet;
+  sls::Detector* myDet;
   
   int plotFlag[NADCS];
   int bitPlotFlag[NSIGNALS];
@@ -151,6 +157,7 @@ class ctbAcquisition : public TGGroupFrame {
   int globalPlot;
   int adcPlot;
   int dbitPlot;
+  int tenG;
 
   int nAnalogSamples, nDigitalSamples;
   // int iScanStep;
@@ -168,7 +175,7 @@ class ctbAcquisition : public TGGroupFrame {
   int deserializer;
 
  public:
-   ctbAcquisition(TGVerticalFrame*,  multiSlsDetector*);
+   ctbAcquisition(TGVerticalFrame*,  sls::Detector*);
    void setOutdir();
    void setFname();
    void setMeasurements();
@@ -227,7 +234,8 @@ class ctbAcquisition : public TGGroupFrame {
    void ChangeNumberOfChannels(Long_t);
    void ChangeDynamicRange();
    void ChangeDynamicRange(Long_t);
-
+   void ChangeImagePixels();
+   void ChangeImagePixels(Long_t);
 
    void canvasClicked();
    void FitADC();

ctbGui/ctbAdcs.cpp

@@ -24,14 +24,14 @@
 #include <fstream>
 
 #include "ctbAdcs.h"
-#include "multiSlsDetector.h"
-#include "slsDetectorCommand.h"
+#include "ctbDefs.h"
+#include "Detector.h"
 
 using namespace std;
 
 
 
-ctbAdc::ctbAdc(TGVerticalFrame *page, int i, multiSlsDetector *det)
+ctbAdc::ctbAdc(TGVerticalFrame *page, int i, sls::Detector *det)
   : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
 
   TGHorizontalFrame *hframe=this;
@@ -155,7 +155,7 @@ void ctbAdc::setAdcAlias(char *tit, int plot, int color) {
 string ctbAdc::getAdcAlias() {
 
   char line[1000];
-  sprintf(line,"ADC%d %s %d %x\n",id,sAdcLabel->GetText()->Data(),sAdcPlot->IsOn(),fColorSel->GetColor());
+  sprintf(line,"ADC%d %s %d %lx\n",id,sAdcLabel->GetText()->Data(),sAdcPlot->IsOn(),fColorSel->GetColor());
   return string(line);
 }
 
@@ -264,7 +264,7 @@ void ctbAdc::setPlot(Bool_t b){
 
 
 
-ctbAdcs::ctbAdcs(TGVerticalFrame *page, multiSlsDetector *det)
+ctbAdcs::ctbAdcs(TGVerticalFrame *page, sls::Detector *det)
   : TGGroupFrame(page,"Adcs",kVerticalFrame), myDet(det) {
 
 
@@ -272,7 +272,6 @@ ctbAdcs::ctbAdcs(TGVerticalFrame *page, multiSlsDetector *det)
   page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
   MapWindow();
   
-  char tit[100];
 
  
   TGHorizontalFrame* hframe=new TGHorizontalFrame(this, 800,800);
@@ -415,108 +414,41 @@ ctbAdcs::ctbAdcs(TGVerticalFrame *page, multiSlsDetector *det)
 
 int ctbAdcs::setEnable(int reg) {
 
-  // char aargs[10][100];
-  // char *args[10];
-  string retval;
-  int retreg;
-
-  // for (int i=0; i<10; i++) args[i]=aargs[i];
-
-  // sprintf(args[0],"adcenable");
-  // sprintf(args[1],"%x",reg);
-  // slsDetectorCommand *cmd=new slsDetectorCommand(myDet);
-  // if (reg>-1) {
-  //   retval=cmd->executeLine(1,args,slsDetectorDefs::PUT_ACTION);
-  // } 
-  if (reg>-1) {
-    try {
-    myDet->setADCEnableMask(reg);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-   
-  }
-  // retval=cmd->executeLine(1,args,slsDetectorDefs::GET_ACTION);
-  // cout <<"enable: " << retval << endl;;
-  // delete cmd;
-
-  // sscanf(retval.c_str(),"%x",&retreg);
   try {
-  retreg=myDet->getADCEnableMask();
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-   
-  eEnableMask->SetHexNumber(retreg);
+    if (reg > -1) {
+      myDet->setADCEnableMask(reg);
+    }
+    auto retval = myDet->getADCEnableMask().tsquash("Different values");
+    eEnableMask->SetHexNumber(retval);
+    return retval;
+  } CATCH_DISPLAY ("Could not set/get adc enablemask.", "ctbAdcs::setEnable")
   
-  return retreg;
+  return -1;
 }
 
 int ctbAdcs::setInvert(int reg) {
-  
-  // char aargs[10][100];
-  // char *args[10];
-  string retval;
-  int retreg;
 
-  // for (int i=0; i<10; i++) args[i]=aargs[i];
-
-  //sprint// f(args[0],"adcinvert");
-  // sprintf(args[1],"%x",reg);
-  // slsDetectorCommand *cmd=new slsDetectorCommand(myDet);
-    
-  if (reg>-1) {  
-    try {
-    myDet->setADCInvert(reg);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-   
-    //retval=cmd->executeLine(1,args,slsDetectorDefs::PUT_ACTION);
-  } 
   try {
-  retreg=myDet->getADCInvert();
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-   
-  // retval=cmd->executeLine(1,args,slsDetectorDefs::GET_ACTION);
-  // cout <<"invert: " << retval << endl;;
-  // delete cmd;
-
-  // sscanf(retval.c_str(),"%x",&retreg);
-  eInversionMask->SetHexNumber(retreg);
-  return retreg;
+    if (reg > -1) {
+      myDet->setADCInvert(reg);
+    }
+    auto retval = myDet->getADCInvert().tsquash("Different values");
+    eInversionMask->SetHexNumber(retval);
+    return retval;
+  } CATCH_DISPLAY ("Could not set/get adc enablemask.", "ctbAdcs::setEnable")
+  
+  return -1;
 }
 
 
 
 void ctbAdcs::update() {
-  Int_t invreg;//=myDet->readRegister(67);//(120);
-  Int_t disreg;//=myDet->readRegister(120);//(94);
-  // for (int i=0; i<10; i++)
-  //   args[i]=aargs[i];
-
-  // string retval;
-  // sprintf(args[0],"adcenable");
-  // slsDetectorCommand *cmd=new slsDetectorCommand(myDet);
-  // retval=cmd->executeLine(1,args,slsDetectorDefs::GET_ACTION);
-  // delete cmd;
-  // // cout << retval << endl;
-
-  // sscanf(retval.c_str(),"adcenable %x",&disreg);
-
-  // eInversionMask->SetHexNumber(invreg);
-  // eEnableMask->SetHexNumber(disreg);
+  Int_t invreg;
+  Int_t disreg;
 
   disreg=setEnable();
   invreg=setInvert();
   
-
   for (int is=0; is<NADCS; is++) {
     sAdc[is]->setAdcAlias(NULL,-1,-1);
     if (invreg & (1<<is) )
@@ -528,42 +460,29 @@ void ctbAdcs::update() {
       sAdc[is]->setEnable(kTRUE);
     else
       sAdc[is]->setEnable(kFALSE);
-      
-
   }
   
    Emit("AdcEnable(Int_t)", disreg);
 
 }
 string ctbAdcs::getAdcParameters() {
-  
-  ostringstream line;
-
+    ostringstream line;
   line << "reg "<< hex  << setInvert() << "# ADC invert reg" << dec << endl;
   line << "reg "<< hex  << setEnable() << " # ADC enable reg"<< dec <<  endl;
-  // line << "reg "<< hex <<  67 << " " << myDet->readRegister(67) << "# ADC invert reg" << dec << endl;
-  // line << "reg "<< hex << 120 << " " << myDet->readRegister(120) << " # ADC enable reg"<< dec <<  endl;
-  // // line << "reg "<< hex << 94 << " " << myDet->readRegister(94) << " # ADC enable reg"<< dec <<  endl;
   return line.str();
 
 }
 
 
 void ctbAdcs::CheckAll() {
-
-
   for (int is=0; is<NADCS; is++){
     sAdc[is]->setPlot(kTRUE);
-    // sAdc[is]->setEnabled(kTRUE);
   }
 }
 
 
 void ctbAdcs::RemoveAll() {
-
-
   for (int is=0; is<NADCS; is++) {
-    //  sAdc[is]->setEnabled(kFALSE);
     sAdc[is]->setPlot(kFALSE);
   }
 }
@@ -571,51 +490,32 @@ void ctbAdcs::RemoveAll() {
 
 
 void ctbAdcs::CheckHalf0() {
-
-
   for (int is=0; is<NADCS/2; is++) {
     sAdc[is]->setPlot(kTRUE);
-    // sAdc[is]->setEnabled(kTRUE)
   }
 }
 
 
 void ctbAdcs::RemoveHalf0() {
-
-
   for (int is=0; is<NADCS/2; is++){
-    //  sAdc[is]->setEnabled(kFALSE);
     sAdc[is]->setPlot(kFALSE);
   }
 }
 
 void ctbAdcs::CheckHalf1() {
-
-
   for (int is=NADCS/2; is<NADCS; is++){
     sAdc[is]->setPlot(kTRUE);
-    // sAdc[is]->setEnabled(kTRUE)
   }
 }
 
 
 void ctbAdcs::RemoveHalf1() {
-
-
   for (int is=NADCS/2; is<NADCS; is++){
-    //  sAdc[is]->setEnabled(kFALSE);
     sAdc[is]->setPlot(kFALSE);
   }
 }
 
 
-// TGraph* ctbAdcs::getGraph(int i) {
-
-//   if (i>=0 &&  i<NADCS)
-//     return sAdc[i]->getGraph();
-//   return NULL;
-// }
-
 int ctbAdcs::setAdcAlias(string line) {
 
   int is=-1, plot=0, color=-1;
@@ -657,33 +557,23 @@ void ctbAdcs::AdcEnable(Int_t b){
 
 void ctbAdcs::ToggledAdcEnable(Int_t b){
 
-
-   Int_t oreg=setEnable();//myDet->readRegister(67);
+   Int_t oreg=setEnable();
    Int_t m=1<<b;
   
-
    if (sAdc[b]->getEnable())
      oreg|=m;
    else
      oreg&=~m;
-  
-//   cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
-
-   setEnable(oreg);//)writeRegister(67, oreg);
-   //oreg=setEnable();//myDet->readRegister(67);
 
+   setEnable(oreg);
   
    Emit("AdcEnable(Int_t)", oreg);
-   //cout << "enable!" << endl;
-  //  Emit("ToggledAdcPlot(Int_t)", b);
-
 }
 
 
 void ctbAdcs::ToggledAdcInvert(Int_t b){
 
-  // char val[1000];
-   Int_t oreg=setInvert();//myDet->readRegister(67);
+   Int_t oreg=setInvert();
    Int_t m=1<<b;
   
 
@@ -692,15 +582,7 @@ void ctbAdcs::ToggledAdcInvert(Int_t b){
    else
      oreg&=~m;
   
-//   cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
-
-   setInvert(oreg);//)writeRegister(67, oreg);
-   // oreg=setInvert();//myDet->readRegister(67);
-
-//   cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
-
-   //sprintf(val,"%X",oreg);
-   //eInversionMask->SetHexNumber(oreg);
+   setInvert(oreg);
 }
 
 
@@ -710,22 +592,23 @@ void ctbAdcs::ToggledAdcInvert(Int_t b){
 Pixel_t ctbAdcs::getColor(int i){
   if (i>=0 && i<NADCS)
     return sAdc[i]->getColor();
+  return static_cast<Pixel_t>(-1);
 }
 
 Bool_t ctbAdcs::getEnabled(int i){
   if (i>=0 && i<NADCS)
     return sAdc[i]->getEnabled();
-  
+  return static_cast<Bool_t>(-1);
 }
 
 Bool_t ctbAdcs::getEnable(int i){
   if (i>=0 && i<NADCS)
     return sAdc[i]->getEnable();
-  
+  return static_cast<Bool_t>(-1);
 }
 
 Bool_t ctbAdcs::getPlot(int i){
   if (i>=0 && i<NADCS)
     return sAdc[i]->getPlot();
-  
+  return static_cast<Bool_t>(-1);
 }

ctbGui/ctbAdcs.h

@@ -28,7 +28,10 @@ class  TGTab;
 
 class TGraph;
 
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 
 #include <string>
 using namespace std;
@@ -49,10 +52,10 @@ class ctbAdc : public TGHorizontalFrame {
    //  TGraph *gADC;
 
    int id;
-   multiSlsDetector *myDet;
+   sls::Detector *myDet;
    
  public:
-   ctbAdc(TGVerticalFrame *page, int i, multiSlsDetector *det);
+   ctbAdc(TGVerticalFrame *page, int i, sls::Detector *det);
 
 
    void setAdcAlias(char *tit, int plot, int color);
@@ -89,7 +92,7 @@ class ctbAdcs : public TGGroupFrame {
 private:
   
   ctbAdc *sAdc[NADCS];
-   multiSlsDetector *myDet;
+   sls::Detector *myDet;
 
    
   TGTextButton *bCheckAll;
@@ -115,7 +118,7 @@ private:
 
 public:
 
-   ctbAdcs(TGVerticalFrame *page, multiSlsDetector *det);
+   ctbAdcs(TGVerticalFrame *page, sls::Detector *det);
    int setAdcAlias(string line);
    string getAdcAlias();
    string getAdcParameters();

ctbGui/ctbDacs.cpp

@@ -9,17 +9,14 @@
 #include <TGButton.h>
 
 #include "ctbDacs.h"
-#include "multiSlsDetector.h"
+#include "ctbDefs.h"
+#include "Detector.h"
 #include "sls_detector_defs.h"
 
 using namespace std;
 
 
-
-
-
-ctbDac::ctbDac(TGGroupFrame *page, int idac, multiSlsDetector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
-
+ctbDac::ctbDac(TGGroupFrame *page, int idac, sls::Detector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
 
     TGHorizontalFrame *hframe=this;
 
@@ -104,80 +101,76 @@ int ctbDac::setLabel(char *tit, int mv) {
 }
 
 string ctbDac::getLabel() {
-
   ostringstream line;
   line << dacsLabel->GetText() << " " <<  dacsUnit->IsOn() << endl;
-
    //  line << "DAC" << dec << id << " " <<  dacsUnit->IsOn() << endl;
-
   return line.str();
 
 }
 
+int ctbDac::getMoenchDacId() {
+  slsDetectorDefs::dacIndex moenchDacIndices[8] = {slsDetectorDefs::VBP_COLBUF, slsDetectorDefs::VIPRE, slsDetectorDefs::VIN_CM, slsDetectorDefs::VB_SDA, slsDetectorDefs::VCASC_SFP, slsDetectorDefs::VOUT_CM, slsDetectorDefs::VIPRE_CDS, slsDetectorDefs::IBIAS_SFP}; 
+
+  if (id >= 8) {
+    return id;
+  }
+  return static_cast<int>(moenchDacIndices[id]);
+}
 
 void ctbDac::setValue(Long_t a) {setValue();}
 
 void ctbDac::setValue() {
-
-
-
   cout << "setting dac! "<< id << " value " << dacsEntry->GetIntNumber() << " units " << dacsUnit->IsOn() << endl;
+
   try {
-    myDet->setDAC(dacsEntry->GetIntNumber(), (slsDetectorDefs::dacIndex)id, dacsUnit->IsOn()); }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
+    int sid = id;
+    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+      sid = getMoenchDacId();
+    }
+    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
+  } CATCH_DISPLAY ("Could not set dac " + to_string(id) + ".", "ctbDac::setValue")
 
   getValue();
-
 }
 
 void ctbDac::setOn(Bool_t b) {
-
-
-
   //  cout << "setting dac! "<< id << endl;
-
   if ( dacsLabel->IsOn()) {
     setValue();
   } else {
     try {
-      myDet->setDAC(-100, (slsDetectorDefs::dacIndex)id, 0); 
-    }  catch (...) {
-      cout << "Do nothing for this error" << endl;
-    }
+      int sid = id;
+      if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+	sid = getMoenchDacId();
+      }
+      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), -100, false);
+    } CATCH_DISPLAY ("Could not power off dac " + to_string(id) + ".", "ctbDac::setOn")
   }
   getValue();
-
 }
 
 int ctbDac::getValue() { 
-  int val;
   try {
-    val=myDet->setDAC(-1,(slsDetectorDefs::dacIndex)id, dacsUnit->IsOn()); 
-  }  catch (...) {
-    cout << "Do nothing for this error" << endl;
-  }
-  char s[100];
-  cout << "dac " << id << " " << val << endl;
-    sprintf(s,"%d",val);
-    dacsValue->SetText(s);
-  if (val>=0) {
-    dacsLabel->SetOn(kTRUE);
-  } else {
-    dacsLabel->SetOn(kFALSE);
-  }
+    int sid = id;
+    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+      sid = getMoenchDacId();
+    }
+    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsUnit->IsOn()).tsquash("Different values"); 
+    cout << "dac " << id << " " << val << endl;
+    dacsValue->SetText(to_string(val).c_str());
+    if (val >= 0) {
+      dacsLabel->SetOn(kTRUE);
+    } else {
+      dacsLabel->SetOn(kFALSE);
+    }
+    return val;
+  } CATCH_DISPLAY ("Could not get dac " + to_string(id) + ".", "ctbDac::getValue")
   
-
-  return val;
-
+  return -1;
 }
 
 
-
-
-
-ctbDacs::ctbDacs(TGVerticalFrame *page, multiSlsDetector *det)   : TGGroupFrame(page,"DACs",kVerticalFrame) , myDet(det){
-
+ctbDacs::ctbDacs(TGVerticalFrame *page, sls::Detector *det)   : TGGroupFrame(page,"DACs",kVerticalFrame) , myDet(det){
 
   SetTitlePos(TGGroupFrame::kLeft);
   page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
@@ -192,14 +185,12 @@ ctbDacs::ctbDacs(TGVerticalFrame *page, multiSlsDetector *det)   : TGGroupFrame(
   }
   dacs[NDACS]=new ctbDac(this, slsDetectorDefs::ADC_VPP, myDet);
   dacs[NDACS+1]=new ctbDac(this, slsDetectorDefs::HIGH_VOLTAGE, myDet);
-  dacs[NDACS]->setLabel("ADC Vpp",2); 
-  dacs[NDACS+1]->setLabel("High Voltage",3); 
-
+  dacs[NDACS]->setLabel((char*)"ADC Vpp",2); 
+  dacs[NDACS+1]->setLabel((char*)"High Voltage",3); 
 }
 
 
 int ctbDacs::setDacAlias(string line) {
-
   int is=-1, mv=0;
   char tit[100];
   int narg=sscanf(line.c_str(),"DAC%d %s %d",&is,tit,&mv);
@@ -217,7 +208,6 @@ string ctbDacs::getDacAlias() {
   for (int i=0; i<NDACS; i++)
     line << dacs[i]->getLabel() << endl;
   return line.str();
-
 }
 
 
@@ -225,8 +215,6 @@ string ctbDacs::getDacAlias() {
 
 
 string ctbDacs::getDacParameters() {
-
-
   ostringstream line;
 
   for (int i=0; i<NDACS; i++) {
@@ -234,18 +222,12 @@ string ctbDacs::getDacParameters() {
     line << "dac:" << i << " " << dacs[i]->getValue() << endl;
   } 
   return line.str();
-
-
 }
 
 
 
 void  ctbDacs::update() {
-
   for (int idac=0; idac<NDACS+1; idac++) {
     dacs[idac]->getValue();
   }
-
-
-
 }

ctbGui/ctbDacs.h

@@ -15,7 +15,10 @@ class TGNumberEntry;
 class TGCheckButton;
 
 
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 
 #include <string>
 using namespace std;
@@ -32,9 +35,9 @@ class ctbDac : public TGHorizontalFrame {
    TGLabel *dacsValue;
    int id;
 
-   multiSlsDetector* myDet;
+   sls::Detector* myDet;
  public:
-   ctbDac(TGGroupFrame*, int , multiSlsDetector*);
+   ctbDac(TGGroupFrame*, int , sls::Detector*);
    void setValue();
    void setValue(Long_t);
    int getValue();
@@ -42,7 +45,7 @@ class ctbDac : public TGHorizontalFrame {
    
    int setLabel(char *tit, int mv);
    string getLabel();
-
+int getMoenchDacId();
 
 
    ClassDef(ctbDac,0)
@@ -51,14 +54,12 @@ class ctbDac : public TGHorizontalFrame {
 class ctbDacs : public TGGroupFrame {
 private:
   
-
-
    ctbDac *dacs[NDACS+2];
 
-   multiSlsDetector* myDet;
+   sls::Detector* myDet;
 
 public:
-   ctbDacs(TGVerticalFrame *page, multiSlsDetector*);
+   ctbDacs(TGVerticalFrame *page, sls::Detector*);
 
    int setDacAlias(string line);
    // int setDacAlias(string line);

ctbGui/ctbDefs.h

@@ -0,0 +1,84 @@
+#pragma once
+
+#include <string>
+#include <stdexcept>
+#include <chrono>
+
+//#include "sls_detector_exceptions.h"
+//#include "ansi.h"
+#define RED    	 	"\x1b[31m"
+#define RESET   	"\x1b[0m"
+#define BOLD    	"\x1b[1m"
+#define cprintf(code, format, ...) printf(code format RESET, ##__VA_ARGS__)
+
+
+#define CATCH_DISPLAY(m, s) catch(...) { ctbDefs::DisplayExceptions(m, s); }
+#define CATCH_HANDLE(...) catch(...) { ctbDefs::HandleExceptions(__VA_ARGS__); }
+
+class ctbDefs {
+  public:
+    /**
+     * Empty Constructor
+     */
+    ctbDefs(){};
+
+    // convert double seconds to chrono ns
+    static std::chrono::nanoseconds ConvertDoubleStoChronoNS(double timeS) {
+        using std::chrono::duration;
+        using std::chrono::duration_cast;
+        using std::chrono::nanoseconds; 
+        return duration_cast<nanoseconds>(duration<double>(timeS));
+    }
+
+    // convert chrono ns to doubel s
+    static double ConvertChronoNStoDoubleS(std::chrono::nanoseconds timeNs) {
+        using std::chrono::duration;
+        using std::chrono::duration_cast;    
+        return duration_cast<duration<double>>(timeNs).count();
+    }
+
+    static void DisplayExceptions(std::string emsg, std::string src) {
+        try {
+            throw;
+        } /* catch (const sls::SocketError &e) {
+            throw;
+        } catch (const sls::SharedMemoryError &e) {
+            throw;
+        } */catch (const std::exception &e) {
+            ExceptionMessage(emsg, e.what(), src);
+        }
+    };
+
+    template <class CT> struct NonDeduced { using type = CT; };
+    template <class S, typename RT, typename... CT>
+    static void HandleExceptions(const std::string emsg, const std::string src, S* s,
+                                    RT (S::*somefunc)(CT...),
+                                    typename NonDeduced<CT>::type... Args) {
+        try {
+            throw;
+        } /*catch (const sls::SocketError &e) {
+            throw;
+        } catch (const sls::SharedMemoryError &e) {
+            throw;
+        } */catch (const std::exception &e) {
+
+            ExceptionMessage(emsg, e.what(), src);
+            (s->*somefunc)(Args...);
+        }
+    };
+
+    static void ExceptionMessage(std::string message, 
+                    std::string exceptionMessage,
+                    std::string source) {
+        // because sls_detector_exceptions cannot be included
+      if (exceptionMessage.find("hared memory") != std::string::npos) {
+            throw;
+        }
+      if (exceptionMessage.find("annot connect") != std::string::npos) {
+            throw;
+        }
+        cprintf(RED, "Warning (%s): %s [Caught Exception: %s]\n", source.c_str(), message.c_str(), exceptionMessage.c_str());
+        //return Message(qDefs::WARNING, message + std::string("\nCaught exception:\n") + exceptionMessage, source);
+    }; 
+
+};

ctbGui/ctbGui.cpp

@@ -9,11 +9,11 @@
 #include <fstream>
 #include <string>
 
-
-#include "multiSlsDetector.h"
+#include "Detector.h"
 #include "sls_detector_defs.h"
 //#include "sls_receiver_defs.h"
 #include "ctbMain.h"
+#include "ctbDefs.h"
 using namespace std;
 
 
@@ -45,9 +45,9 @@ int main(int argc, char **argv) {
 
     } else if  (strcmp(argv[ia],"-par")==0) {
       if (ia+1<argc) {
-	pfname=argv[ia+1];
+  pfname=argv[ia+1];
 	ia++;
-	pf=1;
+  pf=1;
       }
 
 
@@ -61,31 +61,27 @@ int main(int argc, char **argv) {
   
 
   cout << " *** "  << endl;
-  
-  /****** Create detector ****************/
-  multiSlsDetector *myDet=new multiSlsDetector(id);
-  // myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
-
-  //cout << id << " " << myDet << " " << myDet->setOnline() << endl;
-  if (cf) {
-    myDet->readConfigurationFile(cfname);
-  } else
-    cout << "No config file specified" << endl;
-
-  cout << "aa" << endl;
-
-    cout << "Created multi detector id " << id << " hostname " << myDet->getHostname() << endl;
-
-  
-  cout << "bb" << endl;
-  if (pf) {
-    myDet->retrieveDetectorSetup(pfname);
-  } else
-    cout << "No parameter file specified" << endl;
-  
-
-
+  sls::Detector *myDet = nullptr;
+  try {
+    /****** Create detector ****************/
+    myDet=new sls::Detector(id);
+    cout << "Created multi detector id " << id << endl;
 
+    if (cf) {
+      myDet->loadConfig(cfname);
+      cout << "Config file loaded successfully" << endl;
+    } else {
+      cout << "No config file specified" << endl;
+    }
+    cout << "hostname " << myDet->getHostname() << endl;
+    
+    if (pf) {
+      myDet->loadParameters(pfname);
+      cout << "Loaded parameter file successfully" << endl;
+    } else{
+      cout  << "No parameter file specified" << endl;
+    }
+  } CATCH_DISPLAY ("Could not create detector/ load config/parameters.", "ctbGui::main")
 
   /***********Create GUI stuff *******************/
    TApplication theApp("App",&argc,argv);
@@ -141,7 +137,7 @@ int main(int argc, char **argv) {
 
 
   gROOT->ForceStyle();
-  ctbMain *mf=new ctbMain(gClient->GetRoot(),myDet);
+  ctbMain *mf=new ctbMain(gClient->GetRoot(), myDet);
 
   cout << " *** " << argc << endl;
   for (int ia=0; ia<argc; ia++)

ctbGui/ctbMain.cpp

@@ -29,15 +29,13 @@
 
 
 
-
-
-
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
 #include <string>
 
-#include "multiSlsDetector.h"
+#include "Detector.h"
+#include "ctbDefs.h"
 #include "ctbMain.h"
 #include "ctbDacs.h"
 #include "ctbSlowAdcs.h"
@@ -52,7 +50,7 @@ using namespace std;
 
 
 
-ctbMain::ctbMain(const TGWindow *p, multiSlsDetector *det)
+ctbMain::ctbMain(const TGWindow *p, sls::Detector *det)
   : TGMainFrame(p,800,800), pwrs(NULL), senses(NULL) {
 
   myDet=det;
@@ -147,7 +145,7 @@ ctbMain::ctbMain(const TGWindow *p, multiSlsDetector *det)
   tf = mtab->AddTab("Power Supplies");
   page=new TGVerticalFrame(tf, 1500,1200);
   tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-   pwrs=new ctbPowers(page, myDet);
+  pwrs=new ctbPowers(page, myDet);
 
   i_pwrs=i_page++;
 
@@ -155,7 +153,7 @@ ctbMain::ctbMain(const TGWindow *p, multiSlsDetector *det)
   tf = mtab->AddTab("Sense");
   page=new TGVerticalFrame(tf, 1500,1200);
   tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-   senses=new ctbSlowAdcs(page, myDet);
+  senses=new ctbSlowAdcs(page, myDet);
 
   i_senses=i_page++;
 
@@ -261,8 +259,10 @@ ctbMain::ctbMain(const TGWindow *p, multiSlsDetector *det)
 
    cout << "connect mtab" << endl;
 
-   
-   setReadoutMode(pat->getReadoutMode());
+  try{  
+   setReadoutMode(pat->getReadoutMode());  
+  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
+
    setADCEnable(adcs->setEnable());
    setAnalogSamples(pat->getAnalogSamples());
    setDigitalSamples(pat->getDigitalSamples());
@@ -304,7 +304,7 @@ void ctbMain::HandleMenu(Int_t id)
              fi.fIniDir    = StrDup(dir);
              printf("fIniDir = %s\n", fi.fIniDir);
              new TGFileDialog(gClient->GetRoot(), this, kFDOpen, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename);
+             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
 	     // dir = fi.fIniDir;
 	     if (fi.fFilename)
 	       loadAlias(fi.fFilename);
@@ -320,13 +320,12 @@ void ctbMain::HandleMenu(Int_t id)
              fi.fIniDir    = StrDup(dir);
              printf("fIniDir = %s\n", fi.fIniDir);
              new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Save file: %s (dir: %s)\n", fi.fFilename);
+             printf("Save file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
 	     // dir = fi.fIniDir;
 	     if (fi.fFilename)
 	       saveAlias(fi.fFilename);
           }
          break;
-
    case 2: //fMenuFile->AddEntry("Open Parameters", im++);
      cout << "Open Parameters" << endl;
          {
@@ -343,23 +342,7 @@ void ctbMain::HandleMenu(Int_t id)
           }
          break;
 
-   case 3: //fMenuFile->AddEntry("Save Parameters", im++);
-     cout << "Save Parameters" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     if (fi.fFilename)
-	       saveParameters(fi.fFilename);
-          }
-         break;
-
-   case 4: // fMenuFile->AddEntry("Open Configuration", im++);
+   case 3: // fMenuFile->AddEntry("Open Configuration", im++);
      cout << "Open configuration" << endl;
          {
              static TString dir(".");
@@ -375,23 +358,7 @@ void ctbMain::HandleMenu(Int_t id)
           }
          break;
  
-   case 5: //  fMenuFile->AddEntry("Save Configuration", im++);
-     cout << "Save configuration" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             fi.fIniDir    = StrDup(dir);
-             printf("fIniDir = %s\n", fi.fIniDir);
-             new TGFileDialog(gClient->GetRoot(), this, kFDSave, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     if (fi.fFilename)
-	       saveConfiguration(fi.fFilename);
-          }
-         break;
-
-   case 6: //fMenuFile->AddEntry("Open Pattern", im++);
+   case 4: //fMenuFile->AddEntry("Open Pattern", im++);
      cout << "Open pattern" << endl;
          {
              static TString dir(".");
@@ -407,7 +374,7 @@ void ctbMain::HandleMenu(Int_t id)
           }
      break;
 
-   case 7:   //fMenuFile->AddEntry("Save Pattern", im++);
+   case 5:   //fMenuFile->AddEntry("Save Pattern", im++);
      cout << "Save pattern" << endl;
          {
              static TString dir(".");
@@ -419,11 +386,11 @@ void ctbMain::HandleMenu(Int_t id)
              printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
 	     // dir = fi.fIniDir;
 	     if (fi.fFilename)
-	       saveParameters(fi.fFilename);
+	       savePattern(fi.fFilename);
           }
          break;
 
-   case 8: //  fMenuFile->AddEntry("Exit", im++);
+   case 6: //  fMenuFile->AddEntry("Exit", im++);
      CloseWindow();
 
       default:
@@ -439,7 +406,7 @@ int  ctbMain::setADCPlot(Int_t i) {
   //  cout << "ADC " << i << " plot or color toggled" << endl;
   //  acq->setGraph(i,adcs->getGraph(i));
   acq->setGraph(i,adcs->getEnabled(i),adcs->getColor(i));
-
+  return -1;
 }
 
 
@@ -448,120 +415,31 @@ int  ctbMain::setSignalPlot(Int_t i) {
   //  cout << "ADC " << i << " plot or color toggled" << endl;
   //  acq->setGraph(i,adcs->getGraph(i));
   acq->setBitGraph(i,sig->getPlot(i),sig->getColor(i));
-
+  return -1;
 }
 
 
 
-int  ctbMain::loadConfiguration(string fname) {
-
-    myDet->readConfigurationFile(fname);
-
-//   string line;
-//   int i;
-//   ifstream myfile (fname.c_str());
-//   if (myfile.is_open())
-//   {
-//     while ( getline (myfile,line) )
-//     {
-
-	
-      
-//     }
-//     myfile.close();
-//   }
-
-//   else cout << "Unable to open file"; 
-
-  return 0;
-
+void  ctbMain::loadConfiguration(string fname) {
+  try{
+    myDet->loadConfig(fname);
+  } CATCH_DISPLAY ("Could not load config.", "ctbMain::loadConfiguration")
 }
 
-
-
-
-
-int  ctbMain::saveConfiguration(string fname) {
-
-
-    myDet->writeConfigurationFile(fname);
- //  string line;
-//   int i;
-//   ofstream myfile (fname.c_str());
-//   if (myfile.is_open())
-//   {
-    
-
-//    myfile.close();
-//   }
-
-//   else cout << "Unable to open file"; 
-
-  return 0;
-
+void  ctbMain::loadParameters(string fname) {
+  try{
+    myDet->loadParameters(fname);
+  } CATCH_DISPLAY ("Could not load parameters.", "ctbMain::loadParameters")
 }
 
-
-
-
-
-
-
-int  ctbMain::loadParameters(string fname) {
-
-    myDet->retrieveDetectorSetup(fname);
-
-//   string line;
-//   int i;
-//   ifstream myfile (fname.c_str());
-//   if (myfile.is_open())
-//   {
-//     while ( getline (myfile,line) )
-//     {
-
-	
-      
-//     }
-//     myfile.close();
-//   }
-
-//   else cout << "Unable to open file"; 
-
-  return 0;
-
+void  ctbMain::savePattern(string fname) {
+  try{
+    myDet->savePattern(fname);
+  } CATCH_DISPLAY ("Could not save pattern.", "ctbMain::savePattern")
 }
 
 
 
-
-
-int  ctbMain::saveParameters(string fname) {
-
-
-  string line;
-  int i;
-   myDet->dumpDetectorSetup(fname);
-//   ofstream myfile (fname.c_str());
-//   if (myfile.is_open())
-//   {
-
-//    myfile << dacs->getDacParameters();
-//    myfile << sig->getSignalParameters();
-//    myfile << adcs->getAdcParameters();
-
-//    myfile.close();
-//   }
-
-//   else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
 int  ctbMain::loadAlias(string fname) {
 
 
@@ -589,7 +467,7 @@ int  ctbMain::loadAlias(string fname) {
       else if (sscanf(line.c_str(),"PAT%s",aaaa)>0) {
 	pat->setPatternAlias(line);
 	//	cout << "---------" << line<< endl;
-      }	else if (sscanf(line.c_str(),"V%s",&i)>0) {
+      }	else if (sscanf(line.c_str(),"V%s",aaaa)>0) {
 	    if (pwrs)	pwrs->setPwrAlias(line);
 	//	cout << "+++++++++" << line<< endl;
       } else if (sscanf(line.c_str(),"SENSE%d",&i)>0) {
@@ -615,7 +493,6 @@ int  ctbMain::saveAlias(string fname) {
 
 
   string line;
-  int i;
   ofstream myfile (fname.c_str());
   if (myfile.is_open())
   {

ctbGui/ctbMain.h

@@ -33,7 +33,10 @@ class   ctbPowers;
  
 class  ctbSignals;
 
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 
 class  ctbPattern;
 class  ctbAdcs;
@@ -47,7 +50,7 @@ class ctbMain : public TGMainFrame {
 private:
 
 
-  multiSlsDetector *myDet;
+  sls::Detector *myDet;
 
 
 
@@ -96,15 +99,14 @@ private:
 
 
 public:
-   ctbMain(const TGWindow *p, multiSlsDetector *det);
+   ctbMain(const TGWindow *p, sls::Detector *det);
 
 
    int  loadAlias(string fname);
    int  saveAlias(string fname);
-   int  loadParameters(string fname);
-   int  saveParameters(string fname);
-   int  loadConfiguration(string fname);
-   int  saveConfiguration(string fname);
+   void  loadParameters(string fname);
+   void  savePattern(string fname);
+   void  loadConfiguration(string fname);
    void tabSelected(Int_t);
    int setADCPlot(Int_t);
    int setSignalPlot(Int_t);

ctbGui/ctbPattern.cpp

@@ -24,15 +24,16 @@
 #include <fstream>
 
 #include "ctbPattern.h"
-#include "multiSlsDetector.h"
-
+#include "ctbDefs.h"
+#include "Detector.h"
+#include <chrono>
 using namespace std;
 
 
 
 
 
-ctbLoop::ctbLoop(TGGroupFrame *page, int i, multiSlsDetector *det) : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
+ctbLoop::ctbLoop(TGGroupFrame *page, int i, sls::Detector *det) : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
 
   TGHorizontalFrame *hframe=this;
   
@@ -116,47 +117,29 @@ ctbLoop::ctbLoop(TGGroupFrame *page, int i, multiSlsDetector *det) : TGHorizonta
 }
 
 void ctbLoop::setNLoops() {
-
-  int start, stop, n;
-  
-
-    start=-1;
-    stop=-1;
-    n=eLoopNumber->GetNumber();
-    try{
-      myDet->setPatternLoops(id,start, stop,n);
-    } catch (...) {
-
-      cout << "Do nothing for this error" << endl;
-    }
-
-
+  try{
+    myDet->setPatternLoopCycles(id, eLoopNumber->GetNumber());
+  } CATCH_DISPLAY ("Could not set number of pattern loops for level " + to_string(id) + ".", "ctbLoop::setNLoops")
 }
 
 
 
 void ctbLoop::update() {
+  try{
 
-  int start, stop, n;
-  
-  std::array<int, 3> loop;
+    auto loop = myDet->getPatternLoopCycles(id).tsquash("Different values");
+    eLoopNumber->SetNumber(loop);
+    auto loopaddr = myDet->getPatternLoopAddresses(id).tsquash("Different values");
+    eLoopStartAddr->SetHexNumber(loopaddr[0]);
+    eLoopStopAddr->SetHexNumber(loopaddr[1]);
 
- try {
-   loop=myDet->getPatternLoops(id);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-   
 
-    eLoopStartAddr->SetHexNumber(loop[0]);
-    eLoopStopAddr->SetHexNumber(loop[1]);
-    eLoopNumber->SetNumber(loop[2]);
+  } CATCH_DISPLAY ("Could not get pattern loops for level " + to_string(id) + ".", "ctbLoop::update")
 }
 
 
 
-ctbWait::ctbWait(TGGroupFrame *page, int i, multiSlsDetector *det) : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
+ctbWait::ctbWait(TGGroupFrame *page, int i, sls::Detector *det) : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
 
   char tit[100];
   TGHorizontalFrame *hframe=this;
@@ -211,41 +194,25 @@ ctbWait::ctbWait(TGGroupFrame *page, int i, multiSlsDetector *det) : TGHorizonta
 
 
 void ctbWait::setWaitTime() {
-
-
-  Long64_t t=eWaitTime->GetNumber();
   try{
-    t=myDet->setPatternWaitTime(id,t);
-  } catch (...) {
-    
-    cout << "Do nothing for this error" << endl;
-  }
+
+    myDet->setPatternWaitTime(id, eWaitTime->GetNumber());
+
+  } CATCH_DISPLAY ("Could not set pattern wait time for level " + to_string(id) + ".", "ctbWait::setWaitTime")
 }
 
 
 
 void ctbWait::update() {
+  try{
+
+    auto time = myDet->getPatternWaitTime(id).tsquash("Different values");
+    auto addr = myDet->getPatternWaitAddr(id).tsquash("Different values");
 
-  int start, stop, n, addr;
-  
-  Long64_t t=-1;
-  try{
-    
-    t=myDet->setPatternWaitTime(id,t);
-  } catch (...) {
-    
-    cout << "Do nothing for this error" << endl;
-  }
-  try{
-    addr=myDet->setPatternWaitAddr(id,-1);
-  
-  } catch (...) {
-    
-    cout << "Do nothing for this error" << endl;
-  }
     eWaitAddr->SetHexNumber(addr);
-    eWaitTime->SetNumber(t);
+    eWaitTime->SetNumber(time);
 
+  } CATCH_DISPLAY ("Could not get pattern loops for level " + to_string(id) + ".", "ctbWait::update")
 }
 
 
@@ -256,7 +223,7 @@ void ctbWait::update() {
 
 
 
-ctbPattern::ctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
+ctbPattern::ctbPattern(TGVerticalFrame *page, sls::Detector *det)
   : TGGroupFrame(page,"Pattern",kVerticalFrame), myDet(det) {
 
 
@@ -490,7 +457,7 @@ ctbPattern::ctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
    hframe->MapWindow();
 
 
-   sprintf(tit, "Number of cycles: ");
+   sprintf(tit, "Number of triggers: ");
 
    label= new TGLabel(hframe, tit);
    hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
@@ -500,14 +467,14 @@ ctbPattern::ctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
 
 
   
-   eCycles = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
+   eTriggers = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
                                                TGNumberFormat::kNEANonNegative, 
                                                TGNumberFormat::kNELNoLimits);
-   hframe->AddFrame( eCycles,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eCycles->MapWindow();
-   eCycles->Resize(150,30);
-   e= eCycles->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","ctbPattern",this,"setCycles()");
+   hframe->AddFrame( eTriggers,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
+   eTriggers->MapWindow();
+   eTriggers->Resize(150,30);
+   e= eTriggers->TGNumberEntry::GetNumberEntry();
+   e->Connect("ReturnPressed()","ctbPattern",this,"setTriggers()");
 
 
    // sprintf(tit, "Number of measurements: ");
@@ -809,134 +776,64 @@ ctbPattern::ctbPattern(TGVerticalFrame *page, multiSlsDetector *det)
 }
 
 void ctbPattern::update() {
+  try{
+    auto retval = myDet->getRUNClock().tsquash("Different values");
+    eRunClkFreq->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get run clock.", "ctbPattern::update")
 
-  int start, stop, n, addr;
-  
-  Long_t t;
+  try{
+    auto retval = myDet->getADCClock().tsquash("Different values");
+    eAdcClkFreq->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get adc clock.", "ctbPattern::update")
 
-  
-  try {
-    n=myDet->setSpeed(slsDetectorDefs::CLOCK_DIVIDER,-1,0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    auto retval = myDet->getADCPhase().tsquash("Different values");
+    eAdcClkPhase->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get adc phase shift.", "ctbPattern::update")
 
-  eRunClkFreq->SetNumber(n);
+  try{
+    auto retval = myDet->getADCPipeline().tsquash("Different values");
+    eAdcPipeline->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get adc pipeline.", "ctbPattern::update")
 
-  try {
-    n=myDet->setSpeed(slsDetectorDefs::ADC_CLOCK,-1,0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    auto retval = myDet->getDBITClock().tsquash("Different values");
+    eDBitClkFreq->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get dbit clock.", "ctbPattern::update")
 
-  eAdcClkFreq->SetNumber(n);
+  try{
+    auto retval = myDet->getDBITPhase().tsquash("Different values");
+    eDBitClkPhase->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get dbit phase shift.", "ctbPattern::update")
 
-  try {
-    n=myDet->setSpeed(slsDetectorDefs::ADC_PHASE,-1,0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    auto retval = myDet->getDBITPipeline().tsquash("Different values");
+    eDBitPipeline->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get dbit pipeline.", "ctbPattern::update")
 
-  eAdcClkPhase->SetNumber(n);
+  try{
+    auto retval = myDet->getNumberOfFrames().tsquash("Different values");
+    eFrames->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get number of frames.", "ctbPattern::update")
 
-  try {
-    n=myDet->setSpeed(slsDetectorDefs::ADC_PIPELINE,-1,0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    auto timeNs = myDet->getPeriod().tsquash("Different values");
+    ePeriod->SetNumber(ctbDefs::ConvertChronoNStoDoubleS(timeNs));
+  } CATCH_DISPLAY ("Could not get period.", "ctbPattern::update")
 
+  try{
+    auto retval = myDet->getNumberOfTriggers().tsquash("Different values");
+    eTriggers->SetNumber(retval);
+  } CATCH_DISPLAY ("Could not get number of triggers.", "ctbPattern::update")
 
-  eAdcPipeline->SetNumber(n);
+  try{
+    auto retval = myDet->getPatternLoopAddresses(-1).tsquash("Different values");
+    eStartAddr->SetHexNumber(retval[0]);
+    eStopAddr->SetHexNumber(retval[1]);
+  } CATCH_DISPLAY ("Could not get dbit phase shift.", "ctbPattern::update")
 
-  try {
-    n=myDet->setSpeed(slsDetectorDefs::DBIT_CLOCK,-1,0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
-
-  eDBitClkFreq->SetNumber(n);
-
-  try {
-    n=myDet->setSpeed(slsDetectorDefs::DBIT_PHASE,-1,0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
-
-  eDBitClkPhase->SetNumber(n);
-try {
-  myDet->setSpeed(slsDetectorDefs::DBIT_PIPELINE,0,-1);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-  eDBitPipeline->SetNumber(n);
-
-try {
-  n=myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,-1);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
-  eFrames->SetNumber(n);
-
-  
-try {
-  n=myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,-1);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
-
-
- ePeriod->SetNumber(((Double_t)n)*1E-9);
-
- try {
-   n=myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,-1);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
-  eCycles->SetNumber(n);
-
-
- // try {
- //   myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1);
- //      } catch (...) {
-    
- //      cout << "Do nothing for this error" << endl;
- //  }
-   
- //  eMeasurements->SetNumber(n);
-
-  start=-1;
-  stop=-1;
-  n=-1;
-  std::array<int, 3> loop;
-
- try {
-   loop=myDet->getPatternLoops(-1);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-   
-  eStartAddr->SetHexNumber(loop[0]);
-  eStopAddr->SetHexNumber(loop[1]);
- 
   for (int iloop=0; iloop<NLOOPS; iloop++) {
-    eLoop[iloop]->update();
-    
+    eLoop[iloop]->update();  
   }
 
   for (int iwait=0; iwait<NWAITS; iwait++) {
@@ -946,8 +843,9 @@ try {
   getAnalogSamples();
   getDigitalSamples();
   getReadoutMode();
-
 }
+
+
 void ctbPattern::setFile() {
   patternFileChanged(patternFile->GetText());
 
@@ -984,7 +882,8 @@ void ctbPattern::setPatternAlias(string line){
 
 string ctbPattern::getPatternAlias() {
     char line[100000];
-    sprintf("PATCOMPILER %s\nPATFILE %s\n",patternCompiler->GetText(),patternFile->GetText());
+    sprintf(line, "PATCOMPILER %s\nPATFILE %s\n",patternCompiler->GetText(),patternFile->GetText());
+    return line;
 }
 
 
@@ -1032,154 +931,103 @@ string ctbPattern::getPatternFile() {
 }
 
 void ctbPattern::setFrames() {
-  try {
-  myDet->setTimer(slsDetectorDefs::FRAME_NUMBER,eFrames->GetNumber());
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    myDet->setNumberOfFrames(eFrames->GetNumber());
+  } CATCH_DISPLAY ("Could not set number of frames", "ctbPattern::setFrames")
 }
 
-void ctbPattern::setCycles() {
-  try {
-  myDet->setTimer(slsDetectorDefs::CYCLES_NUMBER,eFrames->GetNumber());
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+void ctbPattern::setTriggers() {
+  try{
+    myDet->setNumberOfTriggers(eTriggers->GetNumber());
+  } CATCH_DISPLAY ("Could not set number of triggers", "ctbPattern::setTriggers")
 }
 
-// void ctbPattern::setMeasurements() {
-//   try {
-//   myDet->setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,eFrames->GetNumber());
-//       } catch (...) {
-    
-//       cout << "Do nothing for this error" << endl;
-//   }
-// }
-
-
-
-
 void ctbPattern::setPeriod() {
-  try {
-  myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,ePeriod->GetNumber()*1E9);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  using std::chrono::duration;
+  using std::chrono::duration_cast;
+  using std::chrono::nanoseconds; 
+  try{
+    auto timeNs = ctbDefs::ConvertDoubleStoChronoNS(ePeriod->GetNumber());
+    myDet->setPeriod(timeNs);
+  } CATCH_DISPLAY ("Could not set period", "ctbPattern::setPeriod")
 }
 
-
-
-
 void ctbPattern::setAdcFreq() {
-  try {
-  myDet->setSpeed(slsDetectorDefs::ADC_CLOCK,eAdcClkFreq->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    myDet->setADCClock(eAdcClkFreq->GetNumber());
+  } CATCH_DISPLAY ("Could not set adc clock", "ctbPattern::setAdcFreq")
 }
+
 void ctbPattern::setRunFreq() {
   try{
-    myDet->setSpeed(slsDetectorDefs::CLOCK_DIVIDER,eRunClkFreq->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
+    myDet->setRUNClock(eRunClkFreq->GetNumber());
+  } CATCH_DISPLAY ("Could not set run clock", "ctbPattern::setRunFreq")
 }
+
 void ctbPattern::setDBitFreq() {
-  // cout <<"Not setting dbit frequency to " << eDBitClkFreq->GetNumber()<< endl;
-  try {
-  myDet->setSpeed(slsDetectorDefs::DBIT_CLOCK,eDBitClkFreq->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
+  try{
+    myDet->setDBITClock(eDBitClkFreq->GetNumber());
+  } CATCH_DISPLAY ("Could not set dbit clock", "ctbPattern::setDBitFreq")
 }
-void ctbPattern::setAdcPhase() {
-  try {
-    myDet->setSpeed(slsDetectorDefs::ADC_PHASE,eAdcClkPhase->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
 
+void ctbPattern::setAdcPhase() {
+  try{
+    myDet->setADCPhase(eAdcClkPhase->GetNumber());
+  } CATCH_DISPLAY ("Could not set adc phase shift", "ctbPattern::setAdcPhase")
 }
 
 void ctbPattern::setDBitPhase() {
-  // cout <<"Not setting dbit phase to " << eDBitClkPhase->GetNumber()<< endl;
-  try {
-    myDet->setSpeed(slsDetectorDefs::DBIT_PHASE,eDBitClkPhase->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
+  try{
+    myDet->setDBITPhase(eDBitClkPhase->GetNumber());
+  } CATCH_DISPLAY ("Could not set dbit phase shift", "ctbPattern::setDBitPhase")
 }
 
-
 void ctbPattern::setAdcPipeline() {
-  try {
-    myDet->setSpeed(slsDetectorDefs::ADC_PIPELINE,eAdcPipeline->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    myDet->setADCPipeline(eAdcPipeline->GetNumber());
+  } CATCH_DISPLAY ("Could not set adc pipeline", "ctbPattern::setAdcPipeline")
 }
 
-
 void ctbPattern::setDBitPipeline() {
-  // cout <<"Not setting dbit pipeline to " << eDBitPipeline->GetNumber() << endl;
-  try {
-    myDet->setSpeed(slsDetectorDefs::DBIT_PIPELINE,eDBitPipeline->GetNumber(),0);
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    myDet->setDBITPipeline(eDBitPipeline->GetNumber());
+  } CATCH_DISPLAY ("Could not set dbit pipeline", "ctbPattern::setDBitPipeline")
 }
 
 
 void ctbPattern::setAnalogSamples() {
-  try {
-  myDet->setTimer(slsDetectorDefs::ANALOG_SAMPLES,eAnalogSamples->GetNumber());
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  } 
+  try{
+    myDet->setNumberOfAnalogSamples(eAnalogSamples->GetNumber());
+  } CATCH_DISPLAY ("Could not set number of analog sampels", "ctbPattern::setAnalogSamples")
+
   analogSamplesChanged(eAnalogSamples->GetNumber());
 }
 
 void ctbPattern::setDigitalSamples() {
-  try {
-  myDet->setTimer(slsDetectorDefs::DIGITAL_SAMPLES,eDigitalSamples->GetNumber()); 
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
+  try{
+    myDet->setNumberOfDigitalSamples(eDigitalSamples->GetNumber());
+  } CATCH_DISPLAY ("Could not set number of digital samples", "ctbPattern::setDigitalSamples")
+
   digitalSamplesChanged(eDigitalSamples->GetNumber());
 }
 
 void ctbPattern::setReadoutMode(Bool_t) {
-  // cout << "Set readout mode to be implemented" << endl;
-  slsDetectorDefs::readOutFlags flags;
-  if (cbAnalog->IsOn() && cbDigital->IsOn()) flags=slsDetectorDefs::ANALOG_AND_DIGITAL;
-  else  if (~cbAnalog->IsOn() && cbDigital->IsOn()) flags=slsDetectorDefs::DIGITAL_ONLY;
-  else  if (cbAnalog->IsOn() && ~cbDigital->IsOn()) flags=slsDetectorDefs::NORMAL_READOUT;
-  else flags=slsDetectorDefs::GET_READOUT_FLAGS;
   try {
-    myDet->setReadOutFlags(flags);
-  } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-  cout << "Set readout flags " << hex << flags << dec << endl;
+    slsDetectorDefs::readoutMode flag = slsDetectorDefs::ANALOG_ONLY;
+    if (cbAnalog->IsOn() && cbDigital->IsOn()) 
+      flag=slsDetectorDefs::ANALOG_AND_DIGITAL;
+    else  if (~cbAnalog->IsOn() && cbDigital->IsOn()) 
+      flag=slsDetectorDefs::DIGITAL_ONLY;
+    else  if (cbAnalog->IsOn() && ~cbDigital->IsOn())       
+      flag=slsDetectorDefs::ANALOG_ONLY;
+    else {
+      throw runtime_error("unkown readout flag");
+    }
+    myDet->setReadoutMode(flag);
+    cout << "Set readout flag: " << flag << endl;
+  } CATCH_DISPLAY ("Could not set readout flag", "ctbPattern::setReadoutMode")
+
   getReadoutMode();
-  // myDet->setTimer(slsDetectorDefs::SAMPLES_CTB,eSamples->GetNumber()); 
-  //samplesChanged(eSamples->GetNumber());
 }
 
 void ctbPattern::readoutModeChanged(int flags) {
@@ -1187,73 +1035,71 @@ void ctbPattern::readoutModeChanged(int flags) {
 
 }
 
-int ctbPattern::getReadoutMode() {
-  // cout << "Get readout mode to be implemented" << endl; 
-  slsDetectorDefs::readOutFlags flags;
-  try {
-  flags=(slsDetectorDefs::readOutFlags) myDet->setReadOutFlags();
-      } catch (...) {
+int ctbPattern::getReadoutMode() {  
+ int retval=slsDetectorDefs::ANALOG_ONLY;
     
-      cout << "Do nothing for this error" << endl;
-  }
-
-  cout << "++++++++++++++++++++"<< hex << flags << dec << endl;
-  if (flags&slsDetectorDefs::ANALOG_AND_DIGITAL) {
-    cout << "analog and digital" << hex << slsDetectorDefs::ANALOG_AND_DIGITAL << dec<< endl;
-    cbAnalog->SetOn(kTRUE);
-    cbDigital->SetOn(kTRUE);
-  } else if  (flags&slsDetectorDefs::DIGITAL_ONLY) {
-    cout << "digital only"  << hex << slsDetectorDefs::DIGITAL_ONLY << dec << endl;
-    cbAnalog->SetOn(kFALSE);
-    cbDigital->SetOn(kTRUE);
-  }// else if  (flags==slsDetectorDefs::NORMAL_READOUT) {
-  //   cbAnalog->SetOn(kTRUE);
-  //   cbDigital->SetOn(kFALSE);
-  // }
-  else {
-    cout << "analog only" << endl;
-    flags=slsDetectorDefs::NORMAL_READOUT;
-    cbAnalog->SetOn(kTRUE);
-    cbDigital->SetOn(kFALSE);
-  }
-
-  Emit("readoutModeChanged(int)",(int)flags);
-  return (int)flags;
-
-  // myDet->setTimer(slsDetectorDefs::SAMPLES_CTB,eSamples->GetNumber()); 
-  //samplesChanged(eSamples->GetNumber());
+ if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
+   try{
+     retval = myDet->getReadoutMode().tsquash("Different values");
+   } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
+      
+   switch(retval) {
+   case slsDetectorDefs::ANALOG_AND_DIGITAL:
+     cout << "analog and digital" << endl;
+     cbAnalog->SetOn(kTRUE);
+     cbDigital->SetOn(kTRUE);
+     break;
+   case slsDetectorDefs::DIGITAL_ONLY:
+     cout << "digital only" << endl;
+     cbAnalog->SetOn(kFALSE);
+     cbDigital->SetOn(kTRUE);
+     break;
+   case slsDetectorDefs::ANALOG_ONLY:
+     cout << "analog only" << endl;
+     cbAnalog->SetOn(kTRUE);
+     cbDigital->SetOn(kFALSE);    
+     break;
+   default:
+     throw("unknown readout flag");
+   }
+ } else {
+   cbAnalog->SetOn(kTRUE);
+   cbDigital->SetOn(kFALSE);    
+ }
+    
+    Emit("readoutModeChanged(int)",static_cast<int>(retval));
+    return retval;
+ 
+ 
 }
 
 int ctbPattern::getAnalogSamples() {
-  int n;
-  try {
-    n=(myDet->setTimer(slsDetectorDefs::ANALOG_SAMPLES,-1));
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-  eAnalogSamples->SetNumber((Double_t)n);
-  Emit("analogSamplesChanged(const int)", eAnalogSamples->GetNumber());
-  return eAnalogSamples->GetNumber();
+  try{
+    auto retval = myDet->getNumberOfAnalogSamples().tsquash("Different values");
+    eAnalogSamples->SetNumber((Double_t)retval);
+    Emit("analogSamplesChanged(const int)", eAnalogSamples->GetNumber());
+    return eAnalogSamples->GetNumber();
+  } CATCH_DISPLAY ("Could not get number of triggers.", "ctbPattern::update")
+
+  return -1;
 }
    
-int ctbPattern::getDigitalSamples() {
-  int n;
-  try {
-
-    n=(myDet->setTimer(slsDetectorDefs::DIGITAL_SAMPLES,-1));
-      } catch (...) {
-    
-      cout << "Do nothing for this error" << endl;
-  }
-
-  eDigitalSamples->SetNumber(((Double_t)n));
+int ctbPattern::getDigitalSamples() { 
+  int retval=0;
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
+    try{
+      auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values"); 
+    } CATCH_DISPLAY ("Could not get number of digital samples.", "ctbPattern::getDigitalSamples")
+	}
+  eDigitalSamples->SetNumber((Double_t)retval);
   Emit("digitalSamplesChanged(const int)", eDigitalSamples->GetNumber());
   return eDigitalSamples->GetNumber();
+ 
+
+  return -1;
 }
    
 
-
 void ctbPattern::analogSamplesChanged(const int t){
   Emit("analogSamplesChanged(const int)", t);
 }

ctbGui/ctbPattern.h

@@ -27,7 +27,10 @@ class energyCalibration;
 class  TGTextButton;
 class  TGTab;
 
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 
 
 #include <string>
@@ -46,10 +49,10 @@ class ctbLoop : public TGHorizontalFrame {
 
    int id;
 
-   multiSlsDetector *myDet;
+   sls::Detector *myDet;
 
  public:
-   ctbLoop(TGGroupFrame *page, int i,multiSlsDetector *det);
+   ctbLoop(TGGroupFrame *page, int i,sls::Detector *det);
    
    void setNLoops();
    void update();
@@ -67,10 +70,10 @@ class ctbWait : public TGHorizontalFrame {
 
    int id;
 
-   multiSlsDetector *myDet;
+   sls::Detector *myDet;
 
  public:
-   ctbWait(TGGroupFrame *page, int i,multiSlsDetector *det);
+   ctbWait(TGGroupFrame *page, int i,sls::Detector *det);
    
    void setWaitTime();
    void update();
@@ -99,7 +102,7 @@ private:
    TGNumberEntry *eStopAddr;
    TGNumberEntry *eFrames;
    TGNumberEntry *ePeriod;
-   TGNumberEntry *eCycles;
+   TGNumberEntry *eTriggers;
    // TGNumberEntry *eMeasurements;
    TGNumberEntry *eAdcPipeline;
    TGNumberEntry *eDBitPipeline;
@@ -122,11 +125,11 @@ private:
   
    char pat[PATLEN*8];
 
-   multiSlsDetector *myDet;
+   sls::Detector *myDet;
 
 public:
 
-   ctbPattern(TGVerticalFrame *page, multiSlsDetector *det);
+   ctbPattern(TGVerticalFrame *page, sls::Detector *det);
 
    void update();
    void setAdcFreq();
@@ -138,7 +141,7 @@ public:
    void setAdcPipeline();
    void setDBitPipeline();
    void setFrames();
-   void setCycles();
+   void setTriggers();
    // void setMeasurements();
    void setPeriod();
 

ctbGui/ctbPowers.cpp

@@ -10,61 +10,48 @@
 #include <iostream>
 #include <fstream>
 
+#include "ctbDefs.h"
 #include "ctbDacs.h"
 #include "ctbPowers.h"
-#include "multiSlsDetector.h"
+#include "Detector.h"
 #include "sls_detector_defs.h"
 
 using namespace std;
 
 
 
-ctbPower::ctbPower(TGGroupFrame* f, int i,  multiSlsDetector* d)
+ctbPower::ctbPower(TGGroupFrame* f, int i,  sls::Detector* d)
   : ctbDac(f, i, d) 
 {
   cout << "****************************************************************power " << i << endl;
      dacsUnit->SetOn(kTRUE); 
      dacsUnit->SetEnabled(kFALSE);
-     int ii=0;
 
      switch(i) {
      case slsDetectorDefs::V_POWER_IO: 
      	 dacsLabel->SetText("VIO"); 
-	 ii=slsDetectorDefs::I_POWER_IO;
      	 break; 
      case slsDetectorDefs::V_POWER_A: 
      	 dacsLabel->SetText("VA"); 
-	 ii=slsDetectorDefs::I_POWER_A;
      	 break;  
      case slsDetectorDefs::V_POWER_B: 
      	 dacsLabel->SetText("VB"); 
-	 ii=slsDetectorDefs::I_POWER_B;
      	 break;   
      case slsDetectorDefs::V_POWER_C: 
      	 dacsLabel->SetText("VC");
-	 ii=slsDetectorDefs::I_POWER_C; 
      	 break;    
      case slsDetectorDefs::V_POWER_D: 
      	 dacsLabel->SetText("VD");
-	 ii=slsDetectorDefs::I_POWER_D;  
      	 break;      
      case slsDetectorDefs::V_POWER_CHIP: 
      	 dacsLabel->SetText("VCHIP"); 
      	 dacsLabel->SetEnabled(kFALSE);
-	 ii=-1;
      	 break;    
      default: 
      	 dacsLabel->SetText("Bad index"); 
-	 ii=-1;
      	 break; 
      };
      
-     // ctbSlowAdc *vm=new ctbSlowAdc(f,i,d);
-     // vm->setLabel("V: ");
-     // if (ii>=0) {
-     //   ctbSlowAdc *im=new ctbSlowAdc(f,ii,d);
-     //   im->setLabel("I: ");
-     // }
 
      TGTextEntry *e=dacsEntry->TGNumberEntry::GetNumberEntry();
      e->Disconnect 	("ReturnPressed()");
@@ -104,44 +91,45 @@ string ctbPower::getLabel() {
   }
   line << " " <<  dacsLabel->GetText() << endl;
   return line.str();
-
 }
 
+void ctbPower::setValue(Long_t a) {ctbPower::setValue();}
 
-void ctbPower::setValue(Long_t a) {cout << "ssssssssss" << endl; ctbPower::setValue();}
 void ctbPower::setValue() {
-
-
-  cout << "***************************Setting power " << dacsEntry->GetIntNumber() << " " << (slsDetectorDefs::dacIndex)id <<" " << 1 << endl;
-  myDet->setDAC(dacsEntry->GetIntNumber(), (slsDetectorDefs::dacIndex)id, 1);
+  cout << "***************************Setting power " << dacsEntry->GetIntNumber() << " " << id << " " << 1 << endl;
+ 
+  try {
+    myDet->setVoltage(static_cast<slsDetectorDefs::dacIndex>(id), dacsEntry->GetIntNumber());
+  } CATCH_DISPLAY ("Could not set power " + to_string(id) + ".", "ctbPower::setValue")
 
   getValue();
-
 }
 
 
 int ctbPower::getValue() {
-  
-  int val=myDet->setDAC(-1, (slsDetectorDefs::dacIndex)id, 1);
-  char s[100];
-  cout << "****************************Getting power " << val << " " << (slsDetectorDefs::dacIndex)id <<" " << 1 << endl;
-  sprintf(s,"%d",val);
-  dacsValue->SetText(s);
-  if (val>0) {
-    if (id!=slsDetectorDefs::V_POWER_CHIP)
+  try {
+
+  int val = myDet->getVoltage(static_cast<slsDetectorDefs::dacIndex>(id)).tsquash("Different values");
+  cout << "****************************Getting power " << val << " " << id << " " << 1 << endl;
+
+  dacsValue->SetText(to_string(val).c_str());
+  if (val > 0) {
+    if (id != static_cast<int>(slsDetectorDefs::V_POWER_CHIP))
       dacsLabel->SetOn(kTRUE);
   } else {
     dacsLabel->SetOn(kFALSE);
   }
-  
 
   return val;
 
+  } CATCH_DISPLAY ("Could not get power " + to_string(id) + ".", "ctbPower::getValue") 
+
+  return -1;
 }
 
 
 
-ctbPowers::ctbPowers(TGVerticalFrame* page, multiSlsDetector* det)   : TGGroupFrame(page,"Power Supplies",kVerticalFrame) , myDet(det){
+ctbPowers::ctbPowers(TGVerticalFrame* page, sls::Detector* det)   : TGGroupFrame(page,"Power Supplies",kVerticalFrame) , myDet(det){
 
 
   SetTitlePos(TGGroupFrame::kLeft);
@@ -159,9 +147,8 @@ ctbPowers::ctbPowers(TGVerticalFrame* page, multiSlsDetector* det)   : TGGroupFr
 
 int ctbPowers::setPwrAlias(string line) {
 
-  int is=-1, mv=0;
+  int is=-1;
   char tit[100];
-  int narg;
 
   if (sscanf(line.c_str(),"VA %s",tit)) {
     dacs[0]->setLabel(tit,1);
@@ -212,7 +199,6 @@ string ctbPowers::getPwrAlias() {
 
 string ctbPowers::getPwrParameters() {
 
-
   ostringstream line;
   line << "v_a" << " " << dacs[0]->getValue() << " mv" << endl;
   line << "v_b" << " " << dacs[1]->getValue() << " mv" << endl;
@@ -225,19 +211,13 @@ string ctbPowers::getPwrParameters() {
   //   line << "dac:" << i << " " << dacs[i]->getValue() << endl;
   // } 
   return line.str();
-
-
 }
 
 
 
 void  ctbPowers::update() {
-
   for (int idac=0; idac<NPOWERS; idac++) {
-
     dacs[idac]->getValue();
 
   }
-
-
 }

ctbGui/ctbPowers.h

@@ -3,14 +3,7 @@
 
 #include  <TGFrame.h>
 
-#ifndef CTB
-#define NPOWERS 0
-#else
-
 #define NPOWERS 6
-#endif
-
-
 
 
 
@@ -22,8 +15,10 @@ class TGCheckButton;
 
 
 
-class multiSlsDetector;
-
+namespace sls
+{
+   class Detector;
+};
 
 #include <string>
 using namespace std;
@@ -36,7 +31,7 @@ class ctbPower : public ctbDac {
 
  public:
 
-  ctbPower(TGGroupFrame* f, int i, multiSlsDetector* d);
+  ctbPower(TGGroupFrame* f, int i, sls::Detector* d);
 
     string getLabel();
 
@@ -54,11 +49,11 @@ class ctbPowers : public TGGroupFrame
   
    ctbPower *dacs[NPOWERS]; 
 
-   multiSlsDetector* myDet; 
+   sls::Detector* myDet; 
 
 public:
    //ctbPowers();
-    ctbPowers(TGVerticalFrame*, multiSlsDetector*);
+    ctbPowers(TGVerticalFrame*, sls::Detector*);
 
     int setPwrAlias(string); 
     string getPwrAlias(); 

ctbGui/ctbSignals.cpp

@@ -34,7 +34,8 @@
 
 
 #include "ctbSignals.h"
-#include "multiSlsDetector.h"
+#include "ctbDefs.h"
+#include "Detector.h"
 
 using namespace std;
 
@@ -43,7 +44,7 @@ using namespace std;
 //#define DEFAULTFN "run_0.encal"
 
 
-ctbSignal::ctbSignal(TGFrame *page, int i,  multiSlsDetector *det)
+ctbSignal::ctbSignal(TGFrame *page, int i,  sls::Detector *det)
   : TGHorizontalFrame(page, 800,50), myDet(det), id(i), hsig(NULL) {
 
 
@@ -178,10 +179,6 @@ int ctbSignal::fixOutput(int i) {
 
 int ctbSignal::setDbitList(Long64_t r) {
 
-  Long64_t mask=((Long64_t)1<<id);
-
-  // cout << hex << r << dec <<endl;
-
   if (r)
       sDbitList->SetOn(kTRUE,kFALSE);
   else 
@@ -197,7 +194,6 @@ int ctbSignal::isPlot() { return sPlot->IsOn();}
 Pixel_t ctbSignal::getColor(){return fColorSel->GetColor();}
 
 void ctbSignal::ToggledOutput(Bool_t b) {
-  Long_t mask=b<<id;
   ToggledSignalOutput(id);
   if (b) {
     // sClock->SetEnabled(kTRUE);
@@ -249,7 +245,7 @@ void ctbSignal::ToggledSignalPlot(Int_t b){
 }
 
 
-ctbSignals::ctbSignals(TGVerticalFrame *page, multiSlsDetector *det)
+ctbSignals::ctbSignals(TGVerticalFrame *page, sls::Detector *det)
   : TGGroupFrame(page,"IO Signals",kVerticalFrame), myDet(det) {
 
 
@@ -259,7 +255,6 @@ ctbSignals::ctbSignals(TGVerticalFrame *page, multiSlsDetector *det)
   
 
   TGHorizontalFrame *hframe;
-  char tit[100];
  
   TGHorizontalFrame* hhframe=new TGHorizontalFrame(this, 800,800);
   AddFrame(hhframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
@@ -290,36 +285,6 @@ ctbSignals::ctbSignals(TGVerticalFrame *page, multiSlsDetector *det)
 
   }
 
-// #ifdef CTB
-//   idac=62;
-//   signals[idac]=new ctbSignal(vframe,idac,myDet);
-//   vframe->AddFrame(signals[idac],new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-//   signals[idac]->MapWindow();
-//   sprintf(tit,"DBIT Latch");
-
-//   signals[idac]->setSignalAlias(tit,-1,-1);
-
-//   signals[idac]->Connect("ToggledSignalOutput(Int_t)","ctbSignals",this,"ToggledOutReg(Int_t)");
-//   signals[idac]->Connect("ToggledSignalDbitList(Int_t)","ctbSignals",this,"ToggledDbitList(Int_t)");
-//   signals[idac]->Connect("ToggledSignalPlot(Int_t)","ctbSignals",this,"ToggledPlot(Int_t)");
-
-
-// #endif
-
-
-  // idac=63;
-  // signals[idac]=new ctbSignal(vframe,idac,myDet);
-  // vframe->AddFrame(signals[idac],new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  // signals[idac]->MapWindow();
-  // sprintf(tit,"ADC Latch");
-
-  // signals[idac]->setSignalAlias(tit,-1,-1);
-
-  // signals[idac]->Connect("ToggledSignalOutput(Int_t)","ctbSignals",this,"ToggledOutReg(Int_t)");
-  // signals[idac]->Connect("ToggledSignalDbitList(Int_t)","ctbSignals",this,"ToggledDbitList(Int_t)");
-  // signals[idac]->Connect("ToggledSignalPlot(Int_t)","ctbSignals",this,"ToggledPlot(Int_t)");
-
-
   hframe=new TGHorizontalFrame(vframe, 800,50);
   vframe->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
   hframe->MapWindow();
@@ -398,121 +363,142 @@ string ctbSignals::getSignalAlias() {
 
 
 void ctbSignals::update() {
-  Long64_t oreg=myDet->setPatternIOControl();//setCTBWord(-1,-1);
-  // Long64_t creg=myDet->setPatternClockControl();//setCTBWord(-2,-1);
+  try {
 
+    Long64_t oreg = static_cast<Long64_t>(myDet->getPatternIOControl().tsquash("Different values"));
+    cout << hex << oreg << dec << endl;
 
-  char val[1000];
-  cout << hex << oreg << dec << endl;
-  //  cout << hex << creg << dec << endl;
+    for (int idac=0; idac<NIOSIGNALS; idac++) {
+      signals[idac]->setOutput(oreg);
+    }
 
-  sprintf(val,"%llX",oreg);
-  //  eIOCntrlRegister->SetHexNumber(oreg);
- 
+  } CATCH_DISPLAY ("Could not get patternIOcontrol.", "ctbSignals::update")
 
-  for (int idac=0; idac<NIOSIGNALS; idac++) {
-    signals[idac]->setOutput(oreg);
-   
-  }
-
-  Long64_t mask;
-  std::vector <int> dbitlist=myDet->getReceiverDbitList();
-  if (dbitlist.empty())
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    // enable all
     for (int is=0; is<64; is++) {
       signals[is]->setDbitList(1);
     } 
+    eDbitOffset->SetNumber(0);
+  } 
+  
+  // ctb
   else {
-    for (int is=0; is<64; is++) signals[is]->setDbitList(0);
-    for (const auto &value : dbitlist)  {
-      signals[value]->setDbitList(1);
-    }
+    try {
+
+      auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
+      // enable all
+      if (dbitlist.empty()) {
+        for (int is=0; is<64; is++) {
+          signals[is]->setDbitList(1);
+        } 
+      }
+      else {
+        // disable all
+        for (int is=0; is<64; is++) {
+          signals[is]->setDbitList(0);
+        }
+        // enable selected
+        for (const auto &value : dbitlist)  {
+          signals[value]->setDbitList(1);
+        }
+      }
+
+    } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbSignals::update")
+
+    try {
+      auto val = myDet->getRxDbitOffset().tsquash("Different values");
+      eDbitOffset->SetNumber(val);
+    } CATCH_DISPLAY ("Could not get receiver dbit offset.", "ctbSignals::update")
   }
-
-
-  eDbitOffset->SetNumber(myDet->getReceiverDbitOffset());
-
 }
 
 
 string ctbSignals::getSignalParameters() {
 
+  try {
 
-  ostringstream line;
-  line <<  "patioctrl " << hex << myDet->setPatternIOControl() << dec << endl;//setCTBWord(-1,-1)
-  return line.str();
+    auto val = myDet->getPatternIOControl().tsquash("Different values");
+    ostringstream line;
+    line <<  "patioctrl " << hex << val << dec << endl;
+    return line.str();
 
+  } CATCH_DISPLAY ("Could not get patternIOcontrol.", "ctbSignals::getSignalParameters")
 
+  return ("");
 }
 
 void ctbSignals::ToggledOutReg(Int_t mask) {
-  
-  char val[1000];
-  Long64_t oreg=myDet->setPatternIOControl();//setCTBWord(-1,-1);
-  Long64_t m=((Long64_t)1)<<mask;
-  
+  try {
 
-  cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg;
+    Long64_t oreg = static_cast<Long64_t>(myDet->getPatternIOControl().tsquash("Different values"));
+    Long64_t m=((Long64_t)1)<<mask;
+    cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg;
 
- 
+    if (signals[mask]->isOutput()) {
+      cout <<  " or " << m ;
+      oreg|=m;
+    } else {
+      cout <<  " not " << ~m ;
+      oreg&=~m;
+    }
+    cout <<  " after " << oreg << endl;
 
-  if (signals[mask]->isOutput()) {
-    cout <<  " or " << m ;
-    oreg|=m;
-  }  else {
-    cout <<  " not " << ~m ;
-    oreg&=~m;
-  }
-  cout <<  " after " << oreg << endl;
+    myDet->setPatternIOControl(static_cast<uint64_t>(oreg));
+    oreg = static_cast<Long64_t>(myDet->getPatternIOControl().tsquash("Different values"));
+    cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
 
-  myDet->setPatternIOControl(oreg);//setCTBWord(-1,oreg);
-  oreg=myDet->setPatternIOControl();//myDet->setCTBWord(-1,-1);
+    eIOCntrlRegister->SetText(to_string(oreg).c_str());
 
-  cout << dec << sizeof(Long64_t) << " " << mask << " " << hex << m << " ioreg " << oreg << endl;
-
-  sprintf(val,"%llX",oreg);
-  //  eIOCntrlRegister->SetHexNumber(oreg);
-  eIOCntrlRegister->SetText(val);
-  //  eIOCntrlRegister->SetNumber(oreg);
+  } CATCH_DISPLAY ("Could not get/set patternIOcontrol.", "ctbSignals::ToggledOutReg")
 
 }
 
 
 
 void ctbSignals::ToggledDbitList(Int_t mask){
-  
+  try {
 
+    auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
 
-  cout << "************* Here" << endl;
-
-
-
-  std::vector <int> new_dbitlist;
-  std::vector <int> old_dbitlist=myDet->getReceiverDbitList();
-
-  char val[1000];
-  Long64_t m=((Long64_t)1)<<mask;
-
-  if (old_dbitlist.empty() &&  signals[mask]->isDbitList()) 
-    ;
-  else {
-    int ns=0;
-    for (int is=0; is<64; is++) {
-      if (signals[is]->isDbitList()){ 
-	new_dbitlist.push_back(is);
-	ns++;
-	cout << is << " " << ns << endl;
+    // anyway all enabled
+    if ((dbitlist.empty()) && (signals[mask]->isDbitList())) {
+      ;
+    } 
+    // set the dbitlist
+    else  {
+      std::vector <int> new_dbitlist;
+      for (int is=0; is<64; is++) {
+        if (signals[is]->isDbitList()){ 
+          new_dbitlist.push_back(is);
+          cout << is << " " << new_dbitlist.size() - 1 << endl;
+        }
+      }
+      if (new_dbitlist.size() > 64) 
+        new_dbitlist.clear();
+      myDet->setRxDbitList(new_dbitlist);
+      // get list again
+      dbitlist = myDet->getRxDbitList().tsquash("Different values");
+    }
+    
+    // enable all
+    if (dbitlist.empty()) {
+      for (int is=0; is<64; is++) {
+        signals[is]->setDbitList(1);
+      } 
+    }
+    else {
+      // disable all
+      for (int is=0; is<64; is++) {
+        signals[is]->setDbitList(0);
+      }
+      // enable selected
+      for (const auto &value : dbitlist)  {
+        signals[value]->setDbitList(1);
       }
     }
-    if (ns>63) new_dbitlist.clear();
-    myDet->setReceiverDbitList(new_dbitlist);
-  }
-  std::vector <int> dbitlist=myDet->getReceiverDbitList();
-  if (dbitlist.empty())
-    for (int is=0; is<64; is++) signals[is]->setDbitList(1);
-  else
-    for (int is=0; is<64; is++) signals[is]->setDbitList(0);
-    for (const auto &value : dbitlist)  signals[value]->setDbitList(1);
 
+  } CATCH_DISPLAY ("Could not get/set receiver dbit list.", "ctbSignals::ToggledDbitList")
 }
 
 
@@ -533,16 +519,23 @@ void ctbSignals::ToggledSignalPlot(Int_t b) {
 
 
 Pixel_t ctbSignals::getColor(int i){
-  if (i>=0 && i<NSIGNALS) return signals[i]->getColor();
+  if (i>=0 && i<NSIGNALS) 
+    return signals[i]->getColor();
+  return static_cast<Pixel_t>(-1);
 }
 
 int ctbSignals::getPlot(int i){
-  if (i>=0 && i<NSIGNALS) return signals[i]->isPlot();
+  if (i>=0 && i<NSIGNALS) 
+    return signals[i]->isPlot();
+  return -1;
 };
 
 void ctbSignals::setDbitOffset(Long_t) {
   setDbitOffset();
 }
+
 void ctbSignals::setDbitOffset(){
-  myDet->setReceiverDbitOffset(eDbitOffset->GetNumber());
+  try {
+    myDet->setRxDbitOffset(eDbitOffset->GetNumber());
+  } CATCH_DISPLAY ("Could not set receiver dbit offset.", "ctbSignals::setDbitOffset")
 }

ctbGui/ctbSignals.h

@@ -25,7 +25,10 @@ class TGColorSelect;
 
 
 class TGNumberEntry;
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 class ctbSignal;
 
 #include <string>
@@ -45,14 +48,14 @@ private:
    TGNumberEntry *sEntry;
    TGColorSelect *fColorSel;
 
-   multiSlsDetector *myDet;
+   sls::Detector *myDet;
    Int_t id;
 
    TH1I *hsig;
 
 public:
 
-   ctbSignal(TGFrame *page, int i, multiSlsDetector *det);
+   ctbSignal(TGFrame *page, int i, sls::Detector *det);
    int setSignalAlias(char *tit, int plot, int col);
    string getSignalAlias();
 
@@ -89,10 +92,10 @@ private:
   TGNumberEntry *eIOCntrlRegister;
   TGNumberEntry *eDbitOffset;
 
-  multiSlsDetector *myDet;
+  sls::Detector *myDet;
 
 public:
-  ctbSignals(TGVerticalFrame *page, multiSlsDetector *det);
+  ctbSignals(TGVerticalFrame *page, sls::Detector *det);
    int setSignalAlias(string line);
    string getSignalAlias();
 

ctbGui/ctbSlowAdcs.cpp

@@ -9,7 +9,8 @@
 #include <TGButton.h>
 
 #include "ctbSlowAdcs.h"
-#include "multiSlsDetector.h"
+#include "ctbDefs.h"
+#include "Detector.h"
 #include "sls_detector_defs.h"
 
 using namespace std;
@@ -17,7 +18,7 @@ using namespace std;
 
 
 
-ctbSlowAdc::ctbSlowAdc(TGGroupFrame *page, int idac, multiSlsDetector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
+ctbSlowAdc::ctbSlowAdc(TGGroupFrame *page, int idac, sls::Detector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
 
 
     TGHorizontalFrame *hframe=this;
@@ -55,9 +56,6 @@ ctbSlowAdc::ctbSlowAdc(TGGroupFrame *page, int idac, multiSlsDetector *det) : TG
    b->SetTextJustify(kTextLeft);
 
    b->Connect("Clicked()","ctbSlowAdc",this,"getValue()");
-
-
-
 }
 
 
@@ -66,38 +64,50 @@ int ctbSlowAdc::setLabel(char *tit) {
   if(tit)
     dacsLabel->SetText(tit);
 
-      
   return id;
 
 }
 
 string ctbSlowAdc::getLabel() {
-
   ostringstream line;
   line << dacsLabel->GetText() <<  endl;
 
    //  line << "DAC" << dec << id << " " <<  dacsUnit->IsOn() << endl;
 
   return line.str();
-
 }
 
 
 
 int ctbSlowAdc::getValue() {
-  
-  int val=myDet->getADC((slsDetectorDefs::dacIndex)id);
-  char s[100];
-  cout << "adc " << id << " " << val << endl;
-  sprintf(s,"%d mV",val);
-  if (id==999)
-    sprintf(s,"%d <20>C",val);
-  dacsValue->SetText(s);
- 
-  
+  try {
+    std::string s;
 
-  return val;
+    // temp
+    if (id == static_cast<int>(slsDetectorDefs::SLOW_ADC_TEMP)) {
 
+      int val = myDet->getTemperature(static_cast<slsDetectorDefs::dacIndex>(id)).tsquash("Different values");
+      cout << "slow adc temp" << " " << val << endl;
+
+      s = to_string(val) + " " + to_string(0x00b0) + "C";//<2F>C
+      dacsValue->SetText(s.c_str());
+      return val;
+    } 
+    
+    // mv
+    else {
+
+      int val = myDet->getSlowADC(static_cast<slsDetectorDefs::dacIndex>(id)).tsquash("Different values");
+      cout << "slow adc " << id << " " << val << endl;
+      
+      s = to_string(val) + " mV"; 
+      dacsValue->SetText(s.c_str());
+      return val;
+    }
+
+  } CATCH_DISPLAY ("Could not get slow dac " + to_string(id) + ".", "ctbSlowAdc::getValue")
+
+  return -1;
 }
 
 
@@ -106,8 +116,7 @@ int ctbSlowAdc::getValue() {
 
 
 
-ctbSlowAdcs::ctbSlowAdcs(TGVerticalFrame *page, multiSlsDetector *det)   : TGGroupFrame(page,"Sense",kVerticalFrame) , myDet(det){
-
+ctbSlowAdcs::ctbSlowAdcs(TGVerticalFrame *page, sls::Detector *det)   : TGGroupFrame(page,"Sense",kVerticalFrame) , myDet(det){
 
   SetTitlePos(TGGroupFrame::kLeft);
   page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
@@ -116,14 +125,12 @@ ctbSlowAdcs::ctbSlowAdcs(TGVerticalFrame *page, multiSlsDetector *det)   : TGGro
   // cout << "window mapped " << endl;
 
  
-  for (int idac=0; idac<NSLOWADCS; idac++) {
+  for (int idac=0; idac<NSLOWADCS + 1; idac++) {
 
      adcs[idac]=new ctbSlowAdc(this, idac+1000, myDet);
 
   }
-  adcs[NSLOWADCS]=new ctbSlowAdc(this, 999, myDet);
-  adcs[NSLOWADCS]->setLabel("Temperature"); 
-
+  adcs[NSLOWADCS]->setLabel((char*)"Temperature"); 
 }
 
 
@@ -133,7 +140,7 @@ int ctbSlowAdcs::setSlowAdcAlias(string line) {
 
   int is=-1, mv=0;
   char tit[100];
-  int narg=sscanf(line.c_str(),"SENSE%d %s",&is,tit,&mv);
+  int narg=sscanf(line.c_str(),"SENSE%d %s %d",&is,tit,&mv);
   if (narg<2)
     return -1;
   if (is>=0 && is<NSLOWADCS) 
@@ -149,7 +156,6 @@ string ctbSlowAdcs::getSlowAdcAlias() {
   for (int i=0; i<NSLOWADCS; i++)
     line << adcs[i]->getLabel() << endl;
   return line.str();
-
 }
 
 
@@ -157,7 +163,6 @@ string ctbSlowAdcs::getSlowAdcAlias() {
 
 string ctbSlowAdcs::getAdcParameters() {
 
-
   ostringstream line;
 
   for (int i=0; i<NSLOWADCS; i++) {
@@ -166,20 +171,12 @@ string ctbSlowAdcs::getAdcParameters() {
   }    
   line << "adc:-1" << adcs[NSLOWADCS]->getValue() << endl;
   return line.str();
-
-
 }
 
 
 
 void  ctbSlowAdcs::update() {
-
-
   for (int idac=0; idac<NSLOWADCS+1; idac++) {
-
     adcs[idac]->getValue();
-
   }
-
-
 }

ctbGui/ctbSlowAdcs.h

@@ -19,7 +19,10 @@ class TGTextButton;
 
 
 
-class multiSlsDetector;
+namespace sls
+{
+   class Detector;
+};
 
 #include <string>
 using namespace std;
@@ -35,9 +38,9 @@ class ctbSlowAdc : public TGHorizontalFrame {
    TGLabel *dacsValue;
    int id;
 
-   multiSlsDetector* myDet;
+   sls::Detector* myDet;
  public:
-   ctbSlowAdc(TGGroupFrame*, int , multiSlsDetector*);
+   ctbSlowAdc(TGGroupFrame*, int , sls::Detector*);
    int getValue();
    
    int setLabel(char *tit);
@@ -56,10 +59,10 @@ private:
 
    ctbSlowAdc *adcs[NSLOWADCS+1];
 
-   multiSlsDetector* myDet;
+   sls::Detector* myDet;
 
 public:
-   ctbSlowAdcs(TGVerticalFrame *page, multiSlsDetector*);
+   ctbSlowAdcs(TGVerticalFrame *page, sls::Detector*);
 
    int setSlowAdcAlias(string line);
    // int setDacAlias(string line);

ctbGui/patternGenerator/generate.sh

@@ -21,6 +21,7 @@ if [ -f "$infile" ]
 then
 gcc -DINFILE="\"$infile\"" -DOUTFILE="\"$outfile\""  -DOUTFILEBIN="\"$outfilebin\"" -o $exe generator.c ; 
 echo compiling
+echo gcc -DINFILE="\"$infile\"" -DOUTFILE="\"$outfile\""  -DOUTFILEBIN="\"$outfilebin\"" -o $exe generator.c ; 
 $exe ; 
 echo cleaning
 rm $exe

docs/CMakeLists.txt

@@ -1,67 +1,75 @@
-find_package(Doxygen)
-find_package(Sphinx)
+find_package(Doxygen REQUIRED)
+find_package(Sphinx REQUIRED)
 
 
-if (DOXYGEN_FOUND AND SPHINX_FOUND)
 
-    # #Utility to generate command line documentation
-    add_executable(gendoc src/gendoc.cpp)
-    target_link_libraries(gendoc PRIVATE
-      slsDetectorShared
-    )
-    set_target_properties(gendoc PROPERTIES 
-      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-    )
 
-    
-    
+# Utility to generate command line documentation
+add_executable(gendoc src/gendoc.cpp)
+# This is a bit hacky, but better than exposing stuff? 
+target_include_directories(gendoc PRIVATE ${PROJECT_SOURCE_DIR}/slsDetectorSoftware/src)
+target_link_libraries(gendoc PRIVATE
+  slsDetectorShared
+)
+set_target_properties(gendoc PROPERTIES 
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
 
-    #Doxygen
-    set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
-    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
 
-    #Sphinx
-    set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-    set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR})
 
-    set(SPHINX_SOURCE_FILES
-      src/commandline.rst
-      src/container_utils.rst
-      src/dependencies.rst
-      src/detector.rst
-      src/index.rst
-      src/installation.rst
-      src/pydetector.rst
-      src/pyenums.rst
-      src/pyexamples.rst
-      src/receiver.rst
-      src/result.rst
-      src/type_traits.rst
-      src/ToString.rst
-      
-    )
 
-    foreach(filename ${SPHINX_SOURCE_FILES})
-      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename} 
-                    "${SPHINX_BUILD}/${filename}")
-    endforeach(filename ${SPHINX_SOURCE_FILES})
+#Doxygen
+set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
+set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
 
-    configure_file(
-        "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
-        "${SPHINX_BUILD}/conf.py"
-        @ONLY)
+#Sphinx
+set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR})
 
-    add_custom_target(docs
-                    gendoc
-                    COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-                    COMMAND ${SPHINX_EXECUTABLE} -a -b html
-                    -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
-                    -c "${SPHINX_BUILD}"
-                    ${SPHINX_BUILD}/src 
-                    ${SPHINX_BUILD}/html
-                    COMMENT "Generating documentation with Sphinx")
+set(SPHINX_SOURCE_FILES
+  src/commandline.rst
+  src/container_utils.rst
+  src/consuming.rst
+  src/dependencies.rst
+  src/detector.rst
+  src/index.rst
+  src/installation.rst
+  src/pydetector.rst
+  src/pyenums.rst
+  src/pyexamples.rst
+  src/receiver.rst
+  src/result.rst
+  src/type_traits.rst
+  src/ToString.rst
+  src/examples.rst
+  
+)
 
-else (DOXYGEN_FOUND AND SPHINX_FOUND)
-  message("Doxygen and Sphinx are needed to build documentation")
-endif (DOXYGEN_FOUND AND SPHINX_FOUND)
+foreach(filename ${SPHINX_SOURCE_FILES})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename} 
+              "${SPHINX_BUILD}/${filename}")
+endforeach(filename ${SPHINX_SOURCE_FILES})
+
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
+  "${SPHINX_BUILD}/conf.py"
+  @ONLY)
+
+add_custom_target(docs
+              gendoc
+              COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+              COMMAND ${SPHINX_EXECUTABLE} -a -b html
+              -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
+              -c "${SPHINX_BUILD}"
+              ${SPHINX_BUILD}/src 
+              ${SPHINX_BUILD}/html
+              COMMENT "Generating documentation with Sphinx")
+
+add_custom_target(rst
+              COMMAND ${SPHINX_EXECUTABLE} -a -b html
+              -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
+              -c "${SPHINX_BUILD}"
+              ${SPHINX_BUILD}/src 
+              ${SPHINX_BUILD}/html
+              COMMENT "Generating documentation with Sphinx")

docs/conf.py.in

@@ -21,7 +21,7 @@ print(sys.path)
 # -- Project information -----------------------------------------------------
 
 project = 'slsDetectorPackage'
-copyright = '2019, PSD Detector Group'
+copyright = '2020, PSD Detector Group'
 author = 'PSD Detector Group'
 version = '@PROJECT_VERSION@'
 

docs/src/consuming.rst

@@ -0,0 +1,116 @@
+Consuming slsDetectorPackage
+===============================
+
+Depending on how you want to build your integration with 
+slsDetectorPackage there are a few different ways to 
+consume our package. The recommended way is to use one of the 
+CMake approaches. 
+
+
+
+CMake: slsDetectorPackage as submodule in your project
+---------------------------------------
+
+If you are using CMake to build your integration and want to build everything
+in one go, we support adding slsDetectorPackage as a subfolder in your cmake project. 
+
+A minimal CMakeLists.txt could look like this: 
+
+.. code-block:: cmake
+
+    project(myDetectorIntegration)
+    cmake_minimum_required(VERSION 3.12)
+    add_subdirectory(slsDetectorPackage)
+
+    #Add your executable
+    add_executable(example main.cpp)
+    target_compile_features(example PRIVATE cxx_std_11)
+
+    #Link towards slsDetectorShared
+    target_link_libraries(example slsDetectorShared)
+
+A fully working example can be found at:
+
+https://github.com/slsdetectorgroup/cmake-subfolder-example
+
+
+CMake: find_package(slsDetectorPackage)
+------------------------------------------
+
+If you have compiled and installed slsDetectorPackage we also support
+find_package in CMake. If installed in a system wide location no path
+should be needed, otherwise specify cmake prefix path. 
+
+.. code-block:: cmake 
+
+    cmake_minimum_required(VERSION 3.12)
+    project(myintegration)
+
+    find_package(slsDetectorPackage 5.0 REQUIRED)
+    add_executable(example main.cpp)
+    target_link_libraries(example slsDetectorShared)
+
+
+Then assuming the slsDetectorPackage is installed in /path/to/sls/install
+you should be able to configure and build your project in this way. 
+
+.. code-block:: bash
+
+    cmake ../path/to/your/source -DCMAKE_PREFIX_PATH=/path/to/sls/install
+    make
+
+
+A minimal example is available at: https://github.com/slsdetectorgroup/minimal-cmake
+
+
+CMake: find_package and conda
+----------------------------------
+
+.. note::
+
+    conda can also be used for installing dependencies such as zmq, Qt4 etc. 
+
+find_package(slsDetectorPackage) also works if you have installed slsDetectorPackage using conda.
+The only difference is that you point CMake to $CONDA_PREFIX 
+
+
+.. code-block:: bash
+
+    #assuming myenv contains slsdetlib
+    conda activate myenv
+    cmake ../path/to/your/source -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
+    make
+
+Depending on your system compiler you might also have to install gxx_linux-64 to compiled.
+
+No tools minimal approach
+-----------------------------
+
+While not recommended it is still possible to specify the include and library paths
+manually when invoking g++. This can sometimes be handy for a quick try. 
+
+.. code-block:: cpp
+
+    #include "Detector.h"
+    #include <iostream>
+    int main(){
+
+        sls::Detector det;
+
+        //Get all values and print them
+        std::cout << "Hostname: " << det.getHostname() << "\n";
+        std::cout << "Type: " << det.getDetectorType() << "\n";
+        std::cout << "Udp ip: " << det.getSourceUDPIP() << "\n";
+
+
+        //Get mac addr 
+        const int module = 0;
+        auto mac = det.getSourceUDPMAC()[module];
+        std::cout << "Mac addr of module "<< module <<  " is " <<  mac.str() << '\n'; 
+
+    }     
+
+
+.. code-block:: bash
+
+    g++ -I/install/path/include/  -L/install/path/lib64/ myapp.cpp -lSlsDetector -lSlsSupport -Wl,-rpath=../install/path/lib64

docs/src/dependencies.rst

@@ -13,7 +13,7 @@ To use the basic building blocks, meaning sls_detector_get/put and
 the shared libraries these are needed: 
 
  * Linux, preferably recent kernel (currently no cross platform support)
- * CMake > 3.9 
+ * CMake > 3.12 
  * C++11 compatible compiler. (We test with gcc and clang)
  * ZeroMQ version 4
 
@@ -24,7 +24,7 @@ GUI
 The GUI is currently using Qt4 but watch out for an upgrade to 5. 
 
  * Qt 4.8
- * Qwt 6
+ * Qwt 6.1
 
 -----------------------
 Python bindings
@@ -42,7 +42,7 @@ The documentation that you are reading now is built with
 
  * Doxygen (to extract C++ classes etc.)
  * Breathe (Sphinx plugin to handle doxygen xml)
- * Sphinx 
+ * Sphinx with sphinx_rtd_theme 
 
 -----------------------
 Packaged in libs/

docs/src/examples.rst

@@ -0,0 +1,115 @@
+
+
+
+Examples
+===========
+
+Setup 
+------------
+
+The examples here assume that you have compiled and installed slsDetectorPackage
+to ~/sls/install and that the option for SLS_USE_SIMULATOR was enabled. This also builds
+the virtual detector servers that we will be using for testing. 
+
+We also add ~/sls/detector/install/bin to the path for convenience. 
+
+Compile examples
+-------------------
+
+The source code of the examples is available at:
+https://github.com/slsdetectorgroup/api-examples
+
+
+.. code-block:: bash
+
+    git clone https://github.com/slsdetectorgroup/api-examples.git
+    mkdir build && cd build
+    cmake ../api-examples -DCMAKE_PREFIX_PATH=~/sls/detector/install
+    make
+
+Below follows a short description of what is included in the examples.
+
+
+Running a config file [e1]
+-----------------------------
+
+
+.. code-block:: cpp
+
+    #include "Detector.h"
+    ...
+    sls::Detector det;
+    det.loadConfig("path/to/config/file.config");
+
+
+
+To configure the connection between PC and detector the easiest 
+is to run a config file. For this example we first launch a virtual Jungfrau server and
+then set up the detector. 
+
+**Launch a virtual detector server**
+
+.. code-block:: bash
+
+    jungfrauDetectorServer_virtual
+
+This launches a virtual Jungfrau detector server. As default is uses port 1952 and 1953
+for communication over TCP. Most commands go on 1952 and only stop and status on 1953. 
+
+**Run example to configure**
+
+.. code-block:: bash
+
+    ./e1-config one_det_no_receiver.config
+    - 12:01:06.371 INFO: Shared memory deleted /slsDetectorPackage_multi_0_sls_0
+    - 12:01:06.371 INFO: Shared memory deleted /slsDetectorPackage_multi_0
+    - 12:01:06.372 INFO: Shared memory created /slsDetectorPackage_multi_0
+    - 12:01:06.376 INFO: Loading configuration file: one_det_no_receiver.config
+    - 12:01:06.376 INFO: Adding detector localhost
+    - 12:01:06.377 INFO: Shared memory created /slsDetectorPackage_multi_0_sls_0
+    - 12:01:06.377 INFO: Checking Detector Version Compatibility
+    - 12:01:06.378 INFO: Detector connecting - updating!
+    hostname [localhost]
+
+
+    Jungfrau detector with 1 modules configured
+
+
+Using the return type sls::Result [e2]
+-----------------------------------------
+
+Since many our detectors have multiple modules we cannot return
+a single value when reading from the Detector. Hostname, Ip and also
+for example exposure time can differ between modules. 
+
+Therefore we return Result<T> which is a thin wrapper around
+std::vector. 
+
+.. code-block:: cpp
+
+    sls::Result<int> res1{1, 1, 1};
+    std::cout << "res1: " << res1 << '\n';
+    res1.squash();
+    res1.squash(-1);
+
+
+
+Setting exposure time [e3]
+-----------------------------------------
+
+For setting times, like exposure time, period, delay etc. 
+we use std::chrono::duration. 
+
+Example 3 shows how to set and read exposure time as well
+as converting to floating point. 
+
+.. code-block:: cpp
+
+    #include "Detector.h"
+    #include <chrono>
+    ...
+    std::chrono::microseconds t0{500};
+    det.setExptime(t0);
+
+
+

docs/src/gendoc.cpp

@@ -1,7 +1,7 @@
-/** 
- * Utility program to generate input files for the command line 
+/**
+ * Utility program to generate input files for the command line
  * documentation. Uses the string returned from sls_detector_help cmd
- * 
+ *
  */
 #include <fstream>
 #include <iostream>
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-
 #include "CmdProxy.h"
 #include "Detector.h"
 #include "sls_detector_defs.h"
@@ -36,7 +35,7 @@ int main() {
 
     std::cout << "Generating command line documentation!\n";
 
-    sls::CmdProxy<sls::Detector> proxy(nullptr);
+    sls::CmdProxy proxy(nullptr);
     auto commands = proxy.GetProxyCommands();
 
     std::ofstream fs("commands.rst");
@@ -52,5 +51,4 @@ int main() {
         auto help = replace_all(tmp, "\n\t", "\n\t\t");
         fs << '\t' << cmd << usage << help << "\n";
     }
-
 }

docs/src/index.rst

@@ -6,12 +6,18 @@
 Welcome to slsDetectorPackage's documentation!
 ==============================================
 
+.. note :: 
+
+    This is the documentation for the latest development version of slsDetectorPackage
+    For documentation on current and previous releases visit the official page: https://www.psi.ch/en/detectors/documentation
+
 .. toctree::
     :maxdepth: 1
     :caption: Installation:
 
     installation
     dependencies
+    consuming
    
 .. toctree::
     :caption: C++ API
@@ -20,6 +26,7 @@ Welcome to slsDetectorPackage's documentation!
     detector
     result
     receiver
+    examples
 
 .. toctree::
     :caption: Python API

docs/src/installation.rst

@@ -1,5 +1,114 @@
 
+
+
+.. note :: 
+
+    The default branch of our git repository is developer. It contains the 
+    latest development version. It is expected to compile and work but 
+    features might be added or tweaked. In some cases the API might also change
+    without being communicated. If absolute stability of the API is needed please
+    use one of the release versions. 
+
+.. warning ::
+    
+    Before building from source make sure that you have the 
+    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
+    manage the dependencies.
+    
+
+
 Installation
 ==============================================
 
-get the source etc.
+Build from source using CMake
+---------------------------------
+
+Note that on some systems, for example RH7,  cmake v3+ is available under the cmake3 alias.
+It is also required to clone with the option --recursive to get the git submodules used
+in the package. 
+
+
+.. code-block:: bash
+
+    git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
+    mkdir build && cd build
+    cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
+    make -j12 #or whatever number of cores you are using to build
+    make install
+
+The easiest way to configure options is to use the ccmake utility. 
+
+.. code-block:: bash
+
+    #from the build directory
+    ccmake .
+
+
+Install binaries using conda
+--------------------------------
+
+Conda is not only useful to manage python environments but can also
+be used as a user space package manager. 
+
+We have three different packages available:
+
+ * **slsdetlib**, shared libraries and command line utilities 
+ * **slsdetgui**, GUI
+ * **slsdet**, Python bindings
+
+
+.. code-block:: bash
+
+    #Add channels for dependencies and our library
+    conda config --add channels conda-forge
+    conda config --add channels slsdetectorgroup
+    conda config --set channel_priority strict
+
+    #cerate an environment with our library, then activate
+    conda create -n myenv slsdetlib=2020.07.23.dev0
+    conda activate myenv
+
+    #ready to use
+    sls_detector_get exptime
+    etc ...
+
+
+.. code-block:: bash
+
+    #List available versions
+    conda search slsdet
+
+
+Build from source on old distributions
+-----------------------------------------
+
+If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
+it's possible to install a newer gcc using conda and build the slsDetectorPackage
+using this compiler
+
+.. code-block:: bash
+
+    #Create an environment with the dependencies
+    conda create -n myenv gxx_linux-64 cmake zmq
+    conda activate myenv
+    cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
+    make -j12
+
+
+Build this documentation
+-------------------------------
+
+The documentation for the slsDetectorPackage is build using a combination 
+of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
+is to use conda 
+
+.. code-block:: bash
+
+    conda create -n myenv python sphinx sphinx_rtd_theme
+
+Then enable the option SLS_BUILD_DOCS to create the targets
+
+.. code-block:: bash
+
+    make docs # generate API docs and build Sphinx RST
+    make rst # rst only, saves time in case the API did not change

docs/src/pydetector.rst

@@ -1,9 +1,9 @@
 Detector
 =====================================================
 
-.. py:currentmodule:: sls_detector
+.. py:currentmodule:: slsdet
 
-.. autoclass:: ExperimentalDetector
+.. autoclass:: Detector
     :members:  
     :undoc-members:
     :show-inheritance:

docs/src/pyenums.rst

@@ -4,9 +4,55 @@ Enums
 These enums are defined in slsDetectorDefs in the C++ package and 
 exposed to Python through pybind11.
 
-.. py:currentmodule:: sls_detector
+.. py:currentmodule:: slsdet
 
 .. autoclass:: runStatus
-    :members:  
     :undoc-members:
-    :show-inheritance:
+
+.. autoclass:: detectorType
+    :undoc-members:
+
+.. autoclass:: frameDiscardPolicy
+    :undoc-members:
+
+.. autoclass:: fileFormat
+    :undoc-members:
+
+.. autoclass:: dimension
+    :undoc-members:
+
+.. autoclass:: externalSignalFlag
+    :undoc-members:
+
+.. autoclass:: timingMode
+    :undoc-members:
+
+.. autoclass:: dacIndex
+    :undoc-members:
+
+.. autoclass:: detectorSettings
+    :undoc-members:
+
+.. autoclass:: clockIndex
+    :undoc-members:
+
+.. autoclass:: speedLevel
+    :undoc-members:
+
+.. autoclass:: readoutMode
+    :undoc-members:
+
+.. autoclass:: masterFlags
+    :undoc-members:
+
+.. autoclass:: frameModeType
+    :undoc-members:
+
+.. autoclass:: detectorModeType
+    :undoc-members:
+
+.. autoclass:: burstMode
+    :undoc-members:
+
+.. autoclass:: timingSourceType
+    :undoc-members:

docs/src/pyexamples.rst

@@ -12,7 +12,7 @@ file writing etc.
 
 .. code-block:: python
  
-    from sls_detector import Eiger
+    from slsdet import Eiger
 
     d = Eiger()
     threshold = range(0, 2000, 200)
@@ -74,7 +74,7 @@ But lets start looking at the at the manual way:
 ::
 
     import time
-    from sls_detector import Eiger
+    from slsdet import Eiger
     d = Eiger()
 
     n = 10
@@ -114,7 +114,7 @@ hang around until the main process exits.
 
     import time
     from multiprocessing import Process
-    from sls_detector import Eiger
+    from slsdet import Eiger
 
     def acquire():
         """

docs/src/receiver.rst

@@ -1,6 +1,6 @@
 Receiver
 ==============================================
 
-.. doxygenclass:: slsReceiver
+.. doxygenclass:: Receiver
    :members:
 ..    :undoc-members:

examples/gotthard.config

@@ -12,7 +12,7 @@ hostname bchip007
 0:rx_udpip 129.129.202.98
 0:rx_hostname pc6898
 0:outdir /bigRAID/datadir_gotthard/rec_test_data
-0:vhighvoltage 120
+0:highvoltage 120
 master -1
 sync none
 outdir /bigRAID/datadir_gotthard/rec_test_data

examples/gotthard2_veto_file.txt

@@ -0,0 +1,129 @@
+#Gain index    ADU value (12 bit)
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655
+1               3655

examples/gotthard2_veto_photon.txt

@@ -0,0 +1,129 @@
+#G0 pedestal    G1 pedestal    G2 pedestal    G0 gain    G1 gain    G2 gain     #G1 Energy      #G2 Energy
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000
+100             100             100             10        1             0.1     300	            7000

examples/gotthard_II.config

@@ -0,0 +1,29 @@
+hostname strip3
+
+udp_srcip 10.1.1.184
+udp_dstip 10.1.1.107
+
+udp_dstport2 50084
+udp_srcip2 10.1.1.185
+udp_dstip2 10.1.1.107
+
+rx_hostname pc12365:1954
+#udp_dstmac 3c:fd:fe:d2:a4:25
+fpath  /tmp
+fname run
+fwrite 0
+
+bursts 10
+frames 2700
+burstperiod 100ms
+
+numinterfaces 2
+veto 1
+
+#fixing data looks
+# Sampling pipeline 1 clk
+reg 0x120 0x00000010
+clkphase 1 135 deg
+
+
+

examples/gotthard_setup.det

@@ -8,7 +8,7 @@ period 0.000024984
 delay 0.999999968
 gates 1
 frames 300000.000000000
-cycles 1.000000000
+triggers 1.000000000
 timing auto
 fineoff 0.000000
 startscript none

examples/gotthard_two.config

@@ -6,12 +6,12 @@ hostname bchip074+bchip075+
 0:extsig:0 trigger_in_rising_edge
 0:rx_tcpport 1954
 0:rx_udpport 50001
-0:vhighvoltage 0
+0:highvoltage 0
 
 1:extsig:0 trigger_in_rising_edge
 1:rx_tcpport 1955
 1:rx_udpport 50002
-1:vhighvoltage 0
+1:highvoltage 0
 
 ##############################################################################
 #########
@@ -53,5 +53,5 @@ settings veryhighgain
 exptime 0.000005
 period 0.0001
 
-vhighvoltage 90
+highvoltage 90
 

examples/jctb_moench03_T1.config

@@ -1,4 +1,14 @@
-hostname bchip085+
+initialchecks 0
+#############################################
+### edit with hostname or IP address of your detector 
+############################################
+hostname bchip181+
+runclk 40
+adcclk 20
+dbitclk 40
+
+
+
 
 patword 0000 0000000000000000
 patword 0001 0000000000000000
@@ -408,84 +418,84 @@ patnloop1 0
 patloop2 0400 0400
 patnloop2 0
 patwait0 00aa
-patwaittime0 40000
+patwaittime0 10000
 patwait1 0400
 patwaittime1 0
 patwait2 0400
 patwaittime2 0
 
 
-####mcp2011
-#0:rx_udpip 10.1.1.102
-#0:detectorip 10.1.1.19
-#0:rx_udpport 32410
-####gui listening to 
-#zmqip 129.129.202.131
-#zmqport 30001
-####data streaming out of
-#rx_zmqip 10.1.2.103
-#rx_zmqport 30003
-#0:rx_hostname mpc2011
+#0:rx_tcpport 1977
 
-####mx-test-1
-0:rx_udpip 10.1.1.100
-0:detectorip 10.1.1.19
-0:rx_udpport 32410
-####gui listening to (on receiver pc)
-zmqip 129.129.202.92
-zmqport 30001
-####data streaming out of
-rx_zmqip 10.1.1.100
-rx_zmqport 30003
-0:rx_hostname pcmoench01
+#############################################
+### edit with 10 Gbs IP of your server
+############################################
+0:udp_dstip 10.1.1.102
+#0:udp_dstip 129.129.202.136
+#############################################
+### edit with any number in the subnet of your server (first 3 numbers as above)
+############################################
+0:udp_srcip 10.1.1.19
+#0:udp_srcip 129.129.202.13
+
+0:udp_dstport 33410
+#############################################
+### edit with 10 Gbs IP of your server
+############################################
+#zmqip 129.129.202.110
+#rx_zmqip 10.1.1.102
+#rx_zmqport 30001
+#############################################
+### edit with 1 Gbs IP of PC where you will run the GUI
+############################################
+#zmqip 129.129.202.110
+#zmqport 50001
 
 
+#############################################
+### edit with hostname or 1Gbs IP address of your server
+############################################
+rx_hostname mpc2011
 
+tengiga 1
 
-
-
-
-
-
-
-
-#turn on datastream from commandline
 rx_datastream 1
-
-r_readfreq 1
-
-#0:configuremac -1
-rx_datastream 1
-
-r_readfreq 1
+rx_readfreq 1
 
 
-dac:6 800
-dac:0 1300
-dac:4 1428
-dac:1 1000
-dac:7 900
-dac:3 680
-dac:2 1400
-dac:5 1200
+dac 6 800
+dac 0 1300
+dac 4 1428
+dac 1 1000
+dac 7 900
+dac 3 680
+dac 2 1400
+dac 5 1200
 adcinvert 4a342593
-samples 5000
-adcphase 90
-adcpipeline 15
+#0xb5cbda6c
+asamples 5000
+dsamples 0
+adcphase 30 deg
+adcpipeline 14
 adcreg 14 40
-powerchip 1
-vhighvoltage 90
-period 0.005
 
 
+frames 1000
+period 0.001
+#############################################
+### edit with directory you want to write to
+############################################
+fpath /tmp/
+fwrite 0
 
+romode analog
+#rx_jsonaddheader frameMode
+rx_jsonpara frameMode newpedestal
+#rx_jsonaddheader detectorMode
+rx_jsonpara detectorMode analog
+#flags newpedestal
+#flags analog
 
-
-
-frames 100
-period 0.1
-outdir /scratch/
-enablefwrite 0
-
-
-
+reg 0x5e 0x00010000
+#powerchip 1
+highvoltage 90

examples/jungfrau.config

@@ -6,7 +6,7 @@ hostname localhost
 rx_hostname localhost
 
 #powerchip 1
-#vhighvoltage 200
+#highvoltage 200
 
 #extsig:0 trigger_in_rising_edge
 #timing trigger

examples/jungfrau_two.config

@@ -17,7 +17,7 @@ hostname bchip048+bchip052+
 rx_hostname pcmoench01
 
 powerchip 1
-vhighvoltage 200
+highvoltage 200
 #extsig:0 trigger_in_rising_edge
 #timing trigger
 

examples/moench03_T1.config

@@ -0,0 +1,63 @@
+initialchecks 0
+#############################################
+### edit with hostname or IP address of your detector 
+############################################
+hostname bchip181+
+
+#############################################
+### edit with hostname or 1Gbs IP address of your server
+############################################
+rx_hostname mpc2011
+
+rx_tcpport 1954
+#############################################
+### edit with 10 Gbs IP of your server
+############################################
+udp_dstip 10.1.1.102
+#############################################
+### edit with any number in the subnet of your server (first 3 numbers as above)
+############################################
+udp_srcip 10.1.1.19
+udp_dstport 32411
+
+#############################################
+### edit with 10 Gbs IP of your server
+############################################
+rx_zmqip 10.1.1.102
+rx_zmqport 50003
+#############################################
+### edit with 1 Gbs IP of PC where you will run the GUI
+############################################
+zmqip 129.129.202.136
+zmqport 50001
+
+
+
+
+tengiga 1
+rx_datastream 1
+
+
+
+frames 100000
+period 0.0006
+#############################################
+### edit with directory you want to write to
+############################################
+fpath /mnt/moench_data/scratch/
+fwrite 0
+rx_datastream 1
+
+rx_jsonpara frameMode frame
+rx_jsonpara detectorMode counting
+rx_discardpolicy discardpartial
+
+
+adcpipeline 15
+
+powerchip 1
+highvoltage 90
+
+#adcreg 0x14 0x40
+
+

examples/two_gotthard.config

@@ -19,7 +19,7 @@ hostname bchip007+bchip009+
 0:rx_udpip 10.1.1.1
 0:rx_hostname 129.129.202.134 
 0:outdir /data/speedt
-0:vhighvoltage 120
+0:highvoltage 120
 
 
 #1:hostname bchip009
@@ -37,7 +37,7 @@ hostname bchip007+bchip009+
 1:rx_udpip 10.1.2.1
 1:rx_hostname 129.129.202.134 
 1:outdir /data/speedt
-1:vhighvoltage 120
+1:highvoltage 120
 
 
 master -1

integrationTests/test-eigerIntegration.cpp

@@ -1,12 +1,12 @@
+#include "DetectorImpl.h"
 #include "catch.hpp"
-#include "multiSlsDetector.h"
 #include "string_utils.h"
 #include "tests/globals.h"
 #include <iostream>
 
 class MultiDetectorFixture {
   protected:
-    multiSlsDetector d;
+    DetectorImpl d;
 
   public:
     MultiDetectorFixture() : d(0, true, true) {
@@ -22,56 +22,56 @@ TEST_CASE_METHOD(MultiDetectorFixture, "Set and get dacs",
     auto th = 1000;
 
     // set and read back each individual dac of EIGER
-    d.setDAC(0, di::E_SvP, 0);
-    CHECK(d.setDAC(-1, di::E_SvP, 0) == 0);
-    d.setDAC(4000, di::E_SvN, 0);
-    CHECK(d.setDAC(-1, di::E_SvN, 0) == 4000);
-    d.setDAC(2000, di::E_Vtr, 0);
-    CHECK(d.setDAC(-1, di::E_Vtr, 0) == 2000);
-    d.setDAC(3500, di::E_Vrf, 0);
-    CHECK(d.setDAC(-1, di::E_Vrf, 0) == 3500);
-    d.setDAC(1400, di::E_Vrs, 0);
-    CHECK(d.setDAC(-1, di::E_Vrs, 0) == 1400);
-    d.setDAC(2556, di::E_Vtgstv, 0);
-    CHECK(d.setDAC(-1, di::E_Vtgstv, 0) == 2556);
-    d.setDAC(1500, di::E_Vcmp_ll, 0);
-    CHECK(d.setDAC(-1, di::E_Vcmp_ll, 0) == 1500);
-    d.setDAC(1400, di::E_Vcmp_lr, 0);
-    CHECK(d.setDAC(-1, di::E_Vcmp_lr, 0) == 1400);
-    d.setDAC(4000, di::E_cal, 0);
-    CHECK(d.setDAC(-1, di::E_cal, 0) == 4000);
-    d.setDAC(1300, di::E_Vcmp_rl, 0);
-    CHECK(d.setDAC(-1, di::E_Vcmp_rl, 0) == 1300);
-    d.setDAC(1200, di::E_Vcmp_rr, 0);
-    CHECK(d.setDAC(-1, di::E_Vcmp_rr, 0) == 1200);
-    d.setDAC(1100, di::E_rxb_rb, 0);
-    CHECK(d.setDAC(-1, di::E_rxb_rb, 0) == 1100);
-    d.setDAC(1100, di::E_rxb_lb, 0);
-    CHECK(d.setDAC(-1, di::E_rxb_lb, 0) == 1100);
-    d.setDAC(1500, di::E_Vcp, 0);
-    CHECK(d.setDAC(-1, di::E_Vcp, 0) == 1500);
-    d.setDAC(2000, di::E_Vcn, 0);
-    CHECK(d.setDAC(-1, di::E_Vcn, 0) == 2000);
-    d.setDAC(1550, di::E_Vis, 0);
-    CHECK(d.setDAC(-1, di::E_Vis, 0) == 1550);
+    d.setDAC(0, di::SVP, 0);
+    CHECK(d.setDAC(-1, di::SVP, 0) == 0);
+    d.setDAC(4000, di::SVN, 0);
+    CHECK(d.setDAC(-1, di::SVN, 0) == 4000);
+    d.setDAC(2000, di::VTR, 0);
+    CHECK(d.setDAC(-1, di::VTR, 0) == 2000);
+    d.setDAC(3500, di::VRF, 0);
+    CHECK(d.setDAC(-1, di::VRF, 0) == 3500);
+    d.setDAC(1400, di::VRS, 0);
+    CHECK(d.setDAC(-1, di::VRS, 0) == 1400);
+    d.setDAC(2556, di::VTGSTV, 0);
+    CHECK(d.setDAC(-1, di::VTGSTV, 0) == 2556);
+    d.setDAC(1500, di::VCMP_LL, 0);
+    CHECK(d.setDAC(-1, di::VCMP_LL, 0) == 1500);
+    d.setDAC(1400, di::VCMP_LR, 0);
+    CHECK(d.setDAC(-1, di::VCMP_LR, 0) == 1400);
+    d.setDAC(4000, di::CAL, 0);
+    CHECK(d.setDAC(-1, di::CAL, 0) == 4000);
+    d.setDAC(1300, di::VCMP_RL, 0);
+    CHECK(d.setDAC(-1, di::VCMP_RL, 0) == 1300);
+    d.setDAC(1200, di::VCMP_RR, 0);
+    CHECK(d.setDAC(-1, di::VCMP_RR, 0) == 1200);
+    d.setDAC(1100, di::RXB_RB, 0);
+    CHECK(d.setDAC(-1, di::RXB_RB, 0) == 1100);
+    d.setDAC(1100, di::RXB_LB, 0);
+    CHECK(d.setDAC(-1, di::RXB_LB, 0) == 1100);
+    d.setDAC(1500, di::VCP, 0);
+    CHECK(d.setDAC(-1, di::VCP, 0) == 1500);
+    d.setDAC(2000, di::VCN, 0);
+    CHECK(d.setDAC(-1, di::VCN, 0) == 2000);
+    d.setDAC(1550, di::VIS, 0);
+    CHECK(d.setDAC(-1, di::VIS, 0) == 1550);
     d.setDAC(660, di::IO_DELAY, 0);
     CHECK(d.setDAC(-1, di::IO_DELAY, 0) == 660);
 
     // setting threshold sets all individual vcmp
     d.setDAC(th, di::THRESHOLD, 0);
     CHECK(d.setDAC(-1, di::THRESHOLD, 0) == th);
-    CHECK(d.setDAC(-1, di::E_Vcmp_ll, 0) == th);
-    CHECK(d.setDAC(-1, di::E_Vcmp_lr, 0) == th);
-    CHECK(d.setDAC(-1, di::E_Vcmp_rl, 0) == th);
-    CHECK(d.setDAC(-1, di::E_Vcmp_rr, 0) == th);
+    CHECK(d.setDAC(-1, di::VCMP_LL, 0) == th);
+    CHECK(d.setDAC(-1, di::VCMP_LR, 0) == th);
+    CHECK(d.setDAC(-1, di::VCMP_RL, 0) == th);
+    CHECK(d.setDAC(-1, di::VCMP_RR, 0) == th);
 
     // different values gives -1
     if (d.getNumberOfDetectors() > 1) {
-        d.setDAC(1600, di::E_Vcmp_ll, 0, 0);
-        d.setDAC(1700, di::E_Vcmp_ll, 0, 1);
-        CHECK(d.setDAC(-1, di::E_Vcmp_ll, 0, 0) == 1600);
-        CHECK(d.setDAC(-1, di::E_Vcmp_ll, 0, 1) == 1700);
-        CHECK(d.setDAC(-1, di::E_Vcmp_ll, 0) == -1);
+        d.setDAC(1600, di::VCMP_LL, 0, 0);
+        d.setDAC(1700, di::VCMP_LL, 0, 1);
+        CHECK(d.setDAC(-1, di::VCMP_LL, 0, 0) == 1600);
+        CHECK(d.setDAC(-1, di::VCMP_LL, 0, 1) == 1700);
+        CHECK(d.setDAC(-1, di::VCMP_LL, 0) == -1);
         CHECK(d.setDAC(-1, di::THRESHOLD, 0) == -1);
         CHECK(d.setDAC(-1, di::THRESHOLD, 0, 0) == -1);
         CHECK(d.setDAC(-1, di::THRESHOLD, 0, 1) == -1);

integrationTests/test-integrationDectector.cpp

@@ -2,9 +2,9 @@
 #include "catch.hpp"
 
 #include "ClientSocket.h"
+#include "DetectorImpl.h"
+#include "Module.h"
 #include "logger.h"
-#include "multiSlsDetector.h"
-#include "slsDetector.h"
 #include "sls_detector_defs.h"
 
 #include "Timer.h"
@@ -23,10 +23,10 @@
 // extern dt type;
 
 TEST_CASE("Single detector no receiver", "[.integration][.single]") {
-    auto t = slsDetector::getTypeFromDetector(test::hostname);
+    auto t = Module::getTypeFromDetector(test::hostname);
     CHECK(t == test::type);
 
-    slsDetector d(t);
+    Module d(t);
     CHECK(d.getDetectorTypeAsEnum() == t);
     CHECK(d.getDetectorTypeAsString() == test::detector_type);
 
@@ -51,7 +51,7 @@ TEST_CASE("Set control port then create a new object with this control port",
     int new_cport = 1993;
     int new_sport = 2000;
     {
-        slsDetector d(test::type);
+        Module d(test::type);
         d.setHostname(test::hostname);
         CHECK(d.getControlPort() == old_cport);
         d.setControlPort(new_cport);
@@ -60,7 +60,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
     {
-        slsDetector d(test::type);
+        Module d(test::type);
         d.setHostname(test::hostname);
         d.setControlPort(new_cport);
         d.setStopPort(new_sport);
@@ -73,24 +73,23 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
 
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.getStopPort() == DEFAULT_PORTNO + 1);
     d.freeSharedMemory();
 }
 
-
 TEST_CASE("single EIGER detector no receiver basic set and get",
           "[.integration][eiger]") {
     // TODO! this test should take command line arguments for config
     SingleDetectorConfig c;
 
     // Read type by connecting to the detector
-    auto type = slsDetector::getTypeFromDetector(c.hostname);
+    auto type = Module::getTypeFromDetector(c.hostname);
     CHECK(type == c.type_enum);
 
-    // Create slsDetector of said type and set hostname and detector online
-    slsDetector d(type);
+    // Create Module of said type and set hostname and detector online
+    Module d(type);
     CHECK(d.getDetectorTypeAsEnum() == type);
     CHECK(d.getDetectorTypeAsString() == c.type_string);
 
@@ -102,8 +101,8 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
 
     // Setting and reading exposure time
     auto t = 1000000000;
-    d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, t);
-    CHECK(d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME) == t);
+    d.setExptime(t);
+    CHECK(d.getExptime() == t);
 
     // size of an eiger half module with and without gap pixels
     CHECK(d.getTotalNumberOfChannels() == 256 * 256 * 4);
@@ -130,10 +129,8 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
     d.freeSharedMemory();
 }
 
-
-
 TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
 
     // Check that detector server is unlocked then lock
@@ -143,8 +140,8 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
 
     // Can we still access the detector while it's locked
     auto t = 1300000000;
-    d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, t);
-    CHECK(d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME) == t);
+    d.setExptime(t);
+    CHECK(d.getExptime() == t);
 
     // unlock again and free
     d.lockServer(0);
@@ -154,21 +151,20 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
     d.freeSharedMemory();
 }
 
-TEST_CASE("Set settings", "[.integration][.single]"){
-    slsDetector d(test::type);
+TEST_CASE("Set settings", "[.integration][.single]") {
+    Module d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD);
 }
 
-
 TEST_CASE("Timer functions", "[.integration][cli]") {
     // FRAME_NUMBER, /**< number of real time frames: total number of
-    // acquisitions is number or frames*number of cycles */ ACQUISITION_TIME,
+    // acquisitions is number or frames*number of triggers */ ACQUISITION_TIME,
     // /**< exposure time */ FRAME_PERIOD, /**< period between exposures */
     // DELAY_AFTER_TRIGGER, /**< delay between trigger and start of exposure or
     // readout (in triggered mode) */ GATES_NUMBER, /**< number of gates per
-    // frame (in gated mode) */ CYCLES_NUMBER, /**< number of cycles: total
-    // number of acquisitions is number or frames*number of cycles */
+    // frame (in gated mode) */ TRIGGER_NUMBER, /**< number of triggers: total
+    // number of acquisitions is number or frames*number of triggers */
     // ACTUAL_TIME, /**< Actual time of the detector's internal timer */
     // MEASUREMENT_TIME,  /**< Time of the measurement from the detector (fifo)
     // */
@@ -185,71 +181,58 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
     // MEASURED_SUBPERIOD,	/**< measured subperiod */
     // MAX_TIMERS
 
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
 
     // Number of frames
     auto frames = 5;
-    d.setTimer(slsDetectorDefs::timerIndex::FRAME_NUMBER, frames);
-    CHECK(d.setTimer(slsDetectorDefs::timerIndex::FRAME_NUMBER) == frames);
+    d.setNumberOfFrames(frames);
+    CHECK(d.getNumberOfFrames() == frames);
 
     auto exptime = 2000000000;
-    d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, exptime);
-    CHECK(d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME) == exptime);
+    d.setExptime(exptime);
+    CHECK(d.getExptime() == exptime);
 
     auto period = 2000000000;
-    d.setTimer(slsDetectorDefs::timerIndex::FRAME_PERIOD, period);
-    CHECK(d.setTimer(slsDetectorDefs::timerIndex::FRAME_PERIOD) == period);
+    d.setPeriod(period);
+    CHECK(d.getPeriod() == period);
 
     if (test::type != dt::EIGER) {
         auto delay = 10000;
-        d.setTimer(slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER, delay);
-        CHECK(d.setTimer(slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER) ==
-              delay);
+        d.setDelayAfterTrigger(delay);
+        CHECK(d.getDelayAfterTrigger() == delay);
     }
 
-    if (test::type != dt::EIGER) {
-        auto gates = 1;
-        d.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER, gates);
-        CHECK(d.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER) == gates);
-    }
-
-    auto cycles = 2;
-    d.setTimer(slsDetectorDefs::timerIndex::CYCLES_NUMBER, cycles);
-    CHECK(d.setTimer(slsDetectorDefs::timerIndex::CYCLES_NUMBER) == cycles);
+    auto triggers = 2;
+    d.setNumberOfTriggers(triggers);
+    CHECK(d.getNumberOfTriggers() == triggers);
 
     if (test::type == dt::EIGER) {
         auto subtime = 200;
-        d.setTimer(slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME,
-                   subtime);
-        CHECK(d.setTimer(
-                  slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME) ==
-              subtime);
+        d.setSubExptime(subtime);
+        CHECK(d.getSubExptime() == subtime);
     }
     // for (int i =0; i!=frames; ++i)
-        d.startAndReadAll();
+    d.startAndReadAll();
 
     d.freeSharedMemory();
-
-    // If we add a timer we should add tests for the timer
-    CHECK(slsDetectorDefs::MAX_TIMERS == 19);
 }
 
 // TEST_CASE("Aquire", "[.integration][eiger]"){
 //     SingleDetectorConfig c;
-//     auto type = slsDetector::getTypeFromDetector(c.hostname);
-//     slsDetector d(type);
+//     auto type = Module::getTypeFromDetector(c.hostname);
+//     Module d(type);
 //     d.setHostname(c.hostname);
 
 //     auto period = 1000000000;
 //     auto exptime = 100000000;
-//     d.setTimer(slsDetectorDefs::timerIndex::FRAME_NUMBER, 5);
-//     d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, exptime);
-//     d.setTimer(slsDetectorDefs::timerIndex::FRAME_PERIOD, period);
+//     d.setNumberOfFrames(5);
+//     d.setExptime(exptime);
+//     d.setPeriod(period);
 //     d.startAndReadAll();
 
 //     auto rperiod =
-//     d.getTimeLeft(slsDetectorDefs::timerIndex::MEASURED_PERIOD);
+//     d.getMeasuredPeriod();
 //     CHECK(rperiod == 0.1);
 
 //     d.freeSharedMemory();
@@ -263,7 +246,7 @@ TEST_CASE(
     int ratecorr = 125;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure eiger detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -313,7 +296,7 @@ TEST_CASE("Chiptestboard Loading Patterns", "[.ctbintegration]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -393,12 +376,12 @@ TEST_CASE("Chiptestboard Loading Patterns", "[.ctbintegration]") {
     }
 }
 
-
-TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegration][dbit]") {
+TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert",
+          "[.ctbintegration][dbit]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -414,27 +397,27 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegrat
 
     // dbit list
 
-    std::vector <int> list = m.getReceiverDbitList();
+    std::vector<int> list = m.getReceiverDbitList();
     list.clear();
     for (int i = 0; i < 10; ++i)
         list.push_back(i);
     m.setReceiverDbitList(list);
-    
+
     CHECK(m.getReceiverDbitList().size() == 10);
 
     list.push_back(64);
     CHECK_THROWS_AS(m.setReceiverDbitList(list), sls::RuntimeError);
-    CHECK_THROWS_WITH(m.setReceiverDbitList(list), 
-        Catch::Matchers::Contains("be between 0 and 63"));
+    CHECK_THROWS_WITH(m.setReceiverDbitList(list),
+                      Catch::Matchers::Contains("be between 0 and 63"));
 
     list.clear();
     for (int i = 0; i < 65; ++i)
         list.push_back(i);
     CHECK(list.size() == 65);
-    CHECK_THROWS_WITH(m.setReceiverDbitList(list),  
-        Catch::Matchers::Contains("be greater than 64"));
+    CHECK_THROWS_WITH(m.setReceiverDbitList(list),
+                      Catch::Matchers::Contains("be greater than 64"));
 
-    list.clear(); 
+    list.clear();
     m.setReceiverDbitList(list);
     CHECK(m.getReceiverDbitList().empty());
 
@@ -452,8 +435,8 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegrat
     m.setExternalSamplingSource(62);
     CHECK(m.getExternalSamplingSource() == 62);
     CHECK_THROWS_WITH(m.setExternalSamplingSource(64),
-         Catch::Matchers::Contains("be 0-63"));
-    CHECK(m.getExternalSamplingSource() == 62); 
+                      Catch::Matchers::Contains("be 0-63"));
+    CHECK(m.getExternalSamplingSource() == 62);
     m.setExternalSampling(1);
     CHECK(m.getExternalSampling() == 1);
     m.setExternalSampling(0);
@@ -461,20 +444,23 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegrat
     m.setExternalSampling(1);
     CHECK(m.getExternalSampling() == 1);
     CHECK(m.readRegister(0x7b) == 0x1003E);
-    
 }
 
-TEST_CASE("Eiger or Jungfrau startingfnum", "[.eigerintegration][.jungfrauintegration][startingfnum]") {
+TEST_CASE("Eiger or Jungfrau startingfnum",
+          "[.eigerintegration][.jungfrauintegration][startingfnum]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
-    REQUIRE(((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) || (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::JUNGFRAU)));
+    REQUIRE(
+        ((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) ||
+         (m.getDetectorTypeAsEnum() ==
+          slsDetectorDefs::detectorType::JUNGFRAU)));
     REQUIRE(m.getHostname() == c.hostname);
 
-     CHECK(m.setTimer(slsDetectorDefs::FRAME_NUMBER, 1) == 1);
+    CHECK(m.setNumberOfFrames(1) == 1);
 
     // starting fnum
     uint64_t val = 8;
@@ -506,10 +492,11 @@ TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure detector type, hostname
-    REQUIRE((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER));
+    REQUIRE(
+        (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER));
     REQUIRE(m.getHostname() == c.hostname);
 
     m.setDynamicRange(16);
@@ -518,7 +505,7 @@ TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
     CHECK(m.getReadNLines() == 256);
     m.setReadNLines(1);
     CHECK(m.getReadNLines() == 1);
-        
+
     m.setDynamicRange(8);
     m.setReadNLines(256);
     CHECK(m.getReadNLines() == 256);

integrationTests/test-integrationMulti.cpp

@@ -1,5 +1,5 @@
+#include "DetectorImpl.h"
 #include "catch.hpp"
-#include "multiSlsDetector.h"
 #include "string_utils.h"
 #include "tests/globals.h"
 #include <iostream>
@@ -9,7 +9,7 @@ using namespace Catch::literals;
 TEST_CASE("Initialize a multi detector", "[.integration][.multi]") {
     auto hostnames = sls::split(test::hostname, '+');
 
-    multiSlsDetector d(0, true, true);
+    DetectorImpl d(0, true, true);
     d.setHostname(test::hostname.c_str());
 
     CHECK(d.getHostname() == test::hostname);
@@ -24,11 +24,9 @@ TEST_CASE("Initialize a multi detector", "[.integration][.multi]") {
     d.freeSharedMemory();
 }
 
-
-
 TEST_CASE("Set and read timers", "[.integration][.multi]") {
 
-    multiSlsDetector d(0, true, true);
+    DetectorImpl d(0, true, true);
     d.setHostname(test::hostname.c_str());
 
     // FRAME_NUMBER
@@ -50,14 +48,13 @@ TEST_CASE("Set and read timers", "[.integration][.multi]") {
 
     // DELAY_AFTER_TRIGGER,
     // GATES_NUMBER,
-    // CYCLES_NUMBER,
+    // TRIGGER_NUMBER,
     // ACTUAL_TIME
     // MEASUREMENT_TIME
 
     // PROGRESS, /**< fraction of measurement elapsed - only get! */
     // MEASUREMENTS_NUMBER,
 
-
     // FRAMES_FROM_START,
     // FRAMES_FROM_START_PG,
     // SAMPLES,
@@ -78,7 +75,6 @@ TEST_CASE("Set and read timers", "[.integration][.multi]") {
         CHECK(d.setSubFrameExposureDeadTime(-1) == Approx(subframe_deadtime));
     }
 
-    
     if (test::type == dt::EIGER) {
         // 32bit is needed for subframe exposure
         d.setDynamicRange(32);

libs/rapidjson/rapidjson/document.h

@@ -17,13 +17,13 @@
 
 /*! \file document.h */
 
-#include "reader.h"
+#include "encodedstream.h"
 #include "internal/meta.h"
 #include "internal/strfunc.h"
 #include "memorystream.h"
-#include "encodedstream.h"
-#include <new>      // placement new
+#include "reader.h"
 #include <limits>
+#include <new>      // placement new
 
 RAPIDJSON_DIAG_PUSH
 #ifdef _MSC_VER

libs/rapidjson/rapidjson/encodedstream.h

@@ -15,8 +15,8 @@
 #ifndef RAPIDJSON_ENCODEDSTREAM_H_
 #define RAPIDJSON_ENCODEDSTREAM_H_
 
-#include "stream.h"
 #include "memorystream.h"
+#include "stream.h"
 
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH

libs/rapidjson/rapidjson/internal/strtod.h

@@ -15,9 +15,9 @@
 #ifndef RAPIDJSON_STRTOD_
 #define RAPIDJSON_STRTOD_
 
-#include "ieee754.h"
 #include "biginteger.h"
 #include "diyfp.h"
+#include "ieee754.h"
 #include "pow10.h"
 
 RAPIDJSON_NAMESPACE_BEGIN

libs/rapidjson/rapidjson/rapidjson.h

@@ -164,8 +164,8 @@
 #include "msinttypes/inttypes.h"
 #else
 // Other compilers should have this.
-#include <stdint.h>
 #include <inttypes.h>
+#include <stdint.h>
 #endif
 //!@endcond
 #ifdef RAPIDJSON_DOXYGEN_RUNNING

libs/rapidjson/rapidjson/reader.h

@@ -18,11 +18,11 @@
 /*! \file reader.h */
 
 #include "allocators.h"
-#include "stream.h"
 #include "encodedstream.h"
 #include "internal/meta.h"
 #include "internal/stack.h"
 #include "internal/strtod.h"
+#include "stream.h"
 #include <limits>
 
 #if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)

manual/manual-client/Eiger_short.tex

@@ -99,7 +99,7 @@ If one desires to set the zmqport manually, he offset has to be taken into accou
 
 {\tt{slsMultiReceiver}} uses two or more receivers in one single terminal: {\tt{./slsMultiReceiver startTCPPort numReceivers withCallback}}, where startTCPPort assumes the other ports are consecutively increased.
 
-The command {\tt{r\_framesperfile}} sets the number of frames written in the same file. By default now it is 10000. It can be changes. It needs to be lowered particularly if one wants to parallelize the following conversion of the files. 
+The command {\tt{r\_framesperfile}} (\tt{\textcolor{red}{rx\_framesperfile}}) sets the number of frames written in the same file. By default now it is 10000. It can be changes. It needs to be lowered particularly if one wants to parallelize the following conversion of the files. 
 
 
 \subsection{Mandatory setup - Client}
@@ -122,7 +122,23 @@ To do that:
 sls_detector_put 0-config mydetector.config
 \end{verbatim}
 
-In the config file, if client, receiver and detector are using \textbf{1GbE} the following lines are mandatory (see slsDetectorsPackage/examples/eiger\_1Gb.config):
+In the config file, if client, receiver and detector are using \textbf{1GbE} the following lines are mandatory (see slsDetectorsPackage/examples/eiger\_1Gb.config). It has been adapted to the the new 5.0 major release change:
+\begin{verbatim}
+detsize 1024 512 #detector geometry, long side of the module first
+hostname beb059+beb058+ #1Gb detector hostname for controls
+#1Gb receiver pc hostname to be inserted immediately and tcp\_ports to be stated immediately
+rx_hostname x12sa-vcons:1991+pc1875:1992+
+0:udp_dstport 50011 #udp port first quadrant, first halfmodule         
+0:udp_dstport2 50012 #udp port second quadrant, first halfmodule       
+1:udp_dstport 50013 #udp port first quadrant, second halfmodule       
+1:udp_dstport2 50014 #udp port second quadrant, second halfmodule      
+0:udp_srcip 129.129.202.237
+0:udp_dstip auto
+1:udp_srcip 129.129.202.236
+1:udp_dstip auto
+fpath /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+\end{verbatim}
+In the old 3.x and 4.x release it was: 
 \begin{verbatim}
 detsizechan 1024 512 #detector geometry, long side of the module first
 hostname beb059+beb058+ #1Gb detector hostname for controls
@@ -172,23 +188,25 @@ configuremac 0
 rx_udpmac xx:xx:...
 \end{verbatim}
 
+Now we will give general communication commands. Commands with a diffent name in the \textcolor{red}{5.x} realease will be highlighted in \textcolor{red}{red}.
+
 One can configure all the detector settings in a parameter file {\tt{setup.det}}, which is loaded by doing:
 \begin{verbatim}
 sls_detector_put 0-parameters setup.det
 \end{verbatim}
+Note that the parameter file for any realease before 4.1.1 has not the possibility to understand parameters to be set differently for different half modules, i.e.  {\tt{0:txndelay\_left xxxxx},\tt{1:txndelay\_left yyyyy}}. 
 
-In the case of \E, the proper bias voltage of the sensor has to be setup, i.e. the {\tt{setup.det}} file needs to contain the line {\tt{vhighvoltage 150}}. Other detector functionality, which are rarely changed can be setup here. 
+In the case of \E, the proper bias voltage of the sensor has to be setup, i.e. the {\tt{setup.det}} file needs to contain the line {\tt{highvoltage 150}}. Other detector functionality, which are rarely changed can be setup here. 
 Other important settings that are configured in the {\tt{setup.det}} file are:
 \begin{itemize}
 \item {\tt{tengiga 0/1}}, which sets whether the detector is enabled to send data through the 1~or the 10~Gb Ethernet.
-\item {\tt{flags parallel/nonparallel}}, which sets whether the detector is set in parallel acquisition and readout or in sequential mode. This changes the readout time of the chip and affects the frame rate capability (faster is {\tt{parallel}}, with higher noise but needed when the frame rate is $>2$~kHz. 
+\item {\tt{flags parallel/nonparallel}} or {\tt{\textcolor{red}{parallel 1/0}}}, which sets whether the detector is set in parallel acquisition and readout or in sequential mode. This changes the readout time of the chip and affects the frame rate capability (faster is {\tt{parallel}}).
 \item {\tt{dr 32/16/8/4}} sets the detector in autosumming mode (32 bit counter or not autosumming, 12 bit out of the chip). This is strictly connected to what is required for the readout clock of chip. See next point.
-\item {\tt{clkdivider 0/1/2}}. Changes the readout clock: 200, 100, 50~MHz (also referred to as full, half, quarter speed). Note that autosumming mode ({\tt{dr 32}} only works at {clkdivider 2}=quarter speed). By selecting Refer to readout timing specifications in~section\ref{timing} for how to set the detector. 
+\item {\tt{clkdivider 0/1/2}} or {\tt{\textcolor{red}{speed full\_speed/half\_speed/quart\_speed}}}. Changes the readout clock: 200, 100, 50~MHz (also referred to as full, half, quarter speed). Note that autosumming mode ({\tt{dr 32}} only works at \tt{clkdivider 2}=\tt{quart\_speed}). By selecting Refer to readout timing specifications in~section\ref{timing} for how to set the detector. 
 \item {\tt{flags continuous/storeinram}}. Allows to take frame continuously or storing them on memory. Users should use the {\tt{continuous}} flags. Enabling the {\tt{stroreinram}} flag makes the data to be sent out all at the end of the acquisition. Refer to readout timing specifications in section~\ref{timing} for how to set the detector. Examples will be given in section~\ref{}.
 \end{itemize}
 
-One should notice that, by default, by choosing the option {\tt{dr 32}}, then the software automatically sets the detector to  {\tt{clkdivider 2}}. By choosing the option {\tt{dr 16}}, the software automatically sets the detector to  {\tt{clkdivider 1}}. One needs to choose {\tt{clkdivider 0}} after setting the {\tt{dr 16}} option to have the fastest frame rate. 
-We would recommend expert users (beamline people) to write their parameters file for the users. 
+One should notice that, by default, by choosing the option {\tt{dr 32}}, then the software automatically sets the detector to  {\tt{clkdivider 2}} ({\tt{\textcolor{red}{quart\_speed}}}). By choosing the option {\tt{dr 16}}, the software automatically sets the detector to  {\tt{clkdivider 1}} ({\tt{\textcolor{red}{speed quart\_speed}}}). From release 5.x, 
 
 \section{API versioning} \label{api}
 The eigerDetectorServer running on the boards has a versioning API scheme that will make it crash if used with a wrong firmware.
@@ -209,10 +227,18 @@ Killing and starting the server on the boards allows you to check the firmware v
 
 \section{Setting up the threshold}
 \begin{verbatim}
+sls_detector_put 0-settingsdir /path
 sls_detector_put 0-trimen N xxxx yyyy zzzz
 sls_detector_put 0-settings standard 
 sls_detector_put 0-threshold energy_in_eV standard
 \end{verbatim}
+or in \textcolor{red}{5.x}:
+\begin{verbatim}
+sls_detector_put 0-settingspath /path}
+sls_detector_put 0-trimen N xxxx yyyy zzzz}
+sls_detector_put 0-threshold energy_in_eV standard
+\end{verbatim}
+
 The first line requires to specify how many ({\tt{N}}) and at which energies in eV {\{tt{xxxx}}, {\tt{yyyy}}, {\tt{zzzz}} and so on) trimmed files were generated (to allow for an interpolation). This line should normally be included into the {\tt{mydetector.config}} file and should be set for you by one of the detector group.
 NORMALLY, in this new calibration scheme, only {\tt{settings standard}} will be provided to you, unless specific cases to be discussed.
 The threshold at 6000 eV , for example would be set as:{\tt{sls\_detector\_put 0-threshold 6000 standard}}.
@@ -266,12 +292,13 @@ sls_detector_get receiver
 
 There is a more complex way of performing an acquisition, that is useful for debugging and in case one wants a non blocking behavior: 
 
-You can then reset to zero the number of frames caught, then  start the receiver and the detector:
+You can then reset to zero the number of frames caught (in releases<5.0), then  start the receiver and the detector:
 \begin{enumerate}
 \item {\tt{sls\_detector\_put 0-resetframescaught 0}} 
 \item {\tt{sls\_detector\_put 0-receiver start}} 
 \item {\tt{sls\_detector\_put 0-status start}} 
 \end{enumerate}
+In release \textcolor{red}{5.0} it is not needed to reset the frames caughts.
 
 You can poll the detector status using:
 \begin{verbatim}
@@ -346,29 +373,32 @@ col                        : 257 pixels
 \end{verbatim}
 
 \section{Readout timing- maximum frame rate}\label{timing}
-IMPORTANT: to have faster readout and smaller dead time, one can configure {\tt{clkdivider}}, i.e. the speed at which the data are read, i.e. 200/100/50~MHz for {\tt{clkdivider 0/1/2}} and the dead time between frames through {\tt{flags parallel}}, i.e. acquire and read at the same time or acquire and then read out.
-The configuration of this timing variables allows to achieve different frame rates. NOTE THAT IN EIGER, WHATEVER YOU DO, THE FRAME RATE LIMITATIONS COME FROM THE NETWORK BOTTLENECK AS THE HARDWARE GOES FASTER THAN THE DATA OUT.
+IMPORTANT: to have faster readout and smaller dead time, one can configure {\tt{clkdivider}}, i.e. the {\tt{textcolor}{red}{speed} at which the data are read, i.e. 200/100/50~MHz for {\tt{clkdivider 0/1/2}} ({\tt{
+\textcolor{red}{speed full\_speed/half\_speed/quart\_speed}}) and the dead time between frames through {\tt{flags parallel}} or {\tt{\textcolor{red}{parallel 1}}}, i.e. acquire and read at the same time or acquire and then read out.
+The configuration of this timing variables allows to achieve different frame rates. NOTE THAT IN EIGER, WHATEVER YOU DO, THE FRAME RATE LIMITATIONS COME FROM THE NETWORK BOTTLENECK AS THE HARDWARE GOES FASTER THAN THE DATA OUT. WE recconmmend using the detector in \tt{dr 4/8/16}, \tt{\textcolor{red}{speed full\_speed}}, \tt{parallel 1} or \tt{dr 32}, \tt{\textcolor{red}{speed quart\_speed}}, \tt{parallel 1. All those options are now the defaults options starting from version 5.x.
+
+
 
 In the case of REAL CONTINUOUS readout, i.e. continuous acquire and readout from the boards (independent on how the chip is set), the continuous frame rates are listed in table~\ref{tcont}. The time to send out the frame out of the board 
 \begin{table} 
 \begin{tabular}{|c|c|c|c|c|}
 \hline
-\tiny{GbE} & \tiny{dynamic range} & \tiny{continuos maximum frame rate(Hz)} & \tiny{minimum period ($\mu$s)}& \tiny{time to send out data ($\mu$s)}\\
+\tiny{GbE} & \tiny{dynamic range} & \tiny{continuos maximum frame rate(Hz)} & \tiny{minimum period ($\mu$s)}& \tiny{calculated/measered time to send out data ($\mu$s)}\\
 \hline
 1 & 16 &  \textbf{256} & 3901 & \\ 
 \hline 
 1 &  32 &  \textbf{128} & 7820 & \\
 \hline 
-10 & 4 & \textbf{10240} & 98 & 100\\
+10 & 4 & \textbf{7813} & 98 & 105/128\\
 \hline 
-10 & 8 & \textbf{5120} & 196 & 200\\
+10 & 8 & \textbf{4000} & 196 & 210/250\\
 \hline
-10 & 16 & \textbf{2560} & 391 & 400\\  
+10 & 16 & \textbf{2000} & 391 & 420/490\\  
 \hline 
-10 & 32 & \textbf{1280} & 782 & 800\\  
+10 & 32 & \textbf{1023} & 782 & 840/977\\  
 \hline 
 \end{tabular}
-\caption{Frame rate limits for the CONTINUOS streaming out of images, i.e. the data rate out is just below 1Gb/s or 10Gb/s. 1280~Hz for 32-bit, 10GbE is obtained from the 10GbE limitation. The maximum achievable frame rate is 977~Hz.} 
+\caption{Frame rate limits for the CONTINUOS streaming out of images, i.e. the data rate out is just below 1Gb/s or 10Gb/s. 1023~Hz for 32-bit, 10GbE is obtained from the 10GbE limitation. The maximum achievable frame rate is 977~Hz.} 
 \label{tcont}\end{table}
  Note that in the {\tt{continuous}} flag mode, some buffering is still done on the memories, so a higher frame rate than the proper real continuous one can be achieved. Still, this extra buffering is possible till the memories are not saturated. The number of images that can be stored on the DDR2 on board memories are listed in table~\ref{timgs}.
 \begin{table}
@@ -383,11 +413,11 @@ dynamic range & images\\
 16 & 7600\\
 \hline
 \end{tabular}
-\caption{Amount of images that can be stored on board. As while we store them, we start to send them out, the effective number of images could be larger than this, but it will depend on the network setup (how fats you stream out images).}
+\caption{Amount of images that can be stored on board. As while we store them, we start to send them out, the effective number of images could be larger than this, but it will depend on the network setup (how fast you stream out images).}
 \label{timgs}
 \end{table}
 
-The maximum frame rate achievable with 10~GbE, {\tt{dr 16}}, {\tt{flags continuous}}, {\tt{flags parallel}},{\tt{clkdivider 0}}, \textbf{6.1~kHz}. This is currently limited by the connection between the Front End Board and the Backend board. We expect the 32 bit mode limit, internally, to be \textbf{2~kHz} ({\tt{clkdivider 2}}).
+The maximum frame rate achievable with 10~GbE, {\tt{dr 16}}, {\tt{flags continuous}}, {\tt{flags parallel}} ({\tt{\textcolor{red}{parallel 1}}}),{\tt{clkdivider 0}} ({\tt{\textcolor{red}{speed full\_speed}}}), \textbf{6.1~kHz}. This is currently limited by the connection between the Front End Board and the Backend board. We expect the 32 bit mode limit, internally, to be \textbf{2~kHz} ({\tt{clkdivider 2}}).
  In dynamic range {\tt{dr 8}} the frame rate is \textbf{11~kHz} and for{\tt{dr 4}} is \textbf{22~kHz}. For 4 and 8 bit mode the frame rate are directly limited by the speed of the detector chip and not by the readout boards.    
 
 \subsection{Minimum time between frames and Maximum frame rate}
@@ -458,6 +488,23 @@ where the 'minimum time between frames' and the minimum period will be discussed
 
 \textbf{From software version 4.0.0, there is a very useful function {\tt{sls\_detector\_get measuredperiod}} which return the measured period AFTER the acquisition. This is important to check that the settings to obtain the targeted frame rate was correct.} 
 
+In release \textcolor{red}{5.0} in 4-bit modes one can set a sort of ROI in the detector such to read half of the module (the central part) or a quarter of it with almost double or four times the frame rate. By default the \tt{\textcolor{red}{readnlines}} is set to \tt{256} meaning the whole chip. With \tt{\textcolor{red}{readnlines 128}} or \tt{\textcolor{red}{readnlines 64}} one sets to read half/quarter rows from the chip. In table~\ref{table:hfrpartial} the maximum frame rates, exposure time and period for the partial readout.\\
+
+
+\begin{tabular}{|c|c|c|c|c|c|c|}
+\hline
+ readnlines & \# pixels & Active area (cm$^2$) & Max frame rate (kHz) & Period ($\mu$s) & Dead time ($\mu$s) & \# buffered images\\
+\hline
+256 &1024 $\times$ 512 & 8 $\times$ 3.8 & 22.7 & 44.0 &4.1 & 30k\\
+\hline
+128 &1024 $\times$ 256 & 8 $\times$ 1.9 & 42.1 & 23.7 &4.2 & 60k\\
+\hline
+64 & 1024 $\times$ 128 & 8 $\times$ 0.95 & 73.5 & 13.6 &4.2 & 120k\\
+\hline
+\end{tabular}
+\label{table:hfrpartial}
+
+
 \textbf{If you run too fast, the detector could become noisier (see problem shooting), it is important to match the detector settings to your frame rate. This can be done having more parameters files and load the one suitable with your experiment.} We experienced that with low energy settings could not reach 6~kHz and no noise.
 In 16 bit mode, it could make sense, in case of noise and low threshold to either reduce the frame rate:
 \begin{equation} 
@@ -578,10 +625,10 @@ The number of subframes composing a single 32bit acquisition can be calculated a
 \end{equation}
 This also means that {\tt{exptime}}$<${\tt{subexptime}} will be rounded to{\tt{subexptime}}. If you want shorter acquisitions, either reduce the {\tt{subexptime}} or switch two 16-bit mode (you can always sum offline if needed).   
 
-From release 4.0.0, an extra {\tt{flag overflow/nooverflow}} is added, with {\tt{nooverflow}} default:
+From release 4.0.0, an extra {\tt{flag overflow/nooverflow}} is added (\tt{\textcolor{red}{overflow 0/1}}), with {\tt{nooverflow}} (\tt{\textcolor{red}{overflow 0}}) default:
 \begin{itemize}
-\item {\tt{nooverflow}}: the internal 12-bit result is summed, even if there was saturation of the 12-bit counter (4095) in any of the subframes. Note that if there is saturation for every subframe, you might get as a result a value of the counter equal to (4095$\times$~number~of~subframes), which you need to correctly identify. On the other hand if the saturation occurred only one time, you will get something "close'' to the real number.
-\item {\tt{overflow}}: In this case, even if a pixel saturate only 1 time in a subframe, you will be returned as a value of the counter for that pixel: $2^{32}-1$, i.e. 4294967295.  
+\item {\tt{nooverflow}} (\tt{\textcolor{red}{overflow 0}}): the internal 12-bit result is summed, even if there was saturation of the 12-bit counter (4095) in any of the subframes. Note that if there is saturation for every subframe, you might get as a result a value of the counter equal to (4095$\times$~number~of~subframes), which you need to correctly identify. On the other hand if the saturation occurred only one time, you will get something "close'' to the real number.
+\item {\tt{overflow}} (\tt{\textcolor{red}{overflow 1}})): In this case, even if a pixel saturate only 1 time in a subframe, you will be returned as a value of the counter for that pixel: $2^{32}-1$, i.e. 4294967295.  
 \end{itemize}
 
 The UDP header will contain, after you receive the data, the effective number of subframe per image (see section~\ref{UDP}) as  "SubFrame Num or Exp Time", i.e. the number of subframes recorded  (32 bit eiger).
@@ -609,18 +656,19 @@ The detector can be setup such to receive external triggers. Connect a LEMO sign
 \begin{verbatim}
 sls_detector_put 0-timing [auto/trigger/burst_trigger/gating]
 sls_detector_put 0-frames x
-sls_detector_put 0-cycles y
+sls_detector_put 0-cycles y  (\textcolor{red}{triggers})
 sls_detector_acquire 0-
 \end{verbatim}
 No timeout is expected between the start of the acquisition and the arrival of the first trigger. 
 
 Here are the implemented options so far:
 \begin{itemize}
-\item {\tt{auto}} is the software controlled acquisition (does not use triggers), where {\tt{exptime}} and {\tt{period}} have to be set. Set number of cycles (i.e. triggers) to 1 using {\tt{cycles}}. Set number of frames using {\tt{frames}}.
-\item {\tt{trigger}} 1 frame taken for 1 trigger. Your {\tt{frames}} needs to be  1 always, {\tt{cycles}} can be changed and defines how many triggers are considered.  {\tt{exptime}} needs to be set. In the GUI this is called trigger exposure series.  
-\item {\tt{burst\_trigger}} gets only 1 trigger, but allows to take many frames. With {\tt{frames}} one can change the number of frames. {\tt{cycles}} needs to be 1.  {\tt{exptime}} and {\tt{period}} have to be set. In the gui it is called trigger readout.
-\item{\tt{gating}} allows to get a frame only when the trigger pulse is gating. Note that in this case the exp time and period only depend on the gating signal. {\tt{cycles}} allows to select how many gates to consider.  Set number of frames to 1 using {\tt{frames}}. IMPORTANT: Up to firmware 23, the last subframe is oblige to finish being taken, despite the gate signal going down. This will be configurable from later fw and software version. Also, in gating mode, due to timimg of the state machine, you need to leave 500~$\mu$s deadtime between the end on an acquisition and the next. This is as the state machine is unable to check for changes in the status in the first 500~$\mu$s. ATTENTION: if you are in 16 bit mode and you are applying online rate corrections, as now the exptime is generated by the trigger, you might not have correct rate corrections. If you know what the exposure time is in the gating signal, then you can set the {\tt{exptime}} once and the rate corrections will be correct. In 32 bit mode, it does not matter as the rate corrections depends on the {\tt{subexptime}} which is software set independently from the gate exptime.
+\item {\tt{auto}} is the software controlled acquisition (does not use triggers), where {\tt{exptime}} and {\tt{period}} have to be set. Set number of {\tt{cycles}} (\textcolor{red}{triggers}) to 1. Set number of frames using {\tt{frames}}.
+\item {\tt{trigger}} 1 frame taken for 1 trigger. Your {\tt{frames}} needs to be  1 always, {\tt{cycles}} ({\tt{\textcolor{red}{triggers}}}) can be changed and defines how many triggers are considered.  {\tt{exptime}} needs to be set. In the GUI this is called trigger exposure series.  
+\item {\tt{burst\_trigger}} gets only 1 trigger, but allows to take many frames. With {\tt{frames}} one can change the number of frames. {\tt{cycles}} ({\tt{\textcolor{red}{triggers}}}) needs to be 1.  {\tt{exptime}} and {\tt{period}} have to be set. In the gui it is called trigger readout.
+\item{\tt{gating}} allows to get a frame only when the trigger pulse is gating. Note that in this case the exp time and period only depend on the gating signal. {\tt{cycles}} (\tt{\textcolor{red}{triggers}}) allows to select how many gates to consider.  Set number of frames to 1 using {\tt{frames}}. IMPORTANT: Up to firmware 23, the last subframe is oblige to finish being taken, despite the gate signal going down. This will be configurable from later fw and software version. Also, in gating mode, due to timimg of the state machine, you need to leave 500~$\mu$s deadtime between the end on an acquisition and the next. This is as the state machine is unable to check for changes in the status in the first 500~$\mu$s. ATTENTION: if you are in 16 bit mode and you are applying online rate corrections, as now the exptime is generated by the trigger, you might not have correct rate corrections. If you know what the exposure time is in the gating signal, then you can set the {\tt{exptime}} once and the rate corrections will be correct. In 32 bit mode, it does not matter as the rate corrections depends on the {\tt{subexptime}} which is software set independently from the gate exptime.
 
+ATTENTION: From release 4.1.1 with the {\tt{trigger}} option it is possible to have software triggers as a debugging tool (instead of the hardware trigger signal. One should start the acquisition (with the blocking {\tt{sls\_detector\_acquire}} if wanted and with another client one can send the softare trigger {\tt{sls\_detector\_put status trigger}}. This option allows for example to perform a motor scan (moving a motor in between single images) and still writing all images to the same file. 
 When using 32-bit mode, by default the acquisition ends the last complete subframe that was started when still the acquisition time was valid. This has been chosen as many people wants to know the exact acquisition time for when the detector was taking data and also, if {\tt{ratecorr}} are active, the last subframe will be correctly corrected, while otherwise it will be corrected with a wrong subdeadtime. 
 However, from 4.1.0, in gating mode, an option to immediately terminate the subframe when the gate signal goes down it is implemented to stop the acquisition at the same time.  This option is {\tt{./sls\_detector\_put interruptsubframe 1}} while the default option is {\tt{./sls\_detector\_put interruptsubframe 0}}.  
 
@@ -628,13 +676,13 @@ However, from 4.1.0, in gating mode, an option to immediately terminate the subf
 
 Hardware-wise, the ENABLE OUT signal outputs when the chips are really acquiring. This means that the single subframes will be output in 32 bit mode. The TRIGGER OUT outputs the sum-up-signal at the moment (which is useless). This will be changed in the future to output the envelop of the enable signal. 
 
-We are planning to change some functionality, i.e. unify the {\tt{trigger}} and {\tt{burst\_trigger}} trigger modes and make both {\tt{frames}} and {\tt{cycles}} configurable at the same time.
+We are planning to change some functionality, i.e. unify the {\tt{trigger}} and {\tt{burst\_trigger}} trigger modes and make both {\tt{frames}} and {\tt{cycles}} (\tt{\textcolor{red}{triggers}}) configurable at the same time.
 
 There is the possibility to use {\tt{timing trigger/burst\_trigger}} and send software single commands to fake the trigger. This is done with:
 \begin{verbatim}
 sls_detector_put 0-timing [trigger/burst_trigger]
 sls_detector_put 0-frames x
-sls_detector_put 0-cycles y
+sls_detector_put 0-cycles y (\textcolor{red}{triggers})
 sls_detector_status trigger
 \end{verbatim}
  Note that this functionality is very (!) useful if you need to do something between and acquisition and the next. This can be used to do a fast threshold scan for example. See section~\ref{sec:fastthresholdscan}.
@@ -714,8 +762,8 @@ If \textbf{dr} is 32 and \textbf{clkdivider} is not 2, whatever the detector get
 
 Here is a list of parameters that should be reset:
 \begin{enumerate}
-\item  \textbf{resetframescaught} should be reset to zero after every acquisition taken with {\tt{receiver start}},{\tt{status start}},{\tt{receiver stop}}. If the acquisition is taken with {\tt{sls\_detector\_acquire}}, there is no need to reset this.
-\item After changing the {\tt{timing}} mode of the detector, one should reset to '1' the unused value, in that specific timing mode, between \textbf{frames} and \textbf{cycles}. See section~\ref{triggering} for how to use the timing. At the present moment the detector will acquire more frames than planned if the variable not used between \textbf{frames} and \textbf{cycles} is not reset. In future releases, the unused variable will be ignored. Still resetting is a good practice.
+\item  \textbf{resetframescaught} (only for releases < 5.x) should be reset to zero after every acquisition taken with {\tt{receiver start}},{\tt{status start}},{\tt{receiver stop}}. If the acquisition is taken with {\tt{sls\_detector\_acquire}}, there is no need to reset this.
+\item After changing the {\tt{timing}} mode of the detector, one should reset to '1' the unused value, in that specific timing mode, between \textbf{frames} and \textbf{cycles} (\tt{\textcolor{red}{triggers}}). See section~\ref{triggering} for how to use the timing. At the present moment the detector will acquire more frames than planned if the variable not used between \textbf{frames} and \textbf{cycles} (\tt{\textcolor{red}{trigger}}) is not reset. In future releases, the unused variable will be ignored. Still resetting is a good practice.
       
 \end{enumerate}
 
@@ -794,9 +842,23 @@ Transmission delays should be chosen only to accomodate the writing speed of the
 Table~\ref{tcont} gives the times that are needed to transfer 1 images out of the 10~Gb Ethernet connection. This reflects the CONTINUOS frame rate achieavable. The disk speed can be monitored with {\tt{dstat}}. One you have worked out this, you can calculated the {\tt{txndelay\_frame}} delay as:
 
 \begin{equation}
- {\tt{txndelay\_frame}}=-tsending+dr \cdot \frac{4*256*256*N\_half\_modules}{1024 \cdot 1000 \cdot disk\_speed [MB/s]}
+ {\tt{txndelay\_frame}}=-t_sending+dr \cdot \frac{4*256*256*N\_half\_modules}{1024 \cdot 1000 \cdot disk\_speed [MB/s] \cdot 8}
 \end{equation}
-In 4-bit mode, for a disk seed of 320MB/s, the  {\tt{txndelay\_frame}} is 300~$\mu$s (30000 to be set up to the detector). The sending time is 100~$\mu$s, such that an total ackievable writing sped of 1/400~$\mu$s (2.5~kHz) in achieved.  
+In 4-bit mode, for a disk seed of 320MB/s, the  {\tt{txndelay\_frame}} is 300~$\mu$s (30000 to be set up to the detector). The sending time is 100~$\mu$s, such that an total ackievable writing speed of 1/400~$\mu$s (2.5~kHz) in achieved.  
+
+Note that:
+\begin{enumerate}
+\item The continuos frame rate goes down when transmission delays are introduced:
+\begin{equation}
+continuos\_frame\_rate= \frac{1}{\tt{txndelay\_frame}+t\_sending}
+\end{equation}
+\item If your transmission delays reduce the continuos frame rate, you will saturate the memory on board at some point and you will corrupt images.  Conservatively, we say that the number of maximum images in buffered mode is the one listed in table~\ref{timgs}, call N\_images. However, one can approximately say that (and here we need to test more, so do not believe to these numbers yet), 
+\begin{equation}
+N\_tot\_images= N\_images+\frac{ N\_images}{frame\_rate \cdot (t\_delay\_frame + t\_sending) } 
+\end{equation}
+
+\end{enumerate}
+
 
 \section{Setting up the PC settings for 10Gb}\label{10g}
 
@@ -818,12 +880,8 @@ ethtool -G xth1 rx 4096 #or wheterver is the max number for your pc
 ethtool -C xth1 rx-usecs 100 
 ethtool -A xth1 rx on
 \end{verbatim}
-where {\tt{xth1}} can be replaced with the correct 10Gb device. To minimise loosing packets, priorities are set better as root user, so have the receiver as root.
-To try to bypass being root, we trued something like this:
-\begin{verbatim}
-/etc/security/limits.conf  username – rtprio 99
-\end{verbatim}
-but somehow it did  not fully worked  so we kept the trick of being root.
+where {\tt{xth1}} can be replaced with the correct 10Gb device.
+NOTE THAT THIS SETTINGS WILL BE LOST IF YOU REBOOT THE COMPUTER.
 
 Very important is to activate the flow control in 10Gb (in 1Gb it is on by default and not configurable)
 \begin{verbatim}
@@ -857,10 +915,18 @@ to make the settings permanent, edit /etc/sysctl.conf:
  \begin{verbatim}
 # 100MiB
 net.core.rmem_max = 104857600
+net.core.rmem_default= 104857600
 net.core.netdev_max_backlog = 250000
 \end{verbatim}
 and run \textbf{sysctl -p}.
 
+To minimise loosing packets, priorities are set better as root user, so have the receiver as root.
+To try to bypass being root, we trued something like this:
+\begin{verbatim}
+/etc/security/limits.conf  username – rtprio 99
+\end{verbatim}
+but somehow it did  not fully worked  so we kept the trick of being root.
+
 Last, you can disable power saving in the CPU frequency (chose the appropriate command for your system):
 \begin{verbatim}
 cpupower frequency-info
@@ -895,9 +961,6 @@ mount -t tmpfs none /mnt/ramdisk -o size=10G
 \end{verbatim}
 check how many GB memory you can allocate, to avoid swapping otherwise
 
-
-
-
 \section{Offline processing and monitoring}
 
 \subsection{Data out of the detector: UDP packets}\label{UDP}
@@ -935,19 +998,22 @@ If you use the option of writing raw files, you will have a raw file for each UD
 The master file is named: {\tt{filename\_master\_0.raw}} and for version ``4.0.0'' of the slsDetectorSoftware looks like:
  
 \begin{verbatim}
-Version                    : 2.0
+Version                    : 4.0
+Detector Type              : 3
 Dynamic Range              : 32
 Ten Giga                   : 1
 Image Size                 : 524288 bytes
-x                          : 512 pixels
-y                          : 256 pixels
-Max. Frames Per File       : 10000
-Total Frames               : 1
-Exptime (ns)               : 1000000000
+nPixelsX                   : 512 pixels
+nPixelsY                   : 256 pixels
+Max Frames Per File        : 10000
+Total Frames               : 3
+Exptime (ns)               : 10000000
 SubExptime (ns)            : 2621440
 SubPeriod(ns)              : 2621440
-Period (ns)                : 1000000000
-Timestamp                  : Mon Sep  3 09:07:05 2018
+Period (ns)                : 0
+Gap Pixels Enable          : 0
+Quad Enable                : 0
+Timestamp                  : Wed Aug 21 16:30:20 2019
 
 
 #Frame Header
@@ -957,9 +1023,9 @@ Packet Number              : 4 bytes
 Bunch ID                   : 8 bytes
 Timestamp                  : 8 bytes
 Module Id                  : 2 bytes
-X Coordinate               : 2 bytes
-Y Coordinate               : 2 bytes
-Z Coordinate               : 2 bytes
+Row                        : 2 bytes
+Column                     : 2 bytes
+Reserved                   : 2 bytes
 Debug                      : 4 bytes
 Round Robin Number         : 2 bytes
 Detector Type              : 1 byte
@@ -970,17 +1036,18 @@ Packets Caught Mask        : 64 bytes
 Note that if one wants to  reconstruct the real time the detector was acquiring in 32 bit (autosumming mode), one would have to multiply the SubExptime (ns) for the SubFrame Number. 
 
 \subsection{Offline image reconstruction}
-The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. The code is still available doing \\
-{\tt{git clone git@git.psi.ch:sls\_detectors\_software/sls\_image\_reconstruction.git slsImageReconstruction}}.
-Checkout the {\tt{developer}} branch if in a 3.1.X release or the {\tt{v4.0.0}} branch if in 4.0.X release of the {\tt{slsDetector}} code.
+The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. However, it can be retrieved from \\
+{\tt{git clone https://github.com/slsdetectorgroup/slsImageReconstruction.git slsImageReconstruction}}.\\
+Checkout the {\tt{v3.1}} branch if in a 3.1.X release, the {\tt{v4.0.0}} branch if in 4.0.X release, or the {\tt{v4.1}} branch if in 4.1.X release of the {\tt{slsDetector}} code. There is a {\tt{developer}} branch that has newer updates but needs to be tested.
 
-Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5} and \textbf{root} format. The detector writes 4 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
+Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5}. \textbf{tiff} and  \textbf{root} format. The detector writes 2 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
 
-Note that the number of images per file is hardcoded and needs to match whatever you are using in {\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
+Note that the number of images per file in the 3.1.X release is hardcoded and needs to match whatever you are using in \\
+{\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
 \begin{verbatim}
 #define EIGER_MAX_FRAMES_PER_FILE	2000
 \end{verbatim}
-The default is 2000.
+The default is 2000 in the 3.1.X release. The default has been changed to 10000 frm realease 4.0.X and now this is picked up automatically without doing anything. 
 
 \subsubsection{cbf}
 The cbf executable executable uses the CBFlib-0.9.5 library (downloaded from the web as it downloads architecture dependent packages at installation).Edit the Makefile to correclty point at it.\\
@@ -1025,11 +1092,12 @@ cbfMaker9M [file_name_with_dir]
 contain the hardcoded geometry for the 1.5M (3 modules horizontal on the long side), the 1.5M OMNY geometry (3 modules next to each other on the long side) and for the 9M at cSAXS: 6(short side)$\times$3 (long side) modules.\\ 
 Missing packets in a frame and border pixels ($\times 2$ and $\times 4$ are given with value $-1$ at the present time.
 
+From the new {{v4.1.1}} all the define that you see below need only to be modified in the Makefile.
+
 Make sure the following options are uncommented in the {\tt{slsImageReconstruction/src/main\_csaxs.cpp}} file. 
 \begin{verbatim}
 #define MYCBF
-##following line only if you need to process with 
-##BUBBLE (Material Science / uXAS beamlines).
+##following line only if you need to process with BUBBLE
 #define MSHeader 
 \end{verbatim}
 Compile it with: 
@@ -1078,6 +1146,10 @@ To use it any geometry:\\
 eg.
 {\tt image /scratch/run\_63\_d0\_f000000000000\_3.raw  3072 512 1 2 ``Eiger'' 0}.\\
 
+With new new software, the new options to run the cbfMaker/hdf5Maker executablesare: 
+
+./hdf5Maker -f [filename] -d [outdirname] -x [npix\_x] -y [npix\_y] -v  (v flags that longedge is vertical, no argument) -n [name\_of\_hdf5\_dataset] -m (mask\_hot\_pixels, need to be in file maskpix.txt in the samedir as executable, no argument) -g [0,no filling/1,division/2,interpolation/3,interpolate,alternative]  
+
 \subsection{Read temperatures/HV from boards}
 
 With an updated kernel on the linux boards (ask to the SLS detector group for specifications), it is possible to monitor the temperature on the boards: 
@@ -1102,10 +1174,10 @@ In 500k--2M pixel systems there is a hardware temperature safety switch, which w
  
 The HV can also be set and read through the software:
 \begin{verbatim}
-./sls_detector_put vhighvoltage 150
-./sls_detector_get vhighvoltage 
+./sls_detector_put highvoltage 150
+./sls_detector_get highvoltage 
 \end{verbatim}
-Note that the get {\tt{vhighvoltage}} would return the measured HV from the master module only. If getting the vhighvoltage for individual halfmodules, only the master will have a value different from -999.
+Note that the get {\tt{highvoltage}} would return the measured HV from the master module only. If getting the highvoltage for individual halfmodules, only the master will have a value different from -999.
 
 \appendix
 
@@ -1187,13 +1259,21 @@ do the same for the other boards. You can program in parallel many boards, but y
 There are two ways to pulse the detector: 
 \begin{itemize}
 \item \textbf{Pulse digitally:} when you are interested to the output readout and do not care about the analog response from the pixels:
- \begin{verbatim}
+\begin{verbatim}
 sls_detector_put vthreshold 4000
 sls_detector_put vtr 4000
 sls_detector_put pulsechip N #to pulse N
 sls_detector_put pulsechip -1 #to get out of testing mode 
 \end{verbatim}
 Note that the answer will be $2 \cdot \textrm{{\tt{N}}} +2$ in this case.
+Or in \textcolor{red}{5.x}:
+\begin{verbatim}
+sls_detector_put vthreshold 4000
+sls_detector_put vtrim 4000
+sls_detector_put pulsechip N #to pulse N
+sls_detector_put pulsechip -1 #to get out of testing mode
+\end{verbatim}
+Note that the answer will be $2 \cdot \textrm{{\tt{N}}} +4$ in this case.
 
 \item  \textbf{Pulse analogically:} You want to really check the analogical part of the detector, not just the readout.
 
@@ -1212,8 +1292,25 @@ sls_detector_put resmat 0
 sls_detector_acquire
 \end{verbatim}
 You read {\tt{N}} in every pixel if you are setup correctly. 
+or in realese \textcolor{red}{5.x}:
+\begin{verbatim}
+sls_detector_put vcal 3600
+sls_detector_put vthreshold 1700
+sls_detector_put vrpreamp 3100
+for i in $(seq 0 7) ;
+do px=$((-255+i));
+sls_detector_put  pulse 0 $px 0;
+for j in $(seq 0 255) ; do
+sls_detector_put pulsenmove 100 0 1;
+done;
+done;
+sls_detector_put partialreset 1
+\end{verbatim}
 \end{itemize}
  
+
+
+
 \section{Load a noise pattern with shape}
 For debug purposes, we have created a noise pattern with a shape. If you reconstruct correctly your image, you should be able to read ".EIGER'' in the same direction for both the top and bottom in normal human readable orientation.
 To load the special noise file look at {\tt{settingsdir/eiger/standard/eigernoise.sn0xx}} in the package. 
@@ -1239,7 +1336,7 @@ We have also been requested if we could speed up the threshold scan. At the mome
 ./sls_detector_put enablefwrite 0
 ./sls_detector_put resetframescaught 0 
 ./sls_detector_put index 0
-./sls_detector_put cycles 21
+./sls_detector_put cycles 21  (\textcolor{red}{triggers})
 ./sls_detector_put receiver start
 ./sls_detector_put status start 
 for i in $(seq 0 20); 
@@ -1357,7 +1454,7 @@ Environment variable SLSDETNAME can be set for using 2 different detectors from
 \subsection{Measure the HV}
 For every system: 
 \begin{itemize}
-\item Software-wise measure it (now the software returns the measured value), with {\tt{sls\_detector\_get vhighvoltage}}. The returned value is the HV (for proper Eiger setting is approximately 150~V) if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:vhighvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. 
+\item Software-wise measure it (now the software returns the measured value), with {\tt{sls\_detector\_get highvoltage}}. The returned value is the HV (for proper Eiger setting is approximately 150~V) if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:highvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. 
 \item Hardware-wise (opening the detector) measure value of HV on C14 on the power distribution board. Check also that the small HV connector cable is really connected. 
  \end{itemize}
 
@@ -1408,7 +1505,7 @@ Scroll up in the terminal till you find:\\
 There is also an easier way, that is that only the master module will return the real value of the HV. If you have more than 1 detector system, then you will have more than 1 physical master, as the HV needs to be applied to all the systems.
 
 \begin{verbatim}
-for i in $(seq 0 36); do sls_detector_put $i:vhighvoltage; done
+for i in $(seq 0 36); do sls_detector_put $i:highvoltage; done
 \end{verbatim}
  Only the master will return to you a sensible number (150 normally). the others will return -999.
 
@@ -1569,10 +1666,10 @@ ratecorr number
 where {\tt{number}} is a string that should be interpreted as a float in s.  0.000000 means correction off. Values above zero are the value of $\tau$ in ns.
 
 \item \begin{verbatim}
-sls_detector_get vhighvoltage
-vhighvoltage number
+sls_detector_get highvoltage
+highvoltage number
 \end{verbatim}
-where {\tt{number}} is a string that should be interpreted as an int and for proper Eiger setting is approximately 150~V if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:vhighvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. 
+where {\tt{number}} is a string that should be interpreted as an int and for proper Eiger setting is approximately 150~V if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:highvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. 
   
 \item \begin{verbatim}
 sls_detector_get busy

manual/manual-client/commands.txt

@@ -111,7 +111,7 @@
  "delay"; // sets/gets delay after trigger in s
  "gates"; // sets/gets number of gates per frame in gated mode
  "frames"; // sets/gets number of frames
- "cycles"; // sets/gets number of cycles (use in trigger mode)
+ "triggers"; // sets/gets number of triggers (use in trigger mode)
  "probes"; // sets/gets number of probes (advanced!)
  "measurements"; // sets/gets number of non-real time measurements
   /* read only timers */
@@ -120,7 +120,7 @@
  "delayl"; // gets delay left
  "gatesl"; // gets number of gates left
  "framesl"; // gets number of frames left
- "cyclesl"; // gets number of cycles left
+ "triggersl"; // gets number of triggers left
  "now"; // gets time stamp from the dteector
  "timestamp"; // gets time stamp for the frames (fifo-style)
  "framescaught";// gets the entire frames caught by receiver
@@ -142,7 +142,7 @@
  "vpreamp"; // sets/get vpreamp value  (advanced! Mythen)
  "vshaper1"; // sets/get vshaper1 value  (advanced! Mythen)
  "vshaper2"; // sets/get vshaper2 value  (advanced! Mythen)
- "vhighvoltage"; // sets/get vhighvoltage value  (advanced! Chiptest board and Eiger)
+ "highvoltage"; // sets/get highvoltage value  (advanced! Chiptest board and Eiger)
  "vapower"; // sets/get vapower value  (advanced! Chiptest board)
  "vddpower"; // sets/get vddpower value  (advanced! Chiptest board)
  "vshpower"; // sets/get vshpower value  (advanced! Chiptest board)

manual/manual-client/slsDetectorClientHowTo.tex

@@ -94,7 +94,7 @@ where: \\
 \textit{v0} is the scan0 variable with the desired precision, if scan0 is enabled;\\
 \textit{v1} is the scan1 variable with the desired precision, if scan1 is enabled;\\
 \textit{p} is the position index, if different positions are configured;\\
-\textit{f} is the frame index of the first frame stored in the file, if many frames and cycles are configured;\\
+\textit{f} is the frame index of the first frame stored in the file, if many frames and triggers are configured;\\
 \textit{i} is the file index;\\
 \textit{ext} is the file extension e.g. \textit{.raw} for MYTHEN and \E raw data, \textit{.dat} for MYTHEN processed data.
 \item[index i] Sets the starting index of the file i at the beginning of the acquisition (automatically incremented for each measurement).    
@@ -115,10 +115,10 @@ Sets the number of gates per frame in gated (stroboscopic) mode.\\
 Refer to the detailed documentation to understand how the different timing modes work.
 \item[frames n]  
 Sets the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode). The frame index in the output file name will automatically be incremented.\\
-Note that the total number of images will be  frames times cycles.  Refer to detailed documentation to understand how the different timing modes work. 
-\item[cycles n] 
-Sets the number of cycles (e.g. number of triggers). The frame index in the output file name will automatically be incremented. \\ 
-Note that the total number of images will be by frames times cycles.   Refer to the detailed documentation to understand how the different timing modes work.
+Note that the total number of images will be  frames times triggers.  Refer to detailed documentation to understand how the different timing modes work. 
+\item[triggers n] 
+Sets the number of triggers (e.g. number of triggers). The frame index in the output file name will automatically be incremented. \\ 
+Note that the total number of images will be by frames times triggers.   Refer to the detailed documentation to understand how the different timing modes work.
 \item[probes]  Sets the number of probes to accumulate for stroboscopic measurements. \\
 Refer to detailed documentation to understand how the different timing modes work.
 \item[measurements] Sets the number of repetitions of the acquisitions (non real time!). The file index in the file name will be automatically incremented.\\
@@ -231,7 +231,7 @@ It is normally recommended to use \verb=sls\_detector\_acquire [j-]=, which take
 %\item[delayl]  
 %\item[gatesl]  
 %\item[framesl] 
-%\item[cyclesl]   
+%\item[triggersl]   
 %\item[frameindex]  
 %\item[now]   
 \end{description}
@@ -335,7 +335,7 @@ Advanced settings changing the analog or digital performance of the acquisition.
 \item[vpreamp n]  Sets the DAC value of the preamp feedback  to n.
 \item[vshaper1 n]  Sets the DAC value of the shaper1 feedback  to n.  
 \item[vshaper2 n]   Sets the DAC value of the shaper2 feedback  to n.      
-\item[vhighvoltage n]   Sets the DAC value of the high voltage to n (in V).           
+\item[highvoltage n]   Sets the DAC value of the high voltage to n (in V).           
 \item[vapower n]   CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n. 
 \item[vddpower n]     CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n.      
 \item[vshpower n]     CHIPTEST BOARD ONLY - Sets the comparator power supply in dac units (0-1024).   
@@ -430,11 +430,11 @@ Returns the number of gates per frame in gated (stroboscopic) mode.
 Refer to detailed documentation to understand how the different timing modes work.
 \item[frames]  
 Returns the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode). Returned as a string to be interpreted as an integer ``frames integer''
-Note that the total number of images is  frames times cycles.  
+Note that the total number of images is  frames times triggers.  
 Refer to detailed documentation to understand how the different timing modes work. 
-\item[cycles n] 
-Returns the number of cycles (e.g. number of triggers). Returned as atring to be interpreted as an integer ``cycles integer''
-Note that the total number of images is  frames times cycles. 
+\item[triggers n] 
+Returns the number of triggers (e.g. number of triggers). Returned as atring to be interpreted as an integer ``triggers integer''
+Note that the total number of images is  frames times triggers. 
 Refer to detailed documentation to understand how the different timing modes work.  
 \item[probes]  Returns the number of probes to accumulate for stroboscopic measurements.  
 Refer to detailed documentation to understand how the different timing modes work.
@@ -556,7 +556,7 @@ It is normally recommended to use \verb=sls\_detector\_acquire [j-]=, which take
 \item[delayl]    Returns the delay after trigger left for the current frame.  
 \item[gatesl]     Returns the number of gates left for the current frame.  
 \item[framesl]   Returns the number of frames left for the current cycle.  
-\item[cyclesl]      Returns the number of cycles left for the current acquisition. 
+\item[triggersl]      Returns the number of triggers left for the current acquisition. 
 \item[now]  Returns the current timestamp of the detector clock.
 \item[timestamp]  Returns the timestamp of the acquisitions in a First-In/First-Out mode i.e. every time it is called it returns the timestamp of the first acquisition start of readout. The FIFO is reset everytime the acquisition is started. 
 \end{description}
@@ -648,7 +648,7 @@ Advanced settings changing the analog or digital performance of the acquisition.
 \item[vpreamp]  Returns the DAC value of the preamp feedback  to n.
 \item[vshaper1]  Returns the DAC value of the shaper1 feedback  to n.  
 \item[vshaper2]  Returns the DAC value of the shaper2 feedback  to n.      
-\item[vhighvoltage]  Returns the DAC value of the high voltage to n.           
+\item[highvoltage]  Returns the DAC value of the high voltage to n.           
 \item[vapower]   CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n. 
 \item[vddpower]     CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n.      
 \item[vshpower]     CHIPTEST BOARD ONLY - Returns the comparator power supply in dac units (0-1024).   
@@ -714,7 +714,7 @@ One can configure all the detector settings in a parameter file {\tt{setup.det}}
 sls_detector_put parameters setup.det
 \end{verbatim}
 
-In the case of \E, the parameter file ({\tt{setup.det}} needs to setup the proper bias voltage of the sensor, i.e. needs to contain the line {\tt{vhighvoltage 150}}.
+In the case of \E, the parameter file ({\tt{setup.det}} needs to setup the proper bias voltage of the sensor, i.e. needs to contain the line {\tt{highvoltage 150}}.
 
 \subsection{Standard acquisition}
 

manual/manual-gui/slsDetectorGuiHowTo.tex

@@ -217,7 +217,7 @@ is used to configure the detector parameter var
 \item[delay t] 	Sets the delay after trigger (in s)
 \item[gates n]  	Sets the number of gates per frame
 \item[frames n]  	Sets the number of frames per cycle (e.g. after each trigger)
-\item[cycles n]  	Sets the number of cycles (e.g. number of triggers)
+\item[triggers n]  	Sets the number of triggers (e.g. number of triggers)
 \item[probes n]  	Sets the number of probes to accumulate (max 3)
 \item[dr n]  		Sets the dynamic range - can be (1,) 4, 8,16 or 24 bits
 \item[flags mode]  	Sets the readout flags - can be none or storeinram
@@ -298,7 +298,7 @@ is used to retrieve the detector parameter var
 \item[delay]  		Gets the delay after trigger (in s)    
 \item[gates]  		Gets the number of gates per frame
 \item[frames] 		Gets the number of frames per cycle (e.g. after each trigger)
-\item[cycles] 		Gets the number of cycles (e.g. number of triggers)
+\item[triggers] 		Gets the number of triggers (e.g. number of triggers)
 \item[probes] 		Gets the number of probes to accumulate (max 3)
 \item[timestamp]        Gets the internal time stamp of the nex frame acquired (i.e. during an acquisition, all timestamps of the frames are stored in a FIFO which can be read after the acquisition - returns -1 if the FIFO is empty) 
 \item[dr] 		Gets the dynamic range

manual/manual-main/images/gated_acquisition.eps

@@ -372,7 +372,7 @@ gs 1 -1 sc (Number of frames) col0 sh gr
 gs 1 -1 sc (Number of frames) col0 sh gr
 /Times-Roman ff 450.00 scf sf
 11325 9150 m
-gs 1 -1 sc (Number of cycles) col0 sh gr
+gs 1 -1 sc (Number of triggers) col0 sh gr
 /Times-Roman ff 240.00 scf sf
 5325 4950 m
 gs 1 -1 sc (Readout) col0 sh gr

manual/manual-main/images/gated_acquisition.fig

@@ -118,7 +118,7 @@ Single
 	 21900 2700 22050 2700
 4 0 0 50 0 0 30 0.0000 4 300 3225 6975 7800 Number of frames\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 15975 7800 Number of frames\001
-4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of cycles\001
+4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of triggers\001
 4 0 0 50 0 0 16 0.0000 4 165 810 5325 4950 Readout\001
 4 0 0 50 0 0 30 0.0000 4 300 2565 825 4125 Detection time\001
 4 0 0 50 0 0 30 0.0000 4 300 1785 825 5550 Dead time\001

manual/manual-main/images/gated_acquisition.fig.bak

@@ -95,7 +95,7 @@ Single
 4 0 0 50 0 0 30 0.0000 4 405 2580 9450 6600 Exposure time\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 6975 7800 Number of frames\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 15975 7800 Number of frames\001
-4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of cycles\001
+4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of triggers\001
 4 0 0 50 0 0 16 0.0000 4 165 810 5325 4950 Readout\001
 4 0 0 50 0 0 30 0.0000 4 300 2565 1050 4125 Detection time\001
 4 0 0 50 0 0 30 0.0000 4 300 1785 1050 5550 Dead time\001

manual/manual-main/images/normal_acquisition.eps

@@ -341,7 +341,7 @@ gs 1 -1 sc (Number of frames) col0 sh gr
 gs 1 -1 sc (Number of frames) col0 sh gr
 /Times-Roman ff 450.00 scf sf
 11325 9150 m
-gs 1 -1 sc (Number of cycles) col0 sh gr
+gs 1 -1 sc (Number of triggers) col0 sh gr
 /Times-Roman ff 240.00 scf sf
 5325 4950 m
 gs 1 -1 sc (Readout) col0 sh gr

manual/manual-main/images/normal_acquisition.fig

@@ -79,7 +79,7 @@ Single
 	 4200 5850 4650 5850
 4 0 0 50 0 0 30 0.0000 4 300 3225 6975 7800 Number of frames\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 15975 7800 Number of frames\001
-4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of cycles\001
+4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of triggers\001
 4 0 0 50 0 0 16 0.0000 4 165 810 5325 4950 Readout\001
 4 0 0 50 0 0 30 0.0000 4 300 2565 825 4125 Detection time\001
 4 0 0 50 0 0 30 0.0000 4 300 1785 825 5550 Dead time\001

manual/manual-main/images/normal_acquisition.fig.bak

@@ -118,7 +118,7 @@ Single
 	 21900 2700 22050 2700
 4 0 0 50 0 0 30 0.0000 4 300 3225 6975 7800 Number of frames\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 15975 7800 Number of frames\001
-4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of cycles\001
+4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of triggers\001
 4 0 0 50 0 0 16 0.0000 4 165 810 5325 4950 Readout\001
 4 0 0 50 0 0 30 0.0000 4 300 2565 825 4125 Detection time\001
 4 0 0 50 0 0 30 0.0000 4 300 1785 825 5550 Dead time\001

manual/manual-main/images/trigger_acquisition.eps

@@ -401,7 +401,7 @@ gs 1 -1 sc (External trigger) col0 sh gr
 gs 1 -1 sc (Number of frames) col0 sh gr
 /Times-Roman ff 450.00 scf sf
 12600 9150 m
-gs 1 -1 sc (Number of cycles) col0 sh gr
+gs 1 -1 sc (Number of triggers) col0 sh gr
 /Times-Roman ff 240.00 scf sf
 6600 4950 m
 gs 1 -1 sc (Readout) col0 sh gr

manual/manual-main/images/trigger_acquisition.fig

@@ -111,7 +111,7 @@ Single
 4 0 0 50 0 0 30 0.0000 4 300 1785 825 5550 Dead time\001
 4 0 0 50 0 0 30 0.0000 4 405 2760 825 2700 External trigger\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 8250 7800 Number of frames\001
-4 0 0 50 0 0 30 0.0000 4 405 3090 12600 9150 Number of cycles\001
+4 0 0 50 0 0 30 0.0000 4 405 3090 12600 9150 Number of triggers\001
 4 0 0 50 0 0 16 0.0000 4 165 810 6600 4950 Readout\001
 4 0 0 50 0 0 30 0.0000 4 405 2580 4575 6225 Exposure time\001
 4 0 0 50 0 0 30 0.0000 4 300 1140 9525 6225 Period\001

manual/manual-main/images/trigger_acquisition.fig.bak

@@ -79,7 +79,7 @@ Single
 	 4200 5850 4650 5850
 4 0 0 50 0 0 30 0.0000 4 300 3225 6975 7800 Number of frames\001
 4 0 0 50 0 0 30 0.0000 4 300 3225 15975 7800 Number of frames\001
-4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of cycles\001
+4 0 0 50 0 0 30 0.0000 4 405 3090 11325 9150 Number of triggers\001
 4 0 0 50 0 0 16 0.0000 4 165 810 5325 4950 Readout\001
 4 0 0 50 0 0 30 0.0000 4 300 2565 825 4125 Detection time\001
 4 0 0 50 0 0 30 0.0000 4 300 1785 825 5550 Dead time\001

manual/manual-main/manual.tex

@@ -217,7 +217,7 @@ is used to configure the detector parameter var
 \item[delay t] 	Sets the delay after trigger (in s)
 \item[gates n]  	Sets the number of gates per frame
 \item[frames n]  	Sets the number of frames per cycle (e.g. after each trigger)
-\item[cycles n]  	Sets the number of cycles (e.g. number of triggers)
+\item[triggers n]  	Sets the number of triggers (e.g. number of triggers)
 \item[probes n]  	Sets the number of probes to accumulate (max 3)
 \item[dr n]  		Sets the dynamic range - can be (1,) 4, 8,16 or 24 bits
 \item[flags mode]  	Sets the readout flags - can be none or storeinram
@@ -298,7 +298,7 @@ is used to retrieve the detector parameter var
 \item[delay]  		Gets the delay after trigger (in s)    
 \item[gates]  		Gets the number of gates per frame
 \item[frames] 		Gets the number of frames per cycle (e.g. after each trigger)
-\item[cycles] 		Gets the number of cycles (e.g. number of triggers)
+\item[triggers] 		Gets the number of triggers (e.g. number of triggers)
 \item[probes] 		Gets the number of probes to accumulate (max 3)
 \item[timestamp]        Gets the internal time stamp of the nex frame acquired (i.e. during an acquisition, all timestamps of the frames are stored in a FIFO which can be read after the acquisition - returns -1 if the FIFO is empty) 
 \item[dr] 		Gets the dynamic range

manual/manual-main/slsDetector-softFAQ.tex

@@ -127,7 +127,7 @@ where: \\
 \textit{v0} is the scan0 variable with the desired precision, if scan0 is enabled;\\
 \textit{v1} is the scan1 variable with the desired precision, if scan1 is enabled;\\
 \textit{p} is the position index, if different positions are configured;\\
-\textit{f} is the frame index of the first frame stored in the file, if many frames and cycles are configured;\\
+\textit{f} is the frame index of the first frame stored in the file, if many frames and triggers are configured;\\
 \textit{i} is the file index;\\
 \textit{ext} is the file extension e.g. \textit{.raw} for MYTHEN raw data, \textit{.dat} for MYTHEN processed data.
 
@@ -241,7 +241,7 @@ Figure~\ref{eq:acqflow} shows in which sequence the various scripts and loops ar
 
 
 If you prefere to handle the acquisition from your acquisition enviroment, simply leave al scripts and scans disabled and call the acquition from your acquisition enviroment. \\
-Only the frames and cycles loops are defined in firmware and guarantee a precise timing of the acquisition which cannot replaced by any other method (you can synchronize to your beamline by hardware connection of the IO signals as described in~\ref{sec:timing}).
+Only the frames and triggers loops are defined in firmware and guarantee a precise timing of the acquisition which cannot replaced by any other method (you can synchronize to your beamline by hardware connection of the IO signals as described in~\ref{sec:timing}).
 
 Hereafter a description of the meaning of the various loops:
 \begin{description}
@@ -259,11 +259,11 @@ Hereafter a description of the meaning of the various loops:
  The detector is moved in the angular positions specified by the positions command.\\
  The command for moving the detector should be defined as described in~\ref{sec:usersFunc}.\\
  All data acquired during a position loop will be merged together, unless the number of positions is set to 0. In this case single frames will be converted to angle without merging.\\
- Avoid using the position loop together with many frames/cycles.
+ Avoid using the position loop together with many frames/triggers.
 
-\item[Cycles loop] is executed in real time and defines e.g. the number of triggers that will be accepted. The total number of images will be given by frames times cycles.
+\item[Triggers loop] is executed in real time and defines e.g. the number of triggers that will be accepted. The total number of images will be given by frames times triggers.
 
-\item[Frames loop] is executed in real time and defines e.g. the images acquired per trigger. The total number of images will be given by frames times cycles.
+\item[Frames loop] is executed in real time and defines e.g. the images acquired per trigger. The total number of images will be given by frames times triggers.
 \end{description}
 
 Executing a script simply consists in a system call with the arguments specified below. The various scripts are executed only if they are enabled and different than \textit{none}. \\
@@ -332,11 +332,11 @@ In the following is a list of the main parameters involved in the acquisition ti
 \item[Period] is the period of the images acquired. If it is shorter than the exposure time plus readout time, it will be ignored.
 \item[Delay after trigger] can be set as a delay between the trigger signal and the start of the detection time. 
 \item[Number of gates] is used only in \textit{gating} mode and is the number of times that the gate is toggled before the detector is read out. Useful for stroboscopic measurements with gate period shorter than the minim acquisition period of the detector, otherwise can be left to 1.
-\item[Number of frames] is the number of images to be acquired per cycle. Frames and cycles have the same meaning except in trigger mode, when frames means the number of images per trigger. The total number of images is frames time cycles.
-\item[Number of cycles] is the number of times that the frames are acquired. Frames and cycles have the same meaning except in trigger mode, when cycles means the number of triggers that will be accepted. The total number of images is frames time cycles.
+\item[Number of frames] is the number of images to be acquired per cycle. Frames and triggers have the same meaning except in trigger mode, when frames means the number of images per trigger. The total number of images is frames time triggers.
+\item[Number of triggers] is the number of times that the frames are acquired. Frames and triggers have the same meaning except in trigger mode, when triggers means the number of triggers that will be accepted. The total number of images is frames time triggers.
 \item[Number of probes] is used in stoboscopic measurements when the period is longer than the minimum acquisition period, but shorter than the frame rate.\\
 In this case the data can be summed in firmware. \\
-Currently it is implemented for Mythen only. If probes is set to 0, works normallyreturning an image for each readout, otherwise set number of cycles to 1. The maximum number of probes that can be set is 3. The detector will return a number of image equal to the number of probes, where all frames are going to be accumulated. The total number of readouts is number of frames time probes and for  probes=1 the detector will return one image where all frames have been summed, for  probes=2 two images where every second frame has been summed (each image accumulates the number of frames), for probes=3 three images where every third image has been summed (each image accumulates the number of frames).\\
+Currently it is implemented for Mythen only. If probes is set to 0, works normallyreturning an image for each readout, otherwise set number of triggers to 1. The maximum number of probes that can be set is 3. The detector will return a number of image equal to the number of probes, where all frames are going to be accumulated. The total number of readouts is number of frames time probes and for  probes=1 the detector will return one image where all frames have been summed, for  probes=2 two images where every second frame has been summed (each image accumulates the number of frames), for probes=3 three images where every third image has been summed (each image accumulates the number of frames).\\
 The returned images will always have 32~bit dynamic range, while the dynamic range if the detector defines the bit depth of the counters in rder to limit the readout time, if necessary.\\
 The probes counter waorks also in trigger and gating modes.
 \end{description}
@@ -349,14 +349,14 @@ The probes counter waorks also in trigger and gating modes.
 \begin{center}
 \includegraphics[width=\textwidth]{images/normal_acquisition.eps}
 \end{center}
-\caption{Auto timing: the detection time is defined by the exposure time and the period by period (if longer than exposure time plus readout time). The total number of images is frames (in the example 3) times cycles (in the example 2), and in this case there is no difference between the acquisition of the two.}\label{fig:autotiming}
+\caption{Auto timing: the detection time is defined by the exposure time and the period by period (if longer than exposure time plus readout time). The total number of images is frames (in the example 3) times triggers (in the example 2), and in this case there is no difference between the acquisition of the two.}\label{fig:autotiming}
 \end{figure}
 
 \begin{figure}
 \begin{center}
 \includegraphics[width=\textwidth]{images/gated_acquisition.eps}
 \end{center}
-\caption{Gating mode: the detector acquires for a number of gates define by the  user (in this case 4) before being read out, independently on the timing of the gates. The detector remains insensitive during the readout time and then starts being active again. External gates given during the readout time are ignored. The total number of images is frames (in the example 3) times cycles (in the example 2), and in this case there is no difference between the acquisition of the two. The polarity of the external gate signal can be defined by the user through the \textit{external signal flag} (in the example active high).}\label{fig:gating}
+\caption{Gating mode: the detector acquires for a number of gates define by the  user (in this case 4) before being read out, independently on the timing of the gates. The detector remains insensitive during the readout time and then starts being active again. External gates given during the readout time are ignored. The total number of images is frames (in the example 3) times triggers (in the example 2), and in this case there is no difference between the acquisition of the two. The polarity of the external gate signal can be defined by the user through the \textit{external signal flag} (in the example active high).}\label{fig:gating}
 \end{figure}
 
 
@@ -365,7 +365,7 @@ The probes counter waorks also in trigger and gating modes.
 \begin{center}
 \includegraphics[width=\textwidth]{images/trigger_acquisition.eps}
 \end{center}
-\caption{Trigger mode: the external trigger signal defines the start of the beginning of the acquisition, which starts after the delay set by the user. For each trigger, the number of frames is acquired (in the example 3) and all trigger signals ignored. The number of trigger accepted is given by the number of cycles (in the example 2). The polarity of the external trigger signal can be defined by the user through the \textit{external signal flag} (in the example rising edge).}\label{fig:trig}
+\caption{Trigger mode: the external trigger signal defines the start of the beginning of the acquisition, which starts after the delay set by the user. For each trigger, the number of frames is acquired (in the example 3) and all trigger signals ignored. The number of trigger accepted is given by the number of triggers (in the example 2). The polarity of the external trigger signal can be defined by the user through the \textit{external signal flag} (in the example rising edge).}\label{fig:trig}
 \end{figure}
 
 
@@ -373,7 +373,7 @@ The probes counter waorks also in trigger and gating modes.
 \begin{center}
 \includegraphics[width=\textwidth]{images/ro_trigger_acquisition.eps}
 \end{center}
-\caption{Read Out Trigger mode: the external trigger signal defines the beginning of the readout. The exposure time works as a time out for the waiting time for the trigger signal. The number of trigger accepted is given by the number of cycles (in the example 3) and it does not make sense to program more than one frame. The polarity of the external trigger signal can be defined by the user through the \textit{external signal flag} (in the example rising edge).}\label{fig:trig}
+\caption{Read Out Trigger mode: the external trigger signal defines the beginning of the readout. The exposure time works as a time out for the waiting time for the trigger signal. The number of trigger accepted is given by the number of triggers (in the example 3) and it does not make sense to program more than one frame. The polarity of the external trigger signal can be defined by the user through the \textit{external signal flag} (in the example rising edge).}\label{fig:trig}
 \end{figure}
 
 

manual/manual-main/slsDetectorClientHowTo.tex

@@ -91,7 +91,7 @@ where: \\
 \textit{v0} is the scan0 variable with the desired precision, if scan0 is enabled;\\
 \textit{v1} is the scan1 variable with the desired precision, if scan1 is enabled;\\
 \textit{p} is the position index, if different positions are configured;\\
-\textit{f} is the frame index of the first frame stored in the file, if many frames and cycles are configured;\\
+\textit{f} is the frame index of the first frame stored in the file, if many frames and triggers are configured;\\
 \textit{i} is the file index;\\
 \textit{ext} is the file extension e.g. \textit{.raw} for MYTHEN raw data, \textit{.dat} for MYTHEN processed data.
 \item[index i] Sets the starting index of the file i at the beginning of the acquisition (automatically incremented for each measurement).    
@@ -110,10 +110,10 @@ Sets the number of gates per frame in gated (stroboscopic) mode.\\
 Refere to the detailed documentation to understand how the different timing modes work.
 \item[frames n]  
 Sets the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode). The frame index in the output file name will automatically be incremented.\\
-Note that the total number of images will be  frames times cycles.  Refere to detailed documentation to understand how the different timing modes work. 
-\item[cycles n] 
-Sets the number of cycles (e.g. number of triggers). The frame index in the output file name will automatically be incremented. \\ 
-Note that the total number of images will be by frames times cycles.   Refere to the detailed documentation to understand how the different timing modes work.
+Note that the total number of images will be  frames times triggers.  Refere to detailed documentation to understand how the different timing modes work. 
+\item[triggers n] 
+Sets the number of triggers (e.g. number of triggers). The frame index in the output file name will automatically be incremented. \\ 
+Note that the total number of images will be by frames times triggers.   Refere to the detailed documentation to understand how the different timing modes work.
 \item[probes]  Sets the number of probes to accumulate for stroboscopic measurements. \\
 Refere to detailed documentation to understand how the different timing modes work.
 \item[measurements] Sets the number of repetitions of the acquisitions (non real time!). The file index in the file name will be automotically incremented.\\
@@ -234,7 +234,7 @@ It is normally reccomended to use \verb=sls\_detector\_acquire [j-]=, which take
 %\item[delayl]  
 %\item[gatesl]  
 %\item[framesl] 
-%\item[cyclesl]   
+%\item[triggersl]   
 %\item[frameindex]  
 %\item[now]   
 \end{description}
@@ -322,7 +322,7 @@ Advanced settings changing the analog or digital performance of the acquisition.
 \item[vpreamp n]  Sets the DAC value of the preamp feedback  to n.
 \item[vshaper1 n]  Sets the DAC value of the shaper1 feedback  to n.  
 \item[vshaper2 n]   Sets the DAC value of the shaper2 feedback  to n.      
-\item[vhighvoltage n]   CHIPTEST BOARD ONLY - Sets the DAC value of the high voltage to n.           
+\item[highvoltage n]   CHIPTEST BOARD ONLY - Sets the DAC value of the high voltage to n.           
 \item[vapower n]   CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n. 
 \item[vddpower n]     CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n.      
 \item[vshpower n]     CHIPTEST BOARD ONLY - Sets the comparator power supply in dac units (0-1024).   
@@ -393,11 +393,11 @@ Returns the number of gates per frame in gated (stroboscopic) mode.
 Refere to detailed documentation to understand how the different timing modes work.
 \item[frames]  
 Returns the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode).
-Note that the total number of images is  frames times cycles.  
+Note that the total number of images is  frames times triggers.  
 Refere to detailed documentation to understand how the different timing modes work. 
-\item[cycles n] 
-Returns the number of cycles (e.g. number of triggers). 
-Note that the total number of images is  frames times cycles. 
+\item[triggers n] 
+Returns the number of triggers (e.g. number of triggers). 
+Note that the total number of images is  frames times triggers. 
 Refere to detailed documentation to understand how the different timing modes work.  
 \item[probes]  Returns the number of probes to accumulate for stroboscopic measurements.  
 Refere to detailed documentation to understand how the different timing modes work.
@@ -518,7 +518,7 @@ It is normally reccomended to use \verb=sls\_detector\_acquire [j-]=, which take
 \item[delayl]    Returns the delay after trigger left for the current frame.  
 \item[gatesl]     Returns the number of gates left for the current frame.  
 \item[framesl]   Returns the number of frames left for the current cycle.  
-\item[cyclesl]      Returns the number of cycles left for the current acquisition. 
+\item[triggersl]      Returns the number of triggers left for the current acquisition. 
 \item[now]  Returns the current timestamp of the detector clock.
 \item[timestamp]  Returns the timestamp of the acquisitions in a First-In/First-Out mode i.e. every time it is called it returns the timestamp of the first acquisition start of readout. The FIFO is reset everytime the acquisition is started. 
 \end{description}
@@ -594,7 +594,7 @@ Advanced settings changing the analog or digital performance of the acquisition.
 \item[vpreamp]  Returns the DAC value of the preamp feedback  to n.
 \item[vshaper1]  Returns the DAC value of the shaper1 feedback  to n.  
 \item[vshaper2]  Returns the DAC value of the shaper2 feedback  to n.      
-\item[vhighvoltage]   CHIPTEST BOARD ONLY - Returns the DAC value of the high voltage to n.           
+\item[highvoltage]   CHIPTEST BOARD ONLY - Returns the DAC value of the high voltage to n.           
 \item[vapower]   CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n. 
 \item[vddpower]     CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n.      
 \item[vshpower]     CHIPTEST BOARD ONLY - Returns the comparator power supply in dac units (0-1024).   

manual/manual-main/slsDetectorGuiHowTo.tex

@@ -217,7 +217,7 @@ is used to configure the detector parameter var
 \item[delay t] 	Sets the delay after trigger (in s)
 \item[gates n]  	Sets the number of gates per frame
 \item[frames n]  	Sets the number of frames per cycle (e.g. after each trigger)
-\item[cycles n]  	Sets the number of cycles (e.g. number of triggers)
+\item[triggers n]  	Sets the number of triggers (e.g. number of triggers)
 \item[probes n]  	Sets the number of probes to accumulate (max 3)
 \item[dr n]  		Sets the dynamic range - can be (1,) 4, 8,16 or 24 bits
 \item[flags mode]  	Sets the readout flags - can be none or storeinram
@@ -298,7 +298,7 @@ is used to retrieve the detector parameter var
 \item[delay]  		Gets the delay after trigger (in s)    
 \item[gates]  		Gets the number of gates per frame
 \item[frames] 		Gets the number of frames per cycle (e.g. after each trigger)
-\item[cycles] 		Gets the number of cycles (e.g. number of triggers)
+\item[triggers] 		Gets the number of triggers (e.g. number of triggers)
 \item[probes] 		Gets the number of probes to accumulate (max 3)
 \item[timestamp]        Gets the internal time stamp of the nex frame acquired (i.e. during an acquisition, all timestamps of the frames are stored in a FIFO which can be read after the acquisition - returns -1 if the FIFO is empty) 
 \item[dr] 		Gets the dynamic range

python/CMakeLists.txt

@@ -1,21 +1,23 @@
 
-pybind11_add_module(_sls_detector 
+# find_package (Python COMPONENTS Interpreter Development)
+
+pybind11_add_module(_slsdet 
     src/main.cpp 
     src/enums.cpp
-    src/experimental.cpp
+    src/detector.cpp
+    src/network.cpp
 )
 
-
-
-target_link_libraries(_sls_detector PUBLIC 
+target_link_libraries(_slsdet PUBLIC 
                         slsDetectorShared
                         slsReceiverShared
                         slsSupportLib
-                        zmq )  
+                        ${ZeroMQ_LIBRARIES}
+                        )  
 
 
 
-set_target_properties(_sls_detector PROPERTIES
+set_target_properties(_slsdet PROPERTIES
                         LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
                     )
 
@@ -29,21 +31,25 @@ set( PYTHON_FILES
     detector.py
     eiger.py
     errors.py
-    experimental.py
-    jungfrau_ctb.py
+    ctb.py
     jungfrau.py
+    mythen3.py
     registers.py
+    lookup.py
     utils.py
 
 )
 
 foreach(FILE ${PYTHON_FILES})
-    configure_file( sls_detector/${FILE}  
-    ${CMAKE_BINARY_DIR}/bin/sls_detector/${FILE}  )
+    configure_file( slsdet/${FILE}  
+    ${CMAKE_BINARY_DIR}/bin/slsdet/${FILE}  )
 
 endforeach(FILE ${PYTHON_FILES})
 
 
 configure_file( scripts/basic.py  
     ${CMAKE_BINARY_DIR}/basic.py 
+)
+configure_file( scripts/test_virtual.py  
+    ${CMAKE_BINARY_DIR}/test_virtual.py 
 )

python/api-tests/test_detector.py

@@ -0,0 +1,82 @@
+import pytest
+import datetime as dt
+from slsdet import Detector, timingMode, detectorType
+
+not_eiger = pytest.mark.skipif(
+    Detector().type == detectorType.EIGER, reason="Does not work for eiger"
+)
+
+
+@pytest.fixture
+def det():
+    from slsdet import Detector
+
+    return Detector()
+
+
+def test_frames(det):
+    for n in [1, 100, 3245, 10000]:
+        det.frames = n
+        assert det.frames == n
+    det.frames = 1
+
+
+def test_triggers(det):
+    for n in [1, 100, 3245, 10000]:
+        det.triggers = n
+        assert det.triggers == n
+    det.triggers = 1
+
+
+def test_exptime(det):
+    det.exptime = 1
+    assert det.exptime == 1
+    det.exptime = dt.timedelta(milliseconds=10)
+    assert det.exptime == 0.01
+    det.exptime = 1
+
+
+def test_period(det):
+    det.period = 3.2
+    assert det.period == 3.2
+
+    p = dt.timedelta(microseconds=1020)
+    det.period = p
+    assert det.period == 0.001020
+    r = det.getPeriod()
+    assert r[0] == p
+    det.period = 0
+    assert det.period == 0
+
+
+def test_lock(det):
+    for l in [True, False]:
+        det.lock = l
+        assert det.lock == l
+
+
+def test_timing(det):
+    # auto and trigger is available for all det
+    for m in [timingMode.TRIGGER_EXPOSURE, timingMode.AUTO_TIMING]:
+        det.timing = m
+        assert det.timing == m
+
+@not_eiger
+def test_delay(det):
+    det.delay = 1
+    assert det.delay == 1
+
+    t  = dt.timedelta(microseconds=1)
+    det.delay = t
+    assert det.delay == t.total_seconds()
+
+    r = det.getDelayAfterTrigger()[0]
+    assert r == t
+
+    det.delay = 0
+    assert det.delay == 0
+
+
+@not_eiger
+def test_delayl(det):
+    assert det.delayl == 0

python/api-tests/test_jungfrau.py

@@ -0,0 +1,89 @@
+import pytest
+import datetime as dt
+from slsdet import Detector, detectorType
+
+"""
+These tests are designed to work the API and catch
+any changes in behavior or naming. Tests are expected
+to pass with a virtual detector or a real one
+
+"""
+
+
+@pytest.fixture
+def jf():
+    from slsdet import Jungfrau
+    return Jungfrau()
+
+
+jungfrautest = pytest.mark.skipif(
+    Detector().type != detectorType.JUNGFRAU, reason="Only valid for Jungfrau"
+)
+
+
+@jungfrautest
+def test_storagecells(jf):
+    for i in range(16):
+        jf.storagecells = i
+        assert jf.storagecells == i
+    jf.storagecells = 0  # default
+
+@jungfrautest
+def test_storagecell_start(jf):
+    for i in range(16):
+        jf.storagecell_start = i
+        assert jf.storagecell_start == i
+    jf.storagecells = 15  # default
+
+@jungfrautest
+def test_storagecell_delay(jf):
+    for t in [0.001, 0.0002, 0.0013]:
+        jf.storagecell_delay = t
+        assert jf.storagecell_delay == t
+    jf.storagecell_delay = 0  # default
+
+@jungfrautest
+def test_temp_event(jf):
+    # hard to test with virtual server
+    assert jf.temp_event == 0
+
+@jungfrautest
+def test_temp_threshold(jf):
+    for th in [0, 10, 43, 72]:
+        jf.temp_threshold = th
+        assert jf.temp_threshold == th
+    jf.temp_threshold = 0
+
+@jungfrautest
+def test_auto_comp_disable(jf):
+    for v in [True, False]:
+        jf.auto_comp_disable = v
+        assert jf.auto_comp_disable == v
+
+@jungfrautest
+def test_numinterfaces(jf):
+    for n in [2, 1]:
+        jf.numinterfaces = n
+        assert jf.numinterfaces == n
+
+@jungfrautest
+def test_dr(jf):
+    assert jf.dr == 16
+
+@jungfrautest
+def test_temp_control(jf):
+    for v in [True, False]:
+        jf.temp_control = v
+        assert jf.temp_control == v
+
+@jungfrautest
+def test_startingfnum(jf):
+    for n in [10, 127, 43321, 1]:
+        jf.startingfnum = n
+        assert jf.startingfnum == n
+
+@jungfrautest
+def test_selinterface(jf):
+    for i in [1, 0]:
+        jf.selinterface = i
+        assert jf.selinterface == i

python/scripts/basic.py

@@ -2,11 +2,14 @@ import os
 import sys
 import numpy as np
 sys.path.append(os.path.join(os.getcwd(), 'bin'))
-from sls_detector import Eiger, Detector
-from sls_detector import ExperimentalDetector
 
-from _sls_detector.io import read_my302_file
+from slsdet import Detector, Mythen3, Eiger, Jungfrau, DetectorDacs, Dac, Ctb
+from slsdet import dacIndex, readoutMode
+from slsdet.lookup import view, find
 
 d = Detector()
-e = ExperimentalDetector()
+# e = Eiger()
+c = Ctb()
+# j = Jungfrau()
+# m = Mythen3()
 

python/scripts/cmd_python.py

@@ -0,0 +1,26 @@
+import subprocess
+import locale
+out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.getpreferredencoding())
+cmd = out.stdout.splitlines()
+cmd.pop(0)
+
+from slsdet import Detector, Eiger, Ctb
+
+pycmd = dir(Detector)+dir(Eiger)+dir(Ctb)
+
+#Add commands that we should not expect as direct commands in python
+pycmd += ['vrf', 'vtr', 'vrs', 'vtgstv', 'vsvn', 'vtrim',
+'vsvp', 'vth1', 'vth2', 'vth3', 'vshaper', 'vshaperneg', 'rxb_rb',
+'rxb_lb', 'vref_prech', 'vref_rstore', 'vref_cds',
+'vpreamp', 'vref_comp', 'vref_comp_fe vref_ds', 'vref_h_adc', 
+'vref_l_adc', 'iodelay', 'list', 'vref_ds', 'vis', 'vpl', 
+'vref_comp_fe', 'vph', 'vout_cm', 'vcp', 'vcn', 'vcmp_ll', 'vcmp_lr'
+, 'vcmp_rl', 'vcmp_rr', 'daclist', 'dacvalues', 'vcal', 'vcas']
+
+missing = []
+for c in cmd:
+    if c not in pycmd:
+        print(c)
+        missing.append(c)
+
+print(f'Missing: {len(missing)} commands')

python/scripts/generate_enums.py

@@ -0,0 +1,77 @@
+"""
+Code generator for enum bindings in the Python extension. 
+Reads the sls_detector_defs.h and enums_in.cpp then outputs 
+enums.cpp
+
+"""
+
+
+import re
+import subprocess
+
+from parse import remove_comments
+
+def single_line_enum(line):
+    sub = line[line.find('{')+1:line.find('}')]
+    return sub.strip().split(',')
+
+def extract_enums(lines):
+    line_iter = iter(lines)
+    enums = {}
+    for line in line_iter:
+        m = re.search("(?<=enum )\w+(?= {)", line)
+        if m:
+            enum_name = m.group()
+            print(enum_name)
+            # print(line)
+            fields = []
+
+            #deal with single line enums
+            if '};' in line:
+                fields = single_line_enum(line)
+            else:
+                #deal with multi line enums
+                while True:
+                    l  = next(line_iter)
+                    if '};' in l:
+                        break
+                    m = re.search("\w+", l)
+                    try:
+                        # print('\t', m.group())
+                        fields.append(m.group())
+
+                    except:
+                        pass
+            fields = [f.strip() for f in fields]
+            enums[enum_name] = fields
+    return enums
+
+def generate_enum_string(enums):
+    data = []
+    for key, value in enums.items():
+        data.append(f'py::enum_<slsDetectorDefs::{key}>(Defs, "{key}")\n')
+        for v in value:
+            data.append(f'\t.value("{v}", slsDetectorDefs::{key}::{v})\n')
+        data.append('.export_values();\n\n')
+    return ''.join(data)
+
+with open('../../slsSupportLib/include/sls_detector_defs.h') as f:
+    data = f.read()
+
+data = remove_comments(data)
+data = data.splitlines()
+enums = extract_enums(data)
+s = generate_enum_string(enums)
+
+with open('../src/enums_in.cpp') as f:
+    data = f.read()
+
+text = data.replace('[[ENUMS]]', s)
+warning = '/* WARINING This file is auto generated any edits might be overwritten without warning */\n\n'
+with open('../src/enums.cpp', 'w') as f:
+    f.write(warning)
+    f.write(text)
+
+
+# run clang format on the output
+subprocess.run(['clang-format', '../src/enums.cpp', '-i'])

python/scripts/generate_functions.py

@@ -0,0 +1,123 @@
+"""
+This file is used to auto generate Python bindings for the 
+sls::Detector class. The tool needs the libclang bindings
+to be installed. 
+
+When the Detector API is updated this file should be run
+manually
+"""
+from clang import cindex
+import subprocess
+import argparse
+
+
+from parse import system_include_paths
+
+default_build_path = "/home/l_frojdh/sls/build/"
+fpath = "../../slsDetectorSoftware/src/Detector.cpp"
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    "-p",
+    "--build_path",
+    help="Path to the build database",
+    type=str,
+    default=default_build_path,
+)
+cargs = parser.parse_args()
+
+db = cindex.CompilationDatabase.fromDirectory(cargs.build_path)
+index = cindex.Index.create()
+args = db.getCompileCommands(fpath)
+args = list(iter(args).__next__().arguments)[0:-1]
+args = args + "-x c++ --std=c++11".split()
+syspath = system_include_paths("clang++")
+incargs = ["-I" + inc for inc in syspath]
+args = args + incargs
+
+
+tu = index.parse(fpath, args=args)
+
+
+m = []
+ag = []
+
+lines = []
+
+ag2 = []
+
+cn = []
+
+def get_arguments(node):
+    args = [a.type.spelling for a in node.get_arguments()]
+    args = [
+        "py::arg() = Positions{}" if item == "sls::Positions" else "py::arg()"
+        for item in args
+    ]
+    args = ", ".join(args)
+    if args:
+        args = f", {args}"
+    return args
+
+
+def get_fdec(node):
+    args = [a.type.spelling for a in node.get_arguments()]
+    if node.result_type.spelling:
+        return_type = node.result_type.spelling
+    else:
+        return_type = 'void'
+    
+    if node.is_const_method():
+        const = 'const'
+    else:
+        const = ''
+    args = ", ".join(args)
+    args = f'({return_type}(Detector::*)({args}){const})'
+    return args
+
+
+def visit(node):
+    if node.kind == cindex.CursorKind.CLASS_DECL:
+        if node.displayname == "Detector":
+            for child in node.get_children():
+                if (
+                    child.kind == cindex.CursorKind.CXX_METHOD
+                    and child.access_specifier == cindex.AccessSpecifier.PUBLIC
+                ):
+                    m.append(child)
+                    args = get_arguments(child)
+                    fs = get_fdec(child)
+                    lines.append(
+                        f'.def("{child.spelling}",{fs} &Detector::{child.spelling}{args})'
+                    )
+                    cn.append(child)
+    for child in node.get_children():
+        visit(child)
+
+        # .def("setRxHostname",
+        #      (void (Detector::*)(const std::string &, Positions)) &
+        #          Detector::setRxHostname,
+        #      py::arg(), py::arg() = Positions{})
+        # .def("setRxHostname",
+        #      (void (Detector::*)(const std::vector<std::string> &)) &
+        #          Detector::setRxHostname,
+        #      py::arg())
+
+
+visit(tu.cursor)
+
+
+with open("../src/detector_in.cpp") as f:
+    data = f.read()
+s = "".join(lines)
+s += ";"
+text = data.replace("[[FUNCTIONS]]", s)
+warning = "/* WARINING This file is auto generated any edits might be overwritten without warning */\n\n"
+with open("../src/detector.cpp", "w") as f:
+    f.write(warning)
+    f.write(text)
+
+# run clang format on the output
+subprocess.run(["clang-format", "../src/detector.cpp", "-i"])
+

python/scripts/list_tested_cmd.py

@@ -0,0 +1,61 @@
+"""
+Utility to find and list which command line functions have tests and
+where the tests are located
+"""
+#local import for for parsing c++
+import parse
+
+#General python stuff
+import os
+import locale
+import argparse
+import subprocess
+from pathlib import Path
+
+#Realative path from this dir
+path  = Path('../../slsDetectorSoftware/tests/')
+parser = argparse.ArgumentParser()
+parser.add_argument("-s", "--startswith", help="for filter", type = str, default=None)
+args = parser.parse_args()
+
+files = [f for f in os.listdir(path) if 'CmdProxy' in f]
+tested = []
+for fname in files:
+    with open(path/fname) as f:
+        data = f.read()
+    data = parse.remove_comments(data)
+    data = data.splitlines()
+    for line in data:
+        if 'TEST_CASE' in line or 'SECTION' in line:
+            cmd = line.split("\"")[1]
+            tested.append([cmd, fname])
+
+out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.getpreferredencoding())
+all_cmd = out.stdout.splitlines()
+all_cmd.pop(0)
+
+
+
+if args.startswith is not None:
+    all_cmd = [cmd for cmd in all_cmd if cmd.startswith(args.startswith)]
+    tested = [cmd for cmd in tested if cmd[0].startswith(args.startswith)]
+
+tn = [cmd[0] for cmd in tested]
+
+not_tested = [cmd for cmd in all_cmd if cmd not in tn]
+misnamed = [cmd for cmd in tn if cmd not in all_cmd]
+tested = [cmd for cmd in tested if cmd[0] in all_cmd]
+
+
+print("\nThe following commands are tested:")
+for cmd in tested:
+    print(f'{cmd[0]:>18} : {cmd[1]}')
+
+print("\nThe following commands are NOT tested:")
+for cmd in not_tested:
+    print(cmd)
+
+print(f"\nThe following {len(misnamed)} tests does not match commands and might be misnamed:")
+for cmd in misnamed:
+    print(cmd)
+print(f'\nTests cover {len(tested)} of {len(all_cmd)} commands')