version

.clang-tidy

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

.gitignore

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

.travis.yml

@@ -4,25 +4,38 @@ 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=3.17 
+  - conda install anaconda-client
+  - conda install conda-verify
 
   # 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:
@@ -31,8 +44,7 @@ script:
 
 deploy:
   provider: script
-  script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -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
+    branch: filip1
 

CMakeLists.txt

@@ -1,8 +1,9 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.9)
 project(slsDetectorPackage)
 set(PROJECT_VERSION 5.0.0)
+
 include(CheckIPOSupported)
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+
 
 cmake_policy(SET CMP0074 NEW)
 include(cmake/project_version.cmake)
@@ -41,12 +42,6 @@ option (SLS_USE_TESTS "TESTS" OFF)
 option (SLS_USE_INTEGRATION_TESTS "Integration Tests" OFF)
 option(SLS_USE_SANITIZER "Sanitizers for debugging" OFF)
 option(SLS_USE_PYTHON "Python bindings" OFF)
-option(SLS_USE_CTBGUI "ctb GUI" OFF)
-option(SLS_BUILD_DOCS "docs" OFF)
-option(SLS_BUILD_EXAMPLES "examples" OFF)
-option(SLS_TUNE_LOCAL "tune to local machine" OFF)
-
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -71,7 +66,6 @@ target_compile_options(slsProjectWarnings INTERFACE
                                             -Wredundant-decls
                                             # -Wconversion
                                             -Wdouble-promotion
-                                            -Werror=return-type
 
                                  )
 
@@ -109,16 +103,12 @@ endif()
 
 if(SLS_USE_SANITIZER)
     target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined -fno-omit-frame-pointer)
+    #target_compile_options(slsProjectOptions INTERFACE -fsanitize=address,undefined)
     target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
     # target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
     # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
-if(SLS_TUNE_LOCAL)
-    target_compile_options(slsProjectOptions INTERFACE -mtune=native -march=native)
-endif()
-
-
 #rapidjson
 add_library(rapidjson INTERFACE)
 target_include_directories(rapidjson INTERFACE
@@ -134,7 +124,7 @@ install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
 )
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_INSTALL_RPATH $ORIGIN)
+set(CMAKE_INSTALL_RPATH "$ORIGIN")
 # set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
@@ -163,11 +153,12 @@ if (SLS_USE_RECEIVER)
         find_package(HDF5 1.10 COMPONENTS CXX REQUIRED)
     endif (SLS_USE_HDF5)
     add_subdirectory(slsReceiverSoftware)
+    add_subdirectory(manual/manual-api)    
 endif (SLS_USE_RECEIVER)
 
 if (SLS_USE_GUI)   
     find_package(Qt4 REQUIRED)
-    find_package(Qwt 6.1 REQUIRED)
+    find_package(Qwt 6 REQUIRED)
     if (QT4_FOUND AND QWT_FOUND)
         add_subdirectory(slsDetectorGui)
     endif()
@@ -182,30 +173,25 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
-    set(PYBIND11_CPP_STANDARD -std=c++11)
     add_subdirectory(libs/pybind11)
     add_subdirectory(python)
 endif(SLS_USE_PYTHON)
 
-if (SLS_USE_CTBGUI)
-    add_subdirectory(ctbGui)
-endif(SLS_USE_CTBGUI)
-
 configure_file( .clang-tidy  
     ${CMAKE_BINARY_DIR}/.clang-tidy  
 )
 
-if (SLS_BUILD_EXAMPLES)
-    add_subdirectory(sample)
-endif(SLS_BUILD_EXAMPLES)
 
-if(SLS_BUILD_DOCS)
+add_subdirectory(sample)
+
 add_subdirectory(docs)
-endif(SLS_BUILD_DOCS)
+
+
+
 
 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 slsSupportLib slsDetectorShared slsReceiverShared)
     # Generate and install package config file and version

README.md

@@ -2,67 +2,90 @@
 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 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 
-* Lib: c++11 compiler (gcc=>4.8), ZeroMQ 4
-* Gui: Qt 4.8 and Qwt 6.0
-* Calibration wizards and ctbGUI: ROOT
-* Optional: HDF5
+#### 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>
 
 After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>
 
-Usage: [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
- -[no option]: only make
- -c: Clean
- -b: Builds/Rebuilds CMake files normal mode
- -p: Builds/Rebuilds Python API
- -h: Builds/Rebuilds Cmake files with HDF5 package
- -d: HDF5 Custom Directory
- -t: Build/Rebuilds only text client
- -r: Build/Rebuilds only receiver
- -g: Build/Rebuilds only gui
- -s: Simulator
- -u: Chip Test Gui
- -j: Number of threads to compile through
- -e: Debug mode
- -i: Builds tests
+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>
 
-eg. Rebuild when you switch to a new build and compile in parallel:
-./cmk.sh -bj5
 
 **2. Compile without script**<br>
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. 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
+```
+
+Use the following as an example to compile statically and using specific hdf5 folder
+```
+    $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=ON
+ ```  
+After compiling, the libraries and executables will be found at `bin` directory
+```
+    $ ls bin/
+    gui_client  libSlsDetector.a  libSlsDetector.so  libSlsReceiver.a  libSlsReceiver.so
+    sls_detector_acquire  sls_detector_get  slsDetectorGui  sls_detector_help  sls_detector_put  slsReceiver slsMultiReceiver
 ```

RELEASE.txt

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

cmake/package_config.cmake

@@ -15,20 +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}
-)
+  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 ()

cmk.sh

@@ -10,7 +10,6 @@ DEBUG=0
 PYTHON=0
 TESTS=0
 SIMULATOR=0
-CTBGUI=0
 
 
 CLEAN=0
@@ -19,7 +18,7 @@ CMAKE_PRE=""
 CMAKE_POST=""
 
 usage() { echo -e "
-Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
+Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
  -[no option]: only make
  -c: Clean
  -b: Builds/Rebuilds CMake files normal mode
@@ -30,7 +29,6 @@ Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>]
  -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
@@ -69,7 +67,7 @@ For rebuilding only certain sections
  
  " ; exit 1; }
 
-while getopts ":bpchd:j:trgeisu" opt ; do
+while getopts ":bpchd:j:trgeis" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
@@ -124,10 +122,6 @@ while getopts ":bpchd:j:trgeisu" opt ; do
 		echo "Compiling Options: Simulator" 
 		SIMULATOR=1
 		;; 
-	u)
-		echo "Compiling Options: Chip Test Gui"
-		CTBGUI=1
-		;;
   \?)
     echo "Invalid option: -$OPTARG" 
 		usage
@@ -155,7 +149,7 @@ if [ $TEXTCLIENT -eq 0 ] && [ $RECEIVER -eq 0 ]  && [ $GUI -eq 0 ]; then
     echo "Enabling Compile Option: TextClient, Receiver and GUI"
 else 
     if [ $TEXTCLIENT -eq 1 ]; then
-        CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON -DSLS_USE_RECEIVER=OFF "
+        CMAKE_POST+=" -DSLS_USE_TEXTCLIENT=ON "
         echo "Enabling Compile Option: TextClient"
     fi
     if [ $RECEIVER -eq 1 ]; then
@@ -187,26 +181,21 @@ fi
 
 #Debug
 if [ $DEBUG -eq 1 ]; then
-#	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
+# CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
 	echo "Debug Option enabled"
 fi 
 
 #Simulator
 if [ $SIMULATOR -eq 1 ]; then
-	CMAKE_POST+=" -DSLS_USE_SIMULATOR=ON "
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SIMULATOR=ON "
 	echo "Simulator 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"
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_TESTS=ON -DSLS_USE_INTEGRATION_TESTS=ON"
 	echo "Tests Option enabled"
 fi 
 

conda-recepie/build.sh

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

conda-recepie/build_pylib.sh

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

conda-recepie/conda_build_config.yaml

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

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/.
-

conda-recepie/copy_gui.sh

@@ -1,3 +1,15 @@
-#Copy the GUI 
+
+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/.

conda-recepie/copy_lib.sh

@@ -5,20 +5,18 @@ mkdir $PREFIX/include
 mkdir $PREFIX/include/slsDetectorPackage
 
 #Shared and static libraries
-# cp build/bin/libSlsDetector.so $PREFIX/lib/.
-# cp build/bin/libSlsReceiver.so $PREFIX/lib/.
-# cp build/bin/libSlsSupport.so $PREFIX/lib/.
-
-cp build/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/* $PREFIX/include/
-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/.

conda-recepie/meta.yaml

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

ctbGui/CMakeLists.txt

@@ -1,89 +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}/modules/RootNewMacros.cmake")
-root_generate_dictionary(ctbDict ${HEADERS} LINKDEF ctbLinkDef.h)
-add_library(ctbRootLib SHARED ctbDict.cxx)
-target_include_directories(ctbRootLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(ctbRootLib PUBLIC 
-    ROOT::Core 
-    slsDetectorShared
-    slsSupportLib
-    ${ROOT_LIBRARIES} 
-    ${ROOT_EXE_LINKER_FLAGS}
-)
-
-set_target_properties(
-    ctbRootLib PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-)
-
-target_link_libraries(ctbGui PUBLIC 
-    slsDetectorShared
-    slsSupportLib
-    ctbRootLib
-    ${TIFF_LIBRARIES}
-)
-
-set_target_properties(ctbGui PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-
-)

ctbGui/Makefile.root5

@@ -1,17 +1,17 @@
 
 
 INCS=ctbMain.h ctbDacs.h   ctbPattern.h  ctbSignals.h  ctbAdcs.h ctbAcquisition.h ctbPowers.h   ctbSlowAdcs.h 
-SRC= $(INCS:.h=.cpp) ctbDict.cpp 
+SRC= $(SRC:.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
+LDFLAG=-L../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
+DESTDIR?=../bin
 
 
 OBJS = $(SRC:.cpp=.o) $(MAIN:.cpp=.o)
@@ -30,13 +30,13 @@ ctbDict.cpp: $(INCS)  $(LINKDEF)
 
 %.o : %.cpp 
 	echo $@
-	g++ -DMYROOT `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG)  -o $@ -c $< $(INCDIR)
+	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 `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS)  ../slsDetectorCalibration/tiffIO.cpp
+	g++ -DMYROOT `source root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS)  ../slsDetectorCalibration/tiffIO.cpp
 	mv ctbGui $(DESTDIR)	
 
 clean:

ctbGui/ctbAcquisition.cpp

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

ctbGui/ctbAcquisition.h

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

ctbGui/ctbAdcs.cpp

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

ctbGui/ctbAdcs.h

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

ctbGui/ctbDacs.cpp

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

ctbGui/ctbDacs.h

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

ctbGui/ctbDefs.h

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

ctbGui/ctbGui.cpp

@@ -9,11 +9,11 @@
 #include <fstream>
 #include <string>
 
-#include "Detector.h"
+
+#include "multiSlsDetector.h"
 #include "sls_detector_defs.h"
 //#include "sls_receiver_defs.h"
 #include "ctbMain.h"
-#include "ctbDefs.h"
 using namespace std;
 
 
@@ -61,27 +61,31 @@ int main(int argc, char **argv) {
   
 
   cout << " *** "  << endl;
-  sls::Detector *myDet = nullptr;
-  try {
+  
   /****** Create detector ****************/
-    myDet=new sls::Detector(id);
-    cout << "Created multi detector id " << id << endl;
+  multiSlsDetector *myDet=new multiSlsDetector(id);
+  // myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
 
+  //cout << id << " " << myDet << " " << myDet->setOnline() << endl;
   if (cf) {
-      myDet->loadConfig(cfname);
-      cout << "Config file loaded successfully" << endl;
-    } else {
+    myDet->readConfigurationFile(cfname);
+  } else
     cout << "No config file specified" << endl;
-    }
-    cout << "hostname " << myDet->getHostname() << endl;
 
+  cout << "aa" << endl;
+
+    cout << "Created multi detector id " << id << " hostname " << myDet->getHostname() << endl;
+
+  
+  cout << "bb" << endl;
   if (pf) {
-      myDet->loadParameters(pfname);
-      cout << "Loaded parameter file successfully" << endl;
-    } else{
+    myDet->retrieveDetectorSetup(pfname);
+  } 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);

ctbGui/ctbMain.cpp

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

ctbGui/ctbMain.h

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

ctbGui/ctbPattern.cpp

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

ctbGui/ctbPattern.h

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

ctbGui/ctbPowers.cpp

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

ctbGui/ctbPowers.h

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

ctbGui/ctbSignals.cpp

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

ctbGui/ctbSignals.h

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

ctbGui/ctbSlowAdcs.cpp

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

ctbGui/ctbSlowAdcs.h

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

docs/CMakeLists.txt

@@ -3,11 +3,9 @@ find_package(Sphinx)
 
 
 if (DOXYGEN_FOUND AND SPHINX_FOUND)
-    # message(${CMAKE_PROJECT_SORURCE_DIR}/slsDetectorSoftware/src)
-    # Utility to generate command line documentation
+
+    # #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
     )
@@ -30,7 +28,6 @@ if (DOXYGEN_FOUND AND SPHINX_FOUND)
     set(SPHINX_SOURCE_FILES
       src/commandline.rst
       src/container_utils.rst
-      src/consuming.rst
       src/dependencies.rst
       src/detector.rst
       src/index.rst
@@ -42,7 +39,6 @@ if (DOXYGEN_FOUND AND SPHINX_FOUND)
       src/result.rst
       src/type_traits.rst
       src/ToString.rst
-      src/examples.rst
       
     )
 

docs/src/consuming.rst

@@ -1,95 +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. 
-
-
-
-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
-
-No tools minimal approach
------------------------------
-
-While not recommended it is still possible to specify the include and library paths
-manually when invoking g++. This can sometimes be handy for a quick try. 
-
-.. code-block:: cpp
-
-    #include "Detector.h"
-    #include <iostream>
-    int main(){
-
-        sls::Detector det;
-
-        //Get all values and print them
-        std::cout << "Hostname: " << det.getHostname() << "\n";
-        std::cout << "Type: " << det.getDetectorType() << "\n";
-        std::cout << "Udp ip: " << det.getSourceUDPIP() << "\n";
-
-
-        //Get mac addr 
-        const int module = 0;
-        auto mac = det.getSourceUDPMAC()[module];
-        std::cout << "Mac addr of module "<< module <<  " is " <<  mac.str() << '\n'; 
-
-    }     
-
-
-.. code-block:: bash
-
-    g++ -I/install/path/include/  -L/install/path/lib64/ myapp.cpp -lSlsDetector -lSlsSupport -Wl,-rpath=../install/path/lib64

docs/src/dependencies.rst

@@ -13,7 +13,7 @@ To use the basic building blocks, meaning sls_detector_get/put and
 the shared libraries these are needed: 
 
  * Linux, preferably recent kernel (currently no cross platform support)
