Split slsReceiver into slsListener and slsReceiver

2025-06-14 13:57:13 +02:00 · 2019-03-25 17:52:30 +01:00
1170 changed files with 755686 additions and 139990 deletions
--- a/.clang-format
+++ b/.clang-format
@ -2,6 +2,5 @@ BasedOnStyle: LLVM
 IndentWidth: 4

 UseTab: Never
-ColumnLimit: 80
-AlignConsecutiveAssignments: false 
-AlignConsecutiveMacros: true
+ColumnLimit: 100
+AlignConsecutiveAssignments: false 
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,34 +1,7 @@
 ---
-Checks:          '*, 
-                    -android-cloexec-fopen,
-                    -cppcoreguidelines-pro-bounds-array-to-pointer-decay, 
-                    -cppcoreguidelines-pro-bounds-pointer-arithmetic, 
-                    -fuchsia*,
-                    -readability-else-after-return,
-                    -readability-avoid-const-params-in-decls,
-                    -cppcoreguidelines-pro-bounds-constant-array-index,
-                    -cppcoreguidelines-pro-type-reinterpret-cast,
-                    -llvm-header-guard,
-                    -readability-static-accessed-through-instance,
-                    -readability-braces-around-statements,
-                    -hicpp-signed-bitwise,
-                    -hicpp-no-array-decay, 
-                    -hicpp-braces-around-statements,
-                    -google-runtime-references, 
-                    -google-readability-todo, 
-                    -google-readability-braces-around-statements,
-                    -modernize-use-trailing-return-type,
-                    -readability-isolate-declaration'
-
-HeaderFilterRegex: \.h
+Checks:          '*, -google-runtime-references, -hicpp-no-array-decay, -cppcoreguidelines-pro-bounds-array-to-pointer-decay, -cppcoreguidelines-pro-bounds-pointer-arithmetic, -fuchsia*,-readability-else-after-return,-readability-avoid-const-params-in-decls,-hicpp-signed-bitwise,-cppcoreguidelines-pro-bounds-constant-array-index,-llvm-header-guard,-readability-static-accessed-through-instance,-google-readability-todo'
+WarningsAsErrors: '*'
+HeaderFilterRegex: '.*'
 AnalyzeTemporaryDtors: false
 FormatStyle:     none
-CheckOptions:
-  - { key: readability-identifier-naming.NamespaceCase,       value: lower_case }
- # - { key: readability-identifier-naming.FunctionCase,        value: lower_case }
-  - { key: readability-identifier-naming.ClassCase,           value: CamelCase  }
- # - { key: readability-identifier-naming.MethodCase,          value: CamelCase  }
- # - { key: readability-identifier-naming.StructCase,          value: CamelCase  }
- # - { key: readability-identifier-naming.VariableCase,        value: lower_case }
-  - { key: readability-identifier-naming.GlobalConstantCase,  value: UPPER_CASE }
 ...
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,42 +0,0 @@
---
-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
---
-<!-- Preview changes before submitting -->
-<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
-<!-- This is a comment, the syntax is a bit different from c++ or bash -->
-
-##### *Distribution: 
-<!-- RHEL7, RHEL6, Fedora, etc -->
-
-
-##### *Detector type: 
-<!-- If applicable, Eiger, Jungfrau, Mythen3, Gotthard2, Gotthard, Moench, ChipTestBoard -->
-
-##### *Software Package Version: 
-<!-- developer, 4.2.0, 4.1.1, etc -->
-
-##### 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. -->
--- a/.github/ISSUE_TEMPLATE/change_request.md
+++ b/.github/ISSUE_TEMPLATE/change_request.md
@ -1,28 +0,0 @@
---
-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
---
-<!-- Preview changes before submitting -->
-<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
-<!-- This is a comment, the syntax is a bit different from c++ or bash -->
-
-##### *Detector type: 
-<!-- If applicable, Eiger, Jungfrau, Mythen3, Gotthard2, Gotthard, Moench, ChipTestBoard -->
-
-##### *Software Package Version: 
-<!-- developer, 4.2.0, 4.1.1, etc -->
-
-##### 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 -->
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +0,0 @@
-blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,34 +0,0 @@
---
-name: Feature Request
-about: Suggest a feature, documentation or submit a question
-title: New Feature Request
-labels: action - Enhancement, priority - Unclassified, status - Pending
-template: feature_request.md
---
-<!-- Preview changes before submitting -->
-<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
-<!-- This is a comment, the syntax is a bit different from c++ or bash -->
-
-##### *Detector type: 
-<!-- If applicable, Eiger, Jungfrau, Mythen3, Gotthard2, Gotthard, Moench, ChipTestBoard -->
-
-##### *Software Package Version: 
-<!-- developer, 4.2.0, 4.1.1, etc -->
-
-##### 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 -->
--- a/.gitignore
+++ b/.gitignore
@ -7,15 +7,9 @@ bin/
 *.out
 *.toc
 *.o
-*.so
-.*
 build
+docs/
 RELEASE.txt
-Testing/
-
-ctbDict.cpp
-ctbDict.h
-


 *.pyc
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
 [submodule "python/pybind11"]
-	path = libs/pybind11
+	path = python/pybind11
 	url = https://github.com/pybind/pybind11.git
--- a/.travis.yml
+++ b/.travis.yml
@ -4,35 +4,45 @@ language: cpp

 os: linux

-dist: bionic
+env: 
+  matrix: 
+     - CONDA_PY=3.6
+     - CONDA_PY=3.7
+
+
+dist: trusty

 install:
  - sudo apt-get update
  - ldd --version
  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
  - bash miniconda.sh -b -p $HOME/miniconda
-  - source "$HOME/miniconda/etc/profile.d/conda.sh"
+  - export PATH="$HOME/miniconda/bin:$PATH"
  - rm -f miniconda.sh
  - hash -r
  - conda config --set always_yes yes --set changeps1 no
  - conda config --add channels conda-forge
  - conda config --add channels slsdetectorgroup
-  - conda update -q conda
-  - conda info -a
+  - conda update conda
+  - conda update --all
+  - conda install conda-build anaconda-client

  # Useful for debugging any issues with conda
-  - conda create -q -n testenv conda-build anaconda-client conda-verify
-  - conda activate testenv
+  - conda info -a
+
+
+  # Replace dep1 dep2 ... with your dependencies
+  - conda create -q -n test-environment python=$CONDA_PY
+  - source activate test-environment
  - conda-build .

 script:
- - CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
+ - echo "No test scripts to be run!"


 deploy:
  provider: script
-  script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -v --show-traceback -t $CONDA_TOKEN upload --force {} \;
+  script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
  on:
-    branch: developer
-    tags: true
+    all_branches: true

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 2.8)
+# cmake_minimum_required(VERSION 3.5)
 project(slsDetectorPackage)
-set(PROJECT_VERSION 5.1.0)
-include(CheckIPOSupported)
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
-
-cmake_policy(SET CMP0074 NEW)
 include(cmake/project_version.cmake)

 # Include additional modules that are used unconditionally
@ -32,226 +28,107 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
    set(SLS_MASTER_PROJECT ON)
 endif()

+
+
 option (SLS_USE_HDF5 "HDF5 File format" OFF)
-option (SLS_USE_TEXTCLIENT "Text Client" ON)
-option (SLS_USE_RECEIVER "Receiver" ON)
+option (SLS_USE_TEXTCLIENT "Text Client" OFF)
+option (SLS_USE_RECEIVER "Receiver High Level API" OFF)
+option (SLS_USE_LISTENER "Receiver Low Level API" OFF)
 option (SLS_USE_GUI "GUI" OFF)
-option (SLS_USE_SIMULATOR "Simulator" OFF)
-option (SLS_USE_TESTS "TESTS" OFF)
-option (SLS_USE_INTEGRATION_TESTS "Integration Tests" OFF)
+option (SLS_USE_TESTS "TESTS" ON)
+option (SLS_USE_INTEGRATION_TESTS "Integration Tests" ON)
 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)
-message(STATUS "SLS_LTO_AVAILABLE:" ${SLS_LTO_AVAILABLE})
-

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "No build type selected, default to Release")
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
-endif()
-
-
-#Add two fake libraries to manage options
-add_library(slsProjectOptions INTERFACE)
-add_library(slsProjectWarnings INTERFACE)
-target_compile_features(slsProjectOptions INTERFACE cxx_std_11)
-target_compile_options(slsProjectWarnings INTERFACE 
-                                            -Wall
-                                            -Wextra
-                                            -Wno-unused-parameter #Needs to be slowly mitigated
-                                            # -Wold-style-cast
-                                            -Wnon-virtual-dtor
-                                            -Woverloaded-virtual
-                                            -Wdouble-promotion
-                                            -Wformat=2
-                                            -Wredundant-decls
-                                            # -Wconversion
-                                            -Wvla
-                                            -Wdouble-promotion
-                                            -Werror=return-type
-
-                                 )
-
-
 #Testing for minimum version for compilers
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    # clang does not support -Wno-misleading-indentation 
    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
        message(FATAL_ERROR "Clang version must be at least 3.2!")
    endif()
-    target_compile_options(slsProjectWarnings INTERFACE -Wshadow) #Clag does not warn on constructor
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
            message(FATAL_ERROR "GCC version must be at least 4.8!")
    endif()
-
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
-            target_compile_options(slsProjectWarnings INTERFACE 
-                                             -Wno-missing-field-initializers)
-    endif()
-    
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
-        target_compile_options(slsProjectWarnings INTERFACE 
-                                                -Wno-misleading-indentation # mostly in rapidjson remove using clang format
-                                                -Wduplicated-cond
-                                                -Wnull-dereference )
-
-    endif()
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
-        target_compile_options(slsProjectWarnings INTERFACE 
-                                                -Wno-class-memaccess )
-
-    endif()
+    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation -Wno-stringop-truncation -Wno-class-memaccess")
 endif()

+# Suppressed warnings in GCC
+# -Wno-stringop-truncation happens when we do sls::strcpy_safe truncates string instead of overwrite buffer
+# -Wno-class-memaccess - on memcpy in rapidjson should be investigated upgrade implementation?
+# -Wno-misleading-indentation - until clang format
+
+#set (CMAKE_CXX_STANDARD 11)
+#set (CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ")

 if(SLS_USE_SANITIZER)
-    target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined -fno-omit-frame-pointer)
-    target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
-    # target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
-    # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefined")
+    set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefiend")
 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
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libs/rapidjson>  
-)
-
-# Install fake the libraries
-install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
-    EXPORT "${TARGETS_EXPORT_NAME}"
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_INSTALL_RPATH $ORIGIN)
-# set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-
-set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
-#Adapted from: https://github.com/zeromq/cppzmq/
-if (NOT TARGET libzmq)
-    if(ZeroMQ_HINT)
-        message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
-        find_package(ZeroMQ 4 
-            NO_DEFAULT_PATH
-            HINTS ${ZeroMQ_DIR}
-        )
-    else()
-        find_package(ZeroMQ 4 QUIET)
-    endif()
-    
-
-
-  # libzmq autotools install: fallback to pkg-config
-  if(NOT ZeroMQ_FOUND)
-    message(STATUS "CMake libzmq package not found, trying again with pkg-config (normal install of zeromq)")
-    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
-    find_package(ZeroMQ 4 REQUIRED)
-  endif()
-
-  # TODO "REQUIRED" above should already cause a fatal failure if not found, but this doesn't seem to work
-  if(NOT ZeroMQ_FOUND)
-    message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config")
-  endif()
-
-  if (ZeroMQ_FOUND AND NOT TARGET libzmq)
-    message(FATAL_ERROR "ZeroMQ version not supported!")
-  endif()
-endif()
-
-if (SLS_USE_TESTS)
-    enable_testing()
-    add_subdirectory(tests)
-endif(SLS_USE_TESTS)
+set(CMAKE_INSTALL_RPATH "$ORIGIN")
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)



+find_package(Doxygen)
+find_package(ZeroMQ 4 REQUIRED)

-# Common functionallity to detector and receiver
+
+# Support library containing functionallity common to 
+# detector and receiver
 add_subdirectory(slsSupportLib)

 if (SLS_USE_TEXTCLIENT)
    add_subdirectory(slsDetectorSoftware)
 endif (SLS_USE_TEXTCLIENT)

+# This logic could be moved in slsReceiverSoftware/CMakeLists.txt
 if (SLS_USE_RECEIVER)
-    add_subdirectory(slsReceiverSoftware) 
+    set(SLS_USE_LISTENER ON)
+    if (SLS_USE_HDF5)
+        find_package(HDF5 1.10 COMPONENTS CXX REQUIRED)
+    endif (SLS_USE_HDF5)
+    add_subdirectory(slsReceiverSoftware/slsReceiver)
+    add_subdirectory(manual/manual-api)    
 endif (SLS_USE_RECEIVER)

+if (SLS_USE_LISTENER)
+    add_subdirectory(slsReceiverSoftware/slsListener)
+endif (SLS_USE_LISTENER)
+
 if (SLS_USE_GUI)   
-    add_subdirectory(slsDetectorGui)
+    find_package(Qt4 REQUIRED)
+    find_package(Qwt 6 REQUIRED)
+    if (QT4_FOUND AND QWT_FOUND)
+        add_subdirectory(slsDetectorGui)
+    endif()
 endif (SLS_USE_GUI)

-if (SLS_USE_SIMULATOR)
-    add_subdirectory(slsDetectorServers)
-endif (SLS_USE_SIMULATOR)
+if (SLS_USE_TESTS)
+    enable_testing()
+endif(SLS_USE_TESTS)

 if (SLS_USE_INTEGRATION_TESTS)
    add_subdirectory(integrationTests)
 endif (SLS_USE_INTEGRATION_TESTS)

 if (SLS_USE_PYTHON)
-    find_package (Python 3.6 COMPONENTS Interpreter Development)
-    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)
-
-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 "share/cmake/${PROJECT_NAME}")
+    set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/sls)
    # Set the list of exported targets
-    set(PROJECT_LIBRARIES slsSupportShared slsDetectorShared slsReceiverShared)
+    set(PROJECT_LIBRARIES slsSupportLib slsDetectorShared slsReceiverShared)
    # Generate and install package config file and version
    include(cmake/package_config.cmake)
 endif()
+
--- a/README.md
+++ b/README.md
@ -1,92 +1,91 @@
-### Note
-
-Please do not update to any xxxx.xx.xx.dev0 tags. They are not releases, but tags for internal usage.
-Use only releases with tags such as x.x.x or x.x.x-rcx.
-
 ### Documentation
-Detailed documentation on the latest release of 5.0.0 can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html) and on the [official site](https://www.psi.ch/en/detectors/software).
+Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)

 ### Binaries
-Binaries for the slsDetectorPackage are available through conda. 
-```
-#Add conda channels
-conda config --add channels conda-forge
-conda config --add channels slsdetectorgroup
-conda config --set channel_priority strict
-
-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
-
-```
+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)

 ### Source code
-One can also obtain the source code from this repository and compile.
+One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git

 ```
-#### Dependencies 
-
-Refer [this page](https://slsdetectorgroup.github.io/devdoc/dependencies.html)  for dependencies.
+#### 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.

+* Advanced user Calibration wizards<br>
+Requirements: ROOT
+```
+    export ROOTSYS=/usr/local/root-5.34
+```

 #### Compilation 

-Compiling can be done in two ways. Either with the convenience script
-cmk.sh or directly with cmake for more control.
+Compiling can be done in two ways.

 **1. Compile using script cmk.sh**<br>

-These are mainly aimed at those not familiar with using ccmake and cmake. 
-```
-    The binaries are generated in slsDetectorPackage/build/bin directory.
+After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>