- * CMake > 3.12 
+ * CMake > 3.9 
  * C++11 compatible compiler. (We test with gcc and clang)
  * ZeroMQ version 4
 
@@ -24,7 +24,7 @@ GUI
 The GUI is currently using Qt4 but watch out for an upgrade to 5. 
 
  * Qt 4.8
- * Qwt 6.1
+ * Qwt 6
 
 -----------------------
 Python bindings

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 "Detector.h"
-    ...
-    sls::Detector det;
-    det.loadConfig("path/to/config/file.config");
-
-
-
-To configure the connection between PC and detector the easiest 
-is to run a config file. For this example we first launch a virtual Jungfrau server and
-then set up the detector. 
-
-**Launch a virtual detector server**
-
-.. code-block:: bash
-
-    jungfrauDetectorServer_virtual
-
-This launches a virtual Jungfrau detector server. As default is uses port 1952 and 1953
-for communication over TCP. Most commands go on 1952 and only stop and status on 1953. 
-
-**Run example to configure**
-
-.. code-block:: bash
-
-    ./e1-config one_det_no_receiver.config
-    - 12:01:06.371 INFO: Shared memory deleted /slsDetectorPackage_multi_0_sls_0
-    - 12:01:06.371 INFO: Shared memory deleted /slsDetectorPackage_multi_0
-    - 12:01:06.372 INFO: Shared memory created /slsDetectorPackage_multi_0
-    - 12:01:06.376 INFO: Loading configuration file: one_det_no_receiver.config
-    - 12:01:06.376 INFO: Adding detector localhost
-    - 12:01:06.377 INFO: Shared memory created /slsDetectorPackage_multi_0_sls_0
-    - 12:01:06.377 INFO: Checking Detector Version Compatibility
-    - 12:01:06.378 INFO: Detector connecting - updating!
-    hostname [localhost]
-
-
-    Jungfrau detector with 1 modules configured
-
-
-Using the return type sls::Result [e2]
------------------------------------------
-
-Since many our detectors have multiple modules we cannot return
-a single value when reading from the Detector. Hostname, Ip and also
-for example exposure time can differ between modules. 
-
-Therefore we return Result<T> which is a thin wrapper around
-std::vector. 
-
-.. code-block:: cpp
-
-    sls::Result<int> res1{1, 1, 1};
-    std::cout << "res1: " << res1 << '\n';
-    res1.squash();
-    res1.squash(-1);
-
-
-
-Setting exposure time [e3]
------------------------------------------
-
-For setting times, like exposure time, period, delay etc. 
-we use std::chrono::duration. 
-
-Example 3 shows how to set and read exposure time as well
-as converting to floating point. 
-
-.. code-block:: cpp
-
-    #include "Detector.h"
-    #include <chrono>
-    ...
-    std::chrono::microseconds t0{500};
-    det.setExptime(t0);
-
-
-

docs/src/gendoc.cpp

@@ -36,7 +36,7 @@ int main() {
 
     std::cout << "Generating command line documentation!\n";
 
-    sls::CmdProxy proxy(nullptr);
+    sls::CmdProxy<sls::Detector> proxy(nullptr);
     auto commands = proxy.GetProxyCommands();
 
     std::ofstream fs("commands.rst");

docs/src/index.rst

@@ -6,18 +6,12 @@
 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
@@ -26,7 +20,6 @@ Welcome to slsDetectorPackage's documentation!
     detector
     result
     receiver
-    examples
 
 .. toctree::
     :caption: Python API

docs/src/installation.rst

@@ -2,24 +2,4 @@
 Installation
 ==============================================
 
-Build from source using CMake
----------------------------------
-
-.. 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. 
-
-.. code-block:: bash
-
-    git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
-    mkdir build && cd build
-    cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
-    make -j12
-    make install
-
-    
-
+get the source etc.

docs/src/pydetector.rst

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

docs/src/pyexamples.rst

@@ -12,7 +12,7 @@ file writing etc.
 
 .. code-block:: python
  
-    from slsdet import Eiger
+    from sls_detector import Eiger
 
     d = Eiger()
     threshold = range(0, 2000, 200)

examples/gotthard2_veto_photon.txt

@@ -1,132 +0,0 @@
-#G1 Energy #G2 Energy
-300	7000
-
-#G0 pedestal    G1 pedestal    G2 pedestal    G0 gain    G1 gain    G2 gain (for every channel) ADU
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1
-100        100        100        10        1        0.1

examples/gotthard_setup.det

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

examples/moench01_T1_lab.config

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

examples/moench03_T1.config

@@ -1,61 +0,0 @@
-#initialchecks 0
-#############################################
-### edit with hostname or IP address of your detector 
-############################################
-hostname bchip181+
-
-
-
-#############################################
-### edit with 10 Gbs IP of your server
-############################################
-udp_dstip 10.1.1.102
-#############################################
-### edit with any number in the subnet of your server (first 3 numbers as above)
-############################################
-udp_srcip 10.1.1.19
-udp_dstport 33410
-
-#############################################
-### edit with 10 Gbs IP of your server
-############################################
-#rx_zmqip 10.1.1.102
-#rx_zmqport 30001
-#############################################
-### edit with 1 Gbs IP of PC where you will run the GUI
-############################################
-#zmqip 129.129.202.136
-#zmqport 40001
-
-
-#############################################
-### edit with hostname or 1Gbs IP address of your server
-############################################
-rx_hostname mpc2011
-
-
-tengiga 1
-rx_datastream 1
-
-
-
-frames 1
-period 0.001
-#############################################
-### edit with directory you want to write to
-############################################
-fpath /mnt/moench_data/scratch/
-fwrite 0
-rx_datastream 1
-
-rx_jsonpara frameMode newpedestal
-rx_jsonpara detectorMode analog
-rx_discardpolicy discardpartial
-
-
-adcpipeline 15
-
-powerchip 1
-vhighvoltage 90
-
-adcreg 14 40

integrationTests/test-eigerIntegration.cpp

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

integrationTests/test-integrationDectector.cpp

@@ -3,8 +3,8 @@
 
 #include "ClientSocket.h"
 #include "logger.h"
-#include "DetectorImpl.h"
-#include "Module.h"
+#include "multiSlsDetector.h"
+#include "slsDetector.h"
 #include "sls_detector_defs.h"
 
 #include "Timer.h"
@@ -23,10 +23,10 @@
 // extern dt type;
 
 TEST_CASE("Single detector no receiver", "[.integration][.single]") {
-    auto t = Module::getTypeFromDetector(test::hostname);
+    auto t = slsDetector::getTypeFromDetector(test::hostname);
     CHECK(t == test::type);
 
-    Module d(t);
+    slsDetector d(t);
     CHECK(d.getDetectorTypeAsEnum() == t);
     CHECK(d.getDetectorTypeAsString() == test::detector_type);
 
@@ -51,7 +51,7 @@ TEST_CASE("Set control port then create a new object with this control port",
     int new_cport = 1993;
     int new_sport = 2000;
     {
-        Module d(test::type);
+        slsDetector d(test::type);
         d.setHostname(test::hostname);
         CHECK(d.getControlPort() == old_cport);
         d.setControlPort(new_cport);
@@ -60,7 +60,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
     {
-        Module d(test::type);
+        slsDetector d(test::type);
         d.setHostname(test::hostname);
         d.setControlPort(new_cport);
         d.setStopPort(new_sport);
@@ -73,7 +73,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
 
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.getStopPort() == DEFAULT_PORTNO + 1);
     d.freeSharedMemory();
@@ -86,11 +86,11 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
     SingleDetectorConfig c;
 
     // Read type by connecting to the detector
-    auto type = Module::getTypeFromDetector(c.hostname);
+    auto type = slsDetector::getTypeFromDetector(c.hostname);
     CHECK(type == c.type_enum);
 
-    // Create Module of said type and set hostname and detector online
-    Module d(type);
+    // Create slsDetector of said type and set hostname and detector online
+    slsDetector d(type);
     CHECK(d.getDetectorTypeAsEnum() == type);
     CHECK(d.getDetectorTypeAsString() == c.type_string);
 
@@ -102,8 +102,8 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
 
     // Setting and reading exposure time
     auto t = 1000000000;
-    d.setExptime(t);
-    CHECK(d.getExptime() == t);
+    d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, t);
+    CHECK(d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME) == t);
 
     // size of an eiger half module with and without gap pixels
     CHECK(d.getTotalNumberOfChannels() == 256 * 256 * 4);
@@ -133,7 +133,7 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
 
 
 TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
 
     // Check that detector server is unlocked then lock
@@ -143,8 +143,8 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
 
     // Can we still access the detector while it's locked
     auto t = 1300000000;
-    d.setExptime(t);
-    CHECK(d.getExptime() == t);
+    d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, t);
+    CHECK(d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME) == t);
 
     // unlock again and free
     d.lockServer(0);
@@ -155,7 +155,7 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
 }
 
 TEST_CASE("Set settings", "[.integration][.single]"){
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD);
 }
@@ -163,12 +163,12 @@ TEST_CASE("Set settings", "[.integration][.single]"){
 
 TEST_CASE("Timer functions", "[.integration][cli]") {
     // FRAME_NUMBER, /**< number of real time frames: total number of
-    // acquisitions is number or frames*number of triggers */ ACQUISITION_TIME,
+    // acquisitions is number or frames*number of cycles */ ACQUISITION_TIME,
     // /**< exposure time */ FRAME_PERIOD, /**< period between exposures */
     // DELAY_AFTER_TRIGGER, /**< delay between trigger and start of exposure or
     // readout (in triggered mode) */ GATES_NUMBER, /**< number of gates per
-    // frame (in gated mode) */ TRIGGER_NUMBER, /**< number of triggers: total
-    // number of acquisitions is number or frames*number of triggers */
+    // frame (in gated mode) */ CYCLES_NUMBER, /**< number of cycles: total
+    // number of acquisitions is number or frames*number of cycles */
     // ACTUAL_TIME, /**< Actual time of the detector's internal timer */
     // MEASUREMENT_TIME,  /**< Time of the measurement from the detector (fifo)
     // */
@@ -185,60 +185,71 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
     // MEASURED_SUBPERIOD,	/**< measured subperiod */
     // MAX_TIMERS
 
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
 
     // Number of frames
     auto frames = 5;
-    d.setNumberOfFrames(frames);
-    CHECK(d.getNumberOfFrames() == frames);
+    d.setTimer(slsDetectorDefs::timerIndex::FRAME_NUMBER, frames);
+    CHECK(d.setTimer(slsDetectorDefs::timerIndex::FRAME_NUMBER) == frames);
 
     auto exptime = 2000000000;
-    d.setExptime(exptime);
-    CHECK(d.getExptime() == exptime);
+    d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, exptime);
+    CHECK(d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME) == exptime);
 
     auto period = 2000000000;
-    d.setPeriod(period);
-    CHECK(d.getPeriod() == period);
+    d.setTimer(slsDetectorDefs::timerIndex::FRAME_PERIOD, period);
+    CHECK(d.setTimer(slsDetectorDefs::timerIndex::FRAME_PERIOD) == period);
 
     if (test::type != dt::EIGER) {
         auto delay = 10000;
-        d.setDelayAfterTrigger(delay);
-        CHECK(d.getDelayAfterTrigger() ==
+        d.setTimer(slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER, delay);
+        CHECK(d.setTimer(slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER) ==
               delay);
     }
 
-    auto triggers = 2;
-    d.setNumberOfTriggers(triggers);
-    CHECK(d.getNumberOfTriggers() == triggers);
+    if (test::type != dt::EIGER) {
+        auto gates = 1;
+        d.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER, gates);
+        CHECK(d.setTimer(slsDetectorDefs::timerIndex::GATES_NUMBER) == gates);
+    }
+
+    auto cycles = 2;
+    d.setTimer(slsDetectorDefs::timerIndex::CYCLES_NUMBER, cycles);
+    CHECK(d.setTimer(slsDetectorDefs::timerIndex::CYCLES_NUMBER) == cycles);
 
     if (test::type == dt::EIGER) {
         auto subtime = 200;
-        d.setSubExptime(subtime);
-        CHECK(d.getSubExptime() == subtime);
+        d.setTimer(slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME,
+                   subtime);
+        CHECK(d.setTimer(
+                  slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME) ==
+              subtime);
     }
     // for (int i =0; i!=frames; ++i)
         d.startAndReadAll();
 
     d.freeSharedMemory();
 
+    // If we add a timer we should add tests for the timer
+    CHECK(slsDetectorDefs::MAX_TIMERS == 19);
 }
 
 // TEST_CASE("Aquire", "[.integration][eiger]"){
 //     SingleDetectorConfig c;
-//     auto type = Module::getTypeFromDetector(c.hostname);
-//     Module d(type);
+//     auto type = slsDetector::getTypeFromDetector(c.hostname);
+//     slsDetector d(type);
 //     d.setHostname(c.hostname);
 
 //     auto period = 1000000000;
 //     auto exptime = 100000000;
-//     d.setNumberOfFrames(5);
-//     d.setExptime(exptime);
-//     d.setPeriod(period);
+//     d.setTimer(slsDetectorDefs::timerIndex::FRAME_NUMBER, 5);
+//     d.setTimer(slsDetectorDefs::timerIndex::ACQUISITION_TIME, exptime);
+//     d.setTimer(slsDetectorDefs::timerIndex::FRAME_PERIOD, period);
 //     d.startAndReadAll();
 
 //     auto rperiod =
-//     d.getMeasuredPeriod();
+//     d.getTimeLeft(slsDetectorDefs::timerIndex::MEASURED_PERIOD);
 //     CHECK(rperiod == 0.1);
 
 //     d.freeSharedMemory();
@@ -252,7 +263,7 @@ TEST_CASE(
     int ratecorr = 125;
 
     // pick up multi detector from shm id 0
-    DetectorImpl m(0);
+    multiSlsDetector m(0);
 
     // ensure eiger detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -302,7 +313,7 @@ TEST_CASE("Chiptestboard Loading Patterns", "[.ctbintegration]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    DetectorImpl m(0);
+    multiSlsDetector m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -387,7 +398,7 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegrat
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    DetectorImpl m(0);
+    multiSlsDetector m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -457,13 +468,13 @@ TEST_CASE("Eiger or Jungfrau startingfnum", "[.eigerintegration][.jungfrauintegr
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    DetectorImpl m(0);
+    multiSlsDetector m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) || (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::JUNGFRAU)));
     REQUIRE(m.getHostname() == c.hostname);
 
-     CHECK(m.setNumberOfFrames(1) == 1);
+     CHECK(m.setTimer(slsDetectorDefs::FRAME_NUMBER, 1) == 1);
 
     // starting fnum
     uint64_t val = 8;
@@ -495,7 +506,7 @@ TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    DetectorImpl m(0);
+    multiSlsDetector m(0);
 
     // ensure detector type, hostname
     REQUIRE((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER));