-    Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5 directory>] [-l Install directory] [-k <CMake command>] [-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
-    -k: CMake command
-    -l: Install 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
-    -m: Manuals
-    -n: Manuals without compiling doxygen (only rst)
-    -z: Moench zmq processor
-    
-    # get all options
-    ./cmk.sh -?
-
-    # new build  and compile in parallel:
-    ./cmk.sh -bj5
-```
+Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
+ * -[no option]: only make<br>
+ * -c: Clean<br>
+ * -b: Builds/Rebuilds CMake files normal mode<br>
+ * -h: Builds/Rebuilds Cmake files with HDF5 package<br>
+ * -d: HDF5 Custom Directory<br>
+ * -t: Build/Rebuilds only text client<br>
+ * -r: Build/Rebuilds only receiver<br>
+ * -g: Build/Rebuilds only gui<br>
+ * -j: Number of threads to compile through<br>
+ * -e: Debug mode
 
+Basic Option:
+./cmk.sh -b
+ 
+For only make:
+./cmk.sh
+
+For make clean;make:
+./cmk.sh -c
+
+For using hdf5 without custom dir /blabla:
+./cmk.sh -h -d /blabla
+
+For rebuilding cmake without hdf5 
+./cmk.sh -b
+
+For using multiple cores to compile faster:
+./cmk.sh -j9<br>
+
+
+For rebuilding only certain sections<br>
+./cmk.sh -tg #only text client and gui<br>
+./cmk.sh -r #only receiver<br>
+
+
 **2. Compile without script**<br>
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. This would create a debug build with address sanitizers.
+Use cmake to create out-of-source builds, by creating a build folder parallel to source directory.
 ```
-    $ mkdir build
-    $ cd build
-    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON
-    $ make -j12 #or whatever number of threads wanted
+    $ cd ..
+    $ mkdir slsDetectorPackage-build
+    $ cd slsDetectorPackage-build
+    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=OFF 
+    $ make
 ```

-To install binaries using CMake
+Use the following as an example to compile statically and using specific hdf5 folder
 ```
-    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
+    $ 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
 ```
--- a/RELEASE.txt
+++ b/RELEASE.txt
@ -1,103 +0,0 @@
-SLS Detector Package 5.X.X released on XX.XX.2021 (Minor Release)
-===================================================================
-
-This document describes the differences between X and Y releases.   
-
-
-
-    CONTENTS
-    --------
-    1.  New Features
-    2.  Resolved Issues
-    3.  Known Issues
-    4.  Firmware Requirements
-    5.  Download, Documentation & Support
-
-
-
-
-1. New Features
-===============
-
-    Setting Mythen3 gain from command line
-
-4. Firmware Requirements
-========================
-    
-
-
-5. Known Issues
-===============
-
-    No updates from 5.0.0
-
-
-
-6. Download, Documentation & Support
-====================================
-
-    Download
-    --------
-    
-    The Source Code:
-         https://github.com/slsdetectorgroup/slsDetectorPackage
-            
-    Documentation
-    -------------
-    
-    Installation:
-        https://slsdetectorgroup.github.io/devdoc/installation.html#
-        
-    Firmware Upgrade:
-        https://slsdetectorgroup.github.io/devdoc/firmware.html
-
-    Detector Server upgrade:
-        https://slsdetectorgroup.github.io/devdoc/serverupgrade.html
-
-    Detector Simulators:
-        https://slsdetectorgroup.github.io/devdoc/virtualserver.html
-
-    Consuming slsDetectorPackage:
-        https://slsdetectorgroup.github.io/devdoc/consuming.html
-        
-    API Examples:
-        https://github.com/slsdetectorgroup/api-examples
-
-    Command Line Documentation:
-        https://slsdetectorgroup.github.io/devdoc/commandline.html
-
-    Quick Start Guide:
-        https://slsdetectorgroup.github.io/devdoc/quick_start_guide.html
-        
-    C++ API Documentation:
-        https://slsdetectorgroup.github.io/devdoc/detector.html
-       
-    C++ API Example:
-        https://slsdetectorgroup.github.io/devdoc/examples.html#
-        
-    Python API Documentation:
-        https://slsdetectorgroup.github.io/devdoc/pygettingstarted.html
-
-    Python API Example:
-        https://slsdetectorgroup.github.io/devdoc/pyexamples.html
-
-    Receivers (including custom receiver):
-        https://slsdetectorgroup.github.io/devdoc/receivers.html
-        https://slsdetectorgroup.github.io/devdoc/slsreceiver.html
-
-    TroubleShooting:
-        https://slsdetectorgroup.github.io/devdoc/troubleshooting.html
-        
-    Further Documentation:
-        https://www.psi.ch/en/detectors/documentation
-        
-    Info on Releases:
-        https://www.psi.ch/en/detectors/software
-
-
-    Support
-    -------
-
-        dhanya.thattil@psi.ch
-        erik.frojdh@psi.ch
-
--- a/libs/catch/catch.hpp
+++ b/libs/catch/catch.hpp
--- a/cmake/Catch.cmake
+++ b/cmake/Catch.cmake
@ -1,175 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-Catch
-----
-
-This module defines a function to help use the Catch test framework.
-
-The :command:`catch_discover_tests` discovers tests by asking the compiled test
-executable to enumerate its tests.  This does not require CMake to be re-run
-when tests change.  However, it may not work in a cross-compiling environment,
-and setting test properties is less convenient.
-
-This command is intended to replace use of :command:`add_test` to register
-tests, and will create a separate CTest test for each Catch test case.  Note
-that this is in some cases less efficient, as common set-up and tear-down logic
-cannot be shared by multiple test cases executing in the same instance.
-However, it provides more fine-grained pass/fail information to CTest, which is
-usually considered as more beneficial.  By default, the CTest test name is the
-same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
-
-.. command:: catch_discover_tests
-
-  Automatically add tests with CTest by querying the compiled test executable
-  for available tests::
-
-    catch_discover_tests(target
-                         [TEST_SPEC arg1...]
-                         [EXTRA_ARGS arg1...]
-                         [WORKING_DIRECTORY dir]
-                         [TEST_PREFIX prefix]
-                         [TEST_SUFFIX suffix]
-                         [PROPERTIES name1 value1...]
-                         [TEST_LIST var]
-    )
-
-  ``catch_discover_tests`` sets up a post-build command on the test executable
-  that generates the list of tests by parsing the output from running the test
-  with the ``--list-test-names-only`` argument.  This ensures that the full
-  list of tests is obtained.  Since test discovery occurs at build time, it is
-  not necessary to re-run CMake when the list of tests changes.
-  However, it requires that :prop_tgt:`CROSSCOMPILING_EMULATOR` is properly set
-  in order to function in a cross-compiling environment.
-
-  Additionally, setting properties on tests is somewhat less convenient, since
-  the tests are not available at CMake time.  Additional test properties may be
-  assigned to the set of tests as a whole using the ``PROPERTIES`` option.  If
-  more fine-grained test control is needed, custom content may be provided
-  through an external CTest script using the :prop_dir:`TEST_INCLUDE_FILES`
-  directory property.  The set of discovered tests is made accessible to such a
-  script via the ``<target>_TESTS`` variable.
-
-  The options are:
-
-  ``target``
-    Specifies the Catch executable, which must be a known CMake executable
-    target.  CMake will substitute the location of the built executable when
-    running the test.
-
-  ``TEST_SPEC arg1...``
-    Specifies test cases, wildcarded test cases, tags and tag expressions to
-    pass to the Catch executable with the ``--list-test-names-only`` argument.
-
-  ``EXTRA_ARGS arg1...``
-    Any extra arguments to pass on the command line to each test case.
-
-  ``WORKING_DIRECTORY dir``
-    Specifies the directory in which to run the discovered test cases.  If this
-    option is not provided, the current binary directory is used.
-
-  ``TEST_PREFIX prefix``
-    Specifies a ``prefix`` to be prepended to the name of each discovered test
-    case.  This can be useful when the same test executable is being used in
-    multiple calls to ``catch_discover_tests()`` but with different
-    ``TEST_SPEC`` or ``EXTRA_ARGS``.
-
-  ``TEST_SUFFIX suffix``
-    Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of
-    every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
-    be specified.
-
-  ``PROPERTIES name1 value1...``
-    Specifies additional properties to be set on all tests discovered by this
-    invocation of ``catch_discover_tests``.
-
-  ``TEST_LIST var``
-    Make the list of tests available in the variable ``var``, rather than the
-    default ``<target>_TESTS``.  This can be useful when the same test
-    executable is being used in multiple calls to ``catch_discover_tests()``.
-    Note that this variable is only available in CTest.
-
-#]=======================================================================]
-
-#------------------------------------------------------------------------------
-function(catch_discover_tests TARGET)
-  cmake_parse_arguments(
-    ""
-    ""
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST"
-    "TEST_SPEC;EXTRA_ARGS;PROPERTIES"
-    ${ARGN}
-  )
-
-  if(NOT _WORKING_DIRECTORY)
-    set(_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endif()
-  if(NOT _TEST_LIST)
-    set(_TEST_LIST ${TARGET}_TESTS)
-  endif()
-
-  ## Generate a unique name based on the extra arguments
-  string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS}")
-  string(SUBSTRING ${args_hash} 0 7 args_hash)
-
-  # Define rule to generate test list for aforementioned test executable
-  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
-  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
-  get_property(crosscompiling_emulator
-    TARGET ${TARGET}
-    PROPERTY CROSSCOMPILING_EMULATOR
-  )
-  add_custom_command(
-    TARGET ${TARGET} POST_BUILD
-    BYPRODUCTS "${ctest_tests_file}"
-    COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_TARGET=${TARGET}"
-            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-            -D "TEST_SPEC=${_TEST_SPEC}"
-            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-            -D "TEST_PROPERTIES=${_PROPERTIES}"
-            -D "TEST_PREFIX=${_TEST_PREFIX}"
-            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-            -D "TEST_LIST=${_TEST_LIST}"
-            -D "CTEST_FILE=${ctest_tests_file}"
-            -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
-    VERBATIM
-  )
-
-  file(WRITE "${ctest_include_file}"
-    "if(EXISTS \"${ctest_tests_file}\")\n"
-    "  include(\"${ctest_tests_file}\")\n"
-    "else()\n"
-    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
-    "endif()\n"
-  )
-
-  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") 
-    # Add discovered tests to directory TEST_INCLUDE_FILES
-    set_property(DIRECTORY
-      APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
-    )
-  else()
-    # Add discovered tests as directory TEST_INCLUDE_FILE if possible
-    get_property(test_include_file_set DIRECTORY PROPERTY TEST_INCLUDE_FILE SET)
-    if (NOT ${test_include_file_set})
-      set_property(DIRECTORY
-        PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
-      )
-    else()
-      message(FATAL_ERROR
-        "Cannot set more than one TEST_INCLUDE_FILE"
-      )
-    endif()
-  endif()
-
-endfunction()
-
-###############################################################################
-
-set(_CATCH_DISCOVER_TESTS_SCRIPT
-  ${CMAKE_CURRENT_LIST_DIR}/CatchAddTests.cmake
-)
--- a/cmake/CatchAddTests.cmake
+++ b/cmake/CatchAddTests.cmake
@ -1,78 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-set(prefix "${TEST_PREFIX}")
-set(suffix "${TEST_SUFFIX}")
-set(spec ${TEST_SPEC})
-set(extra_args ${TEST_EXTRA_ARGS})
-set(properties ${TEST_PROPERTIES})
-set(script)
-set(suite)
-set(tests)
-
-function(add_command NAME)
-  set(_args "")
-  foreach(_arg ${ARGN})
-    if(_arg MATCHES "[^-./:a-zA-Z0-9_]")
-      set(_args "${_args} [==[${_arg}]==]") # form a bracket_argument
-    else()
-      set(_args "${_args} ${_arg}")
-    endif()
-  endforeach()
-  set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
-endfunction()
-
-# Run test executable to get list of available tests
-if(NOT EXISTS "${TEST_EXECUTABLE}")
-  message(FATAL_ERROR
-    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
-  )
-endif()
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-test-names-only
-  OUTPUT_VARIABLE output
-  RESULT_VARIABLE result
-)
-# Catch --list-test-names-only reports the number of tests, so 0 is... surprising
-if(${result} EQUAL 0)
-  message(WARNING
-    "Test executable '${TEST_EXECUTABLE}' contains no tests!\n"
-  )
-elseif(${result} LESS 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${result}\n"
-    "  Output: ${output}\n"
-  )
-endif()
-
-string(REPLACE "\n" ";" output "${output}")
-
-# Parse output
-foreach(line ${output})
-  set(test ${line})
-  # use escape commas to handle properly test cases with commans inside the name
-  string(REPLACE "," "\\," test_name ${test})
-  # ...and add to script
-  add_command(add_test
-    "${prefix}${test}${suffix}"
-    ${TEST_EXECUTOR}
-    "${TEST_EXECUTABLE}"
-    "${test_name}"
-    ${extra_args}
-  )
-  add_command(set_tests_properties
-    "${prefix}${test}${suffix}"
-    PROPERTIES
-    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-    ${properties}
-  )
-  list(APPEND tests "${prefix}${test}${suffix}")
-endforeach()
-
-# Create a list of all discovered tests, which users may use to e.g. set
-# properties on the tests
-add_command(set ${TEST_LIST} ${tests})
-
-# Write CTest script
-file(WRITE "${CTEST_FILE}" "${script}")
--- a/cmake/FindCBF.cmake
+++ b/cmake/FindCBF.cmake
--- a/cmake/FindClangFormat.cmake
+++ b/cmake/FindClangFormat.cmake
@ -1,39 +0,0 @@
-# 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()
--- a/cmake/FindQwt.cmake
+++ b/cmake/FindQwt.cmake
--- a/cmake/FindROOT.cmake
+++ b/cmake/FindROOT.cmake
--- a/cmake/FindSphinx.cmake
+++ b/cmake/FindSphinx.cmake
@ -1,11 +0,0 @@
-#Look for an executable called sphinx-build
-find_program(SPHINX_EXECUTABLE
-             NAMES sphinx-build sphinx-build-3.6
-             DOC "Path to sphinx-build executable")
- 
-include(FindPackageHandleStandardArgs)
- 
-#Handle standard arguments to find_package like REQUIRED and QUIET
-find_package_handle_standard_args(Sphinx
-                                  "Failed to find sphinx-build executable"
-                                  SPHINX_EXECUTABLE)
--- a/cmake/FindZeroMQ.cmake
+++ b/cmake/FindZeroMQ.cmake
@ -0,0 +1,112 @@
+
+# This file is originally from https://github.com/zeromq/azmq and distributed 
+# under Boost Software Lincese 1.0
+# Boost Software License - Version 1.0 - August 17th, 2003
+
+# Permission is hereby granted, free of charge, to any person or organization
+# obtaining a copy of the software and accompanying documentation covered by
+# this license (the "Software") to use, reproduce, display, distribute,
+# execute, and transmit the Software, and to prepare derivative works of the
+# Software, and to permit third-parties to whom the Software is furnished to
+# do so, all subject to the following:
+
+# The copyright notices in the Software and this entire statement, including
+# the above license grant, this restriction and the following disclaimer,
+# must be included in all copies of the Software, in whole or in part, and
+# all derivative works of the Software, unless such copies or derivative
+# works are solely in the form of machine-executable object code generated by
+# a source language processor.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+# --------------------------------------------------------------------------------
+
+# Find ZeroMQ Headers/Libs
+
+# Variables
+# ZMQ_ROOT - set this to a location where ZeroMQ may be found
+#
+# ZeroMQ_FOUND - True of ZeroMQ found
+# ZeroMQ_INCLUDE_DIRS - Location of ZeroMQ includes
+# ZeroMQ_LIBRARIES - ZeroMQ libraries
+
+include(FindPackageHandleStandardArgs)
+
+if (NOT ZMQ_ROOT)
+    set(ZMQ_ROOT "$ENV{ZMQ_ROOT}")
+endif()
+
+if (NOT ZMQ_ROOT)
+    find_path(_ZeroMQ_ROOT NAMES include/zmq.h)
+else()
+    set(_ZeroMQ_ROOT "${ZMQ_ROOT}")
+endif()
+
+find_path(ZeroMQ_INCLUDE_DIRS NAMES zmq.h HINTS ${_ZeroMQ_ROOT}/include)
+
+if (ZeroMQ_INCLUDE_DIRS)
+    set(_ZeroMQ_H ${ZeroMQ_INCLUDE_DIRS}/zmq.h)
+
+    function(_zmqver_EXTRACT _ZeroMQ_VER_COMPONENT _ZeroMQ_VER_OUTPUT)
+        set(CMAKE_MATCH_1 "0")
+        set(_ZeroMQ_expr "^[ \\t]*#define[ \\t]+${_ZeroMQ_VER_COMPONENT}[ \\t]+([0-9]+)$")
+        file(STRINGS "${_ZeroMQ_H}" _ZeroMQ_ver REGEX "${_ZeroMQ_expr}")
+        string(REGEX MATCH "${_ZeroMQ_expr}" ZeroMQ_ver "${_ZeroMQ_ver}")
+        set(${_ZeroMQ_VER_OUTPUT} "${CMAKE_MATCH_1}" PARENT_SCOPE)
+    endfunction()
+
+    _zmqver_EXTRACT("ZMQ_VERSION_MAJOR" ZeroMQ_VERSION_MAJOR)
+    _zmqver_EXTRACT("ZMQ_VERSION_MINOR" ZeroMQ_VERSION_MINOR)
+    _zmqver_EXTRACT("ZMQ_VERSION_PATCH" ZeroMQ_VERSION_PATCH)
+
+    message(STATUS "ZeroMQ version: ${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}.${ZeroMQ_VERSION_PATCH}")
+
+    # We should provide version to find_package_handle_standard_args in the same format as it was requested,
+    # otherwise it can't check whether version matches exactly.
+    if (ZeroMQ_FIND_VERSION_COUNT GREATER 2)
+        set(ZeroMQ_VERSION "${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}.${ZeroMQ_VERSION_PATCH}")
+    else()
+        # User has requested ZeroMQ version without patch part => user is not interested in specific patch =>
+        # any patch should be an exact match.
+        set(ZeroMQ_VERSION "${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}")
+    endif()
+
+    if (NOT ${CMAKE_CXX_PLATFORM_ID} STREQUAL "Windows")
+        find_library(ZeroMQ_LIBRARIES NAMES zmq HINTS ${_ZeroMQ_ROOT}/lib)
+    else()
+        find_library(
+            ZeroMQ_LIBRARY_RELEASE
+            NAMES
+                libzmq
+                "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ZeroMQ_VERSION_MAJOR}_${ZeroMQ_VERSION_MINOR}_${ZeroMQ_VERSION_PATCH}"
+            HINTS
+                ${_ZeroMQ_ROOT}/lib
+            )
+
+        find_library(
+            ZeroMQ_LIBRARY_DEBUG
+            NAMES
+                libzmq_d
+                "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-gd-${ZeroMQ_VERSION_MAJOR}_${ZeroMQ_VERSION_MINOR}_${ZeroMQ_VERSION_PATCH}"
+            HINTS
+                ${_ZeroMQ_ROOT}/lib)
+
+        # On Windows we have to use corresponding version (i.e. Release or Debug) of ZeroMQ because of `errno` CRT global variable
+        # See more at http://www.drdobbs.com/avoiding-the-visual-c-runtime-library/184416623
+        set(ZeroMQ_LIBRARIES optimized "${ZeroMQ_LIBRARY_RELEASE}" debug "${ZeroMQ_LIBRARY_DEBUG}")
+    endif()
+endif()
+
+find_package_handle_standard_args(ZeroMQ FOUND_VAR ZeroMQ_FOUND
+    REQUIRED_VARS ZeroMQ_INCLUDE_DIRS ZeroMQ_LIBRARIES
+    VERSION_VAR ZeroMQ_VERSION)
+
+if (ZeroMQ_FOUND)
+    mark_as_advanced(ZeroMQ_INCLUDE_DIRS ZeroMQ_LIBRARIES ZeroMQ_VERSION
+        ZeroMQ_VERSION_MAJOR ZeroMQ_VERSION_MINOR ZeroMQ_VERSION_PATCH)
+endif()
--- a/cmake/ParseAndAddCatchTests.cmake
+++ b/cmake/ParseAndAddCatchTests.cmake
@ -1,203 +0,0 @@
-#==================================================================================================#
-#  supported macros                                                                                #
-#    - TEST_CASE,                                                                                  #
-#    - SCENARIO,                                                                                   #
-#    - TEST_CASE_METHOD,                                                                           #
-#    - CATCH_TEST_CASE,                                                                            #
-#    - CATCH_SCENARIO,                                                                             #
-#    - CATCH_TEST_CASE_METHOD.                                                                     #
-#                                                                                                  #
-#  Usage                                                                                           #
-# 1. make sure this module is in the path or add this otherwise:                                   #
-#    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake.modules/")              #
-# 2. make sure that you've enabled testing option for the project by the call:                     #
-#    enable_testing()                                                                              #
-# 3. add the lines to the script for testing target (sample CMakeLists.txt):                       #
-#        project(testing_target)                                                                   #
-#        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake.modules/")          #
-#        enable_testing()                                                                          #
-#                                                                                                  #
-#        find_path(CATCH_INCLUDE_DIR "catch.hpp")                                                  #
-#        include_directories(${INCLUDE_DIRECTORIES} ${CATCH_INCLUDE_DIR})                          #
-#                                                                                                  #
-#        file(GLOB SOURCE_FILES "*.cpp")                                                           #
-#        add_executable(${PROJECT_NAME} ${SOURCE_FILES})                                           #
-#                                                                                                  #
-#        include(ParseAndAddCatchTests)                                                            #
-#        ParseAndAddCatchTests(${PROJECT_NAME})                                                    #
-#                                                                                                  #
-# The following variables affect the behavior of the script:                                       #
-#                                                                                                  #
-#    PARSE_CATCH_TESTS_VERBOSE (Default OFF)                                                       #
-#    -- enables debug messages                                                                     #
-#    PARSE_CATCH_TESTS_NO_HIDDEN_TESTS (Default OFF)                                               #
-#    -- excludes tests marked with [!hide], [.] or [.foo] tags                                     #
-#    PARSE_CATCH_TESTS_ADD_FIXTURE_IN_TEST_NAME (Default ON)                                       #
-#    -- adds fixture class name to the test name                                                   #
-#    PARSE_CATCH_TESTS_ADD_TARGET_IN_TEST_NAME (Default ON)                                        #
-#    -- adds cmake target name to the test name                                                    #
-#    PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS (Default OFF)                                      #
-#    -- causes CMake to rerun when file with tests changes so that new tests will be discovered    #
-#                                                                                                  #
-# One can also set (locally) the optional variable OptionalCatchTestLauncher to precise the way    #
-# a test should be run. For instance to use test MPI, one can write                                #
-#     set(OptionalCatchTestLauncher ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${NUMPROC})                 #
-# just before calling this ParseAndAddCatchTests function                                          #
-#                                                                                                  #
-#==================================================================================================#
-
-cmake_minimum_required(VERSION 2.8.8)
-
-option(PARSE_CATCH_TESTS_VERBOSE "Print Catch to CTest parser debug messages" OFF)
-option(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS "Exclude tests with [!hide], [.] or [.foo] tags" OFF)
-option(PARSE_CATCH_TESTS_ADD_FIXTURE_IN_TEST_NAME "Add fixture class name to the test name" ON)
-option(PARSE_CATCH_TESTS_ADD_TARGET_IN_TEST_NAME "Add target name to the test name" ON)
-option(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS "Add test file to CMAKE_CONFIGURE_DEPENDS property" OFF)
-
-function(PrintDebugMessage)
-    if(PARSE_CATCH_TESTS_VERBOSE)
-            message(STATUS "ParseAndAddCatchTests: ${ARGV}")
-    endif()
-endfunction()
-
-# This removes the contents between
-#  - block comments (i.e. /* ... */)
-#  - full line comments (i.e. // ... )
-# contents have been read into '${CppCode}'.
-# !keep partial line comments
-function(RemoveComments CppCode)
-  string(ASCII 2 CMakeBeginBlockComment)
-  string(ASCII 3 CMakeEndBlockComment)
-  string(REGEX REPLACE "/\\*" "${CMakeBeginBlockComment}" ${CppCode} "${${CppCode}}")
-  string(REGEX REPLACE "\\*/" "${CMakeEndBlockComment}" ${CppCode} "${${CppCode}}")
-  string(REGEX REPLACE "${CMakeBeginBlockComment}[^${CMakeEndBlockComment}]*${CMakeEndBlockComment}" "" ${CppCode} "${${CppCode}}")
-  string(REGEX REPLACE "\n[ \t]*//+[^\n]+" "\n" ${CppCode} "${${CppCode}}")
-
-  set(${CppCode} "${${CppCode}}" PARENT_SCOPE)
-endfunction()
-
-# Worker function
-function(ParseFile SourceFile TestTarget)
-    # According to CMake docs EXISTS behavior is well-defined only for full paths.
-    get_filename_component(SourceFile ${SourceFile} ABSOLUTE)
-    if(NOT EXISTS ${SourceFile})
-        message(WARNING "Cannot find source file: ${SourceFile}")
-        return()
-    endif()
-    PrintDebugMessage("parsing ${SourceFile}")
-    file(STRINGS ${SourceFile} Contents NEWLINE_CONSUME)
-
-    # Remove block and fullline comments
-    RemoveComments(Contents)
-
-    # Find definition of test names
-    string(REGEX MATCHALL "[ \t]*(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([^\)]+\\)+[ \t\n]*{+[ \t]*(//[^\n]*[Tt][Ii][Mm][Ee][Oo][Uu][Tt][ \t]*[0-9]+)*" Tests "${Contents}")
-
-    if(PARSE_CATCH_TESTS_ADD_TO_CONFIGURE_DEPENDS AND Tests)
-      PrintDebugMessage("Adding ${SourceFile} to CMAKE_CONFIGURE_DEPENDS property")
-      set_property(
-        DIRECTORY
-        APPEND
-        PROPERTY CMAKE_CONFIGURE_DEPENDS ${SourceFile}
-      )
-    endif()
-
-    foreach(TestName ${Tests})
-        # Strip newlines
-        string(REGEX REPLACE "\\\\\n|\n" "" TestName "${TestName}")
-
-        # Get test type and fixture if applicable
-        string(REGEX MATCH "(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)[ \t]*\\([^,^\"]*" TestTypeAndFixture "${TestName}")
-        string(REGEX MATCH "(CATCH_)?(TEST_CASE_METHOD|SCENARIO|TEST_CASE)" TestType "${TestTypeAndFixture}")
-        string(REGEX REPLACE "${TestType}\\([ \t]*" "" TestFixture "${TestTypeAndFixture}")
-
-        # Get string parts of test definition
-        string(REGEX MATCHALL "\"+([^\\^\"]|\\\\\")+\"+" TestStrings "${TestName}")
-
-        # Strip wrapping quotation marks
-        string(REGEX REPLACE "^\"(.*)\"$" "\\1" TestStrings "${TestStrings}")
-        string(REPLACE "\";\"" ";" TestStrings "${TestStrings}")
-
-        # Validate that a test name and tags have been provided
-        list(LENGTH TestStrings TestStringsLength)
-        if(TestStringsLength GREATER 2 OR TestStringsLength LESS 1)
-            message(FATAL_ERROR "You must provide a valid test name and tags for all tests in ${SourceFile}")
-        endif()
-
-        # Assign name and tags
-        list(GET TestStrings 0 Name)
-        if("${TestType}" STREQUAL "SCENARIO")
-            set(Name "Scenario: ${Name}")
-        endif()
-        if(PARSE_CATCH_TESTS_ADD_FIXTURE_IN_TEST_NAME AND TestFixture)
-            set(CTestName "${TestFixture}:${Name}")
-        else()
-            set(CTestName "${Name}")
-        endif()
-        if(PARSE_CATCH_TESTS_ADD_TARGET_IN_TEST_NAME)
-            set(CTestName "${TestTarget}:${CTestName}")
-        endif()
-        # add target to labels to enable running all tests added from this target
-        set(Labels ${TestTarget})
-        if(TestStringsLength EQUAL 2)
-            list(GET TestStrings 1 Tags)
-            string(TOLOWER "${Tags}" Tags)
-            # remove target from labels if the test is hidden
-            if("${Tags}" MATCHES ".*\\[!?(hide|\\.)\\].*")
-                list(REMOVE_ITEM Labels ${TestTarget})
-            endif()
-            string(REPLACE "]" ";" Tags "${Tags}")
-            string(REPLACE "[" "" Tags "${Tags}")
-        else()
-          # unset tags variable from previous loop
-          unset(Tags)
-        endif()
-
-        list(APPEND Labels ${Tags})
-
-        list(FIND Labels "!hide" IndexOfHideLabel)
-        set(HiddenTagFound OFF)
-        foreach(label ${Labels})
-            string(REGEX MATCH "^!hide|^\\." result ${label})
-            if(result)
-                set(HiddenTagFound ON)
-                break()
-            endif(result)
-        endforeach(label)
-        if(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS AND ${HiddenTagFound} AND ${CMAKE_VERSION} VERSION_LESS "3.9")
-            PrintDebugMessage("Skipping test \"${CTestName}\" as it has [!hide], [.] or [.foo] label")
-        else()
-            PrintDebugMessage("Adding test \"${CTestName}\"")
-            if(Labels)
-                PrintDebugMessage("Setting labels to ${Labels}")
-            endif()
-
-            # Escape commas in the test spec
-            string(REPLACE "," "\\," Name ${Name})
-
-            # Add the test and set its properties
-            add_test(NAME "\"${CTestName}\"" COMMAND ${OptionalCatchTestLauncher} ${TestTarget} ${Name} ${AdditionalCatchParameters})
-            # Old CMake versions do not document VERSION_GREATER_EQUAL, so we use VERSION_GREATER with 3.8 instead
-            if(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS AND ${HiddenTagFound} AND ${CMAKE_VERSION} VERSION_GREATER "3.8")
-                PrintDebugMessage("Setting DISABLED test property")
-                set_tests_properties("\"${CTestName}\"" PROPERTIES DISABLED ON)
-            else()
-                set_tests_properties("\"${CTestName}\"" PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran"
-                                                        LABELS "${Labels}")
-            endif()
-        endif()
-
-
-    endforeach()
-endfunction()
-
-# entry point
-function(ParseAndAddCatchTests TestTarget)
-    PrintDebugMessage("Started parsing ${TestTarget}")
-    get_target_property(SourceFiles ${TestTarget} SOURCES)
-    PrintDebugMessage("Found the following sources: ${SourceFiles}")
-    foreach(SourceFile ${SourceFiles})
-        ParseFile(${SourceFile} ${TestTarget})
-    endforeach()
-    PrintDebugMessage("Finished parsing ${TestTarget}")
-endfunction()
--- a/cmake/clang-format.cmake
+++ b/cmake/clang-format.cmake
@ -1,47 +0,0 @@
-# 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}
-)
--- a/cmake/package_config.cmake
+++ b/cmake/package_config.cmake
@ -15,26 +15,17 @@ 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_DIR}
-)
-
-install(FILES
-  "${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake"
-  COMPONENT devel
-  DESTINATION ${CMAKE_INSTALL_DIR}/libzmq-pkg-config
-)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER})

 if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES)
  install(
    EXPORT "${TARGETS_EXPORT_NAME}"
    FILE ${PROJECT_NAME_LOWER}-targets.cmake
-    DESTINATION ${CMAKE_INSTALL_DIR}
-    )
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER})
 endif ()
--- a/cmake/project-config.cmake.in
+++ b/cmake/project-config.cmake.in
@ -12,21 +12,8 @@ include(CMakeFindDependencyMacro)

 set(SLS_USE_HDF5 "@SLS_USE_HDF5@")

-
-find_package(ZeroMQ 4 QUIET)
-# libzmq autotools install: fallback to pkg-config
-if(NOT ZeroMQ_FOUND)
-    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
-    find_package(ZeroMQ 4 REQUIRED)
-endif()
-
-if(NOT ZeroMQ_FOUND)
-    message(FATAL_ERROR "ZeroMQ was NOT found!")
-endif()
-
-find_dependency(Threads)
-
 # Add optional dependencies here
+find_dependency(Threads)
 if (SLS_USE_HDF5)
    find_dependency(HDF5)
 endif ()
--- a/cmake/project_version.cc.in
+++ b/cmake/project_version.cc.in
--- a/cmake/project_version.cmake
+++ b/cmake/project_version.cmake
@ -57,28 +57,28 @@ if (GIT_CMD AND NOT "${GIT_TOPLEVEL}" STREQUAL "")
            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
    #message(STATUS "GIT_DESCRIBE: " ${GIT_DESCRIBE})

-    # if (GIT_DESCRIBE)
-    #     string(REGEX REPLACE "v?([0-9.]+).*" "\\1" GIT_VERSION ${GIT_DESCRIBE})
-    #     message(STATUS "GIT_VERSION: " ${GIT_VERSION})
+    if (GIT_DESCRIBE)
+        string(REGEX REPLACE "v?([0-9.]+).*" "\\1" GIT_VERSION ${GIT_DESCRIBE})
+        message(STATUS "GIT_VERSION: " ${GIT_VERSION})

-    #     # as package version we use the full version from git describe: 1.7.1+7+ge324c81
-    #     if (GIT_DESCRIBE MATCHES ".*-g.*")
-    #         # convert a git describe string to usable debian version, e.g. v1.7.1-7-ge324c81 to 1.7.1+7+ge324c81
-    #         string(REGEX REPLACE "v?([0-9]*.[0-9.]*).*-([0-9]*)-([a-g0-9]*)" "\\1+\\2+\\3" GIT_FULL_VERSION ${GIT_DESCRIBE})
-    #     else()
-    #         # current HEAD is git tag (i.e. releaase), directly use the version
-    #         set(GIT_FULL_VERSION ${GIT_VERSION})
-    #     endif()
-    # else ()
-    #     # no (suitable) tag found
-    #     set(GIT_VERSION "0.0.0")
-    #     # get number of commits in repo
-    #     execute_process(COMMAND ${GIT_CMD} rev-list --count HEAD
-    #             WORKING_DIRECTORY ${GIT_TOPLEVEL}
-    #             OUTPUT_VARIABLE GIT_COMMIT_COUNT
-    #             OUTPUT_STRIP_TRAILING_WHITESPACE)
-    #     set(GIT_FULL_VERSION 0.0.0+${GIT_COMMIT_COUNT}+g${GIT_SHA1})
-    # endif ()
+        # as package version we use the full version from git describe: 1.7.1+7+ge324c81
+        if (GIT_DESCRIBE MATCHES ".*-g.*")
+            # convert a git describe string to usable debian version, e.g. v1.7.1-7-ge324c81 to 1.7.1+7+ge324c81
+            string(REGEX REPLACE "v?([0-9]*.[0-9.]*).*-([0-9]*)-([a-g0-9]*)" "\\1+\\2+\\3" GIT_FULL_VERSION ${GIT_DESCRIBE})
+        else()
+            # current HEAD is git tag (i.e. releaase), directly use the version
+            set(GIT_FULL_VERSION ${GIT_VERSION})
+        endif()
+    else ()
+        # no (suitable) tag found
+        set(GIT_VERSION "0.0.0")
+        # get number of commits in repo
+        execute_process(COMMAND ${GIT_CMD} rev-list --count HEAD
+                WORKING_DIRECTORY ${GIT_TOPLEVEL}
+                OUTPUT_VARIABLE GIT_COMMIT_COUNT
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+        set(GIT_FULL_VERSION 0.0.0+${GIT_COMMIT_COUNT}+g${GIT_SHA1})
+    endif ()
 endif ()

 # get version from package.xml if it exists
@ -104,10 +104,10 @@ if (NOT PROJECT_VERSION)
        set(PROJECT_VERSION "0.0.0")
    endif ()
 endif ()
-# if (NOT PACKAGE_VERSION)
-    # message(WARNING "PACKAGE_VERSION not set! Falling back to (${PROJECT_VERSION})")
+if (NOT PACKAGE_VERSION)
+    message(WARNING "PACKAGE_VERSION not set! Falling back to (${PROJECT_VERSION})")
    set(PACKAGE_VERSION ${PROJECT_VERSION})
-# endif ()
+endif ()

 # warn if versions don't match
 if (GIT_VERSION AND NOT GIT_VERSION MATCHES ${PROJECT_VERSION})
--- a/cmake/project_version.h.in
+++ b/cmake/project_version.h.in
--- a/cmk.sh
+++ b/cmk.sh
@ -1,7 +1,5 @@
 #!/bin/bash
-CMAKE="cmake3"
 BUILDDIR="build"
-INSTALLDIR=""
 HDF5DIR="/opt/hdf5v1.10.0"
 HDF5=0
 COMPILERTHREADS=0
@ -9,13 +7,6 @@ TEXTCLIENT=0
 RECEIVER=0
 GUI=0
 DEBUG=0
-PYTHON=0
-TESTS=0
-SIMULATOR=0
-CTBGUI=0
-MANUALS=0
-MANUALS_ONLY_RST=0
-MOENCHZMQ=0


 CLEAN=0
@ -24,32 +15,17 @@ CMAKE_PRE=""
 CMAKE_POST=""

 usage() { echo -e "
-Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5 directory>] [-l Install directory] [-k <CMake command>] [-j <Number of threads>]
+Usage: $0 [-c] [-b] [-h] [-d <HDF5 directory>] [-j]
 -[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
- -k: CMake command
- -l: Install 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
- -m: Manuals
- -n: Manuals without compiling doxygen (only rst)
- -z: Moench zmq processor
-
-Rebuild when you switch to a new build and compile in parallel:
-./cmk.sh -bj5
-
-Rebuild python
-./cmk.sh -p
 
 For only make:
 ./cmk.sh
@ -79,17 +55,12 @@ For rebuilding only certain sections
 
 " ; exit 1; }

-while getopts ":bpchd:k:l:j:trgeisumnz" opt ; do
+while getopts ":bchd:j:trge" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
 		REBUILD=1
 		;;
-	p)
-    	echo "Compiling Options: Python" 
-		PYTHON=1
-		REBUILD=1
-		;;   
 	c) 
 		echo "Clean Required"
 		CLEAN=1
@ -103,14 +74,6 @@ while getopts ":bpchd:k:l:j:trgeisumnz" opt ; do
 		echo "New HDF5 directory: $OPTARG" 
 		HDF5DIR=$OPTARG
 		;;
-	l)
-		echo "CMake install directory: $OPTARG"
-		INSTALLDIR="$OPTARG"
-		;;
-	k)
-		echo "CMake command: $OPTARG"
-		CMAKE="$OPTARG"
-		;;
 	j) 
 		echo "Number of compiler threads: $OPTARG" 
 		COMPILERTHREADS=$OPTARG
@ -133,69 +96,43 @@ while getopts ":bpchd:k:l:j:trgeisumnz" opt ; do
 	e)
 		echo "Compiling Options: Debug" 
 		DEBUG=1
-		;;   
-	i)
-		echo "Compiling Options: Tests" 
-		TESTS=1
-		;;   
-	s)
-		echo "Compiling Options: Simulator" 
-		SIMULATOR=1
-		;; 
-	m)	
-		echo "Compiling Manuals"
-		MANUALS=1
-		;;
-	n)	
-		echo "Compiling Manuals (Only RST)"
-		MANUALS_ONLY_RST=1
-		;;
-	z)	
-		echo "Compiling Moench Zmq Processor"
-		MOENCHZMQ=1
-		;;
-	u)
-		echo "Compiling Options: Chip Test Gui"
-		CTBGUI=1
-		;;
-  \?)
-    echo "Invalid option: -$OPTARG" 
+		;;    
+    \?)
+     	echo "Invalid option: -$OPTARG" 
 		usage
-    exit 1
-   	;;
-  :)
-    echo "Option -$OPTARG requires an argument."
+      	exit 1
+      	;;
+    :)
+      	echo "Option -$OPTARG requires an argument."
 		usage
-    exit 1
-    ;;	
+      	exit 1
+      	;;	
 	esac
 done


-#python
-if [ $PYTHON -eq 1 ]; then
-	CMAKE_POST+=" -DSLS_USE_PYTHON=ON "
-	echo "Enabling Compile Option: Python"
-fi
+
+


 if [ $TEXTCLIENT -eq 0 ] && [ $RECEIVER -eq 0 ]  && [ $GUI -eq 0 ]; then
-	#CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=ON -DSLS_USE_GUI=ON "
-	CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=ON -DSLS_USE_GUI=OFF "
-    echo "Enabling Compile Option: TextClient, Receiver and GUI"
+#       CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=ON -DSLS_USE_GUI=ON "
+		CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=ON  "
+       echo "Compile Option: TextClient, Receiver and GUI"
 else 
-    if [ $TEXTCLIENT -eq 1 ]; then
-        CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=OFF "
-        echo "Enabling Compile Option: TextClient"
-    fi
-    if [ $RECEIVER -eq 1 ]; then
-        CMAKE_POST+=" -DSLS_USE_RECEIVER=ON "
-        echo "Enabling Compile Option: Receiver"
-    fi              
-    if [ $GUI -eq 1 ]; then
-        CMAKE_POST+=" -DSLS_USE_GUI=ON "
-        echo "Enabling Compile Option: GUI"
-    fi
+       if [ $TEXTCLIENT -eq 1 ]; then
+              CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON "
+               echo "Compile Option: TextClient"
+       fi
+       if [ $RECEIVER -eq 1 ]; then
+               CMAKE_POST+=" -DSLS_USE_RECEIVER=ON "
+               echo "Compile Option: Receiver"
+       fi
+                               
+       if [ $GUI -eq 1 ]; then
+               CMAKE_POST+=" -DSLS_USE_GUI=ON "
+               echo "Compile Option: GUI"
+       fi
 fi


@ -217,46 +154,14 @@ 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 "
 	echo "Debug Option enabled"
 fi 

-#Simulator
-if [ $SIMULATOR -eq 1 ]; then
-	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+=" -DSLS_USE_TESTS=ON -DSLS_USE_INTEGRATION_TESTS=ON"
-	echo "Tests Option enabled"
-fi 
-

 #hdf5 rebuild
 if [ $HDF5 -eq 1 ]; then
-#	CMAKE_PRE+="HDF5_ROOT="$HDF5DIR
-	CMAKE_POST+=" -DCMAKE_INSTALL_PREFIX="$HDF5DIR
+	CMAKE_PRE+="HDF5_ROOT="$HDF5DIR
 	CMAKE_POST+=" -DSLS_USE_HDF5=ON "
 #normal mode rebuild
 else
@ -264,15 +169,7 @@ else
 fi


-#install
-if [ -n "$INSTALLDIR" ]; then
-	CMAKE_POST+=" -DCMAKE_INSTALL_PREFIX=$INSTALLDIR"
-	CMAKE_POST+=" -DCMAKE_FIND_ROOT_PATH=$INSTALLDIR"
-fi
-
-
 #enter build dir
-#pushd $BUILDDIR;
 cd $BUILDDIR;
 echo "in "$PWD

@ -281,7 +178,7 @@ echo "in "$PWD
 #cmake
 if [ $REBUILD -eq 1 ]; then
 	rm -f CMakeCache.txt
-	BUILDCOMMAND="$CMAKE_PRE $CMAKE $CMAKE_POST .."
+	BUILDCOMMAND="$CMAKE_PRE cmake $CMAKE_POST .."
 	echo $BUILDCOMMAND
 	eval $BUILDCOMMAND
 fi
@ -294,45 +191,15 @@ fi

 #make
 if [ $COMPILERTHREADS -gt 0 ]; then
-	if [ $MANUALS -eq 0 ] && [ $MANUALS_ONLY_RST -eq 0 ]; then
-		BUILDCOMMAND="make -j$COMPILERTHREADS"
-		echo $BUILDCOMMAND
-		eval $BUILDCOMMAND
-	else
-		if [ $MANUALS -eq 1 ]; then
-			BUILDCOMMAND="make docs -j$COMPILERTHREADS"
-			echo $BUILDCOMMAND
-			eval $BUILDCOMMAND
-		else
-			BUILDCOMMAND="make rst -j$COMPILERTHREADS"
-			echo $BUILDCOMMAND
-			eval $BUILDCOMMAND		
-		fi
-	fi 
+	BUILDCOMMAND="make -j$COMPILERTHREADS"
+	echo $BUILDCOMMAND
+	eval $BUILDCOMMAND
 else
-	if [ $MANUALS -eq 0 ] && [ $MANUALS_ONLY_RST -eq 0 ]; then
-		echo "make"
-		make
-	else
-		if [ $MANUALS -eq 1 ]; then
-			echo "make docs"
-			make docs
-		else
-			echo "make rst"
-			make rst
-		fi
-	fi 
-fi
-
-
-#install
-if [ -n "$INSTALLDIR" ]; then
-	make install
-#	popd
-#	$CMAKE --build $BUILDDIR --target install
+	make
 fi





+
--- a/conda-recepie/build.sh
+++ b/conda-recepie/build.sh
@ -1,4 +1,3 @@
-
 mkdir build
 mkdir install
 cd build
@ -7,15 +6,10 @@ cmake .. \
      -DCMAKE_INSTALL_PREFIX=install \
      -DSLS_USE_TEXTCLIENT=ON \
      -DSLS_USE_RECEIVER=ON \
-      -DSLS_USE_GUI=ON \
-      -DSLS_USE_TESTS=ON \
-      -DSLS_USE_PYTHON=OFF \
+      -DSLS_USE_GUI=OFF \
      -DCMAKE_BUILD_TYPE=Release \
      -DSLS_USE_HDF5=OFF\
     
-NCORES=$(getconf _NPROCESSORS_ONLN)
-echo "Building using: ${NCORES} cores"
-cmake --build . -- -j${NCORES}
-cmake --build . --target install

-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
+cmake --build . -- -j10
+cmake --build . --target install
--- a/conda-recepie/build_pylib.sh
+++ b/conda-recepie/build_pylib.sh
@ -1,4 +0,0 @@
-
-echo "|<-------- starting python build"
-cd python
-${PYTHON} setup.py install
--- a/conda-recepie/conda_build_config.yaml
+++ b/conda-recepie/conda_build_config.yaml
@ -1,8 +0,0 @@
-python:
-    - 3.6
-    - 3.7
-    - 3.8
-    - 3.9
-    
-numpy: 
-    - 1.17
--- a/conda-recepie/copy_ctbgui.sh
+++ b/conda-recepie/copy_ctbgui.sh
@ -1,9 +0,0 @@
-mkdir $PREFIX/lib
-mkdir $PREFIX/bin
-mkdir $PREFIX/include
-
-
-
-cp build/bin/ctbGui $PREFIX/bin/.
-cp build/bin/libctbRootLib.so $PREFIX/lib/.
-
--- a/conda-recepie/copy_gui.sh
+++ b/conda-recepie/copy_gui.sh
@ -1,3 +1,15 @@
-#Copy the GUI 
-mkdir -p $PREFIX/bin
-cp build/install/bin/slsDetectorGui $PREFIX/bin/.
+
+mkdir $PREFIX/lib
+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/.
--- a/conda-recepie/copy_lib.sh
+++ b/conda-recepie/copy_lib.sh
@ -1,20 +1,22 @@

-mkdir -p $PREFIX/lib
-mkdir -p $PREFIX/bin
-mkdir -p $PREFIX/include/sls
-# mkdir $PREFIX/include/slsDetectorPackage
+mkdir $PREFIX/lib
+mkdir $PREFIX/bin
+mkdir $PREFIX/include
+mkdir $PREFIX/include/slsDetectorPackage

 #Shared and static libraries
-cp build/install/lib/* $PREFIX/lib/
+cp build/bin/libSlsDetector.so $PREFIX/lib/.
+cp build/bin/libSlsReceiver.so $PREFIX/lib/.
+cp build/bin/libSlsSupport.so $PREFIX/lib/.

 #Binaries
-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/.
+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/include/sls/* $PREFIX/include/sls
-cp -r build/install/share/ $PREFIX/share
+#Which headers do we need for development??
+cp build/install/include/* $PREFIX/include/slsDetectorPackage/
+# cp include/some_lib.h $PREFIX/include/.
--- a/conda-recepie/meta.yaml
+++ b/conda-recepie/meta.yaml
@ -1,14 +1,13 @@

 package:
  name: sls_detector_software
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+  version: "refactor"

 source:
  - path: ..

 build:
  number: 0
-  binary_relocation: True
  rpaths:
    - lib/

@ -18,8 +17,9 @@ requirements:
    - {{compiler('cxx')}}
    - cmake
    - qwt 6.*
-    - qt 4.8.*
-    - zeromq
+    - qt=4.8.7=7
+    - zeromq=4.2.5=hfc679d8_5
+    - pyzmq
    - xorg-libx11
    - xorg-libice
    - xorg-libxext
@ -30,15 +30,14 @@ requirements:
    - {{ cdt('mesa-libgl-devel') }}      # [linux]
    - {{ cdt('mesa-libegl-devel') }}     # [linux]
    - {{ cdt('mesa-dri-drivers') }}      # [linux]
-    - {{ cdt('libselinux') }}            # [linux]
+    - {{ cdt('libselinux') }}      # [linux]
    - {{ cdt('libxdamage') }}            # [linux]
    - {{ cdt('libxxf86vm') }}            # [linux]
-    - expat

  host:
    - libstdcxx-ng
    - libgcc-ng
-    - zeromq
+    - libpng >=1.6.32,<1.6.35
    - xorg-libx11
    - xorg-libice
    - xorg-libxext
@ -46,75 +45,54 @@ requirements:
    - xorg-libxau
    - xorg-libxrender
    - xorg-libxfixes
-    - expat

  run:
-    - zeromq
    - libstdcxx-ng
    - libgcc-ng 

-
 outputs:
-  - name: slsdetlib
+  - name: sls_detector_lib
+    version: "refactor"
    script: copy_lib.sh
-
    requirements:
      build:
        - {{ compiler('c') }}
        - {{compiler('cxx')}}
-        - libstdcxx-ng
-        - libgcc-ng
-        - zeromq

-      host:
-        - zeromq
+  # - name: sls_detector
+  #   version: "refactor"
+  #   script: copy_lib.sh
+    # requirements:
+    #   build:
+    #     - {{ compiler('c') }}
+    #     - {{compiler('cxx')}}

-      run: 
-        - libstdcxx-ng
-        - libgcc-ng
-        - zeromq
-
-  - name: slsdet
-
-    script: build_pylib.sh
-
-    requirements:
-      build:
-        - python
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - setuptools
-
-      host:
-        - python
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-
-
-      run:
-        - libstdcxx-ng
-        - libgcc-ng
-        - python
-        - numpy
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-
-
-    test:
-      imports:
-        - slsdet
-
-  - name: slsdetgui
-    script: copy_gui.sh
-    requirements:
-
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qwt 6.*
-
-      run:
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qwt 6.*
-        - qt 4.8.*
-        - expat
+  # - 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
--- a/conda-recepie/run_test.sh
+++ b/conda-recepie/run_test.sh
@ -1 +0,0 @@
-ctest -j2
--- a/58
+++ b/58
@ -0,0 +1,58 @@
+##!/bin/bash
+
+: ${INSTALLROOT=$PWD}
+read -p "Installation directory [default:\"$INSTALLROOT\"]:" -e t3
+if [ -z "$t3" ]
+then
+echo
+else
+	INSTALLROOT=$t3
+fi
+echo "INSTALLROOT will be  \"$INSTALLROOT\""	
+export INSTALLROOT
+
+: ${BINDIR="bin"}
+read -p "Binaries directory [default:\"$BINDIR\"]:" -e t4
+if [ -z "$t4" ]
+then
+	BINDIR=$INSTALLROOT/$BINDIR
+else
+	BINDIR=$INSTALLROOT/$t4
+fi
+echo "BINDIR will be  \"$BINDIR\""	
+export BINDIR
+
+: ${LIBDIR="bin"}
+read -p "Libraries directory [default:\"$LIBDIR\"]:" -e t5
+if [ -z "$t5" ]
+then
+	LIBDIR=$INSTALLROOT/$LIBDIR
+else
+	LIBDIR=$INSTALLROOT/$t5
+fi	
+echo "LIBDIR will be  \"$LIBDIR\""	
+export LIBDIR
+
+:  ${INCDIR="include"}
+read -p "Includes directory [default:\"$INCDIR\"]:" -e t6
+if [ -z "$t6" ]
+then
+	INCDIR=$INSTALLROOT/$INCDIR
+else
+	INCDIR=$INSTALLROOT/$t6
+fi	
+echo "INCDIR will be  \"$INCDIR\""	
+export INCDIR
+
+:  ${DOCDIR="doc"}
+read -p "Documentation directory [default:\"$DOCDIR\"]:" -e t7
+if [ -z "$t7" ]
+then
+	DOCDIR=$INSTALLROOT/$DOCDIR
+else	
+	DOCDIR=$INSTALLROOT/$t7
+fi
+echo "DOCDIR will be  \"$DOCDIR\""
+export DOCDIR
+
+
--- a/ctbGui/CMakeLists.txt
+++ b/ctbGui/CMakeLists.txt
@ -1,87 +0,0 @@
-
-
-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}/RootMacros.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
-    ${ROOT_LIBRARIES} 
-    ${ROOT_EXE_LINKER_FLAGS}
-)
-
-set_target_properties(
-    ctbRootLib PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-)
-
-target_link_libraries(ctbGui PUBLIC 
-    slsDetectorShared
-    ctbRootLib
-    ${TIFF_LIBRARIES}
-)
-
-set_target_properties(ctbGui PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-
-)
--- a/ctbGui/Makefile.root5
+++ b/ctbGui/Makefile.root5
@ -1,44 +0,0 @@
-
-
-INCS=ctbMain.h ctbDacs.h   ctbPattern.h  ctbSignals.h  ctbAdcs.h ctbAcquisition.h ctbPowers.h   ctbSlowAdcs.h 
-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../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?=../build/bin
-
-
-OBJS = $(SRC:.cpp=.o) $(MAIN:.cpp=.o)
-
-all: $(DESTDIR)/ctbGui
-
-
-doc:
-	cd manual && make DESTDIR=$(DESTDIR)
-
-htmldoc:
-	cd manual && make html DESTDIR=$(DESTDIR)
-
-ctbDict.cpp: $(INCS)  $(LINKDEF)
-	rootcint -f ctbDict.cpp -c $(INCS) $(LINKDEF)	
-
-%.o : %.cpp 
-	echo $@
-	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 `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS)  ../slsDetectorCalibration/tiffIO.cpp
-	mv ctbGui $(DESTDIR)	
-
-clean:
-	rm -f $(DESTDIR)/ctbGui *.o ctbDict.* $(OBJS)
-
--- a/ctbGui/Makefile.root6
+++ b/ctbGui/Makefile.root6
@ -1,46 +0,0 @@
-
-
-INCS=ctbMain.h ctbDacs.h   ctbPattern.h  ctbSignals.h  ctbAdcs.h ctbAcquisition.h ctbPowers.h   ctbSlowAdcs.h  
-SRC= $(INCS:.h=.cpp) ctbDict.cpp 
-LINKDEF=ctbLinkDef.h 
-#ctbActions.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../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?=../build/bin
-
-
-OBJS = $(SRC:.cpp=.o) $(MAIN:.cpp=.o)
-
-all: $(DESTDIR)/ctbGui
-
-
-doc:
-	cd manual && make DESTDIR=$(DESTDIR)
-
-htmldoc:
-	cd manual && make html DESTDIR=$(DESTDIR)
-
-ctbDict.cpp: $(INCS)  $(LINKDEF)
-	rootcling -f ctbDict.cpp -c $(INCS) $(LINKDEF)	
-
-%.o : %.cpp 
-	echo $@
-	g++ -DMYROOT `source 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
-	mv ctbGui $(DESTDIR)	
-
-clean:
-	rm -f $(DESTDIR)/ctbGui *.o ctbDict.* $(OBJS)
-
--- a/ctbGui/ctbAcquisition.cpp
+++ b/ctbGui/ctbAcquisition.cpp
--- a/ctbGui/ctbAcquisition.h
+++ b/ctbGui/ctbAcquisition.h
@ -1,246 +0,0 @@
-#ifndef CTBACQUISITION_H
-#define CTBACQUISITION_H
-#include  <TGFrame.h>
-
-#include "ctbAdcs.h"
-#include "ctbSignals.h"
-#include "ctbPattern.h"
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-class TThread;
-class TGraph;
-class TMultiGraph;
-class THStack;
-class TGButtonGroup;
-class TGRadioButton;
-class TGComboBox;
-class TTimer;
-class TCanvas;
-class TH2F;
-class TH1F;
-class TGLabel;
-class TGTextButton;
-
-namespace sls
-{
-   class Detector;
-};
-class detectorData;
-
-template <class dataType> class slsDetectorData;
-
-class singlePhotonDetector;
-//class singlePhotonDetector;
-class commonModeSubtraction;
-
-#include <string>
-#include <stdint.h>
-using namespace std;
-
-class ctbAcquisition : public TGGroupFrame {
-
-
-  enum {DESERIALIZER, MOENCH04, MOENCH02, MOENCH03, IMAGE32B, IMAGE16B, ADCSAR2, MYTHEN301, MYTHEN302};
-
-
- private:
-  TGTextEntry *eOutdir;
-  TGTextEntry *eFname;
-  TGNumberEntry *eFindex;
-  TGCheckButton *cFileSave;
-
-
-  TGNumberEntry *eSerOff;
-  TGNumberEntry *eDynRange;
-  TGNumberEntry *eNumCount;
-
-
-  TGNumberEntry *ePixX;
-  TGNumberEntry *ePixY;
-
-  TGNumberEntry *eFitADC;
-  TGNumberEntry *eBitPlot;
-  TGNumberEntry *eMinRaw;
-  TGNumberEntry *eMaxRaw;
-  TGNumberEntry *eMinPedSub;
-  TGNumberEntry *eMaxPedSub;
-  TGCheckButton *cMinMaxRaw;
-  TGCheckButton *cMinMaxPedSub;
-
-
-
-
-  TGNumberEntry *eMeasurements;
-
-
-
-  TGTextButton *bStatus;
-  // TGTextButton 
-  TGCheckButton *cCompile;
-  TGTextButton *cLoad;
-  //  TGCheckButton *cRun;
-  
-  TThread *acqThread;
-
-
-  THStack *adcStack;
-  THStack *bitStack;
-  THStack *countsStack;
-
-
-  TH1F *adcHisto[NADCS];
-  TH1F *countsHisto[NADCS];
- 
-  TH1F *bitHisto[NSIGNALS];
-  float bitOffset[NSIGNALS];
-  
-  // int enableFlag[NADCS+4];
-  int roMode;
-
-  int dBitOffset;
-
-
-
-  TH1F *adcFit;
-  TH1F *bitPlot;
-  TH1F *countsFit;
-
-
-
-  TH2F *h2DMapAn; // for 2D detectors
-  TH2F *h2DMapDig; // for 2D detectors
-  TH1F *h1DMap; //for 1D detectors
-
-  //  TH2F *h2Scan; // for 2D detectors
-  // TMultiGraph *mgAdcs;
-  // TH1I *plotAdc[NADCS];
-
-
-  sls::Detector* myDet;
-  
-  int plotFlag[NADCS];
-  int bitPlotFlag[NSIGNALS];
-  
-  int ip;
-  // int nChannels;
-  // int chanEnable;
-  //int nADCs;
-
-  std::vector <int> dbitlist;
-  std::vector <int> adclist;
-
-  TGButtonGroup *bgPlot;// = new TGVButtonGroup(main_frame);
-  TGRadioButton *rbPlotOff;
-  TGRadioButton *rbWaveform;
-  TGRadioButton *rbDistribution;
-  TGRadioButton *rb2D;
-  //  TGRadioButton *rbScan;
-  TGComboBox *cbDetType;
-  TGCheckButton *cbGetPedestal;
-  TGCheckButton *cbSubtractPedestal;
-  TGCheckButton *cbCommonMode;
-  TGTextButton *bResetPedestal;
-
-  TGLabel *lClickX;
-  TGLabel *lClickY;
-  TGLabel *lClickValue;
-
-
-  TCanvas *myCanvas;
-  TTimer *plotTimer;
-
-  char patternFile[10000];
-  char patternCompiler[10000];
-  
-  int globalPlot;
-  int adcPlot;
-  int dbitPlot;
-  int tenG;
-
-  int nAnalogSamples, nDigitalSamples;
-  // int iScanStep;
-
-  slsDetectorData<uint16_t> *dataStructure;
-  singlePhotonDetector *photonFinder;
-    //singlePhotonDetector *photonFinder;
-  commonModeSubtraction *commonMode;
-  int cmSub;
-
-  int stop;
-
-  uint64_t dBitMask;
-
-  int deserializer;
-
- public:
-   ctbAcquisition(TGVerticalFrame*,  sls::Detector*);
-   void setOutdir();
-   void setFname();
-   void setMeasurements();
-   void setFsave(Bool_t);
-   void changePlot(Int_t);
-   void changeDetector(Int_t);
-   void changePlot();
-   void changeDetector();
-   void setFindex();
-   void Draw();
-   void setCanvas(TCanvas*);
-
-   void toggleAcquisition();
-   void loadPattern();
-   static void* ThreadHandle(void *arg);
-   void update();
-   void acquisitionFinished();
-   //  string getParameters();
-
-   void setGraph (int i ,int en, Pixel_t col);
-   void setBitGraph (int i ,int en, Pixel_t col);
-   void startAcquisition();
-   static   void progressCallback(double,void*);
-   static void dataCallback(detectorData*, long unsigned int, unsigned int,  void*);
-   int StopFlag;
-   
-   int plotData(detectorData*, int);
-
-   void setPatternFile(const char* t);
-
-   void setPatternCompiler(const char* t);
-
-   void setAnalogSamples(int);
-   void setDigitalSamples(int);
-   
-   void setADCEnable(Int_t);
-   void setDbitEnable(Int_t);
-   void setReadoutMode(int);
-   void updateChans();
-
-   void resetPedestal();
-
-   void ToggleCommonMode(Bool_t);
-   void TogglePedSub(Bool_t);
-   void ChangeHistoLimitsPedSub(Long_t );
-   void ChangeHistoLimitsRaw(Long_t);
-   void ChangeHistoLimitsPedSub( );
-   void ChangeHistoLimitsRaw();
-   void ChangeHistoLimitsPedSub(Bool_t );
-   void ChangeHistoLimitsRaw(Bool_t);
-   
-
-   void ChangeSerialOffset();
-   void ChangeSerialOffset(Long_t);
-   void ChangeNumberOfChannels();
-   void ChangeNumberOfChannels(Long_t);
-   void ChangeDynamicRange();
-   void ChangeDynamicRange(Long_t);
-   void ChangeImagePixels();
-   void ChangeImagePixels(Long_t);
-
-   void canvasClicked();
-   void FitADC();
-   void plotBit();
-   ClassDef(ctbAcquisition,0)
-};
-
-#endif
--- a/ctbGui/ctbAdcs.cpp
+++ b/ctbGui/ctbAdcs.cpp
@ -1,614 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <TGColorSelect.h>
-#include <THStack.h>
-#include <TGTab.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "ctbAdcs.h"
-#include "ctbDefs.h"
-#include "sls/Detector.h"
-
-using namespace std;
-
-
-
-ctbAdc::ctbAdc(TGVerticalFrame *page, int i, sls::Detector *det)
-  : TGHorizontalFrame(page, 800,800), id(i), myDet(det) {
-
-  TGHorizontalFrame *hframe=this;
-  char tit[100];
-
-   page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-   hframe->MapWindow();
-
-
-   
-
-
-   sprintf(tit, "ADC%d", id);
-
-   sAdcLabel= new TGLabel(hframe, tit);
-   hframe->AddFrame(sAdcLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcLabel->MapWindow();
-   sAdcLabel->SetTextJustify(kTextLeft);
-
-
-
-   
-   
-
-   sAdcInvert= new TGCheckButton(hframe, "Inv");
-   hframe->AddFrame( sAdcInvert,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcInvert->MapWindow();
-   sAdcInvert->Connect("Toggled(Bool_t)","ctbAdc",this,"ToggledInvert(Bool_t)");
-
-
-   sAdcEnable= new TGCheckButton(hframe, "En");
-   hframe->AddFrame( sAdcEnable,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcEnable->MapWindow();
-   // sAdcEnable->SetOn(kTRUE);
-   // sAdcEnable->SetEnabled(kFALSE);
-   sAdcEnable->Connect("Toggled(Bool_t)","ctbAdc",this,"ToggledEnable(Bool_t)");
-
-
-
-   sAdcPlot= new TGCheckButton(hframe, "Plot");
-   hframe->AddFrame( sAdcPlot,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sAdcPlot->MapWindow();
-
-
-   sAdcPlot->Connect("Toggled(Bool_t)","ctbAdc",this,"ToggledPlot(Bool_t)");
-
-
-
-   fColorSel = new TGColorSelect(hframe, id+1, 0);
-
-   fColorSel->Connect("ColorSelected(Pixel_t)","ctbAdc",this,"ColorChanged(Pixel_t)");
-   hframe->AddFrame(fColorSel, new TGLayoutHints(kLHintsTop |
-                          kLHintsLeft, 2, 0, 2, 2));
-   
-
-   fColorSel->SetColor(TColor::Number2Pixel(id+1));
-   //   sprintf(tit,"adc%d",id);
-//    gADC=new TGraph();
-//    gADC->SetName(tit);
-//    gADC->SetLineColor(id+1);
-//    gADC->SetMarkerColor(id+1);
-   
-   
-
-};
-Pixel_t ctbAdc::getColor(){
-  return fColorSel->GetColor();
-}
-Bool_t ctbAdc::getEnabled(){
-  return getPlot();
-}
-Bool_t ctbAdc::getPlot(){
-  return sAdcPlot->IsOn();
-}
-Bool_t ctbAdc::getInverted(){
-  return sAdcInvert->IsOn();
-}
-
-Bool_t ctbAdc::getEnable(){
-  return sAdcEnable->IsOn();
-}
-
-
-
-void ctbAdc::setInverted(Bool_t b){
-  //  cout << id << "set enabled " << b << endl;
-  if (b)
-    sAdcInvert->SetOn(kTRUE,kTRUE);
-  else
-    sAdcInvert->SetOn(kFALSE,kTRUE);
-    
-}
-
-
-void ctbAdc::setEnable(Bool_t b){
-  //  cout << id << "set enabled " << b << endl;
-  if (b)
-    sAdcEnable->SetOn(kTRUE,kFALSE);
-  else
-    sAdcEnable->SetOn(kFALSE,kFALSE);
-    
-}
-
-
-
-
-
-void ctbAdc::setAdcAlias(char *tit, int plot, int color) {
-  if (tit)
-    sAdcLabel->SetText(tit);
-  if (plot>0)
-    sAdcPlot->SetOn(kTRUE,kTRUE);
-  else if (plot==0)
-    sAdcPlot->SetOn(kFALSE,kTRUE);
-  if (color>=0)
-    fColorSel->SetColor(color);
-  fColorSel->SetEnabled(sAdcPlot->IsOn());
-}
-
-
-string ctbAdc::getAdcAlias() {
-
-  char line[1000];
-  sprintf(line,"ADC%d %s %d %lx\n",id,sAdcLabel->GetText()->Data(),sAdcPlot->IsOn(),fColorSel->GetColor());
-  return string(line);
-}
-
-void ctbAdc::update() {
-
-  
-  //Emit("ToggledAdcEnable(Int_t)", id);
-  
-}
-
-
-void ctbAdc::ToggledPlot(Bool_t b){
-
-  //  Long_t mask=b<<id;
-  //  ToggledAdcPlot(mask);
-  cout << "Colsel " << id << " enable " << b << endl;
-  if (b)
-    fColorSel->SetEnabled(kTRUE);
-  else
-    fColorSel->SetEnabled(kFALSE);
-    
-  // fColorSel->SetEnabled(sAdcPlot->IsOn());
-  Emit("ToggledAdcPlot(Int_t)", id);
-  
-}
-
-
-
-void ctbAdc::ToggledInvert(Bool_t b){
-
-    
-  // fColorSel->SetEnabled(sAdcPlot->IsOn());
-  Emit("ToggledAdcInvert(Int_t)", id);
-  
-}
-
-
-
-void ctbAdc::ToggledEnable(Bool_t b){
-
-    
-  fColorSel->SetEnabled(sAdcPlot->IsOn());
-  Emit("ToggledAdcEnable(Int_t)", id);
-  
-}
-
-
-
-
-
-
-void ctbAdc::ColorChanged(Pixel_t) {
-  
-  Emit("ToggledAdcPlot(Int_t)", id);
-
-}
-
-void ctbAdc::ToggledAdcPlot(Int_t b){
-
-  
-  Emit("ToggledAdcPlot(Int_t)", id);
-
-}
-
-void ctbAdc::ToggledAdcInvert(Int_t b){
-
-  
-  Emit("ToggledAdcInvert(Int_t)", id);
-
-}
-
-void ctbAdc::ToggledAdcEnable(Int_t b){
-
-  
-  Emit("ToggledAdcEnable(Int_t)", id);
-
-}
-
-
-
-
-void ctbAdc::setEnabled(Bool_t b){
-  //  cout << id << "set enabled " << b << endl;
-  if (b)
-    sAdcPlot->SetOn(kTRUE,kFALSE);
-  else
-    sAdcPlot->SetOn(kFALSE,kFALSE);
-    
-}
-
-
-
-void ctbAdc::setPlot(Bool_t b){
-  //  cout << id << "set enabled " << b << endl;
-  if (b)
-    sAdcPlot->SetOn(kTRUE,kTRUE);
-  else
-    sAdcPlot->SetOn(kFALSE,kTRUE);
-    
-  
-}
-
-
-
-
-
-
-
-ctbAdcs::ctbAdcs(TGVerticalFrame *page, sls::Detector *det)
-  : TGGroupFrame(page,"Adcs",kVerticalFrame), myDet(det) {
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-
- 
-  TGHorizontalFrame* hframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-
-
-  int idac=0;
-
-
-
-
- 
-  TGHorizontalFrame* hhframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hhframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hhframe->MapWindow();
-
-  TGVerticalFrame *vframe;
-
-
-
-
-  for (idac=0; idac<NADCS; idac++) {
-    if (idac%16==0) {
-
-
-    vframe=new TGVerticalFrame(hhframe, 400,800);
-     hhframe->AddFrame(vframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    vframe->MapWindow();
-   
-  
-
-    }
-
-    sAdc[idac]=new ctbAdc(vframe,idac,myDet);
-
-    
-    sAdc[idac]->Connect("ToggledAdcPlot(Int_t)","ctbAdcs",this,"ToggledAdcPlot(Int_t)");
-    sAdc[idac]->Connect("ToggledAdcInvert(Int_t)","ctbAdcs",this,"ToggledAdcInvert(Int_t)");
-    sAdc[idac]->Connect("ToggledAdcEnable(Int_t)","ctbAdcs",this,"ToggledAdcEnable(Int_t)");
-
-  }
-
-  hframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-    bCheckHalf[0]=new TGTextButton(hframe, "All 0-15");
-    hframe->AddFrame(bCheckHalf[0],new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-    bCheckHalf[0]->MapWindow();
-    bCheckHalf[0]->Connect("Clicked()","ctbAdcs",this,"CheckHalf0()");
-
-
-    bRemoveHalf[0]=new TGTextButton(hframe, "None 0-15");
-    hframe->AddFrame(bRemoveHalf[0],new TGLayoutHints(kLHintsBottom |  kLHintsExpandX, 5, 5, 5, 5));
-    bRemoveHalf[0]->MapWindow();
-    bRemoveHalf[0]->Connect("Clicked()","ctbAdcs",this,"RemoveHalf0()");
-
-
-    bCheckHalf[1]=new TGTextButton(hframe, "All 16-23");
-    hframe->AddFrame(bCheckHalf[1],new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-    bCheckHalf[1]->MapWindow();
-    bCheckHalf[1]->Connect("Clicked()","ctbAdcs",this,"CheckHalf1()");
-    //  bCheckAll->Connect("Clicked()","ctbAdcs",this,"CheckAll()");
-
-
-    bRemoveHalf[1]=new TGTextButton(hframe, "None 16-23");
-    hframe->AddFrame(bRemoveHalf[1],new TGLayoutHints(kLHintsBottom |  kLHintsExpandX, 5, 5, 5, 5));
-    bRemoveHalf[1]->MapWindow();
-    bRemoveHalf[1]->Connect("Clicked()","ctbAdcs",this,"RemoveHalf1()");
-    // bRemoveAll->Connect("Clicked()","ctbAdcs",this,"RemoveAll()");
-
-
-
-
-  hframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-    bCheckAll=new TGTextButton(hframe, "All");
-    hframe->AddFrame(bCheckAll,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-    bCheckAll->MapWindow();
-    bCheckAll->Connect("Clicked()","ctbAdcs",this,"CheckAll()");
-
-
-    bRemoveAll=new TGTextButton(hframe, "None");
-    hframe->AddFrame(bRemoveAll,new TGLayoutHints(kLHintsBottom |  kLHintsExpandX, 5, 5, 5, 5));
-    bRemoveAll->MapWindow();
-    bRemoveAll->Connect("Clicked()","ctbAdcs",this,"RemoveAll()");
-
-
-
-  hframe=new TGHorizontalFrame(this, 800,50);
- AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-  TGLabel *label= new TGLabel(hframe, "Inversion mask: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-   eInversionMask = new TGNumberEntry(hframe, 0, 16,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-
-  hframe->AddFrame(eInversionMask,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eInversionMask->MapWindow();
-   eInversionMask->Resize(150,30);
-   eInversionMask->SetState(kFALSE);
-
-
-  hframe=new TGHorizontalFrame(this, 800,50);
- AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
- label= new TGLabel(hframe, "Enable mask: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-   eEnableMask = new TGNumberEntry(hframe, 0, 16,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-
-   hframe->AddFrame(eEnableMask,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eEnableMask->MapWindow();
-   eEnableMask->Resize(150,30);
-   eEnableMask->SetState(kFALSE);
-
-}
-
-
-int ctbAdcs::setEnable(int reg) {
-
-  try {
-    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 -1;
-}
-
-int ctbAdcs::setInvert(int reg) {
-
-  try {
-    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;
-  Int_t disreg;
-
-  disreg=setEnable();
-  invreg=setInvert();
-  
-  for (int is=0; is<NADCS; is++) {
-    sAdc[is]->setAdcAlias(NULL,-1,-1);
-    if (invreg & (1<<is) )
-      sAdc[is]->setInverted(kTRUE);
-    else
-      sAdc[is]->setInverted(kFALSE);
-
-    if (disreg & (1<<is) )
-      sAdc[is]->setEnable(kTRUE);
-    else
-      sAdc[is]->setEnable(kFALSE);
-  }
-  
-   Emit("AdcEnable(Int_t)", disreg);
-
-}
-string ctbAdcs::getAdcParameters() {
-    ostringstream line;
-  line << "reg "<< hex  << setInvert() << "# ADC invert reg" << dec << endl;
-  line << "reg "<< hex  << setEnable() << " # ADC enable reg"<< dec <<  endl;
-  return line.str();
-
-}
-
-
-void ctbAdcs::CheckAll() {
-  for (int is=0; is<NADCS; is++){
-    sAdc[is]->setPlot(kTRUE);
-  }
-}
-
-
-void ctbAdcs::RemoveAll() {
-  for (int is=0; is<NADCS; is++) {
-    sAdc[is]->setPlot(kFALSE);
-  }
-}
-
-
-
-void ctbAdcs::CheckHalf0() {
-  for (int is=0; is<NADCS/2; is++) {
-    sAdc[is]->setPlot(kTRUE);
-  }
-}
-
-
-void ctbAdcs::RemoveHalf0() {
-  for (int is=0; is<NADCS/2; is++){
-    sAdc[is]->setPlot(kFALSE);
-  }
-}
-
-void ctbAdcs::CheckHalf1() {
-  for (int is=NADCS/2; is<NADCS; is++){
-    sAdc[is]->setPlot(kTRUE);
-  }
-}
-
-
-void ctbAdcs::RemoveHalf1() {
-  for (int is=NADCS/2; is<NADCS; is++){
-    sAdc[is]->setPlot(kFALSE);
-  }
-}
-
-
-int ctbAdcs::setAdcAlias(string line) {
-
-  int is=-1, plot=0, color=-1;
-  char tit[100];
-  int narg=sscanf(line.c_str(),"ADC%d %s %d %x",&is,tit,&plot, &color);
-  if (narg<2)
-    return -1;
-  if (narg!=3)
-    color=-1;
-  if (is>=0 && is<NADCS) {
-    sAdc[is]->setAdcAlias(tit,plot,color);
-  }
-  return is;
-
-}
-
-string ctbAdcs::getAdcAlias() {
-
-  ostringstream line;
-
-  for (int is=0; is<NADCS; is++)
-    line << sAdc[is]->getAdcAlias();
-
-  return line.str();
-}
-
-
-void ctbAdcs::ToggledAdcPlot(Int_t b){
-
-  
-  Emit("ToggledAdcPlot(Int_t)", b);
-
-}
-
-void ctbAdcs::AdcEnable(Int_t b){
-   Emit("AdcEnable(Int_t)", b);
-}
-
-
-void ctbAdcs::ToggledAdcEnable(Int_t b){
-
-   Int_t oreg=setEnable();
-   Int_t m=1<<b;
-  
-   if (sAdc[b]->getEnable())
-     oreg|=m;
-   else
-     oreg&=~m;
-
-   setEnable(oreg);
-  
-   Emit("AdcEnable(Int_t)", oreg);
-}
-
-
-void ctbAdcs::ToggledAdcInvert(Int_t b){
-
-   Int_t oreg=setInvert();
-   Int_t m=1<<b;
-  
-
-   if (sAdc[b]->getInverted())
-     oreg|=m;
-   else
-     oreg&=~m;
-  
-   setInvert(oreg);
-}
-
-
-
-
-
-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);
-}
--- a/ctbGui/ctbAdcs.h
+++ b/ctbGui/ctbAdcs.h
@ -1,155 +0,0 @@
-
-
-
-#ifndef CTBADCS_H
-#define CTBADCS_H
-#include  <TGFrame.h>
-
-
-#define NADCS 32
-
-class TRootEmbeddedCanvas;
-class TGButtonGroup;
-class TGVerticalFrame;
-class TGHorizontalFrame;
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TH2F;
-class TGComboBox;
-class TGCheckButton;
-class TGColorSelect;
-class TColor;
-
-class   THStack;
-class   TGraphErrors;
-class  TGTextButton;
-class  TGTab;
-
-class TGraph;
-
-namespace sls
-{
-   class Detector;
-};
-
-#include <string>
-using namespace std;
-
-class ctbAdc : public TGHorizontalFrame {
-
-
- private:
-  
-
-   TGLabel *sAdcLabel;
-   TGCheckButton *sAdcEnable;
-   TGCheckButton *sAdcPlot;
-   TGCheckButton *sAdcInvert;
-
-   TGColorSelect  *fColorSel;
-
-   //  TGraph *gADC;
-
-   int id;
-   sls::Detector *myDet;
-   
- public:
-   ctbAdc(TGVerticalFrame *page, int i, sls::Detector *det);
-
-
-   void setAdcAlias(char *tit, int plot, int color);
-   string getAdcAlias();
-   void ToggledAdcPlot(Int_t b);
-   void ToggledAdcEnable(Int_t b);
-   void ToggledAdcInvert(Int_t b);
-
-
-   void ToggledPlot(Bool_t b);
-   void ToggledEnable(Bool_t b);
-   void ToggledInvert(Bool_t b);
-   void ColorChanged(Pixel_t);
-   void setEnabled(Bool_t b);
-   Bool_t getEnabled();
-   // TGraph *getGraph();
-   void update();
-
-   Pixel_t getColor();
-   
-   Bool_t getEnable();
-   void setEnable(Bool_t);
-   void setPlot(Bool_t);
-   Bool_t getInverted();
-   Bool_t getPlot();
-   void setInverted(Bool_t);
-
-   ClassDef(ctbAdc,0)
-     };
-
-
-
-class ctbAdcs : public TGGroupFrame {
-private:
-  
-  ctbAdc *sAdc[NADCS];
-   sls::Detector *myDet;
-
-   
-  TGTextButton *bCheckAll;
-  TGTextButton *bRemoveAll;
-  TGTextButton *bCheckHalf[2];
-  TGTextButton *bRemoveHalf[2];
-  TGNumberEntry *eInversionMask;
-  TGNumberEntry *eEnableMask;
-
-
-/*   TGTextButton *bPlotSelected; */
-/*   TGNumberEntry *eMinX; */
-/*   TGNumberEntry *eMaxX; */
-/*   TGNumberEntry *eMinY; */
-/*   TGNumberEntry *eMaxY; */
-  
-  
-
-/*   TGTextButton *bGetPixel; */
-/*   TGNumberEntry *ePixelX; */
-/*   TGNumberEntry *ePixelY; */
-/*   TGLabel *lPixelValue; */
-
-public:
-
-   ctbAdcs(TGVerticalFrame *page, sls::Detector *det);
-   int setAdcAlias(string line);
-   string getAdcAlias();
-   string getAdcParameters();
-   void ToggledAdcPlot(Int_t);
-   void ToggledAdcInvert(Int_t);
-   void ToggledAdcEnable(Int_t);
-   void AdcEnable(Int_t b);
-   //   TGraph *getGraph(int i);
-   void CheckAll();
-   void RemoveAll();
-   void update();
-
-   int setInvert(int reg=-1);
-   int setEnable(int reg=-1);
-
-
-   Pixel_t getColor(int i);
-   Bool_t getEnabled(int i);
-   Bool_t getPlot(int i);
-   Bool_t getEnable(int i);
-
-   void CheckHalf0();
-   void RemoveHalf0();
-   
-   void CheckHalf1();
-   void RemoveHalf1();
-   
-
-   ClassDef(ctbAdcs,0)
-};
-
-#endif
-
-
--- a/ctbGui/ctbDacs.cpp
+++ b/ctbGui/ctbDacs.cpp
@ -1,233 +0,0 @@
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include <TGTextEntry.h>
-#include <TGLabel.h>
-#include <TGNumberEntry.h>
-#include <TGButton.h>
-
-#include "ctbDacs.h"
-#include "ctbDefs.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
-
-using namespace std;
-
-
-ctbDac::ctbDac(TGGroupFrame *page, int idac, sls::Detector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
-
-    TGHorizontalFrame *hframe=this;
-
-    page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    MapWindow();
-
-    char tit[100];
-    
-
-   sprintf(tit, "DAC %d:",idac);
-
-   dacsLabel= new TGCheckButton(hframe, tit);// new TGLabel(hframe, tit);
-   dacsLabel->SetOn(kTRUE, kTRUE);
-   
-   dacsLabel->Connect("Toggled(Bool_t)","ctbDac",this,"setOn(Bool_t)");
-
-
-   hframe->AddFrame(dacsLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsLabel->MapWindow();
-   dacsLabel->SetTextJustify(kTextLeft);
-
-  
-   dacsEntry = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELLimitMinMax,
-                                               0, 65535);
-
-  hframe->AddFrame(dacsEntry,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 5, 5, 5, 5));
-   dacsEntry->MapWindow();
-   dacsEntry->Resize(150,30);
-
-
-   dacsUnit= new TGCheckButton(hframe, "mV");
-   // if (idac!=slsDetectorDefs::ADC_VPP) {
-     hframe->AddFrame( dacsUnit,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-     dacsUnit->MapWindow();
-     if (idac==slsDetectorDefs::ADC_VPP) {
-       dacsUnit->SetEnabled(kFALSE);
-       hframe->HideFrame(dacsUnit);
-       dacsUnit->MapWindow();
-       cout << "hiding!" << endl;
-     }
-     if (idac==slsDetectorDefs::HIGH_VOLTAGE) {
-       dacsUnit->SetText("V"); 
-       dacsUnit->SetOn(kTRUE,kTRUE);
-       dacsUnit->SetEnabled(kFALSE);
-     }
-     //}
-
-
-
-   sprintf(tit, "xxx");
-   dacsValue= new TGLabel(hframe, tit);
-   hframe->AddFrame( dacsValue,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsValue->MapWindow();
-   dacsValue->SetTextJustify(kTextLeft);
-
-   TGTextEntry *e=dacsEntry->TGNumberEntry::GetNumberEntry();
-   e->Connect("ReturnPressed()","ctbDac",this,"setValue()");
-   // e->Connect("ValueSet(Long_t)","ctbDac",this,"setValue(Long_t)");
-   dacsEntry->Connect("ValueSet(Long_t)","ctbDac",this,"setValue(Long_t)");
-   //  cout << "(((((((((((((((((((((((((((((((" << dacsEntry->GetListOfSignals()->At(0)->IsA() << endl;
-   
-
-}
-
-
-
-int ctbDac::setLabel(char *tit, int mv) {
-  if(tit)
-    dacsLabel->SetText(tit);
-  if (mv==1)
-    dacsUnit->SetOn(kTRUE,kTRUE);
-  else if (mv==0)
-    dacsUnit->SetOn(kFALSE,kTRUE);
-  // else if (mv==2) {
-  //   ;}
-  // else if  (mv==3)
-  //   ; 
-  return id;
-
-}
-
-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 {
-    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 {
-      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() { 
-  try {
-    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 -1;
-}
-
-
-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));
-  MapWindow();
-  
-  // cout << "window mapped " << endl;
-
-  for (int idac=0; idac<NDACS; idac++) {
-
-     dacs[idac]=new ctbDac(this, idac, myDet);
-
-  }
-  dacs[NDACS]=new ctbDac(this, slsDetectorDefs::ADC_VPP, myDet);
-  dacs[NDACS+1]=new ctbDac(this, slsDetectorDefs::HIGH_VOLTAGE, myDet);
-  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);
-  if (narg<2)
-    return -1;
-  if (is>=0 && is<NDACS) 
-    dacs[is]->setLabel(tit,mv);
-  return is;
-
-}
-
-string ctbDacs::getDacAlias() {
-  ostringstream line;
-
-  for (int i=0; i<NDACS; i++)
-    line << dacs[i]->getLabel() << endl;
-  return line.str();
-}
-
-
-
-
-
-string ctbDacs::getDacParameters() {
-  ostringstream line;
-
-  for (int i=0; i<NDACS; i++) {
-    //line << "dacs:" << i << " " << dacs[i]->getValue << endl;
-    line << "dac:" << i << " " << dacs[i]->getValue() << endl;
-  } 
-  return line.str();
-}
-
-
-
-void  ctbDacs::update() {
-  for (int idac=0; idac<NDACS+1; idac++) {
-    dacs[idac]->getValue();
-  }
-}
--- a/ctbGui/ctbDacs.h
+++ b/ctbGui/ctbDacs.h
@ -1,75 +0,0 @@
-
-
-#ifndef CTBDACS_H
-#define CTBDACS_H
-#include  <TGFrame.h>
-
-
-#define NDACS 18
-//#define NDACS 16
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-
-
-namespace sls
-{
-   class Detector;
-};
-
-#include <string>
-using namespace std;
-
-
-class ctbDac : public TGHorizontalFrame {
-
-
- protected:
-  // TGLabel *dacsLabel;
-   TGNumberEntry *dacsEntry;
-   TGCheckButton *dacsUnit;
-   TGCheckButton *dacsLabel;
-   TGLabel *dacsValue;
-   int id;
-
-   sls::Detector* myDet;
- public:
-   ctbDac(TGGroupFrame*, int , sls::Detector*);
-   void setValue();
-   void setValue(Long_t);
-   int getValue();
-   void setOn(Bool_t);
-   
-   int setLabel(char *tit, int mv);
-   string getLabel();
-int getMoenchDacId();
-
-
-   ClassDef(ctbDac,0)
-};
-
-class ctbDacs : public TGGroupFrame {
-private:
-  
-   ctbDac *dacs[NDACS+2];
-
-   sls::Detector* myDet;
-
-public:
-   ctbDacs(TGVerticalFrame *page, sls::Detector*);
-
-   int setDacAlias(string line);
-   // int setDacAlias(string line);
-   string getDacAlias();
-   string getDacParameters();
-
-   void update();
-
-   ClassDef(ctbDacs,0)
-};
-
-#endif
-
--- a/ctbGui/ctbDefs.h
+++ b/ctbGui/ctbDefs.h
@ -1,84 +0,0 @@
-#pragma once
-
-#include <string>
-#include <stdexcept>
-#include <chrono>
-
-//#include "sls/sls_detector_exceptions.h"
-//#include "sls/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);
-    }; 
-
-};
--- a/ctbGui/ctbGui.cpp
+++ b/ctbGui/ctbGui.cpp
@ -1,157 +0,0 @@
-#include <TApplication.h>
-#include <TColor.h>
-
-#include <TStyle.h>
-#include <TROOT.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
-//#include "sls_receiver_defs.h"
-#include "ctbMain.h"
-#include "ctbDefs.h"
-using namespace std;
-
-
-int main(int argc, char **argv) {
-
-
-  string afname, cfname, pfname;
-  int id=0;
-
-  int af=0, cf=0, pf=0;
-
-
-  cout << " *** " << argc << endl;
-  for (int ia=0; ia<argc; ia++) {
-    if (strcmp(argv[ia],"-alias")==0) {
-      if (ia+1<argc) {
-	afname=argv[ia+1];
-	ia++;
-	af=1;
-      }
-
-    } else if  (strcmp(argv[ia],"-config")==0) {
-      if (ia+1<argc) {
-	cfname=argv[ia+1];
-	ia++;
-	cf=1;
-      }
-
-
-    } else if  (strcmp(argv[ia],"-par")==0) {
-      if (ia+1<argc) {
-  pfname=argv[ia+1];
-	ia++;
-  pf=1;
-      }
-
-
-    } else if  (strcmp(argv[ia],"-id")==0) {
-      if (ia+1<argc) {
-	id=atoi(argv[ia+1]);
-	ia++;
-      }
-    } 
-  }
-  
-
-  cout << " *** "  << 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);
-
-
- gStyle->SetDrawBorder(0);
-  gStyle->SetCanvasColor(kWhite);
-  gStyle->SetCanvasDefH(800);
-  gStyle->SetCanvasDefW(800);
-  gStyle->SetCanvasBorderMode(0);
-  gStyle->SetPadBorderMode(0);
-  gStyle->SetPaintTextFormat("5.2f");
-  gStyle->SetLineWidth(2);
-  gStyle->SetTextSize(1.1);
-  gStyle->SetLabelSize(0.04,"xy");
-  gStyle->SetTitleSize(0.05,"xy");
-  gStyle->SetTitleOffset(1.0,"x");
-  gStyle->SetTitleOffset(1.1,"y");
-  gStyle->SetPadTopMargin(0.15);
-  gStyle->SetPadRightMargin(0.15);
-  gStyle->SetPadBottomMargin(0.15);
-  gStyle->SetPadLeftMargin(0.15);
-  gStyle->SetLegendBorderSize(1);
-  gStyle->SetFrameBorderMode(0);
-  gStyle->SetFrameFillColor(kWhite);
-  // gStyle->SetLegendFillColor(kWhite);
-  gStyle->SetTitleFillColor(kWhite);
-  gStyle->SetFillColor(kWhite);
-  gStyle->SetStatFontSize(0.03);
-  gStyle->SetStatBorderSize(1);
-  gStyle->SetStatFormat("6.4g");
-  gStyle->SetStatX(0.95);
-  gStyle->SetStatY(0.95);
-  gStyle->SetStatW(0.2);
-  gStyle->SetStatH(0.2);
-  gStyle->SetTitleX(0.1);
-  gStyle->SetTitleY(0.95);
-  gStyle->SetTitleBorderSize(0);
-  gStyle->SetTitleFontSize(0.05);
-  gROOT->SetStyle("Default");
-
-
-  TColor::InitializeColors();
-  const Int_t NRGBs = 5;
-  const Int_t NCont = 90;
-
-  Double_t stops[NRGBs] = { 0.00, 0.34, 0.61, 0.84, 1.00 };
-  Double_t red[NRGBs]   = { 0.00, 0.00, 0.87, 1.00, 0.51 };
-  Double_t green[NRGBs] = { 0.00, 0.81, 1.00, 0.20, 0.00 };
-  Double_t blue[NRGBs]  = { 0.51, 1.00, 0.12, 0.00, 0.00 };
-  TColor::CreateGradientColorTable(NRGBs, stops, red, green, blue, NCont);
-  gStyle->SetNumberContours(NCont);
-
-
-  gROOT->ForceStyle();
-  ctbMain *mf=new ctbMain(gClient->GetRoot(), myDet);
-
-  cout << " *** " << argc << endl;
-  for (int ia=0; ia<argc; ia++)
-    cout << argv[ia] << endl;
-  
-
-  cout << " *** "  << endl;
-  
-  if (af)
-    mf->loadAlias(afname);
-  else
-    cout << "no alias specified" << endl;
-
-   theApp.Run();
-
-   return 0;
-}
--- a/ctbGui/ctbLinkDef.h
+++ b/ctbGui/ctbLinkDef.h
@ -1,15 +0,0 @@
-#pragma link C++ class ctbMain;
-#pragma link C++ class ctbDacs;
-#pragma link C++ class ctbDac;
-#pragma link C++ class ctbSignals;
-#pragma link C++ class ctbSignal;
-#pragma link C++ class ctbAdc;
-#pragma link C++ class ctbAdcs;
-#pragma link C++ class ctbLoop;
-#pragma link C++ class ctbWait;
-#pragma link C++ class ctbPattern;
-#pragma link C++ class ctbAcquisition;
-#pragma link C++ class ctbPower;
-#pragma link C++ class ctbPowers;
-#pragma link C++ class ctbSlowAdc;
-#pragma link C++ class ctbSlowAdcs;
--- a/ctbGui/ctbMain.cpp
+++ b/ctbGui/ctbMain.cpp
@ -1,586 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <THStack.h>
-#include <TGTab.h>
-#include <TApplication.h>
-#include <TGCanvas.h>
-#include <stdlib.h>
-
-#include <TGMenu.h>
-#include <TGDockableFrame.h>
-//#include <TGMenuBar.h>
-//#include <TGPopupMenu.h>
-
-
-
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-#include "sls/Detector.h"
-#include "ctbDefs.h"
-#include "ctbMain.h"
-#include "ctbDacs.h"
-#include "ctbSlowAdcs.h"
-#include "ctbPowers.h"
-#include "ctbSignals.h"
-#include "ctbPattern.h"
-#include "ctbAdcs.h"
-#include "ctbAcquisition.h"
-//#include "ctbActions.h"
-
-using namespace std;
-
-
-
-ctbMain::ctbMain(const TGWindow *p, sls::Detector *det)
-  : TGMainFrame(p,800,800), pwrs(NULL), senses(NULL) {
-
-  myDet=det;
-
-  Connect("CloseWindow()", "ctbMain", this, "CloseWindow()");
-
-
-
-
-
-//   fMenuDock = new TGDockableFrame(this);
-//   AddFrame(fMenuDock, new TGLayoutHints(kLHintsExpandX, 0, 0, 1, 0));
-//   fMenuDock->SetWindowName("GuiTest Menu");
-
-  fMenuBarLayout = new TGLayoutHints(kLHintsTop | kLHintsExpandX);
-  fMenuBarItemLayout = new TGLayoutHints(kLHintsTop | kLHintsLeft, 0, 4, 0, 0);
-  fMenuBarHelpLayout = new TGLayoutHints(kLHintsTop | kLHintsRight);
-
-  fMenuFile = new TGPopupMenu(gClient->GetRoot());
-  int im=0;
-
-   fMenuFile->AddEntry("Open Alias", im++);
-   fMenuFile->AddEntry("Save Alias", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Open Parameters", im++);
-   fMenuFile->AddEntry("Save Parameters", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Open Configuration", im++);
-   fMenuFile->AddEntry("Save Configuration", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Open Pattern", im++);
-   fMenuFile->AddEntry("Save Pattern", im++);
-   fMenuFile->AddSeparator();
-   fMenuFile->AddEntry("Exit", im++);
-
-    fMenuFile->Connect("Activated(Int_t)", "ctbMain", this,
-                       "HandleMenu(Int_t)");
- 
-
-    i_dacs=-1;
-    i_pwrs=-1;
-    i_senses=-1;
-    i_sig=-1;
-    i_adcs=-1;
-    i_pat=-1;
-    i_acq=-1;
-
-    int i_page=0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  TGVerticalFrame *vframe=new TGVerticalFrame(this, 800,1200); //main frame
-
-
-
-   fMenuBar = new TGMenuBar(vframe, 1, 1, kHorizontalFrame);
-   fMenuBar->AddPopup("&File", fMenuFile, fMenuBarItemLayout);
-//    fMenuBar->AddPopup("&Test", fMenuTest, fMenuBarItemLayout);
-//    fMenuBar->AddPopup("&View", fMenuView, fMenuBarItemLayout);
-//    fMenuBar->AddPopup("&Help", fMenuHelp, fMenuBarHelpLayout);
-
-   vframe->AddFrame(fMenuBar, fMenuBarLayout);
-
-  TGHorizontalFrame* hpage=new TGHorizontalFrame(vframe, 800,1200); //horizontal frame. Inside there should be the tab and the canvas
-  mtab=new TGTab(hpage, 1500, 1200); //tab!
-  //  page=new TGVerticalFrame(mtab, 1500,1200);
-
-  cout << "DACS" << endl;
-
-  TGCompositeFrame *tf = mtab->AddTab("DACs");
-  TGVerticalFrame *page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  dacs=new ctbDacs(page, myDet);
-  i_dacs=i_page++;
-  
-
-  cout << "power " << endl;
-  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);
-
-  i_pwrs=i_page++;
-
-  cout << "sense " << endl;
-  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);
-
-  i_senses=i_page++;
-
-
- 
-  cout << "signals " << endl;
-  tf = mtab->AddTab("Signals");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  sig=new ctbSignals(page, myDet);
-  sig->Connect("ToggledSignalPlot(Int_t)","ctbMain",this,"setSignalPlot(Int_t)");
-
-  i_sig=i_page++;
-
-  cout << "adcs " << endl;
-  tf = mtab->AddTab("ADCs");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  adcs=new ctbAdcs(page, myDet);
-  adcs->Connect("ToggledAdcPlot(Int_t)","ctbMain",this,"setADCPlot(Int_t)");
-  adcs->Connect("AdcEnable(Int_t)","ctbMain",this,"setADCEnable(Int_t)");
-  i_adcs=i_page++;
-
-
-  cout << "pattern" << endl;
-
-  tf = mtab->AddTab("Pattern");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  pat=new ctbPattern(page, myDet);
-  pat->Connect("patternFileChanged(const char*)","ctbMain",this,"setPatternFile(const char*)");
-  pat->Connect("patternCompilerChanged(const char*)","ctbMain",this,"setPatternCompiler(const char*)");
-  pat->Connect("analogSamplesChanged(const int)","ctbMain",this,"setAnalogSamples(int)");
-  pat->Connect("digitalSamplesChanged(const int)","ctbMain",this,"setDigitalSamples(int)");
-  pat->Connect("readoutModeChanged(int)","ctbMain",this,"setReadoutMode(int)");
-
-  i_pat=i_page++;
-
-  cout << "acquisition" << endl;
-
-  tf = mtab->AddTab("Acquisition");
-  page=new TGVerticalFrame(tf, 1500,1200);
-  tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  acq=new ctbAcquisition(page, myDet);
-
-
-  i_acq=i_page++;
-
-
-  // cout << "actions" << endl;
-  // tf = mtab->AddTab("Actions");
-  // page=new TGVerticalFrame(tf, 1500,1200);
-  // tf->AddFrame(page, new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  // actions=new ctbActions(page, myDet);
-
-
-  // i_actions=i_page++;
-
-
-
-   cout << "tabs finished" << endl;
-
-  hpage->AddFrame(mtab,new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-
-  vframe->AddFrame(hpage,new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  
-  AddFrame(vframe,new TGLayoutHints(kLHintsExpandX | kLHintsExpandY, 10,10,10,1));
-  vframe->MapWindow();
-  hpage->MapWindow();
-  mtab->MapWindow();
-  page->MapWindow();
-
-  // Sets window name and shows the main frame
-   cout << "dockabel" << endl;
-   TGDockableFrame *fdock=new TGDockableFrame(hpage);
-   hpage->AddFrame(fdock, new TGLayoutHints(kLHintsBottom | kLHintsCenterX | kLHintsExpandX | kLHintsExpandY, 10,10,10,10));
-   fdock->MapWindow();
-
-   cout << "canvas" << endl;
-//    // Creates widgets of the example
-
-
-   fEcanvas = new TRootEmbeddedCanvas ("Ecanvas",fdock,800,800);//hpage,800,800);
-   //fEcanvas = new TRootEmbeddedCanvas ("Ecanvas",this,800,800);//hpage,800,800);
-  // fEcanvas->Resize();
-  //  fEcanvas->GetCanvas()->Update();
-  //AddFrame(fEcanvas, new TGLayoutHints(kLHintsBottom | kLHintsCenterX | kLHintsExpandX | kLHintsExpandY, 10,10,10,10));
-
-  // // hpage->
-  fdock->AddFrame(fEcanvas, new TGLayoutHints(kLHintsBottom | kLHintsCenterX | kLHintsExpandX | kLHintsExpandY, 10,10,10,10));
-
-
-  fEcanvas->MapWindow();
-
-  acq->setCanvas(getCanvas());
-
-
-
-  hpage->MapSubwindows();
-   mtab->Connect("Selected(Int_t)","ctbMain",this,"tabSelected(Int_t)");
-
-
-
-   cout << "connect mtab" << endl;
-
-  try{  
-   setReadoutMode(pat->getReadoutMode());  
-  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
-
-   setADCEnable(adcs->setEnable());
-   setAnalogSamples(pat->getAnalogSamples());
-   setDigitalSamples(pat->getDigitalSamples());
-   
-   tabSelected(0);
-
-   SetWindowName("CTB Gui");
-   MapSubwindows();
-   Resize(1500,1200);
-
-   MapWindow();
-}
-
-void ctbMain::CloseWindow() {
-   gApplication->Terminate();
-}
-
-TCanvas* ctbMain::getCanvas() {
-  return fEcanvas->GetCanvas();
-}
-
-
-
-void ctbMain::HandleMenu(Int_t id)
-{
-   // Handle menu items.
-   
-  
- 
-
-   switch (id) {
-
-   case 0:   // fMenuFile->AddEntry("Open Alias", im++);
-     cout << "Open Alias" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             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, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     if (fi.fFilename)
-	       loadAlias(fi.fFilename);
-          }
-         break;
-
-   case 1: // fMenuFile->AddEntry("Save Alias", im++);
-     cout << "Save Alias" << 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("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;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             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, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     if (fi.fFilename)
-	       loadParameters(fi.fFilename);
-          }
-         break;
-
-   case 3: // fMenuFile->AddEntry("Open Configuration", im++);
-     cout << "Open 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, kFDOpen, &fi);
-             printf("Open file: %s (dir: %s)\n", fi.fFilename, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     if (fi.fFilename)
-	       loadConfiguration(fi.fFilename);
-          }
-         break;
- 
-   case 4: //fMenuFile->AddEntry("Open Pattern", im++);
-     cout << "Open pattern" << endl;
-         {
-             static TString dir(".");
-             TGFileInfo fi;
-             //fi.fFileTypes = filetypes;
-             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, fi.fIniDir);
-	     // dir = fi.fIniDir;
-	     if (fi.fFilename)
-	       loadParameters(fi.fFilename);
-          }
-     break;
-
-   case 5:   //fMenuFile->AddEntry("Save Pattern", im++);
-     cout << "Save pattern" << 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)
-	       savePattern(fi.fFilename);
-          }
-         break;
-
-   case 6: //  fMenuFile->AddEntry("Exit", im++);
-     CloseWindow();
-
-      default:
-         printf("Menu item %d selected\n", id);
-         break;
-   }
-}
-
-
-
-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;
-}
-
-
-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;
-}
-
-
-
-void  ctbMain::loadConfiguration(string fname) {
-  try{
-    myDet->loadConfig(fname);
-  } CATCH_DISPLAY ("Could not load config.", "ctbMain::loadConfiguration")
-}
-
-void  ctbMain::loadParameters(string fname) {
-  try{
-    myDet->loadParameters(fname);
-  } CATCH_DISPLAY ("Could not load parameters.", "ctbMain::loadParameters")
-}
-
-void  ctbMain::savePattern(string fname) {
-  try{
-    myDet->savePattern(fname);
-  } CATCH_DISPLAY ("Could not save pattern.", "ctbMain::savePattern")
-}
-
-
-
-int  ctbMain::loadAlias(string fname) {
-
-
-  string line;
-  char aaaa[1000];
-  int i;
-  ifstream myfile (fname.c_str());
-  if (myfile.is_open())
-  {
-    while ( getline (myfile,line) )
-    {
-      // cout << line ;
-      if (sscanf(line.c_str(),"BIT%d",&i)>0) {
-	//cout << "*******" << line<< endl;
-	sig->setSignalAlias(line);
-      // cout << line ;
-      } else if (sscanf(line.c_str(),"DAC%d",&i)>0) {
-	dacs->setDacAlias(line);
-	//	cout << "+++++++++" << line<< endl;
-      } else if (sscanf(line.c_str(),"ADC%d",&i)>0) {
-	adcs->setAdcAlias(line);
-	//	cout << "---------" << line<< endl;
-      }      //  else
-      //	cout << "<<<<<<<" << line << endl;
-      else if (sscanf(line.c_str(),"PAT%s",aaaa)>0) {
-	pat->setPatternAlias(line);
-	//	cout << "---------" << line<< endl;
-      }	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) {
-	if (senses) senses->setSlowAdcAlias(line);
-	//	cout << "+++++++++" << line<< endl;
-      } 
-      
-    }
-    myfile.close();
-  }
-
-  else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-int  ctbMain::saveAlias(string fname) {
-
-
-  string line;
-  ofstream myfile (fname.c_str());
-  if (myfile.is_open())
-  {
-    //while ( getline (myfile,line) )
-    // {
-      // cout << line ;
-      //if (sscanf(line.c_str(),"BIT%d",&i)>0) {
-	//cout << "*******" << line<< endl;
-    myfile << sig->getSignalAlias();
-      // cout << line ;
-    //  } else if (sscanf(line.c_str(),"DAC%d",&i)>0) {
-    myfile << dacs->getDacAlias();
-    if (pwrs) myfile << pwrs->getPwrAlias();
-    if (senses) myfile << senses->getSlowAdcAlias();
-	//	cout << "+++++++++" << line<< endl;
-    //  } else if (sscanf(line.c_str(),"ADC%d",&i)>0) {
-    myfile << adcs->getAdcAlias();
-	//	cout << "---------" << line<< endl;
-    //  }      //  else
-      //	cout << "<<<<<<<" << line << endl;
-    myfile << pat->getPatternAlias();
-      
-    //}
-    myfile.close();
-  }
-
-  else cout << "Unable to open file"; 
-
-  return 0;
-
-}
-
-
-
-
-
-
-
-
-
-
-
-void ctbMain::tabSelected(Int_t i) {
-
-  //  cout << "Selected tab " << i << endl;
-  // cout << "Current tab is " <<  mtab->GetCurrent() << endl;
-
-  if (i==i_dacs) dacs->update();
-  else if (i==i_pwrs) pwrs->update();
-  else if (i==i_senses) ;//senses->update();
- else if (i==i_sig) sig->update();
- else if (i==i_adcs) adcs->update();
- else if (i==i_pat) pat->update();
- else if (i==i_acq) acq->update();
- else if (i==i_acq) acq->update();
-  // else if (i==i_actions) actions->update();
- else cout << "Unknown tab " << i << endl;
- 
-
-}
-
-void ctbMain::setPatternFile(const char* t) {
-  acq->setPatternFile(t);
-
-}
-
-void ctbMain::setPatternCompiler(const char* t) {
-  acq->setPatternCompiler(t);
-
-
-}
-
-void ctbMain::setAnalogSamples(const int n) {
-  acq->setAnalogSamples(n);
-
-
-}
-
-void ctbMain::setDigitalSamples(const int n) {
-  acq->setDigitalSamples(n);
-
-
-}
-
-void ctbMain::setReadoutMode(int flags) {
-  acq->setReadoutMode(flags);
-}
-
-void ctbMain::setADCEnable(Int_t reg){
-  acq->setADCEnable(reg);
-}
--- a/ctbGui/ctbMain.h
+++ b/ctbGui/ctbMain.h
@ -1,128 +0,0 @@
-#ifndef CTBMAIN_H
-#define CTBMAIN_H
-#include <TGFrame.h>
-
-
-class TRootEmbeddedCanvas;
-class TGButtonGroup;
-class TGVerticalFrame;
-class TGHorizontalFrame;
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TH2F;
-class TGComboBox;
-class TGCheckButton;
-
-class   THStack;
-class   TGraphErrors;
-class  TGTextButton;
-class  TGTab;
-
-class   TGMenuBar;
-class   TGPopupMenu;
-class   TGDockableFrame;
-class TGLayoutHints;
-class TGCanvas;
-class TCanvas;
-
-class   ctbDacs;
-class   ctbSlowAdcs;
-class   ctbPowers;
-
- 
-class  ctbSignals;
-
-namespace sls
-{
-   class Detector;
-};
-
-class  ctbPattern;
-class  ctbAdcs;
-class  ctbAcquisition;
-//class  ctbActions;
-
-#include <string>
-using namespace std;
-
-class ctbMain : public TGMainFrame { 
-private:
-
-
-  sls::Detector *myDet;
-
-
-
-   TRootEmbeddedCanvas *fEcanvas;
-   TRootEmbeddedCanvas *fModulecanvas;
-   TGButtonGroup *br;
-   
-   TGTab *mtab;
-
-   
-   ctbDacs *dacs;
-   int i_dacs;
-
-   ctbPowers *pwrs;
-   int i_pwrs;
-
-   ctbSlowAdcs *senses;
-   int i_senses;
-
- 
-  ctbSignals *sig;
-  int i_sig;
-
-
-  ctbAdcs *adcs;
-  int i_adcs;
-  
-
-  ctbPattern *pat;
-  int i_pat;
-
-  ctbAcquisition *acq;
-  int i_acq;
-
-  // ctbActions *actions;
-  int i_actions;
-
-   TGDockableFrame    *fMenuDock;
-
-   TGMenuBar          *fMenuBar;
-   TGPopupMenu        *fMenuFile, *fMenuTest, *fMenuView, *fMenuHelp;
-   TGPopupMenu        *fCascadeMenu, *fCascade1Menu, *fCascade2Menu;
-   TGPopupMenu        *fMenuNew1, *fMenuNew2;
-   TGLayoutHints      *fMenuBarLayout, *fMenuBarItemLayout, *fMenuBarHelpLayout;
-   TGCanvas *myCanvas;
-
-
-public:
-   ctbMain(const TGWindow *p, sls::Detector *det);
-
-
-   int  loadAlias(string fname);
-   int  saveAlias(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);
-   void CloseWindow();
-
-   void setPatternFile(const char* t);
-
-   void setPatternCompiler(const char* t);
-   void setAnalogSamples(const int);
-   void setDigitalSamples(const int);
-   void setReadoutMode(int);
-   void setADCEnable(Int_t);
-
-   void HandleMenu(Int_t);
-   TCanvas* getCanvas();
-   ClassDef(ctbMain,0)
-};
-
-#endif
--- a/ctbGui/ctbPattern.cpp
+++ b/ctbGui/ctbPattern.cpp
--- a/ctbGui/ctbPattern.h
+++ b/ctbGui/ctbPattern.h
@ -1,179 +0,0 @@
-#ifndef CTBPATTERN_H
-#define CTBPATTERN_H
-#include  <TGFrame.h>
-
-
-#define NLOOPS 3
-#define NWAITS 3
-#define NADCS 32
-#define PATLEN 1024
-
-class TRootEmbeddedCanvas;
-class TGButtonGroup;
-class TGVerticalFrame;
-class TGHorizontalFrame;
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TH2F;
-class TGComboBox;
-class TGCheckButton;
-class TGTextEntry;
-class TGCheckButton;
-
-class   THStack;
-class   TGraphErrors;
-class energyCalibration;
-class  TGTextButton;
-class  TGTab;
-
-namespace sls
-{
-   class Detector;
-};
-
-
-#include <string>
-using namespace std;
-
-
-
-class ctbLoop : public TGHorizontalFrame {
- 
-
- private:
-
-   TGNumberEntry *eLoopStartAddr; 
-   TGNumberEntry *eLoopStopAddr; 
-   TGNumberEntry *eLoopNumber; 
-
-   int id;
-
-   sls::Detector *myDet;
-
- public:
-   ctbLoop(TGGroupFrame *page, int i,sls::Detector *det);
-   
-   void setNLoops();
-   void update();
-
-   ClassDef(ctbLoop,0)
-     };
-
-class ctbWait : public TGHorizontalFrame {
- 
-
- private:
-
-   TGNumberEntry *eWaitAddr; 
-   TGNumberEntry *eWaitTime; 
-
-   int id;
-
-   sls::Detector *myDet;
-
- public:
-   ctbWait(TGGroupFrame *page, int i,sls::Detector *det);
-   
-   void setWaitTime();
-   void update();
-
-   ClassDef(ctbWait,0)
-     };
-
-
-
-
-
-
-
-class ctbPattern : public TGGroupFrame {
-private:
-   
-
-   TGNumberEntry *eAdcClkFreq;
-   TGNumberEntry *eRunClkFreq;
-   TGNumberEntry *eDBitClkFreq;
-   TGNumberEntry *eAdcClkPhase;
-   TGNumberEntry *eDBitClkPhase;
-   //TGNumberEntry *eRunClkPhase;
-
-   TGNumberEntry *eStartAddr;
-   TGNumberEntry *eStopAddr;
-   TGNumberEntry *eFrames;
-   TGNumberEntry *ePeriod;
-   TGNumberEntry *eTriggers;
-   // TGNumberEntry *eMeasurements;
-   TGNumberEntry *eAdcPipeline;
-   TGNumberEntry *eDBitPipeline;
-   
-   ctbLoop *eLoop[NLOOPS];
-   ctbWait *eWait[NWAITS];
-
-   TGTextEntry *patternCompiler;
-   TGTextEntry *patternFile;
-   
-   TGTextButton *browseCompiler;
-   TGTextButton *browseFile;
-   
-
-   TGNumberEntry *eAnalogSamples;
-   TGNumberEntry *eDigitalSamples;
-
-  TGCheckButton *cbAnalog;
-  TGCheckButton *cbDigital;
-  
-   char pat[PATLEN*8];
-
-   sls::Detector *myDet;
-
-public:
-
-   ctbPattern(TGVerticalFrame *page, sls::Detector *det);
-
-   void update();
-   void setAdcFreq();
-   void setRunFreq();
-   void setDBitFreq();
-   void setAdcPhase();
-   void setDBitPhase();
-   // void setRunPhase();
-   void setAdcPipeline();
-   void setDBitPipeline();
-   void setFrames();
-   void setTriggers();
-   // void setMeasurements();
-   void setPeriod();
-
-   
-   void chooseCompiler();
-   void choosePattern();
-
-   string getCompiler();
-   string getPatternFile();
-   
-   void setPatternAlias(string);
-   string getPatternAlias();
-
-
-   int getAnalogSamples();
-   void  setAnalogSamples();
-   int getDigitalSamples();
-   void  setDigitalSamples();
-   void  setReadoutMode(Bool_t);
-   int  getReadoutMode();
-
-
-   void setFile();
-   void setCompiler();
-   void patternFileChanged(const char*);
-   void patternCompilerChanged(const char*);
-   void analogSamplesChanged(const int t);
-   void digitalSamplesChanged(const int t);
-   void readoutModeChanged(int);
-
-
-   ClassDef(ctbPattern,0)
-};
-
-#endif
--- a/ctbGui/ctbPowers.cpp
+++ b/ctbGui/ctbPowers.cpp
@ -1,223 +0,0 @@
-#include  <TGFrame.h>
-
-
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include "ctbDefs.h"
-#include "ctbDacs.h"
-#include "ctbPowers.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
-
-using namespace std;
-
-
-
-ctbPower::ctbPower(TGGroupFrame* f, int i,  sls::Detector* d)
-  : ctbDac(f, i, d) 
-{
-  cout << "****************************************************************power " << i << endl;
-     dacsUnit->SetOn(kTRUE); 
-     dacsUnit->SetEnabled(kFALSE);
-
-     switch(i) {
-     case slsDetectorDefs::V_POWER_IO: 
-     	 dacsLabel->SetText("VIO"); 
-     	 break; 
-     case slsDetectorDefs::V_POWER_A: 
-     	 dacsLabel->SetText("VA"); 
-     	 break;  
-     case slsDetectorDefs::V_POWER_B: 
-     	 dacsLabel->SetText("VB"); 
-     	 break;   
-     case slsDetectorDefs::V_POWER_C: 
-     	 dacsLabel->SetText("VC");
-     	 break;    
-     case slsDetectorDefs::V_POWER_D: 
-     	 dacsLabel->SetText("VD");
-     	 break;      
-     case slsDetectorDefs::V_POWER_CHIP: 
-     	 dacsLabel->SetText("VCHIP"); 
-     	 dacsLabel->SetEnabled(kFALSE);
-     	 break;    
-     default: 
-     	 dacsLabel->SetText("Bad index"); 
-     	 break; 
-     };
-     
-
-     TGTextEntry *e=dacsEntry->TGNumberEntry::GetNumberEntry();
-     e->Disconnect 	("ReturnPressed()");
-     e->Disconnect 	("ValueSet(Long_t)");
-     
-     e->Connect("ReturnPressed()","ctbPower",this,"setValue()");
-     dacsEntry->Connect("ValueSet(Long_t)","ctbPower",this,"setValue(Long_t)");
- };
-
-
-string ctbPower::getLabel() {
-
-  ostringstream line;
-  switch (id) {
-     case slsDetectorDefs::V_POWER_IO: 
-	 line << "VIO"; 
-	 break; 
-     case slsDetectorDefs::V_POWER_A: 
-	 line << "VA"; 
-	 break;  
-     case slsDetectorDefs::V_POWER_B: 
-	 line << "VB"; 
-	 break;   
-     case slsDetectorDefs::V_POWER_C: 
-	 line << "VC"; 
-	 break;    
-     case slsDetectorDefs::V_POWER_D: 
-	 line << "VD"; 
-	 break;      
-     case slsDetectorDefs::V_POWER_CHIP: 
-	 line << "VCHIP"; 
-	 break;    
-     default:  
-	 line << "VBAD"; 
-	 break; 
-
-  }
-  line << " " <<  dacsLabel->GetText() << endl;
-  return line.str();
-}
-
-void ctbPower::setValue(Long_t a) {ctbPower::setValue();}
-
-void ctbPower::setValue() {
-  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() {
-  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, sls::Detector* det)   : TGGroupFrame(page,"Power Supplies",kVerticalFrame) , myDet(det){
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-  // cout << "window mapped " << endl;
-
-  for (int idac=0; idac<NPOWERS; idac++) {
-     dacs[idac]=new ctbPower(this, slsDetectorDefs::V_POWER_A+idac, myDet);
-
-  }
-}
-
-
-int ctbPowers::setPwrAlias(string line) {
-
-  int is=-1;
-  char tit[100];
-
-  if (sscanf(line.c_str(),"VA %s",tit)) {
-    dacs[0]->setLabel(tit,1);
-    is=0;
-  }
-
-  if (sscanf(line.c_str(),"VB %s",tit)) {
-    dacs[1]->setLabel(tit,1);
-    is=1;
-  }
-
-  if (sscanf(line.c_str(),"VC %s",tit)) {
-    dacs[2]->setLabel(tit,1);
-    is=2;
-  }
-
-  if (sscanf(line.c_str(),"VD %s",tit)) {
-    dacs[3]->setLabel(tit,1);
-    is=3;
-  }
-
-  if (sscanf(line.c_str(),"VIO %s",tit)) {
-    dacs[4]->setLabel(tit,1);
-    is=4;
-  }
-
-  if (sscanf(line.c_str(),"VCHIP %s",tit)) {
-    dacs[5]->setLabel(tit,1);
-    is=5;
-  }
-    
-  return is;
-
-}
-
-string ctbPowers::getPwrAlias() {
-
-  ostringstream line;
-
-  for (int i=0; i<NPOWERS; i++)
-    line << dacs[i]->getLabel() << endl;
-  return line.str();
-
-}
-
-
-
-
-string ctbPowers::getPwrParameters() {
-
-  ostringstream line;
-  line << "v_a" << " " << dacs[0]->getValue() << " mv" << endl;
-  line << "v_b" << " " << dacs[1]->getValue() << " mv" << endl;
-  line << "v_c" << " " << dacs[2]->getValue() << " mv" << endl;
-  line << "v_d" << " " << dacs[3]->getValue() << " mv" << endl;
-  line << "v_io" << " " << dacs[4]->getValue() << " mv" << endl;
-  line << "v_chip" << " " << dacs[5]->getValue() << " mv" << endl;
-  // for (int i=0; i<POWERS; i++) {
-  //   //line << "dacs:" << i << " " << dacs[i]->getValue << endl;
-  //   line << "dac:" << i << " " << dacs[i]->getValue() << endl;
-  // } 
-  return line.str();
-}
-
-
-
-void  ctbPowers::update() {
-  for (int idac=0; idac<NPOWERS; idac++) {
-    dacs[idac]->getValue();
-
-  }
-}
--- a/ctbGui/ctbPowers.h
+++ b/ctbGui/ctbPowers.h
@ -1,67 +0,0 @@
-#ifndef CTBPOWERS_H
-#define CTBPOWERS_H
-
-#include  <TGFrame.h>
-
-#define NPOWERS 6
-
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-
-
-
-
-namespace sls
-{
-   class Detector;
-};
-
-#include <string>
-using namespace std;
-
-
-class ctbPower : public ctbDac {
-
-  
-
-
- public:
-
-  ctbPower(TGGroupFrame* f, int i, sls::Detector* d);
-
-    string getLabel();
-
-    int getValue();
-    void setValue();
-    void setValue(Long_t);
-
-   ClassDef(ctbPower,0)
-};
-
-
-class ctbPowers : public TGGroupFrame 
-{
- private:
-  
-   ctbPower *dacs[NPOWERS]; 
-
-   sls::Detector* myDet; 
-
-public:
-   //ctbPowers();
-    ctbPowers(TGVerticalFrame*, sls::Detector*);
-
-    int setPwrAlias(string); 
-    string getPwrAlias(); 
-    string getPwrParameters(); 
-
-    void update(); 
-
-    ClassDef(ctbPowers,0)
-};
-
-#endif
--- a/ctbGui/ctbSignals.cpp
+++ b/ctbGui/ctbSignals.cpp
@ -1,541 +0,0 @@
-#include <TApplication.h>
-#include <TGClient.h>
-#include <TCanvas.h>
-#include <TF1.h>
-#include <TRandom.h>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <TList.h>
-#include <TGFileDialog.h>
-#include <TGComboBox.h>
-#include <TH2F.h>
-#include <TColor.h>
-#include <TH1F.h>
-#include <TGraphErrors.h>
-#include <THStack.h>
-#include <TGTab.h>
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <TGButton.h>
-#include <TRootEmbeddedCanvas.h>
-#include <TGButtonGroup.h>
-#include <TGNumberEntry.h>
-#include <TGLabel.h>
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <TColor.h>
-#include <TGColorSelect.h>
-
-
-#include "ctbSignals.h"
-#include "ctbDefs.h"
-#include "sls/Detector.h"
-
-using namespace std;
-
-
-
-//#define DEFAULTFN "run_0.encal"
-
-
-ctbSignal::ctbSignal(TGFrame *page, int i,  sls::Detector *det)
-  : TGHorizontalFrame(page, 800,50), myDet(det), id(i), hsig(NULL) {
-
-
-  TGHorizontalFrame *hframe=this;
-  char tit[100];
-
-
-   
-   sprintf(tit, "BIT%d ",id);
-
-   sLabel= new TGLabel(hframe, tit);
-   hframe->AddFrame( sLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sLabel->MapWindow();
-   sLabel->SetTextJustify(kTextLeft);
-
-
-
-   sOutput= new TGCheckButton(hframe, "Out");
-   hframe->AddFrame( sOutput,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sOutput->MapWindow();
-
- 
-   sOutput->Connect("Toggled(Bool_t)","ctbSignal",this,"ToggledOutput(Bool_t)");
-
-   sDbitList= new TGCheckButton(hframe, "DB List");
-   hframe->AddFrame( sDbitList,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sDbitList->MapWindow();
-
-   sDbitList->Connect("Toggled(Bool_t)","ctbSignal",this,"ToggledDbitList(Bool_t)");
-
-
-   sPlot= new TGCheckButton(hframe, "Plot");
-   hframe->AddFrame( sPlot,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   sPlot->MapWindow();
-
-   sPlot->Connect("Toggled(Bool_t)","ctbSignal",this,"ToggledPlot(Bool_t)");
-   
-   fColorSel = new TGColorSelect(hframe, id+1, 0);
-   fColorSel->Connect("ColorSelected(Pixel_t)","ctbSignal",this,"ColorChanged(Pixel_t)");
-   hframe->AddFrame(fColorSel, new TGLayoutHints(kLHintsTop |
-                          kLHintsLeft, 2, 0, 2, 2));
-   
-
-   fColorSel->SetColor(TColor::Number2Pixel(id+1));
-
-   
-   ToggledOutput(kFALSE);
-
-  
-   ToggledPlot(kFALSE);
-
-  //  if (id==63) {
-//      sOutput->SetOn(kTRUE);
-//      sOutput->SetEnabled(kFALSE);
-//    }
-// #ifdef CTB
-//    if (id==62) {
-//      sOutput->SetOn(kTRUE);
-//      sOutput->SetEnabled(kFALSE);
-//    }
-
-//    // if (id>=32 && id<48)
-//    //   fixOutput(1);
-//    // else if (id>=48 && id<64)
-//    //   fixOutput(0);
-
-// #endif
-}
-int ctbSignal::setSignalAlias(char *tit, int plot, int col) {
-
-  if (tit)
-    sLabel->SetText(tit);
-
-  if (plot>0) {
-      sPlot->SetOn(kTRUE,kTRUE); 
-  } else if (plot==0)
-      sPlot->SetOn(kFALSE,kTRUE);
-    
-  if (col>=0)
-    fColorSel->SetColor(col);//TColor::Number2Pixel(col+1));
-
-  fColorSel->SetEnabled(sPlot->IsOn());
-  return 0;
-
-}
-
-string ctbSignal::getSignalAlias() {
-  
-
-  ostringstream oss;
-  oss << "BIT" << dec << id << " " << sLabel->GetText()->Data() << " " << sPlot->IsOn() << hex << " " << fColorSel->GetColor() << endl;
-  return oss.str();
-
-
-
-
-}
-int ctbSignal::setOutput(Long64_t r) {
-
-
-  //  cout << hex << r << dec <<endl;
-
-  Long64_t mask=((Long64_t)1<<id);
-
-  if (r&mask)
-      sOutput->SetOn(kTRUE,kTRUE);
-  else 
-      sOutput->SetOn(kFALSE,kTRUE);
-    
-  return sOutput->IsOn();
-
-}
-
-int ctbSignal::fixOutput(int i) {
-
-  if (i) {
-    sPlot->SetOn(kFALSE);
-    //sClock->SetOn(kFALSE,kTRUE);
-    sOutput->SetOn(kTRUE);
-    //   sPlot->SetEnabled(kFALSE);
-    //  sClock->SetEnabled(kTRUE);
-  } else {
-    sOutput->SetOn(kFALSE,kTRUE);
-    //  sClock->SetOn(kFALSE);  
-    // sClock->SetEnabled(kFALSE);
-    sPlot->SetEnabled(kTRUE);
-  }
-  sOutput->SetEnabled(kFALSE);
-  return 0;
-
-}
-
-int ctbSignal::setDbitList(Long64_t r) {
-
-  if (r)
-      sDbitList->SetOn(kTRUE,kFALSE);
-  else 
-      sDbitList->SetOn(kFALSE,kFALSE);
-    
-  return sDbitList->IsOn();
-
-}
-
-int ctbSignal::isDbitList() { return sDbitList->IsOn();}
-int ctbSignal::isOutput() { return sOutput->IsOn();}
-int ctbSignal::isPlot() { return sPlot->IsOn();}
-Pixel_t ctbSignal::getColor(){return fColorSel->GetColor();}
-
-void ctbSignal::ToggledOutput(Bool_t b) {
-  ToggledSignalOutput(id);
-  if (b) {
-    // sClock->SetEnabled(kTRUE);
-    sPlot->SetOn(kFALSE);
-    // sPlot->SetEnabled(kFALSE);
-    fColorSel->SetEnabled(kFALSE);
-  } else {
-    // sClock->SetEnabled(kFALSE);
-    // sClock->SetOn(kFALSE);
-    sPlot->SetEnabled(kTRUE);
-    if ( sPlot->IsOn())
-      fColorSel->SetEnabled(kFALSE);
-    else
-      fColorSel->SetEnabled(kTRUE);
-  }
-
-
-}
-
-void ctbSignal::ToggledDbitList(Bool_t b){
-  Long_t mask=id;
-  ToggledSignalDbitList(mask);
-}
-
-
-void ctbSignal::ToggledPlot(Bool_t b){
-  Long_t mask=b<<id;
-  ToggledSignalPlot(mask);
-  fColorSel->SetEnabled(b);
-}
-
-void ctbSignal::ColorChanged(Pixel_t p){
-  ToggledSignalPlot(id);
-}
-
-
-void ctbSignal::ToggledSignalOutput(Int_t b) {
-  cout << "Toggle signal " << id << " " << b  << " " <<  sOutput->IsOn() <<endl;;
-  Emit("ToggledSignalOutput(Int_t)", id);
-}
-
-void ctbSignal::ToggledSignalDbitList(Int_t b){
-  cout << "Toggle dbitlist " << id << " " << b << endl;;
-  Emit("ToggledSignalDbitList(Int_t)", id);
-}
-
-void ctbSignal::ToggledSignalPlot(Int_t b){
-  Emit("ToggledSignalPlot(Int_t)", id);
-}
-
-
-ctbSignals::ctbSignals(TGVerticalFrame *page, sls::Detector *det)
-  : TGGroupFrame(page,"IO Signals",kVerticalFrame), myDet(det) {
-
-
-  SetTitlePos(TGGroupFrame::kLeft);
-  page->AddFrame(this,new TGLayoutHints( kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  MapWindow();
-  
-
-  TGHorizontalFrame *hframe;
- 
-  TGHorizontalFrame* hhframe=new TGHorizontalFrame(this, 800,800);
-  AddFrame(hhframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hhframe->MapWindow();
-
-  TGVerticalFrame *vframe;
-
-
-
-
-  int idac=0;
-  for (idac=0; idac<NSIGNALS; idac++) {
-    if (idac%((NSIGNALS+2)/2)==0) {
-    vframe=new TGVerticalFrame(hhframe, 400,800);
-     hhframe->AddFrame(vframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    vframe->MapWindow();
-    }
-
-
-    signals[idac]=new ctbSignal(vframe,idac,myDet);
-    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)");
- 
-    vframe->AddFrame(signals[idac],new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    signals[idac]->MapWindow();
-
-
-  }
-
-  hframe=new TGHorizontalFrame(vframe, 800,50);
-  vframe->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-  hframe->MapWindow();
-
-
-  TGLabel *label= new TGLabel(hframe, "IO Control Register: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-   eIOCntrlRegister = new TGNumberEntry(hframe, 0, 16,999, TGNumberFormat::kNESHex,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-
-  hframe->AddFrame(eIOCntrlRegister,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eIOCntrlRegister->MapWindow();
-   eIOCntrlRegister->Resize(150,30);
-
-
-
-
-    hframe=new TGHorizontalFrame(vframe, 800,50);
-    vframe->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    hframe->MapWindow();
-   
-
-   label= new TGLabel(hframe, "DBit Offset: ");
-   hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 1, 1, 1, 1));
-   label->MapWindow();
-   label->SetTextJustify(kTextLeft);
-
-
-   eDbitOffset = new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-                                               TGNumberFormat::kNELNoLimits);
-
-  hframe->AddFrame(eDbitOffset,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eDbitOffset->MapWindow();
-   eDbitOffset->Resize(150,30);
-   
- 
-  TGTextEntry *e= eDbitOffset->TGNumberEntry::GetNumberEntry();
-    e->Connect("ReturnPressed()","ctbSignals",this,"setDbitOffset()");
-
-    e->Connect("ValueSet(Long_t)","ctbSignals",this,"setDbitOffset(Long_t)");
-}
-
-
-
-
-int ctbSignals::setSignalAlias(string line) {
-
-  int is=-1, plot=0, col=-1;
-  char tit[100];
-  int narg=sscanf(line.c_str(),"BIT%d %s %d %d",&is,tit,&plot,&col);
-  if (narg<2)
-    return -1;
-  if (is>=0 && is<NIOSIGNALS) {
-    signals[is]->setSignalAlias(tit,plot,col);
-  }
-  return is;
-
-}
-
-string ctbSignals::getSignalAlias() {
-
-  ostringstream oss;
-  for (int is=0; is<NIOSIGNALS; is++)
-    oss << signals[is]->getSignalAlias() << endl;
-
-
-    return oss.str();
-
-}
-
-
-void ctbSignals::update() {
-  try {
-
-    Long64_t oreg = static_cast<Long64_t>(myDet->getPatternIOControl().tsquash("Different values"));
-    cout << hex << oreg << dec << endl;
-
-    for (int idac=0; idac<NIOSIGNALS; idac++) {
-      signals[idac]->setOutput(oreg);
-    }
-
-  } CATCH_DISPLAY ("Could not get patternIOcontrol.", "ctbSignals::update")
-
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-    // enable all
-    for (int is=0; is<64; is++) {
-      signals[is]->setDbitList(1);
-    } 
-    eDbitOffset->SetNumber(0);
-  } 
-  
-  // ctb
-  else {
-    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")
-  }
-}
-
-
-string ctbSignals::getSignalParameters() {
-
-  try {
-
-    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) {
-  try {
-
-    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;
-
-    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;
-
-    eIOCntrlRegister->SetText(to_string(oreg).c_str());
-
-  } CATCH_DISPLAY ("Could not get/set patternIOcontrol.", "ctbSignals::ToggledOutReg")
-
-}
-
-
-
-void ctbSignals::ToggledDbitList(Int_t mask){
-  try {
-
-    auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
-
-    // 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);
-      }
-    }
-
-  } CATCH_DISPLAY ("Could not get/set receiver dbit list.", "ctbSignals::ToggledDbitList")
-}
-
-
-
-
-void ctbSignals::ToggledPlot(Int_t b) {
-  
-  Emit("ToggledSignalPlot(Int_t)", b);
-
-}
-
-
-void ctbSignals::ToggledSignalPlot(Int_t b) {
-  
-  Emit("ToggledSignalPlot(Int_t)", b);
-
-}
-
-
-Pixel_t ctbSignals::getColor(int i){
-  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();
-  return -1;
-};
-
-void ctbSignals::setDbitOffset(Long_t) {
-  setDbitOffset();
-}
-
-void ctbSignals::setDbitOffset(){
-  try {
-    myDet->setRxDbitOffset(eDbitOffset->GetNumber());
-  } CATCH_DISPLAY ("Could not set receiver dbit offset.", "ctbSignals::setDbitOffset")
-}
--- a/ctbGui/ctbSignals.h
+++ b/ctbGui/ctbSignals.h
@ -1,121 +0,0 @@
-#ifndef CTBSIGNALS_H
-#define CTBSIGNALS_H
-#include  <TGFrame.h>
-
-
-#define NSIGNALS 64
-
-#define NIOSIGNALS 64 //for moench board was 52
-
-
-#define ADCLATCH 63
-#define DIGSIGLATCH 62
-
-
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-class TH1I;
-class  TGTextButton;
-class TGColorSelect;
-
-
-
-class TGNumberEntry;
-namespace sls
-{
-   class Detector;
-};
-class ctbSignal;
-
-#include <string>
-using namespace std;
-
-class ctbSignal : public TGHorizontalFrame {
-
-  // RQ_OBJECT("ctbSignal")
-
-private:
-
-   TGLabel *sLabel;
-   TGCheckButton *sOutput;
-   TGCheckButton *sDbitList;
-   TGCheckButton *sPlot;
-   TGLabel *sValue;
-   TGNumberEntry *sEntry;
-   TGColorSelect *fColorSel;
-
-   sls::Detector *myDet;
-   Int_t id;
-
-   TH1I *hsig;
-
-public:
-
-   ctbSignal(TGFrame *page, int i, sls::Detector *det);
-   int setSignalAlias(char *tit, int plot, int col);
-   string getSignalAlias();
-
-   TH1I *getPlot() {return hsig;};
-   int setOutput(Long64_t);
-   int fixOutput(int);
-   int setDbitList(Long64_t);
-
-   void ToggledOutput(Bool_t); 
-   void ToggledDbitList(Bool_t); 
-   void ToggledPlot(Bool_t); 
-   void ColorChanged(Pixel_t); 
-
-   int isDbitList();
-   int isOutput();
-   int isPlot();
-   Pixel_t getColor();
-
-
-   void ToggledSignalOutput(Int_t); //*SIGNAL*
-   void ToggledSignalDbitList(Int_t); //*SIGNAL*
-   void ToggledSignalPlot(Int_t); //*SIGNAL*
-
-
-
-   ClassDef(ctbSignal,0)
-};
-
-class ctbSignals : public TGGroupFrame {
-private:
- 
-  ctbSignal *signals[NSIGNALS];
-
-  TGNumberEntry *eIOCntrlRegister;
-  TGNumberEntry *eDbitOffset;
-
-  sls::Detector *myDet;
-
-public:
-  ctbSignals(TGVerticalFrame *page, sls::Detector *det);
-   int setSignalAlias(string line);
-   string getSignalAlias();
-
-   int getPlot(int);
-   Pixel_t getColor(int);
-   
-   void update();
-   // void saveParameters();
-   string getSignalParameters();
-
-   //void setDbitList(Int_t);
-   void setDbitOffset(Long_t);
-   void setDbitOffset();
-
-   void ToggledOutReg(Int_t);
-   void ToggledDbitList(Int_t);
-   void ToggledPlot(Int_t);
-   void ToggledSignalPlot(Int_t); //*SIGNAL*
-
-   ClassDef(ctbSignals,0)
-};
-
-#endif
--- a/ctbGui/ctbSlowAdcs.cpp
+++ b/ctbGui/ctbSlowAdcs.cpp
@ -1,182 +0,0 @@
-
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-#include <TGTextEntry.h>
-#include <TGLabel.h>
-#include <TGNumberEntry.h>
-#include <TGButton.h>
-
-#include "ctbSlowAdcs.h"
-#include "ctbDefs.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
-
-using namespace std;
-
-
-
-
-ctbSlowAdc::ctbSlowAdc(TGGroupFrame *page, int idac, sls::Detector *det) : TGHorizontalFrame(page, 800,50) , id(idac), myDet(det) {
-
-
-    TGHorizontalFrame *hframe=this;
-
-    page->AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 1,1,1,1));
-    MapWindow();
-
-    char tit[100];
-    
-
-   sprintf(tit, "SENSE %d:",idac-1000);
-
-   dacsLabel= new TGLabel(hframe, tit);// new TGLabel(hframe, tit);
-   
- 
-
-   hframe->AddFrame(dacsLabel,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsLabel->MapWindow();
-   dacsLabel->SetTextJustify(kTextLeft);
-
-  
-
-
-   sprintf(tit, "xxx");
-   dacsValue= new TGLabel(hframe, tit);
-   hframe->AddFrame( dacsValue,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   dacsValue->MapWindow();
-   dacsValue->SetTextJustify(kTextLeft);
-
-   
-
-   TGTextButton *b= new TGTextButton(hframe, "Update");
-   hframe->AddFrame( b,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-   b->MapWindow();
-   b->SetTextJustify(kTextLeft);
-
-   b->Connect("Clicked()","ctbSlowAdc",this,"getValue()");
-}
-
-
-
-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() {
-  try {
-    std::string s;
-
-    // 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;
-}
-
-
-
-
-
-
-
-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));
-  MapWindow();
-  
-  // cout << "window mapped " << endl;
-
- 
-  for (int idac=0; idac<NSLOWADCS + 1; idac++) {
-
-     adcs[idac]=new ctbSlowAdc(this, idac+1000, myDet);
-
-  }
-  adcs[NSLOWADCS]->setLabel((char*)"Temperature"); 
-}
-
-
-
-
-int ctbSlowAdcs::setSlowAdcAlias(string line) {
-
-  int is=-1, mv=0;
-  char tit[100];
-  int narg=sscanf(line.c_str(),"SENSE%d %s %d",&is,tit,&mv);
-  if (narg<2)
-    return -1;
-  if (is>=0 && is<NSLOWADCS) 
-    adcs[is]->setLabel(tit);
-  return is;
-
-}
-
-string ctbSlowAdcs::getSlowAdcAlias() {
-
-  ostringstream line;
-
-  for (int i=0; i<NSLOWADCS; i++)
-    line << adcs[i]->getLabel() << endl;
-  return line.str();
-}
-
-
-
-
-string ctbSlowAdcs::getAdcParameters() {
-
-  ostringstream line;
-
-  for (int i=0; i<NSLOWADCS; i++) {
-    //line << "dacs:" << i << " " << dacs[i]->getValue << endl;
-    line << "adc:" << i << " " << adcs[i]->getValue() << endl;
-  }    
-  line << "adc:-1" << adcs[NSLOWADCS]->getValue() << endl;
-  return line.str();
-}
-
-
-
-void  ctbSlowAdcs::update() {
-  for (int idac=0; idac<NSLOWADCS+1; idac++) {
-    adcs[idac]->getValue();
-  }
-}
--- a/ctbGui/ctbSlowAdcs.h
+++ b/ctbGui/ctbSlowAdcs.h
@ -1,78 +0,0 @@
-
-
-#ifndef CTBSLOWADCS_H
-#define CTBSLOWADCS_H
-#include  <TGFrame.h>
-
-
-//#define NDACS 16
-#define NSLOWADCS 8
-
-
-
-
-class TGTextEntry;
-class TGLabel;
-class TGNumberEntry;
-class TGCheckButton;
-class TGTextButton;
-
-
-
-namespace sls
-{
-   class Detector;
-};
-
-#include <string>
-using namespace std;
-
-class ctbSlowAdc : public TGHorizontalFrame {
-
-
- protected:
-  // TGLabel *dacsLabel;
-  // TGNumberEntry *dacsEntry;
-  // TGCheckButton *dacsUnit;
-   TGLabel *dacsLabel;
-   TGLabel *dacsValue;
-   int id;
-
-   sls::Detector* myDet;
- public:
-   ctbSlowAdc(TGGroupFrame*, int , sls::Detector*);
-   int getValue();
-   
-   int setLabel(char *tit);
-   string getLabel();
-
-
-
-   ClassDef(ctbSlowAdc,0)
-};
-
-
-class ctbSlowAdcs : public TGGroupFrame {
-private:
-  
-
-
-   ctbSlowAdc *adcs[NSLOWADCS+1];
-
-   sls::Detector* myDet;
-
-public:
-   ctbSlowAdcs(TGVerticalFrame *page, sls::Detector*);
-
-   int setSlowAdcAlias(string line);
-   // int setDacAlias(string line);
-   string getSlowAdcAlias();
-   string getAdcParameters();
-
-   void update();
-
-   ClassDef(ctbSlowAdcs,0)
-};
-
-#endif
-
--- a/ctbGui/patternGenerator/deserializer.cpp
+++ b/ctbGui/patternGenerator/deserializer.cpp
@ -1,110 +0,0 @@
-
-#include <stdlib.h>  
-#include <stdint.h>  
-#include <string.h>  
-#include <sys/utsname.h>   
-#include <sys/types.h>
-#include <unistd.h>  
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <math.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-int main(int argc, char *argv[]) {
-
-  int iarg;
-  char fname[10000];
-  uint64_t word;
-  int val[64];
-  int bit[64];
-  FILE *fdin;
-  
-  int nb=2;
-  int off=0;
-  int ioff=0;
-  int dr=24;
-  int idr=0;
-  int ib=0;
-  int iw=0;
-  bit[0]=19;
-  bit[1]=8;
-  //  for (iarg=0; iarg<argc; iarg++) printf("%d %s\n",iarg, argv[iarg]);
-  
-  if (argc<2) printf("Error: usage is %s fname [dr off  b0 b1 bn]\n");
-  
-  if (argc>2) dr=atoi(argv[2]);
-  if (argc>3) off=atoi(argv[3]);
-  if (argc>4) {
-  for (ib=0; ib<64; ib++) {
-    if (argc>4+ib) {
-      bit[ib]=atoi(argv[4+ib]);
-      nb++;
-    }
-  }
-  
-  }
-  
-  idr=0;
-  for (ib=0; ib<nb; ib++) {
-    val[ib]=0;
-  }
-  
-  
-  fdin=fopen(argv[1],"rb");
-  if (fdin==NULL) {
-    printf("Cannot open input file %s for reading\n",argv[1]);
-    return 200;
-  } 
-  
-  while (fread((void*)&word, 8, 1, fdin)) {
-    //   printf("%llx\n",word);
-    if (ioff<off) ioff++;
-    else {
-      
-      for (ib=0; ib<nb; ib++) {
-	if (word&(1<<bit[ib])) 	  val[ib]|=(1<<idr);
-      }
-      idr++;
-      if (idr==dr) {
-	idr=0;
-	fprintf(stdout,"%d\t",iw++);
-	for (ib=0; ib<nb; ib++) {
-#ifdef HEX
-	  fprintf(stdout,"%08llx\t",val[ib]);
-#else
-	  fprintf(stdout,"%lld\t",val[ib]);
-	  
-#endif
-	  
-	  val[ib]=0;
-	}
-	fprintf(stdout,"\n");
-      }
-      
-    }
-
-  }
-  if (idr!=0) {
-    fprintf(stdout,"%d\t",iw++);
-    for (ib=0; ib<nb; ib++) {
-#ifdef HEX
-	  fprintf(stdout,"%08llx\t",val[ib]);
-#else
-	  fprintf(stdout,"%lld\t",val[ib]);
-	  
-#endif
-	  
-	  val[ib]=0;
-    }
-    fprintf(stdout,"\n");
-  }
-
-  fclose(fdin);
-
-  return 0;
-}
--- a/ctbGui/patternGenerator/generate.sh
+++ b/ctbGui/patternGenerator/generate.sh
@ -1,31 +0,0 @@
-if [ "$#" -eq 0 ]; then
-    echo "Wrong number of arguments: usage should be $0 patname"
-    exit 1
-fi
-infile=$1
-outfile=$infile"at"
-outfilebin=$infile"bin"
-if [ "$#" -ge 2 ]; then
-    outfile=$2
-fi
-exe=$infile"exe"
-if [ "$#" -ge 4 ]; then
-    exe=$4
-fi
-
-if [ "$#" -ge 3 ]; then
-    outfilebin=$3
-fi
-
-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
-echo done
-else
-	echo "$infile not found."
-fi
--- a/ctbGui/patternGenerator/generator.c
+++ b/ctbGui/patternGenerator/generator.c
@ -1,177 +0,0 @@
-/****************************************************************************
-usage to generate a patter test.pat from test.p
-
-gcc -DINFILE="\"test.p\"" -DOUTFILE="\"test.pat\"" -o test.exe generator.c ; ./test.exe ; rm test.exe
-
-
-*************************************************************************/
-
-#include <stdlib.h>  
-#include <stdint.h>  
-#include <string.h>  
-#include <sys/utsname.h>   
-#include <sys/types.h>
-#include <unistd.h>  
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <math.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define MAXLOOPS 3
-#define MAXTIMERS 3
-#define MAXWORDS 1024
-
-
-
-uint64_t pat=0;
-uint64_t iopat=0;
-uint64_t clkpat=0;
-
-int iaddr=0;
-int waitaddr[3]={MAXWORDS,MAXWORDS,MAXWORDS};
-int startloopaddr[3]={MAXWORDS,MAXWORDS,MAXWORDS}; 
-int stoploopaddr[3]={MAXWORDS,MAXWORDS,MAXWORDS}; 
-int start=0, stop=0;
-uint64_t waittime[3]={0,0,0};
-int nloop[3]={0,0,0};
-
-char infile[10000], outfile[10000];
-
-FILE *fd, *fd1;
-uint64_t PAT[MAXWORDS];
-
-
-int i,ii,iii,j,jj,jjj,pixx,pixy,memx,memy,muxout,memclk,colclk,rowclk,muxclk,memcol,memrow,loopcounter;
-
-void setstart() {
-  start=iaddr;
-}
-
-void setstop() {
-  stop=iaddr;
-}
-
-void setinput(int bit) {
-  uint64_t mask=1;
-  mask=mask<<bit;
-  iopat &= ~mask;
-}
-
-void setoutput(int bit) {
-  uint64_t mask=1;
-  mask=mask<<bit;
-  iopat |= mask;
-}
-
-void setclk(int bit) {
-  uint64_t mask=1;
-  mask=mask<<bit;
-  iopat |= mask;
-  clkpat |= mask;
-}
-
-void clearbit(int bit){
-  uint64_t mask=1;
-  mask=mask<<bit;
-  pat &= ~mask;
-}
-void setbit(int bit){
-  uint64_t mask=1;
-  mask=mask<<bit;
-  pat |= mask;
-}
-
-int checkbit(int bit) {
-  uint64_t mask=1;
-  mask=mask<<bit;
-  return (pat & mask ) >>bit;
-}
-
-void setstartloop(int iloop) {
-  if (iloop>=0 && iloop<MAXLOOPS)
-    startloopaddr[iloop]=iaddr;
-}
-
-
-void setstoploop(int iloop) {
-  if (iloop>=0 && iloop<MAXLOOPS)
-    stoploopaddr[iloop]=iaddr;
-}
-
-
-void setnloop(int iloop, int n) {
-  if (iloop>=0 && iloop<MAXLOOPS)
-    nloop[iloop]=n;
-}
-
-void setwaitpoint(int iloop) {
-  if (iloop>=0 && iloop<MAXTIMERS)
-    waitaddr[iloop]=iaddr;
-}
-
-
-void setwaittime(int iloop, uint64_t t) {
-  if (iloop>=0 && iloop<MAXTIMERS)
-    waittime[iloop]=t;
-}
-
-
-
-
-void pw(){
-  if (iaddr<MAXWORDS)
-    PAT[iaddr]= pat;
-  fprintf(fd,"patword 0x%04x 0x%016llx\n",iaddr, pat);
-  iaddr++;
-  if (iaddr>=MAXWORDS) printf("ERROR: too many word in the pattern (%d instead of %d)!",iaddr, MAXWORDS);
-}
-
-int parseCommand(int clk, int cmdbit, int cmd, int length) {
-  int ibit;
-  clearbit(clk);
-  for (ibit=0; ibit<length; ibit++) {
-    if (cmd&(1>>ibit))
-      setbit(cmdbit);
-    else
-      clearbit(cmdbit);
-    pw();
-    /******/
-    setbit(clk);
-    pw();
-    /******/
-  }
-};
-
-
-
-main(void) {
-  int iloop=0;
-  fd=fopen(OUTFILE,"w");
-#include INFILE
-
-  fprintf(fd,"patioctrl 0x%016llx\n",iopat);
-  fprintf(fd,"patclkctrl 0x%016llx\n",clkpat);
-  fprintf(fd,"patlimits 0x%04x 0x%04x\n",start, stop);
-
-  for (iloop=0; iloop<MAXLOOPS; iloop++) {
-    fprintf(fd,"patloop%d 0x%04x 0x%04x\n",iloop, startloopaddr[iloop], stoploopaddr[iloop]);
-    if ( startloopaddr[iloop]<0 || stoploopaddr[iloop]<= startloopaddr[iloop]) nloop[iloop]=0;
-    fprintf(fd,"patnloop%d %d\n",iloop, nloop[iloop]);
-  }
-
-  for (iloop=0; iloop<MAXTIMERS; iloop++) {
-    fprintf(fd,"patwait%d 0x%04x\n",iloop, waitaddr[iloop]);
-    if (waitaddr[iloop]<0) waittime[iloop]=0;
-    fprintf(fd,"patwaittime%d %lld\n",iloop, waittime[iloop]);
-  }
-  
-  close((int)fd);
-  fd1=fopen(OUTFILEBIN,"w");
-  fwrite(PAT,sizeof(uint64_t),iaddr, fd1);
-  close((int)fd1);
-}
--- a/ctbGui/patternGenerator/test.p
+++ b/ctbGui/patternGenerator/test.p
@ -1,201 +0,0 @@
-//define signals and directions (Input, outputs, clocks)
-
-
-#define compTestIN 1
-setoutput(compTestIN);
-
-#define curON 32
-setoutput(curON);
-
-#define side_clk 2
-setclk(side_clk);
-
-#define side_din 3
-setoutput(side_din);
-
-#define clear_shr 4
-setoutput(clear_shr);
-
-#define bottom_din 5
-setoutput(bottom_din);
-
-#define bottom_clk 6
-setclk(bottom_clk);
-
-#define gHG 7
-setoutput(gHG);
-
-#define bypassCDS 31
-setoutput(bypassCDS);
-
-
-#define ENprechPRE 8
-setoutput(ENprechPRE);
-
-
-#define res 9
-setoutput(res);
-
-#define pulseOFF 30
-setoutput(pulseOFF);
-
-#define connCDS 27
-setoutput(connCDS);
-
-#define Dsg_1 24
-setoutput(Dsg_1);
-
-
-#define Dsg_2 25
-setoutput(Dsg_2);
-
-
-#define Dsg_3 23
-setoutput(Dsg_3);
-
-#define sto0 10
-setoutput(sto0);
-
-#define sto1 11
-setoutput(sto1);
-
-#define sto2 12
-setoutput(sto2);
-
-#define resCDS 13
-setoutput(resCDS);
-
-#define prechargeConnect 14
-setoutput(prechargeConnect);
-
-#define pulse 15
-setoutput(pulse);
-
-#define PCT_mode 21
-setoutput(PCT_mode);
-
-#define res_DGS 16
-setoutput(res_DGS);
-
-#define adc_ena 17
-setoutput(adc_ena);
-
-
-#define CLKBIT 18
-setclk(CLKBIT);
-
-
-#define adc_sync 63
-setoutput(adc_sync);
-
-
-
-
-
-	  
-#define PW pw()
-#define SB(x) setbit(x) 
-#define CB(x) clearbit(x)
-#define CLOCK  clearbit(CLKBIT); pw();setbit(CLKBIT);pw()
-#define LCLOCK  clearbit(CLKBIT); pw();setbit(CLKBIT);pw();clearbit(CLKBIT); pw()
-#define CLOCKS(x) for (i=0;i<x;i++) {clearbit(CLKBIT);pw(); setbit(CLKBIT); pw();}
-#define STOP setstop();
-#define START setstart();
-#define REPEAT(x) for (i=0;i<(x);i++) {pw();}
-#define DOFOR(x) for (j=0;j<(x);j++) {
-// }				     
-#define STARTUP1 CB(compTestIN);SB(clear_shr);CB(side_clk);CB(side_din);CB(bottom_din);CB(bottom_clk);
-#define STARTUP2 CB(pulse);SB(PCT_mode);SB(pulseOFF);CB(curON);
-#define STARTUP3 SB(res);SB(gHG);SB(ENprechPRE);
-#define STARTUP4 SB(bypassCDS); CB(connCDS);CB(sto0);SB(sto1);SB(sto2);
-#define STARTUP5 SB(resCDS);CB(Dsg_1);CB(Dsg_2);SB(Dsg_3);CB(prechargeConnect);SB(res_DGS);
-#define STARTUP STARTUP1 STARTUP2 STARTUP3 STARTUP4 STARTUP5 PW;
-
-
-
-
-
-//****NOTES****//
-//FUNCTIONS
-//Declare functions at the beginning 
-void load_pix(int nx, int ny)
-{//SELECT PIXEL 1,1 for readout
-SB(clear_shr);PW;PW;
-CB(clear_shr);PW;PW;PW;PW;
-
-SB(side_din);PW;
-SB(side_clk);PW;
-CB(side_din);
-setstartloop(0); //loop on the rows
-SB(side_clk);PW;
-setstoploop(0);  //finish loop on the rows
-setnloop(0,ny); //set number row selected -can be changed dynamically
-CB(side_clk);PW;
-SB(bottom_din);PW;
-SB(bottom_clk);PW;
-CB(bottom_din);
-setstartloop(1); //loop on the columns
-SB(bottom_clk);PW;
-setstoploop(1); //loop on the columns
-setnloop(1,ny); //set number columns selected -can be changed dynamically
-}
-   
-void load_col(void)
-{//SELECT COLUMN 1 for readout
-SB(clear_shr);PW;PW;
-CB(clear_shr);PW;PW;PW;PW;
-SB(bottom_din);PW;
-SB(bottom_clk);PW;
-CB(bottom_clk);PW;
-CB(bottom_din);PW;
-}
-//END of FUNCTIONS
-////////////////////////////////////////////////////////
-//LET BYPASS PREAMP AND CDS and write on preamp out.//
-//THIS ALLOWS CHECKING SOURCE FOLLOWERS               //
-////////////////////////////////////////////////////////
-
-   
-PW;
-   
-SB(5); PW;
-
-CB(5); PW;
-
-START; //pattern starts from here
-STARTUP;
-setwaitpoint(0); //set wait points
-PW;
-setwaittime(0,20); //wait time - can be changed dynamically
-SB(adc_ena);PW;
-   printf("ADC sync %x %d %llx\n",iaddr,adc_sync, pat);
-SB(adc_sync);PW;
-   printf("ADC sync %x %d  %llx\n",iaddr, adc_sync, pat);
-CB(gHG);
-setwaitpoint(1); //set wait points
-setwaittime(1,16); //wait time - can be changed dynamically
-CB(adc_sync);PW;
-load_pix(10, 20);
-
-CB(res);
-//CB(Dsg_3);PW;
-CB(res_DGS);
-setwaitpoint(2); //set wait points
-setwaittime(2,1000); //wait time - can be changed dynamically
-
-//SB(res_DGS);
-//PW;
-//SB(Dsg_3);
-//
-//CB(connCDS);
-//TEST SIGNALS END
-//
-REPEAT(20)
-
-//****************//
-//*FINAL COMMANDS*//
-//****************//
-CB(adc_ena);PW;
-//STARTUP;
-STOP; PW; //stops here
-//REPEAT(4);
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@ -1,98 +0,0 @@
-find_package(Doxygen REQUIRED)
-find_package(Sphinx REQUIRED)
-
-
-
-
-# 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/consuming.rst
-  src/dependencies.rst
-  src/detector.rst
-  src/index.rst
-  src/installation.rst
-  src/pydetector.rst
-  src/pyenums.rst
-  src/pyexamples.rst
-  src/servers.rst
-  src/receiver_api.rst
-  src/result.rst
-  src/type_traits.rst
-  src/ToString.rst
-  src/examples.rst
-  src/pygettingstarted.rst
-  src/firmware.rst
-  src/serverupgrade.rst
-  src/virtualserver.rst
-  src/serverdefaults.rst
-  src/quick_start_guide.rst
-  src/troubleshooting.rst
-  src/receivers.rst
-  src/slsreceiver.rst
-)
-
-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)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/gen_server_doc.py.in"
-  "${SPHINX_BUILD}/gen_server_doc.py"
-  @ONLY)
-
-  configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/static/extra.css"
-  "${SPHINX_BUILD}/static/css/extra.css"
-  @ONLY)
-
-add_custom_target(server_rst python gen_server_doc.py)  
-
-add_custom_target(docs
-              gendoc
-              COMMAND python gen_server_doc.py
-              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")
-
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@ -1,66 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-import sys
-# sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('../bin/'))
-#sys.path.insert(0, '/home/l_frojdh/sls/build/bin')
-#sys.path.insert(0, @CMAKE_CURRENT_BINARY_DIR@)
-print(sys.path)
-
-# -- Project information -----------------------------------------------------
-
-project = 'slsDetectorPackage'
-copyright = '2020, PSD Detector Group'
-author = 'PSD Detector Group'
-version = '@PROJECT_VERSION@'
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = ['breathe',
-              'sphinx_rtd_theme',
-              'sphinx.ext.autodoc',
-              'sphinx.ext.napoleon',
-             ]
-
-breathe_default_project = "slsDetectorPackage"
-napoleon_use_ivar = True
-
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = "sphinx_rtd_theme"
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['static']
-
-
-def setup(app):
-    app.add_stylesheet('css/extra.css')  # may also be an URL
--- a/docs/gen_server_doc.py.in
+++ b/docs/gen_server_doc.py.in
@ -1,86 +0,0 @@
-import os 
-import re
-from pathlib import Path
-def remove_comments(text):
-    def replacer(match):
-        s = match.group(0)
-        if s.startswith('/'):
-            return " " # note: a space and not an empty string
-        else:
-            return s
-    pattern = re.compile(
-        r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',
-        re.DOTALL | re.MULTILINE
-    )
-    return re.sub(pattern, replacer, text)
-
-
-# @CMAKE_CURRENT_BINARY_DIR@
-
-print('\n\n\n\n SERVER CSV')
-
-src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
-detectors = ['Mythen3', 'Gotthard2', 'Eiger', 
-            'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
-
-
-for det in detectors:
-    print(det)
-    in_fname = src/f'{det.lower()}DetectorServer/slsDetectorServer_defs.h'
-    #print(f'Reading: {in_fname}')
-    with open(in_fname) as f:
-        lines = f.read().replace('\\\n', '')
-        lines = lines.splitlines(keepends = True)
-
-    lines = [l.strip('#define').strip(' ') for l in lines if l.startswith('#define')]
-    output = []
-    signals = []
-    fields = ['Name,', 'Value', 'Comment']
-    excluded = ['DAC_NAMES', 'DEFAULT_DAC_VALS', 'CLK_NAMES', 'ONCHIP_DAC_NAMES']
-    header = f'{fields[0]:35}{fields[1]:35}\n'
-    output.append(header)
-    signals.append(header)
-    dac_names = []
-    dac_values = []
-    for line in lines:
-        name, *parts = line.split()
-        arg = ' '.join(parts)
-        value, *comments = arg.split('//') 
-        value = value.strip('() ')
-        # value = value.replace(', ', ' ')
-        value = value.replace('\"', '')
-        if name not in excluded:
-            name += ','
-            if name.startswith('SIGNAL_'):
-                signals.append(f'{name:35}{value}\n')
-            else:
-                output.append(f'{name:35}\"{value}\"\n')
-        elif name == 'DAC_NAMES':
-            dac_names = [v.strip(', ') for v in value.split()]
-            dac_names = [n+',' for n in dac_names]
-        elif name == 'DEFAULT_DAC_VALS':
-            dac_values = remove_comments(value).strip('{}; ')
-            dac_values = dac_values.replace(',', '').split()
-            dac_values = [v.strip('') for v in dac_values]
-
-    print(f"dac_names: {len(dac_names)}, dac_values={len(dac_values)}")
-    if len(dac_values) == 0:
-        dac_values = ['N/A']*len(dac_names)
-
-    
-
-    rstpath = Path('@CMAKE_SOURCE_DIR@')/'docs/src/'
-
-    out_fname = Path.cwd()/f'src/{det.lower()}.csv'
-    out_dac_fname = Path.cwd()/f'src/{det.lower()}-dacs.csv'
-    #print(f'Writing: {out_fname}')
-    with open(out_fname, 'w') as f:
-        f.writelines(output)
-
-    output = [f'{n:35}{v}\n' for n,v in zip(dac_names, dac_values)]
-    output.insert(0, header)
-
-    with open(out_dac_fname, 'w') as f:
-        f.writelines(output)
-
-print('END\n\n\n\n')
--- a/docs/src/ToString.rst
+++ b/docs/src/ToString.rst
@ -1,6 +0,0 @@
-ToString
-==============
-
-String conversion
-
-.. doxygenfile:: ToString.h
--- a/docs/src/commandline.rst
+++ b/docs/src/commandline.rst
@ -1,47 +0,0 @@
-Command line interface
-==============================================
-
-Usage
-------------
-
-Commands can be used either with sls_detector_get or sls_detector_put
-
-.. code-block::
-
-    sls_detector_get vrf
-
-Help
--------
-
-.. code-block::
-
-    # get list of commands
-    sls_detector_get list
-
-    # search for a particular command using a word
-    sls_detector_get list | grep adc
-
-    # get help for a particular command
-    sls_detector_get -h fpath
-    sls_detector_help fpath
-  
-
-Commands
-----------
-
-.. include:: ../commands.rst
-
-
-Depreciated commands
------------------------
-
-.. note ::
-	All the dac commands are preceded with the **dac** command. Use command **daclist** to get correct list of dac command arguments for current detector.
-
-.. csv-table:: Depreciated commands
-   :file: ../depreciated.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-
-
--- a/docs/src/consuming.rst
+++ b/docs/src/consuming.rst
@ -1,116 +0,0 @@
-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. 
-
-One can test with :ref:`detector simulators<Virtual Detector Servers>` before testing the API with a real detector or when a real detector is not at hand.
-
-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 "sls/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
--- a/docs/src/container_utils.rst
+++ b/docs/src/container_utils.rst
@ -1,14 +0,0 @@
-ContainerUtils
-==================
-
-Helper functions to handle standard container compliant 
-containers. Supports array, vector, sls::Result etc.
-
-While not a part of the public API we aim not to change this
-interface too much. However, we don't give the same strong
-guarantees as for Detector etc. 
-
-Any reoccurring container operation should probably be added to
-this file.  
-
-.. doxygenfile:: container_utils.h
--- a/docs/src/dependencies.rst
+++ b/docs/src/dependencies.rst
@ -1,53 +0,0 @@
-Dependencies
-=========================
-
-While we value few dependencies some libraries are required in 
-order to not have to reinvent the wheel. Due to the state of package
-management in C++ we decided to bundle some of them with our source
-code. These are found in the libs/ directory. 
-
-----------------------
-Core
-----------------------
-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.12 
- * C++11 compatible compiler. (We test with gcc and clang)
- * ZeroMQ version 4
-
-----------------------
-GUI
-----------------------
-
-The GUI is currently using Qt4 but watch out for an upgrade to 5. 
-
- * Qt 4.8
- * Qwt 6.1
-
-----------------------
-Python bindings
-----------------------
-
- * Python > 3.6
- * pybind11 (packaged in libs/)
-
-
-----------------------
-Documentation
-----------------------
-
-The documentation that you are reading now is built with 
-
- * Doxygen (to extract C++ classes etc.)
- * Breathe (Sphinx plugin to handle doxygen xml)
- * Sphinx with sphinx_rtd_theme 
-
-----------------------
-Packaged in libs/
-----------------------
-
- * catch2 (unit testing)
- * rapidjson (streaming from receiver)
- * pybind11 (python bindings)  
--- a/docs/src/detector.rst
+++ b/docs/src/detector.rst
@ -1,16 +0,0 @@
-Detector
-==============================================
-
-The sls::Detector is the new public API to control 
-detectors from C++. This API is also used internally
-for the Python bindings and the command line interface. 
-If a receiver has been configured this is also controlled
-through this class.
-
-Most, if not all, functions are called in parallel
-and the return value is a thin std::vector wrapper 
-containing results from all modules. (Result<T>)
-
-.. doxygenclass:: sls::Detector
-   :members:
-   :undoc-members:
--- a/docs/src/examples.rst
+++ b/docs/src/examples.rst
@ -1,115 +0,0 @@
-
-
-
-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 "sls/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 "sls/Detector.h"
-    #include <chrono>
-    ...
-    std::chrono::microseconds t0{500};
-    det.setExptime(t0);
-
-
-
--- a/docs/src/firmware.rst
+++ b/docs/src/firmware.rst
@ -1,371 +0,0 @@
-Firmware Upgrade
-=================
-
-
-
-Eiger
-------------
-
-Download 
-^^^^^^^^^^^^^
- `bcp script <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/eiger/bcp>`__
-
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- `bit files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
-
-Upgrade
-^^^^^^^^
-#. Tftp must be already installed on your pc to use the bcp script.
-
-#. Kill the on-board servers and copy new servers to the board. 
-
-    .. code-block:: bash
-
-        # Option 1: from detector console
-        # kill old server
-        ssh root@bebxxx
-        killall eigerDetectorServer
-
-        # copy new server
-        cd executables
-        scp user@pc:/path/eigerDetectorServerxxx .
-        chmod 777 eigerDetectorServerxxx
-        ln -sf eigerDetectorServerxxx eigerDetectorServer
-        sync
-
-        # Options 2: from client console for multiple modules
-        for i in bebxxx bebyyy;
-        do ssh root@$i killall eigerDetectorServer;
-        scp eigerDetectorServerxxx root@$i:~/executables/eigerDetectorServer;
-        ssh root@$i sync; done
-
-
-    * This is crucial when registers between firmwares change. Failure to do so will result in linux on boards to crash and boards can't be pinged anymore.
-
-#. Bring the board into programmable mode using either of the 2 ways. Both methods result in only the central LED blinking.
-    
-    * **Manual:**
-    
-        Do a hard reset for each half module on back panel boards, between the LEDs, closer to each of the 1G ethernet connectors. Push until all LEDs start to blink.
-    
-    * Software:  
-        .. code-block:: bash
-
-            ssh root@bebxxx
-            cd executables
-            ./boot_recovery
-
-#. Start a terminal for each half module and run the following to see progress.
-
-    .. code-block:: bash
-    
-    	nc -p 3000 -u bebxxx 3000
-        # Press enter twice to see prompt with board name.
-        > bebxxx
-        # After each bcp command, wait for this terminal to print "Success".
-
-
-#. In another terminal, run the following to update firmware. Please update bit files with great caution as it could make your board inaccessible, if done incorrectly.
-
-    .. code-block:: bash
-    
-        #update back end fpga
-        bcp download.bit bebxxx:/fw0
-
-        #update front left fpga
-        bcp download.bit bebxxx:/febl
-
-        #update front right fpga
-        bcp download.bit bebxxx:/febr
-
-        #update kernel (only if required by the SLS Detector Group)
-        bcp download.bit bebxxx:/kernel
-
-#. Reboot the detector.
-
-Jungfrau
-------------
-
-Download 
-^^^^^^^^^^^^^
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
-
-
-Upgrade (from v4.x.x)
-^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-#. Tftp must be installed on pc.
-
-#. Update client package to the latest (5.x.x).
-
-#. Disable server respawning or kill old server
-    .. code-block:: bash
-
-        # Option 1: if respawning enabled
-        telnet bchipxxx
-        # edit /etc/inittab
-        # comment out line #ttyS0::respawn:/jungfrauDetectorServervxxx
-        reboot
-        # ensure servers did not start up after reboot
-        telnet bchipxxx
-        ps
-
-        #  Option 2: if respawning already disabled
-        telnet bchipxxx
-        killall jungfrauDetectorServerv*
-
-#. Copy new server and start in update mode
-    .. code-block:: bash
-
-        tftp pcxxx -r jungfrauDetectorServervxxx -g
-        chmod 777 jungfrauDetectorServervxxx
-        ./jungfrauDetectorServervxxx -u
-
-#. Program fpga from the client console
-    .. code-block:: bash
-
-        sls_detector_get free
-        # Crucial that the next command executes without any errors
-        sls_detector_put hostname bchipxxx
-        sls_detector_put programfpga xxx.pof
-
-#. After programming, kill 'update server' using Ctrl + C in server console.
-
-#. Enable server respawning if needed
-    .. code-block:: bash
-
-        telnet bchipxxx
-        # edit /etc/inittab
-        # uncomment out line #ttyS0::respawn:/jungfrauDetectorServervxxx
-        # ensure the line has the new server name
-        reboot
-        # ensure both servers are running using ps
-        jungfrauDetectorServervxxx
-        jungfrauDetectorServervxxx --stop-server 1953
-
-
-Upgrade (from v5.0.0)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # removes old server from respawn, sets up new server to respawn
-        # and reboots
-        sls_detector_put update jungfrauDetectorServervxxx pcxxx xx.pof
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.pof
-
-
-
-Gotthard
---------
-
-Download 
-^^^^^^^^^^^^^
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
-
-
-.. _firmware upgrade using blaster for blackfin:
-
-Upgrade
-^^^^^^^^
-.. warning ::
-    | Gotthard firmware cannot be upgraded remotely and requires the use of USB-Blaster.
-    | It is generally updated by the SLS Detector group.
-
-#. Download `Altera Quartus software or Quartus programmer <https://fpgasoftware.intel.com/20.1/?edition=standard&platform=linux&product=qprogrammer#tabs-4>`__.
-   
-
-#. Start Quartus programmer, click on Hardware Setup. In the "Currently selected hardware" window, select USB-Blaster.
-
-#. In the Mode combo box, select "Active Serial Programming".
-
-#. Plug the end of your USB-Blaster with the adaptor provided to the connector 'AS config' on the Gotthard board.
-
-#. Click on 'Add file'. Select programming (pof) file provided by the SLS Detector group.
-
-#. Check "Program/Configure" and "Verify". Push the start button. Wait until the programming process is finished.
-
-#. In case of error messages, check the polarity of cable (that pin1 corresponds) and that the correct programming connector is selected.
-
-#. Reboot the detector.
-
-
-Mythen3
-------
-
-.. note :: 
-
-  As it is still in developement, the rbf files must be picked up from the SLS Detector Group.
-
-Download 
-^^^^^^^^^^^^^
-
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- rbf files (in developement)
-
-
-Upgrade (from v5.0.0)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # and reboots (new server not respawned currently)
-        sls_detector_put update mythen3DetectorServervxxx pcxxx xxx.rbf
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.rbf
-
-
-
-Gotthard2
-------------
-
-.. note :: 
-
-  As it is still in developement, the rbf files must be picked up from the SLS Detector Group.
-
-Download 
-^^^^^^^^^^^^^
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- rbf files (in development)
-
-
-Upgrade (from v5.0.0)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # and reboots (new server not respawned currently)
-        sls_detector_put update gotthard2DetectorServervxxx pcxxx xxx.rbf
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.rbf
-
-
-
-Moench
-------
-
-Download 
-^^^^^^^^^^^^^
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
-
-
-Upgrade (from v5.0.0)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # removes old server from respawn, sets up new server to respawn
-        # and reboots
-        sls_detector_put update moenchDetectorServervxxx pcxxx xx.pof
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.pof
-
-Ctb
----
-
-Download 
-^^^^^^^^^^^^^
- detector server corresponding to package in slsDetectorPackage/serverBin
-
- `pof files <https://github.com/slsdetectorgroup/slsDetectorFirmware>`__
-
-
-Upgrade (from v5.0.0)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # removes old server from respawn, sets up new server to respawn
-        # and reboots
-        sls_detector_put update ctbDetectorServervxxx pcxxx xx.pof
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.pof
-
-
-.. _blackfin firmware troubleshooting:
-
-Firmware Troubleshooting with blackfin
----------------------------------------
-
-1. v4.x.x client after programming will most likely reboot the blackfin processor, regardless of error.
-
-2. v5.x.x-rcx client after programming will not reboot the blackfin processor, if error occurred.
-
-3. If a reboot occured with an incomplete firmware in flash, the blackfin will most likely not find the mtd3 drive. To see if this drive exists:
-
-  .. code-block:: bash
-    
-    # connect to the board
-    telnet bchipxxx
-
-    # view of mtd3 existing
-    root:/> more /proc/mtd
-    dev:    size   erasesize  name
-    mtd0: 00040000 00020000 "bootloader(nor)"
-    mtd1: 00100000 00020000 "linux kernel(nor)"
-    mtd2: 002c0000 00020000 "file system(nor)"
-    mtd3: 01000000 00010000 "bitfile(spi)"
-
-4. If one can see the mtd3 drive, one can already try to flash again using the **programfpga** command (without rebooting blackfin or detector). 
-
-5. If one can't list it, read the next section to try to get the blackfin to list it.
-
-How to get back mtd3 drive remotely
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-This might take a few reruns (maybe even 10) until the mtd drive is accessed by the blackfin upon linux startup.
-
-  .. code-block:: bash
-    
-    # step 1: connect to the board
-    telnet bchipxxx
-
-    # step 2: check if mtd3 drive listed
-    more /proc/mtd
-
-    # step 3: tell fpga not to touch flash and reboot
-    echo 9 > /sys/class/gpio/export; 
-    echo out > /sys/class/gpio/gpio9/direction; 
-    echo 0 > /sys/class/gpio/gpio9/value;
-    reboot
-
-    # step 4: repeat steps 1 - 3 until you see the mtd3 drive
-
-
-Last Resort using USB Blaster
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If none of these steps work, the last resort might be physically upgrading the firmware using a USB blaster, which also requires opening up the detector. Instructions for all the blackfin detectors are the same as the one for :ref:`gotthard firmware upgrade <firmware upgrade using blaster for blackfin>`.
--- a/docs/src/gendoc.cpp
+++ b/docs/src/gendoc.cpp
@ -1,61 +0,0 @@
-/**
- * Utility program to generate input files for the command line
- * documentation. Uses the string returned from sls_detector_help cmd
- *
- */
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "CmdProxy.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
-
-std::string replace_all(const std::string &src, const std::string &from,
-                        const std::string &to) {
-
-    std::string results;
-    std::string::const_iterator end = src.end();
-    std::string::const_iterator current = src.begin();
-    std::string::const_iterator next =
-        std::search(current, end, from.begin(), from.end());
-    while (next != end) {
-        results.append(current, next);
-        results.append(to);
-        current = next + from.size();
-        next = std::search(current, end, from.begin(), from.end());
-    }
-    results.append(current, next);
-    return results;
-}
-
-int main() {
-
-    std::cout << "Generating command line documentation!\n";
-
-    sls::CmdProxy proxy(nullptr);
-    auto commands = proxy.GetProxyCommands();
-
-    std::ofstream fs("commands.rst");
-    fs << ".. glossary::\n";
-
-    for (const auto &cmd : commands) {
-        std::ostringstream os;
-        proxy.Call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os);
-
-        auto tmp = os.str().erase(0, cmd.size());
-        auto usage = tmp.substr(0, tmp.find_first_of('\n'));
-        tmp.erase(0, usage.size());
-        auto help = replace_all(tmp, "\n\t", "\n\t\t| ");
-        fs << '\t' << cmd << usage << help << "\n";
-    }
-
-    std::ofstream fs2("depreciated.csv");
-    fs2 << "Old, New\n";
-    auto cmds = proxy.GetDepreciatedCommands();
-    for (auto it : cmds) {
-        fs2 << it.first << ", " << it.second << '\n';
-    }
-}
--- a/docs/src/index.rst
+++ b/docs/src/index.rst
@ -1,87 +0,0 @@
-.. slsDetectorPackage documentation master file, created by
-   sphinx-quickstart on Mon Jul 29 17:38:15 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-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
-    :maxdepth: 2
-
-    detector
-    result
-    receiver_api
-    examples
-
-.. toctree::
-    :caption: Python API
-    :maxdepth: 2
-
-    pygettingstarted
-    pydetector
-    pyenums
-    pyexamples
-
-.. toctree::
-    :caption: Command line
-    :maxdepth: 2
-
-    commandline  
-    quick_start_guide
-
-.. toctree::
-    :caption: Developer
-
-    container_utils
-    type_traits
-    ToString
-
-.. toctree::
-    :caption: Firmware
-    :maxdepth: 2
-
-    firmware 
-
-.. toctree::
-    :caption: Detector Server
-    :maxdepth: 2
-
-    servers
-    serverupgrade
-    virtualserver
-    serverdefaults
-
-.. toctree::
-    :caption: Receiver
-    :maxdepth: 2
-
-    receivers
-    slsreceiver
-
-.. toctree::
-    :caption: Troubleshooting
-
-    troubleshooting
-
-
-.. Indices and tables
-.. ==================
-
-.. * :ref:`genindex`
-.. * :ref:`modindex`
-.. * :ref:`search`
--- a/docs/src/installation.rst
+++ b/docs/src/installation.rst
@ -1,154 +0,0 @@
-
-
-
-.. 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:
-
-Installation
-==============================================
-
-.. _build from source using cmake:
-
-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 .
-
-
-Build using cmk.sh script
-------------------------
-These are mainly aimed at those not familiar with using ccmake and cmake.
-
-.. code-block:: bash
-
-    The binaries are generated in slsDetectorPackage/build/bin directory.
-
-    Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5 directory>] [-l Install directory] [-k <CMake command>] [-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
-    -k: CMake command
-    -l: Install 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
-    -m: Manuals
-    -n: Manuals without compiling doxygen (only rst)
-    -z: Moench zmq processor
-    
-    # get all options
-    ./cmk.sh -?
-
-    # new build  and compile in parallel:
-    ./cmk.sh -bj5
-
-
-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
-    #replace 2020.07.20.dev0 with the required tag
-    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
--- a/docs/src/pydetector.rst
+++ b/docs/src/pydetector.rst
@ -1,10 +0,0 @@
-Detector
-=====================================================
-
-.. py:currentmodule:: slsdet
-
-.. autoclass:: Detector
-    :members:  
-    :undoc-members:
-    :show-inheritance:
-    :inherited-members:
--- a/docs/src/pyenums.rst
+++ b/docs/src/pyenums.rst
@ -1,77 +0,0 @@
-Enums
-===========
-
-These enums are defined in slsDetectorDefs in the C++ package and 
-exposed to Python through pybind11.
-
-
-::  
-
-    # Most settings are represented as enums that can be 
-    # explicitly imported
-
-    from slsdet import Detector, fileFormat
-    d = Detector()
-    d.fformat = fileFormat.BINARY
-
-    # Altough not recommended for convenience all enums 
-    # and some other things can be impored using *
-
-    from slsdet import *
-    d.speed = speedLevel.FULL_SPEED 
-
-    # To list the available enums, use dir()
-
-    import slsdet.enums
-    for enum in dir(slsdet.enums):
-        # filter out special memebers
-        if not enum.startswith('_'):
-            print(enum)
-
-
-.. py:currentmodule:: slsdet
-
-.. autoclass:: runStatus
-    :undoc-members:
-
-.. 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:: burstMode
-    :undoc-members:
-
-.. autoclass:: timingSourceType
-    :undoc-members:
--- a/docs/src/pyexamples.rst
+++ b/docs/src/pyexamples.rst
@ -1,285 +0,0 @@
-Examples
-================
-
-Some short examples on how to use slsdet. If something is missing don't hesitate to
-open an issue in our our  `github repo
-<https://github.com/slsdetectorgroup/slsDetectorPackage>`_. 
-
-
------------------------------------
-Setting exposure time 
------------------------------------
-
-Setting and reading back exposure time can be done either using a Python datetime.timedelta
-or by setting the time in seconds. 
-
-::
-
-    # Set exposure time to 1.2 seconds
-    >>> d.exptime = 1.2
-
-    # Setting exposure time using timedelta
-    import datetime as dt
-    >>> d.exptime = dt.timedelta(seconds = 1.2)
-
-    # With timedelta any arbitrary combination of units can be used
-    >>> t = dt.timedelta(microseconds = 100, seconds = 5.3, minutes = .3)
-
-    # To set exposure time for individual detector one have to resort
-    # to the C++ style API.
-    # Sets exposure time to 1.2 seconds for module 0, 6 and 12
-    >>> d.setExptime(1.2, [0, 6, 12]) 
-    >>> d.setExptime(dt.timedelta(seconds = 1.2), [0, 6, 12]) 
-
-
-
------------------------------------
-Converting numbers to hex
------------------------------------
-
-Python support entering numbers in  format by using the 0x prefix. However, when reading 
-back you will get a normal integer. This can then be converted to a hex string representation
-using the built in hex() function. 
-
-.. code-block :: python
-
-    from slsdet import Detector
-    >>> d = Detector()
-    >>> d.patwait0 = 0xaa
-    >>> d.patwait0
-    170
-
-    # Convert to  string
-    >>> hex(d.patwait0)
-    '0xaa'
-
-For multiple values one can use a list comprehension to loop over the values. 
-
-.. code-block :: python
-
-    >>> values = [1,2,3,4,5]
-    >>> [(v) for v in values]
-    ['0x1', '0x2', '0x3', '0x4', '0x5']
-
-    # or to a single string by passing the list to .join
-    >>> ', '.join([hex(v) for v in values])
-    '0x1, 0x2, 0x3, 0x4, 0x5'
-
-
-
-    
-
------------------------
-Simple threshold scan
------------------------
-
-Assuming you have set up your detector with exposure time, period, enabled
-file writing etc.
-
-.. code-block:: python
- 
-    from slsdet import Eiger
-
-    d = Eiger()
-    threshold = range(0, 2000, 200)
-    for th in threshold:
-        d.vthreshold = th
-        d.acquire()
-    
-
-If we want to control the shutter of for example, the big X-ray box we can add
-this line in our code. It then opens the shutter just before the measurement
-and closes is afterwards.
-    
-::
-
-    with xrf_shutter_open(box, 'Fe'):
-        for th in threshold:
-            d.vthreshold = th
-            d.acquire()
-        
-        
-----------------------
-Reading temperatures
-----------------------       
-
-::
-
-    d.temp
-    >>
-    temp_fpga     :  43.19°C,  51.83°C
-    temp_fpgaext  :  38.50°C,  38.50°C
-    temp_10ge     :  39.50°C,  39.50°C
-    temp_dcdc     :  42.50°C,  42.50°C
-    temp_sodl     :  39.50°C,  40.50°C
-    temp_sodr     :  39.50°C,  40.50°C
-    temp_fpgafl   :  40.87°C,  37.61°C
-    temp_fpgafr   :  34.51°C,  35.63°C
-    
-    d.temp.fpga
-    >> temp_fpga     :  40.84°C,  39.31°C
-    
-    t = d.temp.fpga[0]
-    t
-    >> 40.551
-    
-    t = d.temp.fpga[:]
-    t
-    >> [40.566, 39.128]
-
-
-----------------------
-Non blocking acquire
-----------------------
-
-There are mainly two ways to achieve a non blocking acquire when calling from the Python API. One is to manually start
-the detector and the second one is to launch the normal acquire from a different process. Depending on your measurement
-it might also be better to run the other task in a seperate process and use acq in the main thread.
-But lets start looking at the at the manual way:
-
-::
-
-    import time
-    from slsdet import Detector, runStatus
-
-
-    n_frames = 10
-    t_exp = 1
-
-    # Set exposure time and number of frames
-    d = Detector()
-    d.exptime = t_exp
-    d.frames = n_frames
-
-    # Start the measurement
-    t0 = time.time()
-    d.startDetector()
-    d.startReceiver()
-
-    # Wait for the detector to be ready or do other important stuff
-    time.sleep(t_exp * n_frames)
-
-    # check if the detector is ready otherwise wait a bit longer
-    while d.status != runStatus.IDLE:
-        time.sleep(0.1)
-
-    # Stop the receiver after we got the frames
-    # Detector is already idle so we don't need to stop it
-    d.stopReceiver()
-
-    lost = d.rx_framescaught - n_frames
-    print(
-        f"{n_frames} frames of {t_exp}s took {time.time()-t0:{.3}}s with {lost} frames lost "
-    )
-
-
-
-Instead launching d.acq() from a different process is a bit easier since the control of receiver and detector
-is handled in the acq call. However, you need to join the process used otherwise a lot of zombie processes would
-hang around until the main process exits.
-
-::
-
-    import time
-    from multiprocessing import Process
-    from slsdet import Detector, runStatus
-
-
-    d = Detector()
-
-    #Create a separate process to run acquire in
-    p = Process(target=d.acquire)
-
-    #Start the thread and short sleep to allow the acq to start
-    p.start()
-    time.sleep(0.01)
-
-    #Do some other work
-    while d.status != runStatus.IDLE:
-        print("Working")
-        time.sleep(0.1)
-
-    #Join the process
-    p.join()
-
-
------------------------------
-Setting and getting times
------------------------------
-
-::
-
-    import datetime as dt
-    from slsdet import Detector
-    from slsdet.utils import element_if_equal
-
-    d = Detector()
-
-    # The simplest way is to set the exposure time in 
-    # seconds by using the exptime property
-    # This sets the exposure time for all modules
-    d.exptime = 0.5
-
-    # exptime also accepts a python datetime.timedelta
-    # which can be used to set the time in almost any unit
-    t = dt.timedelta(milliseconds = 2.3)
-    d.exptime = t
-
-    # or combination of units
-    t = dt.timedelta(minutes = 3, seconds = 1.23)
-    d.exptime = t
-
-    # exptime however always returns the time in seconds
-    >>> d.exptime
-    181.23 
-
-    # To get back the exposure time for each module 
-    # it's possible to use getExptime, this also returns
-    # the values as datetime.timedelta
-
-    >>> d.getExptime()
-    [datetime.timedelta(seconds=181, microseconds=230000), datetime.timedelta(seconds=181, microseconds=230000)]
-
-    # In case the values are the same it's possible to use the
-    # element_if_equal function to reduce the values to a single 
-    # value
-
-    >>> t = d.getExptime()
-    >>> element_if_equal(t)
-    datetime.timedelta(seconds=1)
-
--------------
-Reading dacs
--------------
-
-::
-
-    from slsdet import Detector, Eiger, dacIndex
-
-    #using the specialized class
-    e = Eiger()
-    >>> e.dacs
-    ========== DACS =========
-    vsvp      :    0    0
-    vtrim     : 2480 2480
-    vrpreamp  : 3300 3300
-    vrshaper  : 1400 1400
-    vsvn      : 4000 4000
-    vtgstv    : 2556 2556
-    vcmp_ll   : 1000 1000
-    vcmp_lr   : 1000 1000
-    vcal      :    0    0
-    vcmp_rl   : 1000 1000
-    rxb_rb    : 1100 1100
-    rxb_lb    : 1100 1100
-    vcmp_rr   : 1000 1000
-    vcp       : 1000 1000
-    vcn       : 2000 2000
-    vishaper  : 1550 1550
-    iodelay   :  650  650
-
-    # or using the general class and the list
-    d = Detector()
-    for dac in d.daclist:
-        r = d.getDAC(dac, False)
-        print(f'{dac.name:10s} {r}')
--- a/docs/src/pygettingstarted.rst
+++ b/docs/src/pygettingstarted.rst
@ -1,228 +0,0 @@
-Getting Started 
-==================
-
-
--------------------
-Which Python?  
--------------------
-
-We require at lest Python 3.6 and strongly recommended that you don't use the system
-Python installation. The examples in this documentation uses `conda
-<https://docs.conda.io/en/latest/miniconda.html>`_ since it provides good support
-also for non Python packages but there are also other alternatives like, pyenv. 
-
-Using something like conda also allows you to quickly switch beteen different Python 
-environments. 
-
-.. warning ::
-
-    If you use conda avoid also installing packages with pip. 
-
---------------------
-PYTHONPATH 
---------------------
-
-If you install slsdet using conda everything is set up and you can
-directly start using the Python bindings. However, if you build 
-from source you need to tell Python where to find slsdet. This
-is be done by adding your build/bin directory to PYTHONPATH. 
-
-.. code-block:: bash
-
-    export PYTHONPATH = /path/to/your/build/bin:$PYTHONPATH
-
-.. note ::
-
-    Don't forget to compile with the option SLS_USE_PYTHON=ON to enable
-    the Python bindings or if you use the cmk.sh script -p.
-
--------------------------------------
-Which detector class should I use? 
--------------------------------------
-
-We provide a generic class called Detector and detector specific 
-versions like, Eiger, Jungfrau etc. The most or all functionality 
-is there in the base class except the convenient access to dacs
-and temperatures. 
-
-:: 
-
-    from slsdet import Detector, Eiger
-
-    d = Detector()
-    e = Eiger()
-
-    # Both classes can be used to control an Eiger detector
-    d.exptime = 0.5
-    e.period = 1
-
-    # But Eiger gives a simpler interface to the dacs
-    >>> e.dacs
-    ========== DACS =========
-    vsvp           :    0
-    vtrim          : 2480
-    vrpreamp       : 3300
-    vrshaper       : 1400
-    vsvn           : 4000
-    vtgstv         : 2556
-    vcmp_ll        : 1000
-    vcmp_lr        : 1000
-    vcal           :    0
-    vcmp_rl        : 1000
-    rxb_rb         : 1100
-    rxb_lb         : 1100
-    vcmp_rr        : 1000
-    vcp            : 1000
-    vcn            : 2000
-    vishaper       : 1550
-    iodelay        :  650
-
-
-.. note ::
-
-    Depending on user feedback we might move some detector specific
-    functionality to the specialized classes.
-
-
----------------------------------
-Hey, there seems to be two APIs?
----------------------------------
-
-To make the Python API approachable, both if you come from the command line 
-or are using the C++ API, we provide two interfaces to the detector. 
-One is property based and tries to stay as close to the command line syntax
-as is possible, and the other one directly maps the C++ API found in Detector.h.
-There is also an underlying design reason for the two APIs since we auto 
-generate the bindings to the C++ code using a mix of pybind11 and clang-tools. 
-The property based API covers most of the functionality but in some cases 
-you have to reach for the C++ like interface. 
-
-
-::  
-
-    d = Detector()
-
-    # C++ like API 
-    d.setExptime(0.1)
-
-    # or a bit more pythonic
-    d.exptime = 0.1
-
-The c++ style API offers more control over access to individual modules
-in a large detector.
-
-:: 
-
-    # Set exposure time for module 1, 5 and 7
-    d.setExptime(0.1, [1,5,7])
-
--------------------
-Finding functions 
--------------------
-
-To find out which properties and methods that a Python object have you
-can use dir()
-
-::
-
-    >>> from slsdet import Detector
-    >>> d = Detector()
-    >>> dir(d)
-    ['__class__', '__delattr__', '__dict__', '__dir__', '__doc__', 
-    '__eq__', '__format__', '__ge__', '__getattribute__', '__gt__', 
-    '__hash__', '__init__', '__init_subclass__', '__le__', '__len__', 
-    '__lt__', '__module__', '__ne__', '__new__', '__reduce__', 
-    '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', 
-    '__str__', '__subclasshook__', '_adc_register', '_frozen', 
-    '_register', 'acquire', 'adcclk', 'adcphase', 'adcpipeline', 
-    'adcreg', 'asamples', 'auto_comp_disable', 'clearAcquiringFlag', 
-    'clearBit', 'clearROI', 'client_version', 'config', 'copyDetectorServer', 
-    'counters', 'daclist', 'dacvalues', 'dbitclk', 'dbitphase' ...
-
-Since the list for Detector is rather long it's an good idea to filter it. 
-The following example gives you properties and methods containing time in 
-their name.
-
-:: 
-
-    >>> [item for item in dir(d) if 'time' in item]
-    ['exptime', 'getExptime', 'getExptimeForAllGates', 'getExptimeLeft', 
-    'getSubExptime', 'patwaittime0', 'patwaittime1', 'patwaittime2', 
-    'setExptime', 'setSubExptime', 'subdeadtime', 'subexptime']
-
-The above method works on any Python object but for convenience we also 
-included two functions to find names. View prints the names one per line
-while find returns a list of names. 
-
-::
-
-    from slsdet.lookup import view, find
-
-    >>> view('exptime')
-    exptime
-    getExptime
-    getExptimeForAllGates
-    getExptimeLeft
-    getSubExptime
-    setExptime
-    setSubExptime
-    subexptime
-
-    >>> find('exptime')
-    ['exptime', 'getExptime', 'getExptimeForAllGates', 'getExptimeLeft', 
-    'getSubExptime', 'setExptime', 'setSubExptime', 'subexptime']
-
-
------------------------------------
-Finding out what the function does
------------------------------------
-
-To access the documentation of a function directly from the Python prompt use help(). 
-
-.. code-block :: python
-
-    >>> help(Detector.period)
-    Help on property:
-
-        Period between frames, accepts either a value in seconds or datetime.timedelta
-
-        Note
-        -----
-        :getter: always returns in seconds. To get in datetime.delta, use getPeriod
-
-        Examples
-        -----------
-        >>> d.period = 1.05
-        >>> d.period = datetime.timedelta(minutes = 3, seconds = 1.23)
-        >>> d.period
-        181.23
-        >>> d.getPeriod()
-        [datetime.timedelta(seconds=181, microseconds=230000)]
-
-
----------------------
-Where are the ENUMs?
----------------------
-
-To set some of the detector settings like file format you have
-to pass in an enum. 
-
-:: 
-
-    >>> d.setFileFormat(fileFormat.BINARY)
-    
-The enums can be found in slsdet.enums 
-
-::
-
-    import slsdet
-    >>> [e for e in dir(slsdet.enums) if not e.startswith('_')]
-    ['burstMode', 'clockIndex', 'dacIndex', 
-    'detectorSettings', 'detectorType', 'dimension', 'externalSignalFlag', 
-    'fileFormat', 'frameDiscardPolicy', 'masterFlags', 
-    'readoutMode', 'runStatus', 'speedLevel', 'timingMode', 
-    'timingSourceType']
-
-    # Even though importing using * is not recommended one could
-    # get all the enums like this: 
-    >>> from slsdet.enums import *
--- a/docs/src/quick_start_guide.rst
+++ b/docs/src/quick_start_guide.rst
@ -1,140 +0,0 @@
-Quick Start Guide
-=================
-
-Detector
--------
-Start up detector (with cooling if required). Ensure both control server and stop server is running on-board.
-
-Or use a detector simulator to test. Click :ref:`here<Virtual Detector Servers>` for further instructions.
-
-Receiver
--------
-
-| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
-
-For a Single Module
-    .. code-block:: bash  
-
-        # default port 1954
-        slsReceiver
-
-        # custom port 2012
-        slsReceiver -t2012
-
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 0 
-
-
-Client
------
-
-Refer :ref:`Sample Config file` to create config file.
-
-.. code-block:: bash  
-
-    # load config file
-    sls_detector_put config /path/sample.config
-
-    # set number of frames
-    sls_detector_put frames 5
-
-    # acquire
-    sls_detector_acquire
-
-
-.. _Sample Config file:
-
-Sample Config file
-^^^^^^^^^^^^^^^^^^
-There are sample config files for each detector in slsDetectorPackage/examples folder.
-
-For a Single Module
-    .. code-block:: bash  
-
-        # connects to module
-        hostname bchipxxx
-
-        # connects to receiver at default port
-        rx_hostname mpc1922
-        # or to connect to specific port
-        # rx_hostname mpc1922:2012
-
-        # sets destination udp ports (not needed, default is 50001)
-        udp_dstport 50012
-
-        # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-For a Single Module with custom Receiver (not slsReceiver)
-    .. code-block:: bash  
-
-        # connects to module
-        hostname bchipxxx
-
-        # sets destination udp ports (not needed, default is 50001)
-        udp_dstport 50012
-
-        # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
-
-        # destination udp ip 
-        udp_dstip 192.168.1.100
-
-        # source udp mac 
-        udp_srcmac aa:bb:cc:dd:ee:ff
-        
-        # destination udp mac 
-        udp_dstmac 3c:ab:98:bf:50:60
-
-        # set file path
-        fpath /tmp
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # connects to mulitple modules
-        hostname bchipxxx+bchipyyy+
-
-        # connects to receivers at ports 2012 and 2014
-        rx_hostname mpc1922:2012+mpc1922:2013+
-
-        # sets differernt destination udp ports
-        0:udp_dstport 50012
-        1:udp_dstport 50014
-
-        # source udp ips must be same subnet at destintaion udp ips
-        0:udp_srcip 192.168.1.112
-        1:udp_srcip 192.168.1.114
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-Gui
----
-
-Compile with SLS_USE_GUI=ON in cmake or -g option in cmk.sh script. One can also just use the conda binary. Refer :ref:`installation instructions<Installation>`.
-
-.. code-block:: bash  
-
-    slsDetectorGui
-
-
-.. note ::
-    | The streaming high water mark (commmand: rx_zmqhwm) and the receiving high water mark (command: zmqhwm) is by default the lib zmq's default (currently 1000).
-    | At Gui startup, these values are set to 2. Hence, for very fast detectors, many frames will be dropped to be able to view the latest in the gui.
-    | One can still change this setting in the gui in the Plot tab (ZMQ Streaming), from the command line or API.
-    | Both hwm's can be set to a -1 to use the lib's default.
-    | Since the dummy end of acquisition packet streamed from receiver might also be lost, receiver restreams until gui acknowledges.
--- a/docs/src/receiver_api.rst
+++ b/docs/src/receiver_api.rst
@ -1,6 +0,0 @@
-Receiver
-==============================================
-
-.. doxygenclass:: sls::Receiver
-   :members:
-..    :undoc-members:
--- a/docs/src/receivers.rst
+++ b/docs/src/receivers.rst
@ -1,71 +0,0 @@
-Receivers
-=================
-
-Receiver processes can be run on same or different machines as the client, receives the data from the detector (via UDP packets).
-When using the slsReceiver/ slsMultiReceiver, they can be further configured by the client control software (via TCP/IP) to set file name, file path, progress of acquisition etc.
-
-Detector UDP Header
---------------------
-
-| The UDP data format for the packets consist of a common header for all detectors, followed by the data for that one packet.
-
-**The SLS Detector Header**
-
-.. table:: <-------------------------------- 8 bytes -------------------------------->
-    :align: center
-    :widths: 30,30,30,30
-
-    +--------------------------------------------------------------------+
-    |frameNumber                                                         |
-    +---------------------------------+----------------------------------+
-    |expLength                        |packetNumber                      |
-    +---------------------------------+----------------------------------+
-    |bunchId                                                             |
-    +--------------------------------------------------------------------+
-    |timestamp                                                           |
-    +----------------+----------------+----------------+-----------------+
-    |modId           |row             |column          |reserved         |
-    +----------------+----------------+----------------+--------+--------+
-    |debug                            |roundRNumber    |detType |version |
-    +---------------------------------+----------------+--------+--------+
-
-UDP configuration in Config file
----------------------------------
-
-#. UDP source port is hardcoded in detector server, starting at 32410.
-#. **udp_dstport** : UDP destination port number. Port in receiver pc to listen to packets from the detector.
-#. **udp_dstip** : IP address of UDP destination interface. IP address of interface in receiver pc to listen to packets from detector. If **auto** is used (only when using slsReceiver/ slsMultiReceiver), the IP of **rx_hostname** is picked up.
-#. **udp_dstmac** : Mac address of UDP destination interface. MAC address of interface in receiver pc to list to packets from detector. Only required when using custom receiver, else slsReceiver/slsMultiReceiver picks it up from **udp_dstip**.
-#. **udp_srcip** : IP address of UDP source interface. IP address of detector UDP interface to send packets from. Do not use for Eiger 1Gb interface (uses its hardware IP). For others, must be in the same subnet as **udp_dstip**.
-#. **udp_srcmac** : MAC address of UDP source interface. MAC address of detector UDP interface to send packets from. Do not use for Eiger (uses hardware mac). For others, it is not necessary, but can help for switch and debugging to put unique values for each module.
- 
-
-Custom Receiver
----------------
-
-| When using  custom receiver with our package, ensure that **udp_dstmac** is also configured in the config file. This parameter is not required when using slsReceiver.
-
-| Cannot use "auto" for **udp_dstip**.
-
-| Also ensure that there are no **rx_** commands in the config file. These commands are for configuring the slsReceiver.
-
-Example of a custom receiver config file
-
-* The main difference is the lack of **rx_** commands or file commands (eg. fwrite, fpath) and the udp_dstmac is required in config file.
-
-.. code-block:: bash
-
-    # detector hostname
-    hostname bchip052
-
-    # udp destination port (receiver)
-    udp_dstport 50004
-
-    # udp destination ip (receiver)
-    udp_dstip 10.0.1.100
-
-    # udp source ip (same subnet as udp_dstip)
-    udp_srcip 10.0.1.184
-
-    # udp destination mac
-    udp_dstmac 22:47:d5:48:ad:ef
--- a/docs/src/result.rst
+++ b/docs/src/result.rst
@ -1,4 +0,0 @@
-Result
-==============================================
-
-.. doxygenfile:: Result.h
--- a/docs/src/serverdefaults.rst
+++ b/docs/src/serverdefaults.rst
@ -1,106 +0,0 @@
-Default Values
-==============================================
-
-Mythen3
-------------
-
-.. csv-table:: Default values
-   :file: mythen3.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Mythen3 DACS
-   :file: mythen3-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Gotthard2
-------------
-
-.. csv-table:: Default values
-   :file: gotthard2.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Gotthard 2 DACS
-   :file: gotthard2-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Moench
-------------
-
-.. csv-table:: Default values
-   :file: moench.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Moench DACS
-   :file: moench-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Ctb
-------------
-
-.. csv-table:: Default values
-   :file: ctb.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Eiger
-------------
-
-.. csv-table:: Default values
-   :file: eiger.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Eiger DACS
-   :file: eiger-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Jungfrau
-------------
-
-.. csv-table:: Default values
-   :file: jungfrau.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Jungfrau DACS
-   :file: jungfrau-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Gotthard
-------------
-
-.. csv-table:: Default values
-   :file: gotthard.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Gotthard DACS
-   :file: gotthard-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
--- a/docs/src/servers.rst
+++ b/docs/src/servers.rst
@ -1,36 +0,0 @@
-Detector Servers
-=================
-
-Location
---------
-   slsDetectorPackage/serverBin/ folder in every release.
-
-
-.. _Detector Server Arguments:
-
-Arguments
---------
-
-   .. code-block:: bash  
-
-      Possible arguments are:
-      -v, --version            : Software version
-      -p, --port <port>        : TCP communication port with client. 
-      -g, --nomodule           : [Mythen3][Gotthard2] Generic or No Module mode. 
-                                 Skips detector type checks.
-      -f, --phaseshift <value> : [Gotthard] only. Sets phase shift. 
-      -d, --devel              : Developer mode. Skips firmware checks. 
-      -u, --update             : Update mode. Skips firmware checks and initial detector setup. 
-      -s, --stopserver         : Stop server. Do not use as it is created by control server 
-
-
-Basics
------------
-
-Detector Servers include:
-   * Control server [default port: 1952]
-      * Almost all client communication.
-   * Stop server [default port: 1953]
-      *  Client requests for detector status, stop acquisition, temperature, advanced read/write registers.
-
-When using a blocking acquire command (sls_detector_acquire or Detector::acquire), the control server is blocked until end of acquisition. However, stop server commands could be used in parallel.
--- a/docs/src/serverupgrade.rst
+++ b/docs/src/serverupgrade.rst
@ -1,114 +0,0 @@
-Detector Server Upgrade
-=======================
-
-
-
-Eiger
-------------
-
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-
-#. Kill old server and copy new server
-    .. code-block:: bash
-
-        # Option 1: from detector console
-        # kill old server
-        ssh root@bebxxx
-        killall eigerDetectorServer
-
-        # copy new server
-        cd executables
-        scp user@pc:/path/eigerDetectorServerxxx .
-        chmod 777 eigerDetectorServerxxx
-        ln -sf eigerDetectorServerxxx eigerDetectorServer
-        sync
-
-        # Options 2: from client console for multiple modules
-        for i in bebxxx bebyyy;
-        do ssh root@$i killall eigerDetectorServer;
-        scp eigerDetectorServerxxx root@$i:~/executables/eigerDetectorServer;
-        ssh root@$i sync; done
-
-
-#. Reboot the detector.
-
-
-Jungfrau
-------------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver jungfrauDetectorServerxxx pcxxx
-
-
-Gotthard
---------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver gotthardDetectorServerxxx pcxxx
-
-
-
-Mythen3
-------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder and reboots (does not respawn)
-        sls_detector_put copydetectorserver mythen3DetectorServerxxx pcxxx
-
-
-Gotthard2
----------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder and reboots (does not respawn)
-        sls_detector_put copydetectorserver gotthard2DetectorServerxxx pcxxx
-
-
-Moench
------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver moenchDetectorServerxxx pcxxx
-
-
-Ctb
---
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver ctbDetectorServerxxx pcxxx
--- a/docs/src/slsreceiver.rst
+++ b/docs/src/slsreceiver.rst
@ -1,170 +0,0 @@
-slsReceiver/ slsMultiReceiver
-================================
-
-| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
-
-For a Single Module
-    .. code-block:: bash  
-
-        # default port 1954
-        slsReceiver
-
-        # custom port 2012
-        slsReceiver -t2012
-
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # each receiver (for each module) requires a unique tcp port (if all on same machine)
-
-        # using slsReceiver in multiple consoles
-        slsReceiver
-        slsReceiver -t1955
-
-        # slsMultiReceiver [starting port] [number of receivers]
-        slsMultiReceiver 2012 2
-
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 1
-
-
-Client Commands 
-----------------
-
-| One can remove **udp_dstmac** from the config file, as the slsReceiver fetches this from the **udp_ip**.
-
-| One can use "auto" for **udp_dstip** if one wants to use default ip of **rx_hostname**.
-
-| The first command to the receiver (**rx_** commands) should be **rx_hostname**. The following are the different ways to establish contact.
-
-    .. code-block:: bash  
-
-        # default receiver tcp port (1954)
-        rx_hostname xxx
-
-        # custom receiver port
-        rx_hostname xxx:1957
-
-        # custom receiver port
-        rx_tcpport 1954
-        rx_hostname xxx
-
-        # multi modules with custom ports
-        rx_hostname xxx:1955+xxx:1956+
-
-        # multi modules with custom ports on same rxr pc
-        0:rx_tcpport 1954
-        1:rx_tcpport 1955
-        2:rx_tcpport 1956
-        rx_hostname xxx
-
-        # multi modules with custom ports on different rxr pc
-        0:rx_tcpport 1954
-        0:rx_hostname xxx
-        1:rx_tcpport 1955
-        1:rx_hostname yyy
-
-
-| Example commands:
-
-    .. code-block:: bash 
-
-        # to get a list of receiver commands (these dont include file commands)
-        sls_detector_get list | grep rx_
-
-        # some file commands are:
-        fwrite
-        foverwrite
-        findex
-        fpath
-        fname
-        fmaster
-        fformat
-
-        # to get help on a single commands
-        sls_detector_get -h rx_framescaught
-
-
-File format
--------------
-
-* The file name format is [fpath]/[fname]_dx_fy_[findex].raw, where x is module index and y is file index. **fname** is file name prefix and by default "run". **fpath** is '/' by default.
-
-* Each acquisition will have an increasing acquisition index or findex (if file write enabled). This can be retrieved by using **findex** command. 
-
-* Each acquisition can have multiple files (the file index number **y**), with **rx_framesperfile** being the maximum number of frames per file. The default varies for each detector type.
-
-* Some file name examples:
-
-    .. code-block:: bash
-
-        # first file
-        path-to-file/run_d0_f0_0.raw
-
-        # second file after reaching max frames in first file
-        path-to-file/run_d0_f1_0.raw
-        
-        # second acquisition, first file
-        path-to-file/run_d0_f0_1.raw
-
-* Each acquisition will create a master file that can be enabled/disabled using **fmaster**. This should have parameters relevant to the acquisition.
-
-* SLS Receiver Header consist of SLS Detector Header + 64 bytes of bitmask, altogether 112 bytes. The packetNumber in the sls detector header part, will be updated to number of packets caught by receiver for that frame. Furthermore, the bit mask will specify which packets have been received.
-
-**Binary file format**
-
-* This is the default file format. 
-
-* Each data file will consist of frames, each consisting of slsReceiver Header followed by data for 1 frame.
-
-* Master file is of ASCII format and will also include the format of the slsReceiver Header.
-
-
-**HDF5 file formats**
-
-#. Compile the package with HDF5 option enabled
-
-    #. Using cmk script: ./cmk.sh -hj9 -d [path of hdf5 dir]
-
-    #. Enable using cmake **-DCMAKE_INSTALL_PREFIX=/path/to/hdf/installation** and **-DSLS_USE_HDF5=ON**
-
-#. Start Receiver process
-
-#. Load config file
-
-#. Set file format from client or in config file
-    .. code-block:: bash
-
-        sls_detector_put fformat hdf5
-
-
-| For multiple, modules, a virtual file linking all the modules is created. Both the data files and virtual files are linked in the master file.
-
-
-Performance 
-------------
-
-Please refer to Receiver PC Tuning options and slsReceiver Tuning under `Troubleshooting <https://slsdetectorgroup.github.io/devdoc/troubleshooting.html>`_.
-
-
-Using Callbacks
----------------
-
-One can get a callback in the receiver for each frame to:
-    * manipulate the data that will be written to file, or
-    * disable file writing in slsReceiver and take care of the data for each call back
-
-When handling callbacks, the control should be returned as soon as possible, to prevent packet loss from fifo being full.
-
-**Example**
-    * `main cpp file <https://github.com/slsdetectorgroup/api-examples/blob/master/e4-receiver_callbacks.cpp>`_ 
-    * `cmake file <https://github.com/slsdetectorgroup/api-examples/blob/master/CMakeLists.txt>`_. 
-    * how to install the slsDetectorPackage is provided :ref:`here <build from source using cmake>`.
-    * compile the example **e4-rxr** by:
-
-        .. code-block:: bash
-
-            cmake ../path/to/your/source -DCMAKE_PREFIX_PATH=/path/to/sls/install
-            make
-            
--- a/docs/src/troubleshooting.rst
+++ b/docs/src/troubleshooting.rst
@ -1,299 +0,0 @@
-Troubleshooting
-=================
-
-If something is missing, don't hesitate to
-open an issue at our  `github repo issues
-<https://github.com/slsdetectorgroup/slsDetectorPackage/issues>`_. 
-
-Common
------
-
-Missing Packets
-^^^^^^^^^^^^^^^
-Possible causes could be the following:
-
-#. Receiver PC is not tuned for socket buffer size and input packet queue.
-    * Refer to :ref:`Increase rmem_default, rmem_max and max_backlog<Receiver PC Tuning>`
-
-#. Wiring
-    * Faulty wiring or connecting cable to incorrect interface.
-
-#. Link up and speed
-    * Check to see if there is a blue LED on board to signal that the link is up. Check ethtool and find if Link Deteced:Yes and Speed is acceptable (>10k).
-
-#. Detector is not acquiring (Not Eiger)
-    * Take an acquisition with many images and using the following steps instead of acquire:
-        .. code-block:: bash
-
-            sls_detector_put status start
-            # keep executing this command to see if the number of frames left keeps decreasing,
-            # which means the detector is acquiring.
-            sls_detector_get framesl 
-
-    .. note ::
-    
-        If you are using multiple modules, the previous command can return -1 because each module will return different values. Then, check for a single module instead: sls_detector_get 0:framesl
-
-#. Data cable plugged into the wrong interface on board (Jungfrau)
-    * Please ensure that the data cable is plugged into the rightmost interface. The middle one is disabled for PCB v1.0 and must be selected via command for PCB v2.0.
-
-#. Detector is not sending data
-    * Check the board to see if the green LED is blinking next to the data cable, which means that the detector is sending data.
-
-#. Firewall or security feature
-    * A firewall or some security feature could be blocking the reception of data.
-
-#. Ethernet interface not configured properly
-    * Ensure that the interfaces used are configured properly with the right mask and ip. Eg. use ifconfig and route commands to verify.
-
-#. Ethernet interface not configured for Jumbo frames (10Gb)
-    * Ensure that the interfaces used in receiver pc have MTU 9000 (jumbo frames) enabled.
-
-#. Detector IP (Not Eiger)
-    * Ensure it is valid and does not end if 0 or 255. Also ensure that the detector ip is in the same subnet as rx_udpip and the masking in the interface configuration ensures this rule.
-
-#. Tcpdump or wireshark
-    * Use one of these to confirm that you receive packets (with the right filtering ie. source and destination ports, ip).
-
-#. Check SFP modules
-    * Check if the SFP modules on both sides of the fiber are of same type.
-
-#. Pinging the subnet (receiving only a few number of packets each time)
-    * If a switch is used between a receiver pc and detector instead of plugging the cables directly, one might have to ping any ip in the subnet of the Ethernet interface constantly so that it does not forget the ip during operation.
-    * Eg. if rx_udpip is 10.2.3.100, then ping constantly 10.2.3.xxx, where xxx is any ip other than 100.
-
-
-
-.. _Receiver PC Tuning:
-
-Receiver PC Tuning Options
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-#. Increase maximum receive socket buffer size and socket input packet queue. 
-    * Temporarily (until shut down)
-        .. code-block:: bash
-            
-            # check size
-            sysctl -a | grep rmem
-            sysctl -a | grep backlog
-
-            # set max and default (use 1Gb for Jungfrau and 100Mb for others)
-            sysctl net.core.rmem_max=$((100*1024*1024)) 
-            sysctl net.core.rmem_default=$((100*1024*1024))
-            sysctl net.core.netdev_max_backlog=250000
-
-
-    * Permanently
-            .. code-block:: bash
-
-                # edit /etc/sysctl.conf file
-                # set max and default (use 1Gb for Jungfrau and 100Mb for others)
-                net.core.rmem_max = 104857600
-                net.core.rmem_default= 104857600
-                net.core.netdev_max_backlog = 250000
-
-                # save file and run the following
-                sysctl -p
-
-    .. note ::
-        This is the most basic setting, which is sometimes more than enough.
-
-#. For 10Gb,
-    * MTU must be set up to 9000 for jumbo frames on detector, switch and server NIC
-    
-    * Set up static MAC address tables with separated VLANs
-
-#. Write to memory if not a large disk and pc not fast enough.
-    .. code-block:: bash
-
-        mount -t tmpfs none /ramdisk_folder
-        # or
-        mount -t tmpfs none /mnt/ramdisk -o size=10G
-        # check how many GB memory you can allocate, to avoid swapping otherwise    
-
-
-#. Modify ethtool settings. 
-    * rx ring parameters
-        .. code-block:: bash
-
-            # check 
-            ethtool -g xth1
-
-            # set to max value in your pc settings
-            ethtool -G xth1 rx 4096 
-
-    * coalesce settings (might not always work)
-        .. code-block:: bash
-
-            # check 
-            ethtool -c xth1
-
-            # set to max value in your pc settings
-            ethtool -C xth1 rx-usecs 100 
-
-    * pause parameters
-        .. code-block:: bash
-
-            # check 
-            ethtool -a xth1
-
-            # set to max value in your pc settings
-            ethtool -A xth1 rx on
- 
-    .. note ::
-
-        | xth1 is example interface name. 
-        | These settings are lost at pc reboot.
-
-#. Give user speicific user scheduling privileges.
-    .. code-block:: bash
-
-        # edit /etc/security/limits.conf
-        # add following line or similar depending on your distribution
-        username rtprio 99
-
-    .. note ::
-
-        This is also set if slsReceiver is run as root user.
-        
-        
-#. Disable power saving in CPU frequency 
-    .. code-block:: bash
-
-        # or similar command depending on your distribution
-        cpupower frequency-info
-        cpupower frequency-set -g performance
-
-        # or
-        cpufreq-info
-        for i in ‘seq 0 7‘; do cpufreq-set -c $i -g performance; done
-
-
-slsReceiver Tuning
-^^^^^^^^^^^^^^^^^^
-
-#. Starting receiver as root to have scheduling privileges.
-
-#. For 10g, enable flow control
-    .. code-block:: bash
-
-        sls_detector_put flowcontrol10g 1
-
-#. Increase slsReceiver fifo depth between listening and processing threads.
-    .. code-block:: bash
-
-        sls_detector_get rx_fifodepth
-        # sets number of frames in fifo to 5000
-        sls_detector_put rx_fifodepth 5000
-
-#. Increase number of frames per file to reduce time taken to open and close files.
-    .. code-block:: bash
-
-        sls_detector_get rx_framesperfile
-        sls_detector_put rx_framesperfile 20000
-        # writes all frames into a single file
-        sls_detector_put rx_framesperfile 0
-
-
-Shared memory error
-^^^^^^^^^^^^^^^^^^^
-| For errors due to access or size, delete shared memory files nd try again.
-
-To list all shared memory files of sls detector package.
-    .. code-block:: bash
-        
-        ll /dev/shm/slsDetectorPackage*
-        -rw-------. 1 l_d l_d  136 Oct  1 11:42 /dev/shm/slsDetectorPackage_multi_0
-        -rw-------. 1 l_d l_d 3476 Oct  1 11:42 /dev/shm/slsDetectorPackage_multi_0_sls_0
-        -rw-------. 1 l_d l_d 3476 Oct  1 11:42 /dev/shm/slsDetectorPackage_multi_0_sls_1
-
-Cannot connect to detector
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Ensure both control and stop servers are running on the detector.
-    .. code-block:: bash
-
-        ps -ef | grep jungfrauDetectorServer*
-
-Cannot connect to receiver
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Start receiver before running a client command that needs to communicate with receiver.
-
-Receiver: cannot bind socket
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#. slsReceiver or slsMultiReceiver is already open somewhere.
-    * Kill it and restart it.
-
-#. Tcp port is in use by another application.
-    * Start Receiver with a different tcp port and adjust it config file
-        .. code-block:: bash
-
-            # restart receiver with different port
-            slsReceiver -t1980
-
-            # adjust in config file
-            rx_hostname pcxxxx:1980
-
-.. _common troubleshooting multi module data:
-
-Cannot get multi module data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Possible causes could be the following:
-
-#. Network
-    * If you have a direct connection, check to see if the network cables are connected correctly to corresponding interfaces on the PC side. Check also the network configuration and that the detectors and receivers are in the corresponding subnet.
-
-#. Power Supply
-    * Check power supply current limit.
-    * For Jungfrau, refer to :ref:`Jungfrau Power Supply Troubleshooting<Jungfrau Troubleshooting Power Supply>`.
-
-
-
-Gotthard
----------
-
-
-Missing first frame or next frame after a delay
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Connect the data link from the Module directly to receiver pc or to a private network.
-
-
-Jungfrau
---------
-
-Temperature event occured
-^^^^^^^^^^^^^^^^^^^^^^^^^
-This will occur only if:
-* temp_threshold (threshold temperature) has been set to a value
-* temp_control (temperature control) set to 1
-* and the temperature overshooted the threshold temperature.
-
-**Consequence**
-* sls_detector_get temp_event will give 1 # temperature event occured
-* the chip will be powered off
-
-**Solution**
-* Even after fixing the cooling, any subsequent powerchip command will fail unless the temperature event has been cleared.
-
-* Clear the temperature event
-    .. code-block:: bash
-        
-        # gives the current chip power status (zero currently as chip powered off)
-        sls_detector_get powerchip 
-
-        # clear temperature event
-        sls_detector_put temp_event 0
-
-        # power on the chip
-        sls_detector_put powerchip 1 
-
-
-.. _Jungfrau Troubleshooting Power Supply:
-
-Cannot get multi module data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Check :ref:`Common Multi Module Troubleshooting<common troubleshooting multi module data>`
-#. Power Supply
-    * Comment out this line in the config file: powerchip 1
-    * Powering on the chip increases the power consumption by a considerable amount. If commenting out this line aids in getting data (strange data due to powered off chip), then it could be the power supply current limit. Fix it (possibly to 8A current limit) and uncomment the powerchip line back in config file.
-
--- a/docs/src/type_traits.rst
+++ b/docs/src/type_traits.rst
@ -1,7 +0,0 @@
-TypeTraits
-==============
-
-Template meta functions in the same spirit as type_traits
-from the standard library.
-
-.. doxygenfile:: TypeTraits.h
--- a/docs/src/virtualserver.rst
+++ b/docs/src/virtualserver.rst
@ -1,149 +0,0 @@
-.. _Virtual Detector Servers:
-Detector Simulators
-===================
-
-Compilation
-----------
-
-* Using CMake, turn on the option 
-    .. code-block:: bash  
-        
-        SLS_USE_SIMULATOR=ON
-
-* Using cmk.sh script,
-     .. code-block:: bash  
-        
-        ./cmk.sh -bsj9 #option s is for simulator
-
-
-Binaries
-^^^^^^^^
-    .. code-block:: bash  
-
-        eigerDetectorServerMaster_virtual
-        eigerDetectorServerSlaveTop_virtual
-        eigerDetectorServerSlaveBottom_virtual
-        jungfrauDetectorServer_virtual
-        gotthardDetectorServer_virtual
-        gotthard2DetectorServer_virtual
-        mythen3DetectorServer_virtual
-        moenchDetectorServer_virtual
-        ctbDetectorServer_virtual
-
-
-Arguments
---------
-
-The arguments are the same as the :ref:`normal server arguments<Detector Server Arguments>`.
-
-When using multiple modules, use different ports for each virtual server.
-    .. code-block:: bash  
-
-        # will start control server at port 1912 and stop server at port 1913
-        jungfrauDetectorServer --port 1912 &
-
-        # will start second control server at port 1914 and stop server at port 1915
-        jungfrauDetectorServer --port 1914 &
-
-
-Client
------
-
-.. code-block:: bash  
-
-    # hostname should include the port (if not default)
-    sls_detector_put hostname localhost:1912+localhost:1914+
-
-    # or use virtual command, instead of hostname
-    # connects to 2 servers at localhost 
-    # (control servers: 1912, 1914; stop servers: 1913, 1915)
-    sls_detector_put virtual 2 1912 
-
-Use the same in the config file.
-Detector API has a method 'isVirtualDetectorServer' to check if on-board detector server is virtual.
-
-
-Sample Config file
-^^^^^^^^^^^^^^^^^^
-There are sample config files for each detector in slsDetectorPackage/examples folder.
-
-For a Single Module
-    .. code-block:: bash  
-
-        # connects to control port 1912
-        hostname localhost:1912+
-
-        # connects to receiver at ports 2012
-        rx_hostname mpc1922:2012+
-
-        # sets destination udp ports (not needed, default is 50001)
-        udp_dstport 50012
-
-        # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # connects to control ports 1912, 1914 and stop ports 1913, 1915
-        virtual 2 1912
-        # or hostname localhost:1912+localhost:1914+
-
-        # connects to receivers at ports 2012 and 2014
-        rx_hostname mpc1922:2012+mpc1922:2013+
-
-        # sets differernt destination udp ports
-        0:udp_dstport 50012
-        1:udp_dstport 50014
-
-        # source udp ips must be same subnet at destintaion udp ips
-        0:udp_srcip 192.168.1.112
-        1:udp_srcip 192.168.1.114
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-Receivers
----------
-Same as if you would use an actual detector
-
-For a Single Module
-    .. code-block:: bash  
-
-        slsReceiver -t2012
-
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 0 
-
-Gui
----
-| Same as if you would use an actual detector.
-| Compile with SLS_USE_GUI=ON in cmake or -g option in cmk.sh script.
-
-.. code-block:: bash  
-
-    slsDetectorGui
-
-Limitations
-----------
-
-#. Data coming out of virtual server is fake. Value at each pixel/ channel is incremented by 1.
-
-#. A stop will stop the virtual acquisition only at the start of every new frame.
-
-#. Triggers are counted as number of virtual frames. trigger command to send a software trigger (Mythen3 & Eiger) is not implemented in virtual server.
-
-#. firmware version and serial number will give 0.
--- a/docs/static/extra.css
+++ b/docs/static/extra.css
@ -1,4 +0,0 @@
-/* override table no-wrap */
-.wy-table-responsive table td, .wy-table-responsive table th {
-    white-space: normal;
-}
--- a/evalVersionVariables.sh
+++ b/evalVersionVariables.sh
--- a/examples/ang.off
+++ b/examples/ang.off
@ -0,0 +1,24 @@
+ module 0 center 6.395E+02 +- 0.00E+00 conversion 6.5660E-05 +- 7.10E-09 offset 0.00000 +- 0.00015 
+ module 1 center 6.395E+02 +- 0.00E+00 conversion 6.5650E-05 +- 7.09E-09 offset 5.00211 +- 0.00015 
+ module 2 center 6.395E+02 +- 0.00E+00 conversion 6.5625E-05 +- 7.09E-09 offset 10.00733 +- 0.00015 
+ module 3 center 6.395E+02 +- 0.00E+00 conversion 6.5618E-05 +- 7.09E-09 offset 15.00742 +- 0.00015 
+ module 4 center 6.395E+02 +- 0.00E+00 conversion 6.5642E-05 +- 7.15E-09 offset 20.00620 +- 0.00015 
+ module 5 center 6.395E+02 +- 0.00E+00 conversion 6.5612E-05 +- 7.09E-09 offset 25.00281 +- 0.00015 
+ module 6 center 6.395E+02 +- 0.00E+00 conversion 6.5623E-05 +- 6.93E-09 offset 30.00704 +- 0.00015 
+ module 7 center 6.395E+02 +- 0.00E+00 conversion 6.5605E-05 +- 7.10E-09 offset 34.99715 +- 0.00015 
+ module 8 center 6.395E+02 +- 0.00E+00 conversion 6.5643E-05 +- 7.21E-09 offset 39.99533 +- 0.00015 
+ module 9 center 6.395E+02 +- 0.00E+00 conversion 6.5638E-05 +- 7.09E-09 offset 44.99969 +- 0.00015 
+ module 10 center 6.395E+02 +- 0.00E+00 conversion 6.5638E-05 +- 6.94E-09 offset 49.99859 +- 0.00015 
+ module 11 center 6.395E+02 +- 0.00E+00 conversion 6.5644E-05 +- 7.10E-09 offset 54.99499 +- 0.00015 
+ module 12 center 6.395E+02 +- 0.00E+00 conversion 6.5618E-05 +- 7.09E-09 offset 59.99120 +- 0.00015 
+ module 13 center 6.395E+02 +- 0.00E+00 conversion 6.5607E-05 +- 7.11E-09 offset 64.98880 +- 0.00015 
+ module 14 center 6.395E+02 +- 0.00E+00 conversion 6.5609E-05 +- 7.09E-09 offset 69.98205 +- 0.00015 
+ module 15 center 6.395E+02 +- 0.00E+00 conversion 6.5611E-05 +- 7.09E-09 offset 74.98379 +- 0.00015 
+ module 16 center 6.395E+02 +- 0.00E+00 conversion 6.5619E-05 +- 4.72E-09 offset 79.98559 +- 0.00015 
+ module 17 center 6.395E+02 +- 0.00E+00 conversion 6.5604E-05 +- 7.09E-09 offset 84.98376 +- 0.00015 
+ module 18 center 6.395E+02 +- 0.00E+00 conversion 6.5605E-05 +- 7.09E-09 offset 89.98307 +- 0.00015 
+ module 19 center 6.395E+02 +- 0.00E+00 conversion 6.5616E-05 +- 7.09E-09 offset 94.98907 +- 0.00015 
+ module 20 center 6.395E+02 +- 0.00E+00 conversion 6.5634E-05 +- 7.08E-09 offset 99.97965 +- 0.00015 
+ module 21 center 6.395E+02 +- 0.00E+00 conversion 6.5608E-05 +- 4.16E-09 offset 104.99732 +- 0.00016 
+ module 22 center 6.395E+02 +- 0.00E+00 conversion 6.5608E-05 +- 7.09E-09 offset 109.98646 +- 0.00015 
+ module 23 center 6.395E+02 +- 0.00E+00 conversion 6.5649E-05 +- 7.09E-09 offset 114.98765 +- 0.00015 
--- a/examples/bad.chans
+++ b/examples/bad.chans
@ -0,0 +1,5 @@
+15
+1528
+5000
+6513
+
--- a/examples/config_gen_script/beb_31_25.config_gen
+++ b/examples/config_gen_script/beb_31_25.config_gen
--- a/examples/config_gen_script/eiger_2m_1gb.config_gen
+++ b/examples/config_gen_script/eiger_2m_1gb.config_gen
--- a/Show More
+++ b/Show More