integrationTests/test-integrationMulti.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "DetectorImpl.h"
+#include "multiSlsDetector.h"
 #include "string_utils.h"
 #include "tests/globals.h"
 #include <iostream>
@@ -9,7 +9,7 @@ using namespace Catch::literals;
 TEST_CASE("Initialize a multi detector", "[.integration][.multi]") {
     auto hostnames = sls::split(test::hostname, '+');
 
-    DetectorImpl d(0, true, true);
+    multiSlsDetector d(0, true, true);
     d.setHostname(test::hostname.c_str());
 
     CHECK(d.getHostname() == test::hostname);
@@ -28,7 +28,7 @@ TEST_CASE("Initialize a multi detector", "[.integration][.multi]") {
 
 TEST_CASE("Set and read timers", "[.integration][.multi]") {
 
-    DetectorImpl d(0, true, true);
+    multiSlsDetector d(0, true, true);
     d.setHostname(test::hostname.c_str());
 
     // FRAME_NUMBER
@@ -50,7 +50,7 @@ TEST_CASE("Set and read timers", "[.integration][.multi]") {
 
     // DELAY_AFTER_TRIGGER,
     // GATES_NUMBER,
-    // TRIGGER_NUMBER,
+    // CYCLES_NUMBER,
     // ACTUAL_TIME
     // MEASUREMENT_TIME
 

libs/rapidjson/rapidjson/document.h

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

libs/rapidjson/rapidjson/encodedstream.h

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

libs/rapidjson/rapidjson/internal/strtod.h

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

libs/rapidjson/rapidjson/rapidjson.h

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

libs/rapidjson/rapidjson/reader.h

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

manual/manual-client/Eiger_short.tex

@@ -176,7 +176,6 @@ One can configure all the detector settings in a parameter file {\tt{setup.det}}
 \begin{verbatim}
 sls_detector_put 0-parameters setup.det
 \end{verbatim}
-Note that the parameter file for any realease before 4.1.1 has not the possibility to understand parameters to be set differently for different half modules, i.e.  {\tt{0:txndelay\_left xxxxx},\tt{1:txndelay\_left yyyyy}}. 
 
 In the case of \E, the proper bias voltage of the sensor has to be setup, i.e. the {\tt{setup.det}} file needs to contain the line {\tt{vhighvoltage 150}}. Other detector functionality, which are rarely changed can be setup here. 
 Other important settings that are configured in the {\tt{setup.det}} file are:
@@ -354,19 +353,19 @@ In the case of REAL CONTINUOUS readout, i.e. continuous acquire and readout from
 \begin{table} 
 \begin{tabular}{|c|c|c|c|c|}
 \hline
-\tiny{GbE} & \tiny{dynamic range} & \tiny{continuos maximum frame rate(Hz)} & \tiny{minimum period ($\mu$s)}& \tiny{calculated/measered time to send out data ($\mu$s)}\\
+\tiny{GbE} & \tiny{dynamic range} & \tiny{continuos maximum frame rate(Hz)} & \tiny{minimum period ($\mu$s)}& \tiny{time to send out data ($\mu$s)}\\
 \hline
 1 & 16 &  \textbf{256} & 3901 & \\ 
 \hline 
 1 &  32 &  \textbf{128} & 7820 & \\
 \hline 
-10 & 4 & \textbf{10240} & 98 & 105/128\\
+10 & 4 & \textbf{10240} & 98 & 100\\
 \hline 
-10 & 8 & \textbf{5120} & 196 & 210/250\\
+10 & 8 & \textbf{5120} & 196 & 200\\
 \hline
-10 & 16 & \textbf{2560} & 391 & 420/490\\  
+10 & 16 & \textbf{2560} & 391 & 400\\  
 \hline 
-10 & 32 & \textbf{1280} & 782 & 840/977\\  
+10 & 32 & \textbf{1280} & 782 & 800\\  
 \hline 
 \end{tabular}
 \caption{Frame rate limits for the CONTINUOS streaming out of images, i.e. the data rate out is just below 1Gb/s or 10Gb/s. 1280~Hz for 32-bit, 10GbE is obtained from the 10GbE limitation. The maximum achievable frame rate is 977~Hz.} 
@@ -622,7 +621,6 @@ Here are the implemented options so far:
 \item {\tt{burst\_trigger}} gets only 1 trigger, but allows to take many frames. With {\tt{frames}} one can change the number of frames. {\tt{cycles}} needs to be 1.  {\tt{exptime}} and {\tt{period}} have to be set. In the gui it is called trigger readout.
 \item{\tt{gating}} allows to get a frame only when the trigger pulse is gating. Note that in this case the exp time and period only depend on the gating signal. {\tt{cycles}} allows to select how many gates to consider.  Set number of frames to 1 using {\tt{frames}}. IMPORTANT: Up to firmware 23, the last subframe is oblige to finish being taken, despite the gate signal going down. This will be configurable from later fw and software version. Also, in gating mode, due to timimg of the state machine, you need to leave 500~$\mu$s deadtime between the end on an acquisition and the next. This is as the state machine is unable to check for changes in the status in the first 500~$\mu$s. ATTENTION: if you are in 16 bit mode and you are applying online rate corrections, as now the exptime is generated by the trigger, you might not have correct rate corrections. If you know what the exposure time is in the gating signal, then you can set the {\tt{exptime}} once and the rate corrections will be correct. In 32 bit mode, it does not matter as the rate corrections depends on the {\tt{subexptime}} which is software set independently from the gate exptime.
 
-ATTENTION: From release 4.1.1 with the {\tt{trigger}} option it is possible to have software triggers as a debugging tool (instead of the hardware trigger signal. One should start the acquisition (with the blocking {\tt{sls\_detector\_acquire}} if wanted and with another client one can send the softare trigger {\tt{sls\_detector\_put status trigger}}. This option allows for example to perform a motor scan (moving a motor in between single images) and still writing all images to the same file. 
 When using 32-bit mode, by default the acquisition ends the last complete subframe that was started when still the acquisition time was valid. This has been chosen as many people wants to know the exact acquisition time for when the detector was taking data and also, if {\tt{ratecorr}} are active, the last subframe will be correctly corrected, while otherwise it will be corrected with a wrong subdeadtime. 
 However, from 4.1.0, in gating mode, an option to immediately terminate the subframe when the gate signal goes down it is implemented to stop the acquisition at the same time.  This option is {\tt{./sls\_detector\_put interruptsubframe 1}} while the default option is {\tt{./sls\_detector\_put interruptsubframe 0}}.  
 
@@ -796,23 +794,9 @@ Transmission delays should be chosen only to accomodate the writing speed of the
 Table~\ref{tcont} gives the times that are needed to transfer 1 images out of the 10~Gb Ethernet connection. This reflects the CONTINUOS frame rate achieavable. The disk speed can be monitored with {\tt{dstat}}. One you have worked out this, you can calculated the {\tt{txndelay\_frame}} delay as:
 
 \begin{equation}
- {\tt{txndelay\_frame}}=-t_sending+dr \cdot \frac{4*256*256*N\_half\_modules}{1024 \cdot 1000 \cdot disk\_speed [MB/s] \cdot 8}
+ {\tt{txndelay\_frame}}=-tsending+dr \cdot \frac{4*256*256*N\_half\_modules}{1024 \cdot 1000 \cdot disk\_speed [MB/s]}
 \end{equation}
-In 4-bit mode, for a disk seed of 320MB/s, the  {\tt{txndelay\_frame}} is 300~$\mu$s (30000 to be set up to the detector). The sending time is 100~$\mu$s, such that an total ackievable writing speed of 1/400~$\mu$s (2.5~kHz) in achieved.  
-
-Note that:
-\begin{enumerate}
-\item The continuos frame rate goes down when transmission delays are introduced:
-\begin{equation}
-continuos\_frame\_rate= \frac{1}{\tt{txndelay\_frame}+t\_sending}
-\end{equation}
-\item If your transmission delays reduce the continuos frame rate, you will saturate the memory on board at some point and you will corrupt images.  Conservatively, we say that the number of maximum images in buffered mode is the one listed in table~\ref{timgs}, call N\_images. However, one can approximately say that (and here we need to test more, so do not believe to these numbers yet), 
-\begin{equation}
-N\_tot\_images= N\_images+\frac{ N\_images}{frame\_rate \cdot (t\_delay\_frame + t\_sending) } 
-\end{equation}
-
-\end{enumerate}
-
+In 4-bit mode, for a disk seed of 320MB/s, the  {\tt{txndelay\_frame}} is 300~$\mu$s (30000 to be set up to the detector). The sending time is 100~$\mu$s, such that an total ackievable writing sped of 1/400~$\mu$s (2.5~kHz) in achieved.  
 
 \section{Setting up the PC settings for 10Gb}\label{10g}
 
@@ -834,8 +818,12 @@ ethtool -G xth1 rx 4096 #or wheterver is the max number for your pc
 ethtool -C xth1 rx-usecs 100 
 ethtool -A xth1 rx on
 \end{verbatim}
-where {\tt{xth1}} can be replaced with the correct 10Gb device.
-NOTE THAT THIS SETTINGS WILL BE LOST IF YOU REBOOT THE COMPUTER.
+where {\tt{xth1}} can be replaced with the correct 10Gb device. To minimise loosing packets, priorities are set better as root user, so have the receiver as root.
+To try to bypass being root, we trued something like this:
+\begin{verbatim}
+/etc/security/limits.conf  username – rtprio 99
+\end{verbatim}
+but somehow it did  not fully worked  so we kept the trick of being root.
 
 Very important is to activate the flow control in 10Gb (in 1Gb it is on by default and not configurable)
 \begin{verbatim}
@@ -869,18 +857,10 @@ to make the settings permanent, edit /etc/sysctl.conf:
  \begin{verbatim}
 # 100MiB
 net.core.rmem_max = 104857600
-net.core.rmem_default= 104857600
 net.core.netdev_max_backlog = 250000
 \end{verbatim}
 and run \textbf{sysctl -p}.
 
-To minimise loosing packets, priorities are set better as root user, so have the receiver as root.
-To try to bypass being root, we trued something like this:
-\begin{verbatim}
-/etc/security/limits.conf  username – rtprio 99
-\end{verbatim}
-but somehow it did  not fully worked  so we kept the trick of being root.
-
 Last, you can disable power saving in the CPU frequency (chose the appropriate command for your system):
 \begin{verbatim}
 cpupower frequency-info
@@ -915,6 +895,9 @@ mount -t tmpfs none /mnt/ramdisk -o size=10G
 \end{verbatim}
 check how many GB memory you can allocate, to avoid swapping otherwise
 
+
+
+
 \section{Offline processing and monitoring}
 
 \subsection{Data out of the detector: UDP packets}\label{UDP}
@@ -952,22 +935,19 @@ If you use the option of writing raw files, you will have a raw file for each UD
 The master file is named: {\tt{filename\_master\_0.raw}} and for version ``4.0.0'' of the slsDetectorSoftware looks like:
  
 \begin{verbatim}
-Version                    : 4.0
-Detector Type              : 3
+Version                    : 2.0
 Dynamic Range              : 32
 Ten Giga                   : 1
 Image Size                 : 524288 bytes
-nPixelsX                   : 512 pixels
-nPixelsY                   : 256 pixels
-Max Frames Per File        : 10000
-Total Frames               : 3
-Exptime (ns)               : 10000000
+x                          : 512 pixels
+y                          : 256 pixels
+Max. Frames Per File       : 10000
+Total Frames               : 1
+Exptime (ns)               : 1000000000
 SubExptime (ns)            : 2621440
 SubPeriod(ns)              : 2621440
-Period (ns)                : 0
-Gap Pixels Enable          : 0
-Quad Enable                : 0
-Timestamp                  : Wed Aug 21 16:30:20 2019
+Period (ns)                : 1000000000
+Timestamp                  : Mon Sep  3 09:07:05 2018
 
 
 #Frame Header
@@ -977,9 +957,9 @@ Packet Number              : 4 bytes
 Bunch ID                   : 8 bytes
 Timestamp                  : 8 bytes
 Module Id                  : 2 bytes
-Row                        : 2 bytes
-Column                     : 2 bytes
-Reserved                   : 2 bytes
+X Coordinate               : 2 bytes
+Y Coordinate               : 2 bytes
+Z Coordinate               : 2 bytes
 Debug                      : 4 bytes
 Round Robin Number         : 2 bytes
 Detector Type              : 1 byte
@@ -990,18 +970,17 @@ Packets Caught Mask        : 64 bytes
 Note that if one wants to  reconstruct the real time the detector was acquiring in 32 bit (autosumming mode), one would have to multiply the SubExptime (ns) for the SubFrame Number. 
 
 \subsection{Offline image reconstruction}
-The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. However, it can be retrieved from \\
-{\tt{git clone https://github.com/slsdetectorgroup/slsImageReconstruction.git slsImageReconstruction}}.\\
-Checkout the {\tt{v3.1}} branch if in a 3.1.X release, the {\tt{v4.0.0}} branch if in 4.0.X release, or the {\tt{v4.1}} branch if in 4.1.X release of the {\tt{slsDetector}} code. There is a {\tt{developer}} branch that has newer updates but needs to be tested.
+The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. The code is still available doing \\
+{\tt{git clone git@git.psi.ch:sls\_detectors\_software/sls\_image\_reconstruction.git slsImageReconstruction}}.
+Checkout the {\tt{developer}} branch if in a 3.1.X release or the {\tt{v4.0.0}} branch if in 4.0.X release of the {\tt{slsDetector}} code.
 
-Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5}. \textbf{tiff} and  \textbf{root} format. The detector writes 2 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
+Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5} and \textbf{root} format. The detector writes 4 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
 
-Note that the number of images per file in the 3.1.X release is hardcoded and needs to match whatever you are using in \\
-{\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
+Note that the number of images per file is hardcoded and needs to match whatever you are using in {\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
 \begin{verbatim}
 #define EIGER_MAX_FRAMES_PER_FILE	2000
 \end{verbatim}
-The default is 2000 in the 3.1.X release. The default has been changed to 10000 frm realease 4.0.X and now this is picked up automatically without doing anything. 
+The default is 2000.
 
 \subsubsection{cbf}
 The cbf executable executable uses the CBFlib-0.9.5 library (downloaded from the web as it downloads architecture dependent packages at installation).Edit the Makefile to correclty point at it.\\
@@ -1046,12 +1025,11 @@ cbfMaker9M [file_name_with_dir]
 contain the hardcoded geometry for the 1.5M (3 modules horizontal on the long side), the 1.5M OMNY geometry (3 modules next to each other on the long side) and for the 9M at cSAXS: 6(short side)$\times$3 (long side) modules.\\ 
 Missing packets in a frame and border pixels ($\times 2$ and $\times 4$ are given with value $-1$ at the present time.
 
-From the new {{v4.1.1}} all the define that you see below need only to be modified in the Makefile.
-
 Make sure the following options are uncommented in the {\tt{slsImageReconstruction/src/main\_csaxs.cpp}} file. 
 \begin{verbatim}
 #define MYCBF
-##following line only if you need to process with BUBBLE
+##following line only if you need to process with 
+##BUBBLE (Material Science / uXAS beamlines).
 #define MSHeader 
 \end{verbatim}
 Compile it with: 
@@ -1100,10 +1078,6 @@ To use it any geometry:\\
 eg.
 {\tt image /scratch/run\_63\_d0\_f000000000000\_3.raw  3072 512 1 2 ``Eiger'' 0}.\\
 
-With new new software, the new options to run the cbfMaker/hdf5Maker executablesare: 
-
-./hdf5Maker -f [filename] -d [outdirname] -x [npix\_x] -y [npix\_y] -v  (v flags that longedge is vertical, no argument) -n [name\_of\_hdf5\_dataset] -m (mask\_hot\_pixels, need to be in file maskpix.txt in the samedir as executable, no argument) -g [0,no filling/1,division/2,interpolation/3,interpolate,alternative]  
-
 \subsection{Read temperatures/HV from boards}
 
 With an updated kernel on the linux boards (ask to the SLS detector group for specifications), it is possible to monitor the temperature on the boards: 

manual/manual-client/commands.txt

@@ -111,7 +111,7 @@
  "delay"; // sets/gets delay after trigger in s
  "gates"; // sets/gets number of gates per frame in gated mode
  "frames"; // sets/gets number of frames
- "triggers"; // sets/gets number of triggers (use in trigger mode)
+ "cycles"; // sets/gets number of cycles (use in trigger mode)
  "probes"; // sets/gets number of probes (advanced!)
  "measurements"; // sets/gets number of non-real time measurements
   /* read only timers */
@@ -120,7 +120,7 @@
  "delayl"; // gets delay left
  "gatesl"; // gets number of gates left
  "framesl"; // gets number of frames left
- "triggersl"; // gets number of triggers left
+ "cyclesl"; // gets number of cycles left
  "now"; // gets time stamp from the dteector
  "timestamp"; // gets time stamp for the frames (fifo-style)
  "framescaught";// gets the entire frames caught by receiver

manual/manual-client/slsDetectorClientHowTo.tex

@@ -94,7 +94,7 @@ where: \\
 \textit{v0} is the scan0 variable with the desired precision, if scan0 is enabled;\\
 \textit{v1} is the scan1 variable with the desired precision, if scan1 is enabled;\\
 \textit{p} is the position index, if different positions are configured;\\
-\textit{f} is the frame index of the first frame stored in the file, if many frames and triggers are configured;\\
+\textit{f} is the frame index of the first frame stored in the file, if many frames and cycles are configured;\\
 \textit{i} is the file index;\\
 \textit{ext} is the file extension e.g. \textit{.raw} for MYTHEN and \E raw data, \textit{.dat} for MYTHEN processed data.
 \item[index i] Sets the starting index of the file i at the beginning of the acquisition (automatically incremented for each measurement).    
@@ -115,10 +115,10 @@ Sets the number of gates per frame in gated (stroboscopic) mode.\\
 Refer to the detailed documentation to understand how the different timing modes work.
 \item[frames n]  
 Sets the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode). The frame index in the output file name will automatically be incremented.\\
-Note that the total number of images will be  frames times triggers.  Refer to detailed documentation to understand how the different timing modes work. 
-\item[triggers n] 
-Sets the number of triggers (e.g. number of triggers). The frame index in the output file name will automatically be incremented. \\ 
-Note that the total number of images will be by frames times triggers.   Refer to the detailed documentation to understand how the different timing modes work.
+Note that the total number of images will be  frames times cycles.  Refer to detailed documentation to understand how the different timing modes work. 
+\item[cycles n] 
+Sets the number of cycles (e.g. number of triggers). The frame index in the output file name will automatically be incremented. \\ 
+Note that the total number of images will be by frames times cycles.   Refer to the detailed documentation to understand how the different timing modes work.
 \item[probes]  Sets the number of probes to accumulate for stroboscopic measurements. \\
 Refer to detailed documentation to understand how the different timing modes work.
 \item[measurements] Sets the number of repetitions of the acquisitions (non real time!). The file index in the file name will be automatically incremented.\\
@@ -231,7 +231,7 @@ It is normally recommended to use \verb=sls\_detector\_acquire [j-]=, which take
 %\item[delayl]  
 %\item[gatesl]  
 %\item[framesl] 
-%\item[triggersl]   
+%\item[cyclesl]   
 %\item[frameindex]  
 %\item[now]   
 \end{description}
@@ -430,11 +430,11 @@ Returns the number of gates per frame in gated (stroboscopic) mode.
 Refer to detailed documentation to understand how the different timing modes work.
 \item[frames]  
 Returns the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode). Returned as a string to be interpreted as an integer ``frames integer''
-Note that the total number of images is  frames times triggers.  
+Note that the total number of images is  frames times cycles.  
 Refer to detailed documentation to understand how the different timing modes work. 
-\item[triggers n] 
-Returns the number of triggers (e.g. number of triggers). Returned as atring to be interpreted as an integer ``triggers integer''
-Note that the total number of images is  frames times triggers. 
+\item[cycles n] 
+Returns the number of cycles (e.g. number of triggers). Returned as atring to be interpreted as an integer ``cycles integer''
+Note that the total number of images is  frames times cycles. 
 Refer to detailed documentation to understand how the different timing modes work.  
 \item[probes]  Returns the number of probes to accumulate for stroboscopic measurements.  
 Refer to detailed documentation to understand how the different timing modes work.
@@ -556,7 +556,7 @@ It is normally recommended to use \verb=sls\_detector\_acquire [j-]=, which take
 \item[delayl]    Returns the delay after trigger left for the current frame.  
 \item[gatesl]     Returns the number of gates left for the current frame.  
 \item[framesl]   Returns the number of frames left for the current cycle.  
-\item[triggersl]      Returns the number of triggers left for the current acquisition. 
+\item[cyclesl]      Returns the number of cycles left for the current acquisition. 
 \item[now]  Returns the current timestamp of the detector clock.
 \item[timestamp]  Returns the timestamp of the acquisitions in a First-In/First-Out mode i.e. every time it is called it returns the timestamp of the first acquisition start of readout. The FIFO is reset everytime the acquisition is started. 
 \end{description}

manual/manual-gui/slsDetectorGuiHowTo.tex

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

manual/manual-main/images/gated_acquisition.eps

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

manual/manual-main/images/gated_acquisition.fig

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

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

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

manual/manual-main/images/normal_acquisition.eps

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

manual/manual-main/images/normal_acquisition.fig

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

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

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

manual/manual-main/images/trigger_acquisition.eps

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

manual/manual-main/images/trigger_acquisition.fig

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

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

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

manual/manual-main/manual.tex

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

manual/manual-main/slsDetector-softFAQ.tex

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

manual/manual-main/slsDetectorClientHowTo.tex

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

manual/manual-main/slsDetectorGuiHowTo.tex

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

python/CMakeLists.txt

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

python/scripts/basic.py

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

python/scripts/cmd_python.py

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

python/scripts/generate_enums.py

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

python/scripts/generate_functions.py

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

python/scripts/list_tested_cmd.py

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

python/scripts/parse.py

@@ -1,56 +0,0 @@
-import re
-import subprocess
-from subprocess import PIPE
-import os
-
-
-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)
-
-
-
-
-#based on ccsyspath: https://github.com/AndrewWalker/ccsyspath
-
-def compiler_preprocessor_verbose(compiler, extraflags):
-    """Capture the compiler preprocessor stage in verbose mode
-    """
-    lines = []
-    with open(os.devnull, 'r', encoding='utf-8') as devnull:
-        cmd = [compiler, '-E'] 
-        cmd += extraflags
-        cmd += ['-', '-v']
-        p = subprocess.Popen(cmd, stdin=devnull, stdout=PIPE, stderr=PIPE)
-        p.wait()
-        lines = p.stderr.read()
-        lines = lines.splitlines()
-    return lines
-    
-def system_include_paths(compiler, cpp=True):
-    extraflags = []
-    if cpp:
-        extraflags = b'-x c++'.split()
-    lines = compiler_preprocessor_verbose(compiler, extraflags)
-    lines = [ line.strip() for line in lines ]
-
-    start = lines.index(b'#include <...> search starts here:')
-    end   = lines.index(b'End of search list.')
-
-    lines = lines[start+1:end]
-    paths = []
-    for line in lines:
-        line = line.replace(b'(framework directory)', b'')
-        line = line.strip()
-        paths.append(line)
-    paths = [p.decode('utf-8') for p in paths]
-    return paths 

python/scripts/test_virtual.py

@@ -1,164 +0,0 @@
-import pytest
-import subprocess
-import os
-import sys
-import time
-import datetime as dt
-
-sys.path.append(os.path.join(os.getcwd(), "bin"))
-from sls_detector import ExperimentalDetector, detectorSettings
-
-n_detectors = 3
-start_port = 1952
-port_step = 3
-
-
-@pytest.fixture(scope="module")
-def virtual_jf_detectors(request):
-    """
-    Fixture that is run once for the module
-    will launch virtual servers and clean up
-    after
-    """
-    print("Setting up virtual detectors")
-
-    # Ensure that no detector servers are running
-    subprocess.run(["killall", "jungfrauDetectorServer_virtual"])
-
-    # Ensure no shared memory exists before tests start
-    d = ExperimentalDetector()
-    d.free()
-
-    # Start servers
-    virtual_jf_detectors = [
-        subprocess.Popen(
-            [
-                "bin/jungfrauDetectorServer_virtual",
-                "--port",
-                f"{start_port+port_step*i}",
-            ]
-        )
-        for i in range(n_detectors)
-    ]
-
-    # Allow server startup to complete
-    time.sleep(3)
-
-    def fin():
-        print("Cleaning up virtual detectors")
-        d = ExperimentalDetector()
-        d.free()
-        subprocess.run(["killall", "jungfrauDetectorServer_virtual"])
-
-    request.addfinalizer(fin)
-    return virtual_jf_detectors  # provide the fixture value
-
-
-def test_shmid(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    assert d.getShmId() == 0
-    d.free()
-
-    d = ExperimentalDetector(73)
-    assert d.getShmId() == 73
-    d.free()
-
-
-def test_hostname(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    d.hostname = "localhost"
-    assert d.hostname == ["localhost"]
-
-    d.hostname = [f"localhost:{start_port+i*port_step}" for i in range(n_detectors)]
-    assert d.hostname == ["localhost"] * n_detectors
-
-
-def test_fwversion(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    assert d.detectorversion == 0  # Firmware of virtual detector
-    assert d.getFirmwareVersion() == [0] * n_detectors
-
-
-def test_len(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    assert len(d) == n_detectors
-    assert d.size() == n_detectors
-
-
-def test_module_geometry(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    geo = d.module_geometry
-    assert geo.x == 1
-    assert geo.y == 3
-
-
-def test_module_size(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    geo = d.module_size
-    assert geo.x == 1024
-    assert geo.y == 512
-
-
-def test_settings(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    assert d.settings == detectorSettings.DYNAMICGAIN
-
-    gain_list = [
-        detectorSettings.FIXGAIN1,
-        detectorSettings.FIXGAIN2,
-        detectorSettings.FORCESWITCHG1,
-        detectorSettings.FORCESWITCHG2,
-        detectorSettings.DYNAMICHG0,
-        detectorSettings.DYNAMICGAIN,
-    ]
-
-    # Set all viable gain for Jungfrau to make sure nothing is crashing
-    for gain in gain_list:
-        d.settings = gain
-        assert d.settings == gain
-
-    d.setSettings(detectorSettings.FORCESWITCHG1, [1])
-    assert d.settings == [
-        detectorSettings.DYNAMICGAIN,
-        detectorSettings.FORCESWITCHG1,
-        detectorSettings.DYNAMICGAIN,
-    ]
-
-    d.settings = detectorSettings.DYNAMICGAIN
-    assert d.settings == detectorSettings.DYNAMICGAIN
-
-def test_frames(virtual_jf_detectors):
-    d = ExperimentalDetector()
-    d.frames = 10
-    assert d.frames == 10
-
-# def test_triggers(virtual_jf_detectors):
-
-def test_exptime(virtual_jf_detectors):
-    d = ExperimentalDetector()
-
-    #default value
-    assert d.exptime == 1e-5
-
-    d.exptime = 1.5
-    assert d.exptime == 1.5
-
-    t = dt.timedelta(microseconds=10)
-    d.exptime  = t
-    assert d.exptime == 10e-6
-
-def test_period(virtual_jf_detectors):
-    d = ExperimentalDetector()
-
-    #default value
-    d.period = 0
-    assert d.period == 0
-
-    d.period = 1.5
-    assert d.period == 1.5
-
-    t = dt.timedelta(microseconds=10)
-    d.period  = t
-    assert d.period == 10e-6
-
-    

python/setup.py

@@ -8,7 +8,7 @@ import sys
 import setuptools
 import os
 
-__version__ = os.environ.get('GIT_DESCRIBE_TAG', 'developer')
+__version__ = 'refactor'
 
 
 def get_conda_path():
@@ -19,33 +19,31 @@ def get_conda_path():
     return os.environ['CONDA_PREFIX']
 
 
-# class get_pybind_include(object):
-#     """Helper class to determine the pybind11 include path
-#     The purpose of this class is to postpone importing pybind11
-#     until it is actually installed, so that the ``get_include()``
-#     method can be invoked. """
+class get_pybind_include(object):
+    """Helper class to determine the pybind11 include path
+    The purpose of this class is to postpone importing pybind11
+    until it is actually installed, so that the ``get_include()``
+    method can be invoked. """
 
-#     def __init__(self, user=False):
-#         self.user = user
+    def __init__(self, user=False):
+        self.user = user
 
-#     def __str__(self):
-#         import pybind11
-#         return pybind11.get_include(self.user)
+    def __str__(self):
+        import pybind11
+        return pybind11.get_include(self.user)
 
 
 ext_modules = [
     Extension(
-        '_slsdet',
+        '_sls_detector',
         ['src/main.cpp',
         'src/enums.cpp',
-        'src/detector.cpp',
-        'src/network.cpp'],
+        'src/experimental.cpp'],
         include_dirs=[
             # Path to pybind11 headers
-            # get_pybind_include(),
-            # get_pybind_include(user=True),
-            os.path.join('../libs/pybind11/include'),
-            os.path.join(get_conda_path(), 'include'),
+            get_pybind_include(),
+            get_pybind_include(user=True),
+            os.path.join(get_conda_path(), 'include/slsDetectorPackage'),
 
         ],
         libraries=['SlsDetector', 'SlsReceiver', 'zmq'],
@@ -110,28 +108,20 @@ class BuildExt(build_ext):
             opts.append('/DVERSION_INFO=\\"%s\\"' % self.distribution.get_version())
         for ext in self.extensions:
             ext.extra_compile_args = opts
-
-        print('**************************************************')
-        print(ct)
-        print(opts)
-        print('**************************************************')
         build_ext.build_extensions(self)
 
 
-
-def get_shared_lib():
-    return [f for f in os.listdir('.') if '_slsdet' in f]
-
 setup(
-    name='slsdet',
+    name='sls_detector',
     version=__version__,
     author='Erik Frojdh',
     author_email='erik.frojdh@psi.ch',
-    url='https://github.com/slsdetectorgroup/slsDetectorPackage',
+    url='https://github.com/slsdetectorgroup/sls_detector',
     description='Detector API for SLS Detector Group detectors',
     long_description='',
     packages=find_packages(exclude=['contrib', 'docs', 'tests']),
     ext_modules=ext_modules,
+    install_requires=['pybind11>=2.2'],
     cmdclass={'build_ext': BuildExt},
     zip_safe=False,
 )

python/sls_detector/__init__.py

@@ -0,0 +1,9 @@
+from .detector import Detector, DetectorError, free_shared_memory
+from .eiger import Eiger
+from .experimental import ExperimentalDetector
+from .jungfrau import Jungfrau
+from .jungfrau_ctb import JungfrauCTB
+from _sls_detector import DetectorApi
+
+import _sls_detector
+runStatus = _sls_detector.slsDetectorDefs.runStatus

python/sls_detector/dacs.py

@@ -1,9 +1,7 @@
 from .detector_property import DetectorProperty
 from functools import partial
 import numpy as np
-import _slsdet
-from .detector import freeze
-dacIndex = _slsdet.slsDetectorDefs.dacIndex
+
 class Dac(DetectorProperty):
     """
     This class represents a dac on the detector. One instance handles all
@@ -16,11 +14,11 @@ class Dac(DetectorProperty):
 
 
     """
-    def __init__(self, name, enum, low, high, default, detector):
+    def __init__(self, name, low, high, default, detector):
 
-        super().__init__(partial(detector.getDAC, enum, False),
-                         lambda x, y : detector.setDAC(enum, x, False, y),
-                         detector.size,
+        super().__init__(partial(detector._api.getDac, name),
+                         partial(detector._api.setDac, name),
+                         detector._api.getNumberOfDetectors,
                          name)
 
         self.min_value = low
@@ -31,16 +29,30 @@ class Dac(DetectorProperty):
 
     def __repr__(self):
         """String representation for a single dac in all modules"""
-        dacstr = ''.join([f'{item:5d}' for item in self.get()])
-        return f'{self.__name__:10s}:{dacstr}'
+        r_str = ['{:10s}: '.format(self.__name__)]
+        r_str += ['{:5d}, '.format(self.get(i)) for i in range(self.get_nmod())]
+        return ''.join(r_str).strip(', ')
+
 
-# a = Dac('vrf', dacIndex.VRF, 0, 4000, 2500, d )
-# @freeze
 class DetectorDacs:
-    _dacs = []
+    _dacs = [('vsvp',    0, 4000,    0),
+             ('vtr',     0, 4000, 2500),
+             ('vrf',     0, 4000, 3300),
+             ('vrs',     0, 4000, 1400),
+             ('vsvn',    0, 4000, 4000),
+             ('vtgstv',  0, 4000, 2556),
+             ('vcmp_ll', 0, 4000, 1500),
+             ('vcmp_lr', 0, 4000, 1500),
+             ('vcall',   0, 4000, 4000),
+             ('vcmp_rl', 0, 4000, 1500),
+             ('rxb_rb',  0, 4000, 1100),
+             ('rxb_lb',  0, 4000, 1100),
+             ('vcmp_rr', 0, 4000, 1500),
+             ('vcp',     0, 4000,  200),
+             ('vcn',     0, 4000, 2000),
+             ('vis',     0, 4000, 1550),
+             ('iodelay', 0, 4000,  660)]
     _dacnames = [_d[0] for _d in _dacs]
-    _allowed_attr = ['_detector', '_current']
-    _frozen = False
 
     def __init__(self, detector):
         # We need to at least initially know which detector we are connected to
@@ -53,8 +65,6 @@ class DetectorDacs:
         for _d in self._dacs:
             setattr(self, '_'+_d[0], Dac(*_d, detector))
 
-        self._frozen = True
-
     def __getattr__(self, name):
         return self.__getattribute__('_' + name)
 
@@ -63,11 +73,8 @@ class DetectorDacs:
         if name in self._dacnames:
             return self.__getattribute__('_' + name).__setitem__(slice(None, None, None), value)
         else:
-            if self._frozen == True and name not in self._allowed_attr:
-                raise AttributeError(f'Dac not found: {name}')
             super().__setattr__(name, value)
 
-
     def __next__(self):
         if self._current >= len(self._dacs):
             self._current = 0
@@ -88,7 +95,7 @@ class DetectorDacs:
         """
         Read the dacs into a numpy array with dimensions [ndacs, nmodules]
         """
-        dac_array = np.zeros((len(self._dacs), len(self._detector)))
+        dac_array = np.zeros((len(self._dacs), self._detector.n_modules))
         for i, _d in enumerate(self):
             dac_array[i,:] = _d[:]
         return dac_array
@@ -108,3 +115,11 @@ class DetectorDacs:
         for _d in self:
             _d[:] = _d.default
 
+    def update_nmod(self):
+        """
+        Update the cached value of nmod, needs to be run after adding or
+        removing detectors
+        """
+        for _d in self:
+            _d._n_modules = self._detector.n_modules
+

python/sls_detector/detector_property.py

@@ -14,20 +14,21 @@ class DetectorProperty:
 
     def __getitem__(self, key):
         if key == slice(None, None, None):
-            return self.get()
+            return [self.get(i) for i in range(self.get_nmod())]
         elif isinstance(key, Iterable):
-            return self.get(list(key))
+            return [self.get(k) for k in key]
         else:
-            return self.get([key])[0] #No list for single value
+            return self.get(key)
 
     def __setitem__(self, key, value):
         #operate on all values
         if key == slice(None, None, None):
             if isinstance(value, (np.integer, int)):
-                self.set(value, [])
+                for i in range(self.get_nmod()):
+                    self.set(i, value)
             elif isinstance(value, Iterable):
                 for i in range(self.get_nmod()):
-                    self.set(value[i], [i])
+                    self.set(i, value[i])
             else:
                 raise ValueError('Value should be int or np.integer not', type(value))
         
@@ -35,14 +36,15 @@ class DetectorProperty:
         elif isinstance(key, Iterable):
             if isinstance(value, Iterable):
                 for k,v in zip(key, value):
-                    self.set(v, [k])
+                    self.set(k,v)
 
             elif isinstance(value, int):
-                self.set(value, list(key))
+                for k in key:
+                    self.set(k, value)
 
         #Set single value
         elif isinstance(key, int):
-            self.set(value, [key])
+            self.set(key, value)
 
     def __repr__(self):
         s = ', '.join(str(v) for v in self[:])

python/sls_detector/eiger.py

@@ -0,0 +1,596 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Dec  6 11:51:18 2017
+
+@author: l_frojdh
+"""
+
+import socket
+from collections.abc import Iterable
+from collections import namedtuple
+from functools import partial
+
+from .adcs import Adc, DetectorAdcs
+from .dacs import DetectorDacs
+from .detector import Detector
+from .detector_property import DetectorProperty
+from .utils import element_if_equal
+from sls_detector.errors import DetectorValueError, DetectorError
+
+class EigerVcmp:
+    """
+    Convenience class to be able to loop over vcmp for Eiger
+    
+    
+    .. todo::
+        
+        Support single assignment and perhaps unify with Dac class
+    
+    """
+    
+    def __init__(self, detector):
+        _names = ['vcmp_ll',
+                  'vcmp_lr',
+                  'vcmp_rl',
+                  'vcmp_rr']
+        self.set = []
+        self.get = []
+        for i in range(detector.n_modules):
+            if i % 2 == 0:
+                name = _names
+            else:
+                name = _names[::-1]
+            for n in name:
+                self.set.append(partial(detector._api.setDac, n, i))
+                self.get.append(partial(detector._api.getDac, n, i))
+    
+    def __getitem__(self, key):
+        if key == slice(None, None, None):
+            return [_d() for _d in self.get]
+        return self.get[key]()
+    
+    def __setitem__(self, i, value):
+        self.set[i](value)
+
+    def __repr__(self):
+        return 'vcmp: '+ str(self[:])
+
+
+class EigerDacs(DetectorDacs):
+    _dacs = [('vsvp',    0, 4000,    0),
+             ('vtr',     0, 4000, 2500),
+             ('vrf',     0, 4000, 3300),
+             ('vrs',     0, 4000, 1400),
+             ('vsvn',    0, 4000, 4000),
+             ('vtgstv',  0, 4000, 2556),
+             ('vcmp_ll', 0, 4000, 1500),
+             ('vcmp_lr', 0, 4000, 1500),
+             ('vcall',   0, 4000, 4000),
+             ('vcmp_rl', 0, 4000, 1500),
+             ('rxb_rb',  0, 4000, 1100),
+             ('rxb_lb',  0, 4000, 1100),
+             ('vcmp_rr', 0, 4000, 1500),
+             ('vcp',     0, 4000,  200),
+             ('vcn',     0, 4000, 2000),
+             ('vis',     0, 4000, 1550),
+             ('iodelay', 0, 4000,  660)]
+    _dacnames = [_d[0] for _d in _dacs]
+
+
+# noinspection PyProtectedMember
+class DetectorDelays:
+    _delaynames = ['frame', 'left', 'right']
+
+    def __init__(self, detector):
+        # We need to at least initially know which detector we are connected to
+        self._detector = detector
+        
+        setattr(self, '_frame', DetectorProperty(detector._api.getDelayFrame,
+                                                 detector._api.setDelayFrame,
+                                                 detector._api.getNumberOfDetectors,
+                                                 'frame'))
+
+        setattr(self, '_left', DetectorProperty(detector._api.getDelayLeft,
+                                                detector._api.setDelayLeft,
+                                                detector._api.getNumberOfDetectors,
+                                                'left'))
+
+        setattr(self, '_right', DetectorProperty(detector._api.getDelayRight,
+                                                 detector._api.setDelayRight,
+                                                 detector._api.getNumberOfDetectors,
+                                                 'right'))
+        # Index to support iteration
+        self._current = 0
+
+    def __getattr__(self, name):
+        return self.__getattribute__('_' + name)
+
+    def __setattr__(self, name, value):
+        if name in self._delaynames:
+            return self.__getattribute__('_' + name).__setitem__(slice(None, None, None), value)
+        else:
+            super().__setattr__(name, value)
+
+    def __next__(self):
+        if self._current >= len(self._delaynames):
+            self._current = 0
+            raise StopIteration
+        else:
+            self._current += 1
+            return self.__getattr__(self._delaynames[self._current-1])
+
+    def __iter__(self):
+        return self
+
+    def __repr__(self):
+        hn = self._detector.hostname
+        r_str = ['Transmission delay [ns]\n'
+                 '{:11s}{:>8s}{:>8s}{:>8s}'.format('', 'left', 'right', 'frame')]
+        for i in range(self._detector.n_modules):
+            r_str.append('{:2d}:{:8s}{:>8d}{:>8d}{:>8d}'.format(i, hn[i], self.left[i], self.right[i], self.frame[i]))
+        return '\n'.join(r_str)
+
+
+class Eiger(Detector):
+    """
+    Subclassing Detector to set up correct dacs and detector specific 
+    functions. 
+    """
+    _detector_dynamic_range = [4, 8, 16, 32]
+
+
+    _settings = ['standard', 'highgain', 'lowgain', 'veryhighgain', 'verylowgain']
+    """available settings for Eiger, note almost always standard"""
+
+    def __init__(self, id=0):
+        super().__init__(id)
+
+        self._active = DetectorProperty(self._api.getActive,
+                                        self._api.setActive,
+                                        self._api.getNumberOfDetectors,
+                                        'active')
+
+        self._vcmp = EigerVcmp(self)
+        self._dacs = EigerDacs(self)
+        self._trimbit_limits = namedtuple('trimbit_limits', ['min', 'max'])(0, 63)
+        self._delay = DetectorDelays(self)
+        
+        # Eiger specific adcs
+        self._temp = DetectorAdcs()
+        self._temp.fpga = Adc('temp_fpga', self)
+        self._temp.fpgaext = Adc('temp_fpgaext', self)
+        self._temp.t10ge = Adc('temp_10ge', self)
+        self._temp.dcdc = Adc('temp_dcdc', self)
+        self._temp.sodl = Adc('temp_sodl', self)
+        self._temp.sodr = Adc('temp_sodr', self)
+        self._temp.fpgafl = Adc('temp_fpgafl', self)
+        self._temp.fpgafr = Adc('temp_fpgafr', self)
+
+    @property
+    def active(self):
+        """
+        Is the detector active? Can be used to enable or disable a detector
+        module
+        
+        Examples
+        ----------
+        
+        ::
+            
+            d.active
+            >> active: [True, True]
+            
+            d.active[1] = False
+            >> active: [True, False]
+        """
+        return self._active
+    
+    @active.setter
+    def active(self, value):
+        self._active[:] = value
+    
+    @property
+    def measured_period(self):
+        return self._api.getMeasuredPeriod()
+
+    @property
+    def measured_subperiod(self):
+        return self._api.getMeasuredSubPeriod()
+
+    @property
+    def add_gappixels(self):
+       """Enable or disable the (virual) pixels between ASICs
+
+       Examples
+       ----------
+
+       ::
+
+           d.add_gappixels = True
+
+           d.add_gappixels
+           >> True
+
+       """
+       return self._api.getGapPixels()
+
+    @add_gappixels.setter
+    def add_gappixels(self, value):
+       self._api.setGapPixels(value)
+
+    @property
+    def dacs(self):
+        """
+
+        An instance of DetectorDacs used for accessing the dacs of a single
+        or multi detector.
+
+        Examples
+        ---------
+
+        ::
+
+            d = Eiger()
+
+            #Set all vrf to 1500
+            d.dacs.vrf = 1500
+
+            #Check vrf
+            d.dacs.vrf
+            >> vrf       :  1500,  1500
+
+            #Set a single vtr
+            d.dacs.vtr[0] = 1800
+
+            #Set vrf with multiple values
+            d.dacs.vrf = [3500,3700]
+            d.dacs.vrf
+            >> vrf       :  3500,  3700
+
+            #read into a variable
+            var = d.dacs.vrf[:]
+
+            #set multiple with multiple values, mostly used for large systems
+            d.dacs.vcall[0,1] = [3500,3600]
+            d.dacs.vcall
+            >> vcall     :  3500,  3600
+
+            d.dacs
+            >>
+            ========== DACS =========
+            vsvp      :     0,     0
+            vtr       :  4000,  4000
+            vrf       :  1900,  1900
+            vrs       :  1400,  1400
+            vsvn      :  4000,  4000
+            vtgstv    :  2556,  2556
+            vcmp_ll   :  1500,  1500
+            vcmp_lr   :  1500,  1500
+            vcall     :  4000,  4000
+            vcmp_rl   :  1500,  1500
+            rxb_rb    :  1100,  1100
+            rxb_lb    :  1100,  1100
+            vcmp_rr   :  1500,  1500
+            vcp       :  1500,  1500
+            vcn       :  2000,  2000
+            vis       :  1550,  1550
+            iodelay   :   660,   660
+
+        """
+        return self._dacs
+
+    @property
+    def tx_delay(self):
+        """
+        Transmission delay of the modules to allow running the detector
+        in a network not supporting the full speed of the detector.
+
+
+        ::
+            
+            d.tx_delay
+            >>
+            Transmission delay [ns]
+                           left   right   frame
+             0:beb048         0   15000       0
+             1:beb049       100  190000     100
+             
+             d.tx_delay.left = [2000,5000]
+        """
+        return self._delay
+
+    def default_settings(self):
+        """
+        reset the detector to some type of standard settings
+        mostly used when testing
+        """
+        self.n_frames = 1
+        self.exposure_time = 1
+        self.period = 0
+        self.n_cycles = 1
+        self.n_measurements = 1
+        self.dynamic_range = 16
+
+    @property
+    def eiger_matrix_reset(self):
+        """
+        Matrix reset bit for Eiger.
+
+        :py:obj:`True` : Normal operation, the matrix is reset before each acq.
+        :py:obj:`False` : Matrix reset disabled. Used to not reset before
+        reading out analog test pulses.
+        """
+        return self._api.getCounterBit()
+
+    @eiger_matrix_reset.setter
+    def eiger_matrix_reset(self, value):
+        self._api.setCounterBit(value)
+
+    @property
+    def flowcontrol_10g(self):
+        """
+        :py:obj:`True` - Flow control enabled :py:obj:`False` flow control disabled.
+        Sets for all moduels, if for some reason access to a single module is needed
+        this can be done trough the C++ API.
+
+        """
+        fc = self._api.getNetworkParameter('flow_control_10g')
+        return element_if_equal([bool(int(e)) for e in fc])
+
+    @flowcontrol_10g.setter
+    def flowcontrol_10g(self, value):
+        if value is True:
+            v = '1'
+        else:
+            v = '0'
+        self._api.setNetworkParameter('flow_control_10g', v, -1)
+
+    def pulse_all_pixels(self, n):
+        """
+        Pulse each pixel of the chip **n** times using the analog test pulses.
+        The pulse height is set using d.dacs.vcall with 4000 being 0 and 0 being
+        the highest pulse.
+        
+        ::
+            
+            #Pulse all pixels ten times
+            d.pulse_all_pixels(10)
+            
+            #Avoid resetting before acq
+            d.eiger_matrix_reset = False
+            
+            d.acq() #take frame
+            
+            #Restore normal behaviour
+            d.eiger_matrix_reset = True
+        
+        
+        """
+        self._api.pulseAllPixels(n)
+        
+
+    def pulse_diagonal(self, n):
+        """
+        Pulse pixels in super colums in a diagonal fashion. Used for calibration
+        of vcall. Saves time compared to pulsing all pixels.
+        """
+        self._api.pulseDiagonal(n)
+
+
+    def pulse_chip(self, n):
+        """
+        Advance the counter by toggling enable. Gives 2*n+2 int the counter
+        
+        """
+        n = int(n)
+        if n >= -1:
+            self._api.pulseChip(n)
+        else:
+            raise ValueError('n must be equal or larger than -1')
+
+    @property
+    def vcmp(self):
+        """
+        Convenience function to get and set the individual vcmp of chips
+        Used mainly in the calibration code.
+
+        Examples
+        ---------
+
+        ::
+
+            #Reading
+            d.vcmp[:]
+            >> [500, 500, 500, 500, 500, 500, 500, 500]
+
+            #Setting
+            d.vcmp = [500, 500, 500, 500, 500, 500, 500, 500]
+
+
+        """
+
+        return self._vcmp
+    
+    @vcmp.setter
+    def vcmp(self, values):
+        if len(values) == len(self._vcmp.set):
+            for i, v in enumerate(values):
+                self._vcmp.set[i](v)
+        else:
+            raise ValueError('vcmp only compatible with setting all')
+
+    @property
+    def rx_udpport(self):
+        """
+        UDP port for the receiver. Each module has two ports referred to
+        as rx_udpport and rx_udpport2 in the command line interface
+        here they are grouped for each detector
+        
+        ::
+            
+            [0:rx_udpport, 0:rx_udpport2, 1:rx_udpport ...]
+        
+        Examples
+        -----------
+        
+        ::
+        
+            d.rx_udpport
+            >> [50010, 50011, 50004, 50005]
+            
+            d.rx_udpport = [50010, 50011, 50012, 50013]
+        
+        """
+        p0 = self._api.getReceiverUDPPort()
+        p1 = self._api.getReceiverUDPPort2()
+        return [int(val) for pair in zip(p0, p1) for val in pair]
+    
+    @rx_udpport.setter
+    def rx_udpport(self, ports):
+        """Requires iterating over elements two and two for setting ports"""
+        a = iter(ports)
+        for i, p in enumerate(zip(a, a)):
+            self._api.setReceiverUDPPort(p[0], i)
+            self._api.setReceiverUDPPort2(p[1], i)
+
+    @property
+    def rx_zmqport(self):
+        """
+        Return the receiver zmq ports. Note that Eiger has two ports per receiver!
+
+        ::
+
+            detector.rx_zmqport
+            >> [30001, 30002, 30003, 30004]
+
+
+        """
+        _s = self._api.getReceiverStreamingPort()
+        if _s == '':
+            return []
+        else:
+            return [int(_p) + i for _p in _s for i in range(2)]
+
+    @rx_zmqport.setter
+    def rx_zmqport(self, port):
+        if isinstance(port, Iterable):
+            for i, p in enumerate(port):
+                self._api.setReceiverStreamingPort(p, i)
+        else:
+            self._api.setReceiverStreamingPort(port, -1)
+
+
+    @property
+    def sub_exposure_time(self):
+        """
+        Sub frame exposure time in *seconds* for Eiger in 32bit autosumming mode
+
+        ::
+
+            d.sub_exposure_time
+            >> 0.0023
+
+            d.sub_exposure_time = 0.002
+
+        """
+        return self._api.getSubExposureTime() / 1e9
+
+    
+    @sub_exposure_time.setter
+    def sub_exposure_time(self, t):
+        #TODO! checking here or in the detector?
+        ns_time = int(t * 1e9)
+        if ns_time > 0:
+            self._api.setSubExposureTime(ns_time)
+        else:
+            raise DetectorValueError('Sub exposure time must be larger than 0')
+
+    @property
+    def sub_deadtime(self):
+        """
+        Deadtime between subexposures. Used to mimize noise by delaying the start of the next
+        subexposure.
+        """
+        return self._api.getSubExposureDeadTime() / 1e9
+
+    
+    @sub_deadtime.setter
+    def sub_deadtime(self, t):
+        ns_time = int(t * 1e9)
+        if ns_time >= 0:
+            self._api.setSubExposureDeadTime(ns_time)
+        else:
+            raise ValueError('Sub deadtime time must be larger or equal to 0')
+
+    @property
+    def temp(self):
+        """
+        An instance of DetectorAdcs used to read the temperature
+        of different components
+
+        Examples
+        -----------
+
+        ::
+
+            detector.temp
+            >>
+            temp_fpga     :  36.90°C,  45.60°C
+            temp_fpgaext  :  31.50°C,  32.50°C
+            temp_10ge     :   0.00°C,   0.00°C
+            temp_dcdc     :  36.00°C,  36.00°C
+            temp_sodl     :  33.00°C,  34.50°C
+            temp_sodr     :  33.50°C,  34.00°C
+            temp_fpgafl   :  33.81°C,  30.93°C
+            temp_fpgafr   :  27.88°C,  29.15°C
+
+            a = detector.temp.fpga[:]
+            a
+            >> [36.568, 45.542]
+
+
+        """
+        return self._temp
+
+    @property
+    def tengiga(self):
+        """Enable 10Gbit/s data output
+        
+        Examples
+        ----------
+        
+        ::
+            
+            d.tengiga
+            >> False
+            
+            d.tengiga = True
+            
+        """
+        return self._api.getTenGigabitEthernet()
+    
+    @tengiga.setter
+    def tengiga(self, value):
+        self._api.setTenGigabitEthernet(value)
+
+    def set_delays(self, delta):
+        self.tx_delay.left = [delta*(i*2) for i in range(self.n_modules)]
+        self.tx_delay.right = [delta*(i*2+1) for i in range(self.n_modules)]
+
+
+    def setup500k(self, hostnames):
+        """
+        Setup the Eiger detector to run on the local machine
+        """
+        
+        self.hostname = hostnames
+        self.file_write = False
+        self.image_size = (512, 1024)
+        self.rx_tcpport = [1954, 1955]
+        self.rx_udpport = [50010, 50011, 50004, 50005]
+        self.rx_hostname = socket.gethostname().split('.')[0]
+        self.rx_datastream = False
+        self.file_write = False
+        self.online = True
+        self.receiver_online = True

python/sls_detector/experimental.py

@@ -0,0 +1,180 @@
+from _sls_detector import multiDetectorApi
+from _sls_detector import slsDetectorDefs
+
+runStatus = slsDetectorDefs.runStatus
+from .utils import element_if_equal, all_equal
+import datetime as dt
+
+from functools import wraps
+
+
+def freeze(cls):
+    cls.__frozen = False
+
+    def frozensetattr(self, key, value):
+        if self.__frozen and not hasattr(self, key):
+            raise AttributeError(
+                "Class {} is frozen. Cannot set {} = {}".format(
+                    cls.__name__, key, value
+                )
+            )
+        else:
+            object.__setattr__(self, key, value)
+
+    def init_decorator(func):
+        @wraps(func)
+        def wrapper(self, *args, **kwargs):
+            func(self, *args, **kwargs)
+            self.__frozen = True
+
+        return wrapper
+
+    cls.__setattr__ = frozensetattr
+    cls.__init__ = init_decorator(cls.__init__)
+    return cls
+
+
+@freeze
+class ExperimentalDetector(multiDetectorApi):
+    """
+    This class is the base for detector specific 
+    interfaces. Most functions exists in two versions
+    like the getExptime() function that uses the 
+    C++ API directly and the simplified exptime property. 
+    """
+    def __init__(self, multi_id = 0):
+        """
+        multi_id refers to the shared memory id of the 
+        slsDetectorPackage. Default value is 0. 
+        """
+        super().__init__(multi_id)
+
+    # Acq
+    @property
+    def rx_status(self):
+        """
+        Read the status of the receiver
+        """
+        return element_if_equal(self.getReceiverStatus())
+
+    @rx_status.setter
+    def rx_status(self, status_str):
+        if status_str == "start":
+            self.startReceiver()
+        elif status_str == "stop":
+            self.stopReceiver()
+        else:
+            raise NotImplementedError("Unknown argument to rx_status")
+
+    @property
+    def busy(self):
+        """
+        Checks if the detector is acquiring. Can also be set but should only be used if the acquire fails and
+        leaves the detector with busy == True
+
+        .. note ::
+
+            Only works when the measurement is launched using acquire, not with status start!
+
+        Returns
+        --------
+        bool
+            :py:obj:`True` if the detector is acquiring otherwise :py:obj:`False`
+
+        Examples
+        ----------
+
+        ::
+
+            d.busy
+            >> True
+
+            #If the detector is stuck reset by:
+            d.busy = False
+
+
+        """
+        return self.getAcquiringFlag()
+    
+    @busy.setter
+    def busy(self, value):
+        self.setAcquiringFlag(value)
+
+    # Configuration
+    @property
+    def startingfnum(self):
+        return element_if_equal(self.getStartingFrameNumber())
+
+    @startingfnum.setter
+    def startingfnum(self, value):
+        self.setStartingFrameNumber(value)
+
+    @property
+    def config(self):
+        return NotImplementedError("config is set only")
+
+    @config.setter
+    def config(self, fname):
+        self.setConfig(fname)
+
+    # File
+    @property
+    def fname(self):
+        return element_if_equal(self.getFileName())
+
+    @fname.setter
+    def fname(self, file_name):
+        self.setFileName(file_name)
+
+    @property
+    def fpath(self):
+        return element_if_equal(self.getFilePath())
+    
+    @fpath.setter
+    def fpath(self, path):
+        self.setFilePath(path)
+
+    @property
+    def fwrite(self):
+        return element_if_equal(self.getFileWrite())
+
+    @fwrite.setter
+    def fwrite(self, value):
+        self.setFileWrite(value)
+
+    @property
+    def foverwrite(self):
+        return element_if_equal(self.getFileOverWrite())
+
+    @foverwrite.setter
+    def foverwrite(self, value):
+        self.setFileOverWrite(value)
+
+    # Time
+    @property
+    def exptime(self):
+        res = self.getExptime()
+        return element_if_equal([it.total_seconds() for it in res])
+
+    @exptime.setter
+    def exptime(self, t):
+        self.setExptime(dt.timedelta(seconds=t))
+
+    @property
+    def subexptime(self):
+        res = self.getSubExptime()
+        return element_if_equal([it.total_seconds() for it in res])
+
+    @subexptime.setter
+    def subexptime(self, t):
+        self.setSubExptime(dt.timedelta(seconds=t))
+
+    @property
+    def period(self):
+        res = self.getPeriod()
+        return element_if_equal([it.total_seconds() for it in res])
+
+    @period.setter
+    def period(self, t):
+        self.setPeriod(dt.timedelta(seconds=t))
+

python/sls_detector/jungfrau.py

@@ -0,0 +1,259 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Jungfrau detector class and support functions.
+Inherits from Detector.
+"""
+from .adcs import Adc, DetectorAdcs
+from .detector import Detector
+from .dacs import DetectorDacs
+from .utils import element_if_equal
+
+
+class JungfrauDacs(DetectorDacs):
+    _dacs = [('vb_comp',    0, 4000,    1220),
+             ('vdd_prot',   0, 4000,    3000),
+             ('vin_com',    0, 4000,    1053),
+             ('vref_prech', 0, 4000,    1450),
+             ('vb_pixbuff', 0, 4000,     750),
+             ('vb_ds',      0, 4000,    1000),
+             ('vref_ds',    0, 4000,     480),
+             ('vref_comp',  0, 4000,     420),
+            ]
+    _dacnames = [_d[0] for _d in _dacs]
+
+class Jungfrau(Detector):
+    """
+    Class used to control a Jungfrau detector. Inherits from the Detector class but a specialized
+    class is needed to provide the correct dacs and unique functions.
+
+    """
+    _detector_dynamic_range = [4, 8, 16, 32]
+
+    _settings = ['dynamichg0',
+                 'dynamicgain',
+                 'fixgain1',
+                 'fixgain2',
+                 'forceswitchg1',
+                 'forceswitchg2']
+    """Available settings for Jungfrau"""
+
+    def __init__(self, multi_id=0):
+        #Init on base calss
+        super().__init__(multi_id)
+        self._dacs = JungfrauDacs(self)
+
+        #Jungfrau specific temps, this can be reduced to a single value?
+        self._temp = DetectorAdcs()
+        self._temp.fpga = Adc('temp_fpga', self)
+        # self._register = Register(self)
+
+
+    @property
+    def dacs(self):
+        """
+
+        An instance of DetectorDacs used for accessing the dacs of a single
+        or multi detector.
+
+        Examples
+        ---------
+
+        ::
+
+            #Jungfrau
+
+
+        """
+        return self._dacs
+
+    @property
+    def power_chip(self):
+        """Power on or off the ASICs, True for on False for off"""
+        return self._api.isChipPowered()
+
+    @power_chip.setter
+    def power_chip(self, value):
+        self._api.powerChip(value)
+
+    @property
+    def delay(self):
+        """Delay after trigger [s]"""
+        return self._api.getDelay()/1e9
+
+    @delay.setter
+    def delay(self, t):
+        ns_time = int(t * 1e9)
+        self._api.setDelay(ns_time)
+
+    @property
+    def n_gates(self):
+        return self._api.getNumberOfGates()
+
+    @n_gates.setter
+    def n_gates(self, n):
+        self._api.setNumberOfGates(n)
+
+    @property
+    def n_probes(self):
+        return self._api.getNumberOfProbes()
+
+    @n_probes.setter
+    def n_probes(self, n):
+        self._api.setNumberOfProbes(n)
+
+    @property
+    def storagecell_start(self):
+        """
+        First storage cell
+        """
+        return self._api.getStoragecellStart()
+
+    @storagecell_start.setter
+    def storagecell_start(self, value):
+        self._api.setStoragecellStart(value)
+
+
+    @property
+    def n_storagecells(self):
+        """
+        number of storage cells used for the measurements
+        """
+        return self._api.getNumberOfStorageCells()
+
+    @n_storagecells.setter
+    def n_storagecells(self, value):
+        self._api.setNumberOfStorageCells(value)
+
+    @property
+    def temp(self):
+        """
+        An instance of DetectorAdcs used to read the temperature
+        of different components
+
+        Examples
+        -----------
+
+        ::
+
+            detector.temp
+            >>
+            temp_fpga     :  36.90°C,  45.60°C
+
+            a = detector.temp.fpga[:]
+            a
+            >> [36.568, 45.542]
+
+
+        """
+        return self._temp
+
+    @property
+    def temperature_threshold(self):
+        """Threshold for switching of chips"""
+        return self._api.getThresholdTemperature()
+
+    @temperature_threshold.setter
+    def temperature_threshold(self, t):
+        self._api.setThresholdTemperature(t)
+
+    @property
+    def temperature_control(self):
+        """
+        Monitor the temperature of the detector and switch off chips if temperature_threshold is
+        crossed
+
+
+        Examples
+        ---------
+
+        ::
+
+            #activate
+            detector.temperature_control = True
+
+            #deactivate
+            detector.temperature_control = False
+
+
+        """
+        return self._api.getTemperatureControl()
+
+    @temperature_control.setter
+    def temperature_control(self, v):
+        self._api.setTemperatureControl(v)
+
+    @property
+    def temperature_event(self):
+        """Have the temperature threshold been crossed?
+
+        Returns
+        ---------
+
+            :py:obj:`True` if the threshold have been crossed and temperature_control is active
+            otherwise :py:obj:`False`
+
+        """
+        return self._api.getTemperatureEvent()
+
+    def reset_temperature_event(self):
+        """Reset the temperature_event. After reset temperature_event is False"""
+        self._api.resetTemperatureEvent()
+
+    @property
+    def rx_udpport(self):
+        """
+        UDP port for the receiver. Each module have one port.
+        Note! Eiger has two ports
+
+        ::
+
+            [0:rx_udpport]
+
+        Examples
+        -----------
+
+        ::
+
+            d.rx_udpport
+            >> [50010]
+
+            d.rx_udpport = [50010]
+
+        """
+        return self._api.getNetworkParameter('rx_udpport')
+
+
+    @rx_udpport.setter
+    def rx_udpport(self, ports):
+        """Requires iterating over elements two and two for setting ports"""
+        for i, p in enumerate(ports):
+            self._api.setNetworkParameter('rx_udpport', str(p), i)
+
+    @property
+    def detector_mac(self):
+        s = self._api.getNetworkParameter('detectormac')
+        return element_if_equal(s)
+
+
+    @detector_mac.setter
+    def detector_mac(self, mac):
+        if isinstance(mac, list):
+            for i, m in enumerate(mac):
+                self._api.setNetworkParameter('detectormac', m, i)
+        else:
+            self._api.setNetworkParameter('detectormac', mac, -1)
+
+
+    @property
+    def detector_ip(self):
+        s = self._api.getNetworkParameter('detectorip')
+        return element_if_equal(s)
+
+    @detector_ip.setter
+    def detector_ip(self, ip):
+        if isinstance(ip, list):
+            for i, addr in enumerate(ip):
+                self._api.setNetworkParameter('detectorip', addr, i)
+        else:
+            self._api.setNetworkParameter('detectorip', ip, -1)

python/sls_detector/jungfrau_ctb.py

@@ -0,0 +1,178 @@
+from functools import partial
+from collections.abc import Iterable
+from collections import namedtuple
+import socket
+
+from .detector import Detector
+from .utils import element_if_equal
+from .adcs import DetectorAdcs, Adc
+from .dacs import DetectorDacs
+from .detector_property import DetectorProperty
+from .registers import Register, Adc_register
+
+class JungfrauCTBDacs(DetectorDacs):
+    _dacs = [('dac0',  0, 4000,    1400),
+             ('dac1',  0, 4000,    1200),
+             ('dac2',  0, 4000,    900),
+             ('dac3',  0, 4000,    1050),
+             ('dac4',  0, 4000,     1400),
+             ('dac5',  0, 4000,    655),
+             ('dac6',  0, 4000,    2000),
+             ('dac7',  0, 4000,     1400),
+             ('dac8',  0, 4000,    850),
+             ('dac9',  0, 4000,    2000),
+             ('dac10', 0, 4000,    2294),
+             ('dac11', 0, 4000,    983),
+             ('dac12', 0, 4000,    1475),
+             ('dac13', 0, 4000,    1200),
+             ('dac14', 0, 4000,    1600),
+             ('dac15', 0, 4000,    1455),
+             ('dac16', 0, 4000,       0),
+             ('dac17', 0, 4000,    1000),
+            ]
+    _dacnames = [_d[0] for _d in _dacs]
+
+
+
+class JungfrauCTB(Detector):
+    def __init__(self, id = 0):
+        super().__init__(id)
+        self._dacs = JungfrauCTBDacs(self)
+        self._register = Register(self)
+        self._adc_register = Adc_register(self)
+
+    @property
+    def v_a(self):
+        return self._api.getDac_mV('v_a', -1)
+
+    @v_a.setter
+    def v_a(self, value):
+        self._api.setDac_mV('v_a', -1, value)
+
+    @property
+    def v_b(self):
+        return self._api.getDac_mV('v_b', -1)
+
+    @v_b.setter
+    def v_b(self, value):
+        self._api.setDac_mV('v_b', -1, value)
+
+
+    @property
+    def v_c(self):
+        return self._api.getDac_mV('v_c', -1)
+
+    @v_c.setter
+    def v_c(self, value):
+        self._api.setDac_mV('v_c', -1, value)
+
+    @property
+    def v_d(self):
+        return self._api.getDac_mV('v_d', -1)
+
+    @v_d.setter
+    def v_d(self, value):
+        self._api.setDac_mV('v_d', -1, value)
+        
+    @property
+    def v_io(self):
+        return self._api.getDac_mV('v_io', -1)
+
+    @v_io.setter
+    def v_io(self, value):
+        self._api.setDac_mV('v_io', -1, value)        
+
+    @property
+    def v_limit(self):
+        return self._api.getDac_mV('v_limit', -1)
+
+    @v_limit.setter
+    def v_limit(self, value):
+        self._api.setDac_mV('v_limit', -1, value)
+        
+    @property
+    def adc_register(self):
+        return self._adc_register
+
+    # @property
+    # def register(self):
+    #     return self._register
+
+    def adcOFF(self):
+        """Switch off the ADC"""
+        self.adc_register[0x8] = 1
+
+
+
+    @property
+    def dacs(self):
+        """
+
+        An instance of DetectorDacs used for accessing the dacs of a single
+        or multi detector.
+
+        Examples
+        ---------
+
+        ::
+
+            #JungfrauCTB
+
+
+        """
+        return self._dacs
+
+    @property
+    def dbitpipeline(self):
+        return self._api.getDbitPipeline()
+
+    @dbitpipeline.setter
+    def dbitpipeline(self, value):
+        self._api.setDbitPipeline(value)
+
+
+    @property
+    def dbitphase(self):
+        return self._api.getDbitPhase()
+
+    @dbitphase.setter
+    def dbitphase(self, value):
+        self._api.setDbitPhase(value)
+
+    @property
+    def dbitclock(self):
+        return self._api.getDbitClock()
+
+    @dbitclock.setter
+    def dbitclock(self, value):
+        self._api.setDbitClock(value)
+
+    @property
+    def samples(self):
+        return self._api.getJCTBSamples()
+
+    @samples.setter
+    def samples(self, value):
+        self._api.setJCTBSamples(value)
+
+    @property
+    def readout_clock(self):
+        """
+        Speed of the readout clock relative to the full speed
+
+
+        Examples
+        ---------
+
+        ::
+
+
+
+
+        """
+        return  self._api.getReadoutClockSpeed()
+
+
+    @readout_clock.setter
+    def readout_clock(self, value):
+        self._api.setReadoutClockSpeed(value)

python/sls_detector/registers.py

@@ -3,17 +3,14 @@ class Register:
         self._detector = detector
 
     def __getitem__(self, key):
-        return self._detector.readRegister(key)
+        return self._detector._api.readRegister(key)
 
     def __setitem__(self, key, value):
-        self._detector.writeRegister(key, value)
+        self._detector._api.writeRegister(key, value)
 
 class Adc_register:
     def __init__(self, detector):
         self._detector = detector
 
     def __setitem__(self, key, value):
-        self._detector.writeAdcRegister(key, value)
-
-    def __getitem__(self, key):
-        raise ValueError('Adc registers cannot be read back')
+        self._detector._api.writeAdcRegister(key, value)

python/sls_detector/utils.py

@@ -0,0 +1,32 @@
+"""
+Utility functions that are useful for testing and troubleshooting
+but not directly used in controlling the detector
+"""
+
+
+def all_equal(mylist):
+    """If all elements are equal return true otherwise false"""
+    return all(x == mylist[0] for x in mylist)
+
+
+def element_if_equal(mylist):
+    """If all elements are equal return only one element"""
+    if all_equal(mylist):
+        if len(mylist) == 0:
+            return None
+        else:
+            return mylist[0]
+    else:
+        return mylist
+
+
+def eiger_register_to_time(register):
+    """
+    Decode register value and return time in s. Values are stored in
+    a 32bit register with bits 2->0 containing the exponent and bits
+    31->3 containing the significand (int value)
+
+    """
+    clocks = register >> 3
+    exponent = register & 0b111
+    return clocks*10**exponent / 100e6

python/slsdet/__init__.py

@@ -1,23 +0,0 @@
-# from .detector import Detector, DetectorError, free_shared_memory
-from .eiger import Eiger
-from .ctb import Ctb
-from .dacs import DetectorDacs, Dac
-from .detector import Detector
-from .jungfrau import Jungfrau
-from .mythen3 import Mythen3
-# from .jungfrau_ctb import JungfrauCTB
-# from _slsdet import DetectorApi
-
-import _slsdet
-
-defs = _slsdet.slsDetectorDefs
-runStatus = _slsdet.slsDetectorDefs.runStatus
-speedLevel = _slsdet.slsDetectorDefs.speedLevel
-timingMode = _slsdet.slsDetectorDefs.timingMode
-dacIndex = _slsdet.slsDetectorDefs.dacIndex
-detectorType = _slsdet.slsDetectorDefs.detectorType
-detectorSettings = _slsdet.slsDetectorDefs.detectorSettings
-readoutMode = _slsdet.slsDetectorDefs.readoutMode
-
-IpAddr = _slsdet.IpAddr
-MacAddr = _slsdet.MacAddr

python/slsdet/ctb.py

@@ -1,43 +0,0 @@
-from .detector import Detector
-from .utils import element_if_equal
-from .dacs import DetectorDacs
-import _slsdet
-dacIndex = _slsdet.slsDetectorDefs.dacIndex
-from .detector_property import DetectorProperty
-
-class CtbDacs(DetectorDacs):
-    """
-    Ctb dacs
-    """
-    _dacs = [('dac0',  dacIndex(0), 0, 4000,    1400),
-             ('dac1',  dacIndex(1), 0, 4000,    1200),
-             ('dac2',  dacIndex(2), 0, 4000,    900),
-             ('dac3',  dacIndex(3), 0, 4000,    1050),
-             ('dac4',  dacIndex(4), 0, 4000,     1400),
-             ('dac5',  dacIndex(5), 0, 4000,    655),
-             ('dac6',  dacIndex(6), 0, 4000,    2000),
-             ('dac7',  dacIndex(7), 0, 4000,     1400),
-             ('dac8',  dacIndex(8), 0, 4000,    850),
-             ('dac9',  dacIndex(9), 0, 4000,    2000),
-             ('dac10', dacIndex(10), 0, 4000,    2294),
-             ('dac11', dacIndex(11), 0, 4000,    983),
-             ('dac12', dacIndex(12), 0, 4000,    1475),
-             ('dac13', dacIndex(13), 0, 4000,    1200),
-             ('dac14', dacIndex(14), 0, 4000,    1600),
-             ('dac15', dacIndex(15), 0, 4000,    1455),
-             ('dac16', dacIndex(16), 0, 4000,       0),
-             ('dac17', dacIndex(17), 0, 4000,    1000),
-            ]
-    _dacnames = [_d[0] for _d in _dacs]
-
-from .utils import element
-class Ctb(Detector):
-    def __init__(self, id = 0):
-        super().__init__(id)
-        self._frozen = False 
-        self._dacs = CtbDacs(self)
-    
-    @property
-    def dacs(self):
-        return self._dacs
-

python/slsdet/eiger.py

@@ -1,476 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Created on Wed Dec  6 11:51:18 2017
-
-@author: l_frojdh
-"""
-
-
-from .detector import Detector
-
-# from .adcs import Adc, DetectorAdcs
-from .dacs import DetectorDacs
-import _slsdet
-dacIndex = _slsdet.slsDetectorDefs.dacIndex
-from .detector_property import DetectorProperty
-# from .utils import element_if_equal
-# from sls_detector.errors import DetectorValueError, DetectorError
-
-class EigerVcmp:
-    """
-    Convenience class to be able to loop over vcmp for Eiger
-    
-    
-    .. todo::
-        
-        Support single assignment and perhaps unify with Dac class
-    
-    """
-    
-    def __init__(self, detector):
-        _dacs = [ dacIndex.VCMP_LL,
-                  dacIndex.VCMP_LR,
-                  dacIndex.VCMP_RL,
-                  dacIndex.VCMP_RR]
-        self.set = []
-        self.get = []
-        for i in range(detector.size()):
-            if i % 2 == 0:
-                dacs = _dacs
-            else:
-                dacs = _dacs[::-1]
-            for d in dacs:
-                self.set.append(lambda x, d=d, i=i : detector.setDAC(d, x, False, [i]))
-                self.get.append(lambda d=d, i=i : detector.getDAC(d, False, [i])[0])
-    
-    def __getitem__(self, key):
-        if key == slice(None, None, None):
-            return [_d() for _d in self.get]
-        return self.get[key]()
-    
-    def __setitem__(self, i, value):
-        self.set[i](value)
-
-    def __repr__(self):
-        return 'vcmp: '+ str(self[:])
-
-
-class EigerDacs(DetectorDacs):
-    """
-    Eiger specific dacs
-    """
-    _dacs = [('vsvp',    dacIndex.SVP,0, 4000,    0),
-             ('vtr',     dacIndex.VTR,0, 4000, 2500),
-             ('vrf',     dacIndex.VRF,0, 4000, 3300),
-             ('vrs',     dacIndex.VRS,0, 4000, 1400),
-             ('vsvn',    dacIndex.SVN,0, 4000, 4000),
-             ('vtgstv',  dacIndex.VTGSTV,0, 4000, 2556),
-             ('vcmp_ll', dacIndex.VCMP_LL,0, 4000, 1500),
-             ('vcmp_lr', dacIndex.VCMP_LR,0, 4000, 1500),
-             ('vcall',   dacIndex.CAL,0, 4000, 4000),
-             ('vcmp_rl', dacIndex.VCMP_RL,0, 4000, 1500),
-             ('rxb_rb',  dacIndex.RXB_RB,0, 4000, 1100),
-             ('rxb_lb',  dacIndex.RXB_LB,0, 4000, 1100),
-             ('vcmp_rr', dacIndex.VCMP_RR,0, 4000, 1500),
-             ('vcp',     dacIndex.VCP,0, 4000,  200),
-             ('vcn',     dacIndex.VCN,0, 4000, 2000),
-             ('vis',     dacIndex.VIS,0, 4000, 1550),
-             ('iodelay', dacIndex.IO_DELAY,0, 4000,  660)]
-    _dacnames = [_d[0] for _d in _dacs]
-
-# # noinspection PyProtectedMember
-# class DetectorDelays:
-#     _delaynames = ['frame', 'left', 'right']
-
-#     def __init__(self, detector):
-#         # We need to at least initially know which detector we are connected to
-#         self._detector = detector
-        
-#         setattr(self, '_frame', DetectorProperty(detector._api.getDelayFrame,
-#                                                  detector._api.setDelayFrame,
-#                                                  detector._api.getNumberOfDetectors,
-#                                                  'frame'))
-
-#         setattr(self, '_left', DetectorProperty(detector._api.getDelayLeft,
-#                                                 detector._api.setDelayLeft,
-#                                                 detector._api.getNumberOfDetectors,
-#                                                 'left'))
-
-#         setattr(self, '_right', DetectorProperty(detector._api.getDelayRight,
-#                                                  detector._api.setDelayRight,
-#                                                  detector._api.getNumberOfDetectors,
-#                                                  'right'))
-#         # Index to support iteration
-#         self._current = 0
-
-#     def __getattr__(self, name):
-#         return self.__getattribute__('_' + name)
-
-#     def __setattr__(self, name, value):
-#         if name in self._delaynames:
-#             return self.__getattribute__('_' + name).__setitem__(slice(None, None, None), value)
-#         else:
-#             super().__setattr__(name, value)
-
-#     def __next__(self):
-#         if self._current >= len(self._delaynames):
-#             self._current = 0
-#             raise StopIteration
-#         else:
-#             self._current += 1
-#             return self.__getattr__(self._delaynames[self._current-1])
-
-#     def __iter__(self):
-#         return self
-
-#     def __repr__(self):
-#         hn = self._detector.hostname
-#         r_str = ['Transmission delay [ns]\n'
-#                  '{:11s}{:>8s}{:>8s}{:>8s}'.format('', 'left', 'right', 'frame')]
-#         for i in range(self._detector.n_modules):
-#             r_str.append('{:2d}:{:8s}{:>8d}{:>8d}{:>8d}'.format(i, hn[i], self.left[i], self.right[i], self.frame[i]))
-#         return '\n'.join(r_str)
-
-from .detector import freeze
-
-@freeze
-class Eiger(Detector):
-    """
-    Subclassing Detector to set up correct dacs and detector specific 
-    functions. 
-    """
-    _detector_dynamic_range = [4, 8, 16, 32]
-
-
-    _settings = ['standard', 'highgain', 'lowgain', 'veryhighgain', 'verylowgain']
-    """available settings for Eiger, note almost always standard"""
-
-    def __init__(self, id=0):
-        super().__init__(id)
-        self._frozen = False 
-        self._dacs = EigerDacs(self)
-        self._vcmp = EigerVcmp(self)
-
-        # self._active = DetectorProperty(self.getActive,
-        #                                 self.setActive,
-        #                                 self.size,
-        #                                 'active')   
-
-#         self._trimbit_limits = namedtuple('trimbit_limits', ['min', 'max'])(0, 63)
-#         self._delay = DetectorDelays(self)
-        
-#         # Eiger specific adcs
-#         self._temp = DetectorAdcs()
-#         self._temp.fpga = Adc('temp_fpga', self)
-#         self._temp.fpgaext = Adc('temp_fpgaext', self)
-#         self._temp.t10ge = Adc('temp_10ge', self)
-#         self._temp.dcdc = Adc('temp_dcdc', self)
-#         self._temp.sodl = Adc('temp_sodl', self)
-#         self._temp.sodr = Adc('temp_sodr', self)
-#         self._temp.fpgafl = Adc('temp_fpgafl', self)
-#         self._temp.fpgafr = Adc('temp_fpgafr', self)
-
-    # @property
-    # def active(self):
-    #     """
-    #     Is the detector active? Can be used to enable or disable a detector
-    #     module
-        
-    #     Examples
-    #     ----------
-        
-    #     ::
-            
-    #         d.active
-    #         >> active: [True, True]
-            
-    #         d.active[1] = False
-    #         >> active: [True, False]
-    #     """
-    #     return self._active
-    
-    # @active.setter
-    # def active(self, value):
-    #     self._active[:] = value
-    
-#     @property
-#     def measured_period(self):
-#         return self._api.getMeasuredPeriod()
-
-#     @property
-#     def measured_subperiod(self):
-#         return self._api.getMeasuredSubPeriod()
-
-#     @property
-#     def add_gappixels(self):
-#        """Enable or disable the (virual) pixels between ASICs
-
-#        Examples
-#        ----------
-
-#        ::
-
-#            d.add_gappixels = True
-
-#            d.add_gappixels
-#            >> True
-
-#        """
-#        return self._api.getGapPixels()
-
-#     @add_gappixels.setter
-#     def add_gappixels(self, value):
-#        self._api.setGapPixels(value)
-
-    @property
-    def dacs(self):
-        """
-
-        An instance of DetectorDacs used for accessing the dacs of a single
-        or multi detector.
-
-        Examples
-        ---------
-
-        ::
-
-            d = Eiger()
-
-            #Set all vrf to 1500
-            d.dacs.vrf = 1500
-
-            #Check vrf
-            d.dacs.vrf
-            >> vrf       :  1500,  1500
-
-            #Set a single vtr
-            d.dacs.vtr[0] = 1800
-
-            #Set vrf with multiple values
-            d.dacs.vrf = [3500,3700]
-            d.dacs.vrf
-            >> vrf       :  3500,  3700
-
-            #read into a variable
-            var = d.dacs.vrf[:]
-
-            #set multiple with multiple values, mostly used for large systems
-            d.dacs.vcall[0,1] = [3500,3600]
-            d.dacs.vcall
-            >> vcall     :  3500,  3600
-
-            d.dacs
-            >>
-            ========== DACS =========
-            vsvp      :     0,     0
-            vtr       :  4000,  4000
-            vrf       :  1900,  1900
-            vrs       :  1400,  1400
-            vsvn      :  4000,  4000
-            vtgstv    :  2556,  2556
-            vcmp_ll   :  1500,  1500
-            vcmp_lr   :  1500,  1500
-            vcall     :  4000,  4000
-            vcmp_rl   :  1500,  1500
-            rxb_rb    :  1100,  1100
-            rxb_lb    :  1100,  1100
-            vcmp_rr   :  1500,  1500
-            vcp       :  1500,  1500
-            vcn       :  2000,  2000
-            vis       :  1550,  1550
-            iodelay   :   660,   660
-
-        """
-        return self._dacs
-
-#     @property
-#     def tx_delay(self):
-#         """
-#         Transmission delay of the modules to allow running the detector
-#         in a network not supporting the full speed of the detector.
-
-
-#         ::
-            
-#             d.tx_delay
-#             >>
-#             Transmission delay [ns]
-#                            left   right   frame
-#              0:beb048         0   15000       0
-#              1:beb049       100  190000     100
-             
-#              d.tx_delay.left = [2000,5000]
-#         """
-#         return self._delay
-
-#     def pulse_all_pixels(self, n):
-#         """
-#         Pulse each pixel of the chip **n** times using the analog test pulses.
-#         The pulse height is set using d.dacs.vcall with 4000 being 0 and 0 being
-#         the highest pulse.
-        
-#         ::
-            
-#             #Pulse all pixels ten times
-#             d.pulse_all_pixels(10)
-            
-#             #Avoid resetting before acq
-#             d.eiger_matrix_reset = False
-            
-#             d.acq() #take frame
-            
-#             #Restore normal behaviour
-#             d.eiger_matrix_reset = True
-        
-        
-#         """
-#         self._api.pulseAllPixels(n)
-        
-
-#     def pulse_diagonal(self, n):
-#         """
-#         Pulse pixels in super colums in a diagonal fashion. Used for calibration
-#         of vcall. Saves time compared to pulsing all pixels.
-#         """
-#         self._api.pulseDiagonal(n)
-
-
-#     def pulse_chip(self, n):
-#         """
-#         Advance the counter by toggling enable. Gives 2*n+2 int the counter
-        
-#         """
-#         n = int(n)
-#         if n >= -1:
-#             self._api.pulseChip(n)
-#         else:
-#             raise ValueError('n must be equal or larger than -1')
-
-    @property
-    def vcmp(self):
-        """
-        Convenience function to get and set the individual vcmp of chips
-        Used mainly in the calibration code.
-
-        Examples
-        ---------
-
-        ::
-
-            #Reading
-            d.vcmp[:]
-            >> [500, 500, 500, 500, 500, 500, 500, 500]
-
-            #Setting
-            d.vcmp = [500, 500, 500, 500, 500, 500, 500, 500]
-
-
-        """
-
-        return self._vcmp
-    
-    @vcmp.setter
-    def vcmp(self, values):
-        if len(values) == len(self._vcmp.set):
-            for i, v in enumerate(values):
-                self._vcmp.set[i](v)
-        else:
-            raise ValueError('vcmp only compatible with setting all')
-
-#     @property
-#     def rx_udpport(self):
-#         """
-#         UDP port for the receiver. Each module has two ports referred to
-#         as rx_udpport and rx_udpport2 in the command line interface
-#         here they are grouped for each detector
-        
-#         ::
-            
-#             [0:rx_udpport, 0:rx_udpport2, 1:rx_udpport ...]
-        
-#         Examples
-#         -----------
-        
-#         ::
-        
-#             d.rx_udpport
-#             >> [50010, 50011, 50004, 50005]
-            
-#             d.rx_udpport = [50010, 50011, 50012, 50013]
-        
-#         """
-#         p0 = self._api.getReceiverUDPPort()
-#         p1 = self._api.getReceiverUDPPort2()
-#         return [int(val) for pair in zip(p0, p1) for val in pair]
-    
-#     @rx_udpport.setter
-#     def rx_udpport(self, ports):
-#         """Requires iterating over elements two and two for setting ports"""
-#         a = iter(ports)
-#         for i, p in enumerate(zip(a, a)):
-#             self._api.setReceiverUDPPort(p[0], i)
-#             self._api.setReceiverUDPPort2(p[1], i)
-
-    @property
-    def rx_zmqport(self):
-        """
-        Return the receiver zmq ports. Note that Eiger has two ports per receiver!
-        This functions therefore differ from the base class.
-
-        ::
-
-            e.rx_zmqport
-            >> [30001, 30002, 30003, 30004]
-
-
-        """
-        ports = self.getRxZmqPort()
-        return [p + i for p in ports for i in range(2)]
-
-
-#     @rx_zmqport.setter
-#     def rx_zmqport(self, port):
-#         if isinstance(port, Iterable):
-#             for i, p in enumerate(port):
-#                 self._api.setReceiverStreamingPort(p, i)
-#         else:
-#             self._api.setReceiverStreamingPort(port, -1)
-
-#     @property
-#     def temp(self):
-#         """
-#         An instance of DetectorAdcs used to read the temperature
-#         of different components
-
-#         Examples
-#         -----------
-
-#         ::
-
-#             detector.temp
-#             >>
-#             temp_fpga     :  36.90°C,  45.60°C
-#             temp_fpgaext  :  31.50°C,  32.50°C
-#             temp_10ge     :   0.00°C,   0.00°C
-#             temp_dcdc     :  36.00°C,  36.00°C
-#             temp_sodl     :  33.00°C,  34.50°C
-#             temp_sodr     :  33.50°C,  34.00°C
-#             temp_fpgafl   :  33.81°C,  30.93°C
-#             temp_fpgafr   :  27.88°C,  29.15°C
-
-#             a = detector.temp.fpga[:]
-#             a
-#             >> [36.568, 45.542]
-
-
-#         """
-#         return self._temp
-
-
-
-#     def set_delays(self, delta):
-#         self.tx_delay.left = [delta*(i*2) for i in range(self.n_modules)]
-#         self.tx_delay.right = [delta*(i*2+1) for i in range(self.n_modules)]
-
-