jungfrau: new firmware version

* jungfrau: added dbitphase, different pll clkindex 0 with different wr bit

.clang-tidy

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

.gitignore

@@ -7,6 +7,7 @@ bin/
 *.out
 *.toc
 *.o
+*.so
 .*
 build
 RELEASE.txt

.travis.yml

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

CMakeLists.txt

@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.12)
 project(slsDetectorPackage)
 set(PROJECT_VERSION 5.0.0)
-
 include(CheckIPOSupported)
-
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 
 cmake_policy(SET CMP0074 NEW)
 include(cmake/project_version.cmake)
@@ -45,6 +44,9 @@ 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)
@@ -106,12 +108,17 @@ 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 -fno-omit-frame-pointer)
-    # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
+    target_link_libraries(slsProjectOptions INTERFACE -fsanitize=address,undefined)
-    target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
+    # target_compile_options(slsProjectOptions INTERFACE -fsanitize=thread)
-    target_link_libraries(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
@@ -127,7 +134,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)
 
@@ -175,6 +182,7 @@ 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)

README.md

@@ -2,90 +2,67 @@
 Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)
 
 ### Binaries
-Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui)
+Binaries for the slsDetectorPackage are available through conda. 
+```
+#Add conda channels
+conda config --add channels conda-forge
+conda config --add channels slsdetectorgroup
+
+conda install slsdetlib   #only shared lib and command line
+conda install slsdet      #python bindings (includes slsdetlib)
+conda install slsdetgui   #gui (includes qt4)
+
+#Install specific version
+conda install slsdet=2020.03.02.dev0 #developer version from 3 March 2020
+
+```
 
 ### Source code
-One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
+One can also obtain the source code from this repository and compile.
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
 
 ```
-#### Setup dependencies 
+#### Dependencies 
-* Gui Client <br>
+* Lib: c++11 compiler (gcc=>4.8), ZeroMQ 4
-Requirements: Qt 4.8 and Qwt 6.0
+* Gui: Qt 4.8 and Qwt 6.0
-```
+* Calibration wizards and ctbGUI: ROOT
-    export QTDIR=/usr/local/Trolltech/
+* Optional: HDF5
-    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.
+Compiling can be done in two ways. Either with the convenience script
+cmk.sh or directly with cmake for more control.
 
 **1. Compile using script cmk.sh**<br>
 
 After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>
 
-Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
+Usage: [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
- * -[no option]: only make<br>
+ -[no option]: only make
- * -c: Clean<br>
+ -c: Clean
- * -b: Builds/Rebuilds CMake files normal mode<br>
+ -b: Builds/Rebuilds CMake files normal mode
- * -h: Builds/Rebuilds Cmake files with HDF5 package<br>
+ -p: Builds/Rebuilds Python API
- * -d: HDF5 Custom Directory<br>
+ -h: Builds/Rebuilds Cmake files with HDF5 package
- * -t: Build/Rebuilds only text client<br>
+ -d: HDF5 Custom Directory
- * -r: Build/Rebuilds only receiver<br>
+ -t: Build/Rebuilds only text client
- * -g: Build/Rebuilds only gui<br>
+ -r: Build/Rebuilds only receiver
- * -j: Number of threads to compile through<br>
+ -g: Build/Rebuilds only gui
- * -e: Debug mode
+ -s: Simulator
- 
+ -u: Chip Test Gui
-Basic Option:
+ -j: Number of threads to compile through
-./cmk.sh -b
+ -e: Debug mode
- 
+ -i: Builds tests
-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.
+Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. This would create a debug build with address sanitizers.
 ```
-    $ cd ..
+    $ mkdir build
-    $ mkdir slsDetectorPackage-build
+    $ cd build
-    $ cd slsDetectorPackage-build
+    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON
-    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=OFF 
+    $ make -j12 #or whatever number of threads wanted
-    $ 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

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

cmk.sh

@@ -187,8 +187,8 @@ fi
 
 #Debug
 if [ $DEBUG -eq 1 ]; then
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
+#	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
-# CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
 	echo "Debug Option enabled"
 fi 
 

conda-recepie/build.sh

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

conda-recepie/build_pylib.sh

@@ -1,14 +1,4 @@
 
-# mkdir $PREFIX/lib
+echo "|<-------- starting python build"
-# 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

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

conda-recepie/copy_ctbgui.sh

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

conda-recepie/copy_gui.sh

@@ -1,15 +1,3 @@
-
+#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/meta.yaml

@@ -1,13 +1,14 @@
 
 package:
   name: sls_detector_software
-  version: "developer"
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
 
 source:
   - path: ..
 
 build:
-  number: 1
+  number: 2
+  binary_relocation: True
   rpaths:
     - lib/
 
@@ -16,10 +17,9 @@ requirements:
     - {{ compiler('c') }}
     - {{compiler('cxx')}}
     - cmake
-    # - qwt 6.* #require qt5 investigate befor activating gui
+    - qwt 6.*
-    # - qt=4.8.7=7
+    - qt 4.8.*
-    - zeromq=4.2.5=hfc679d8_5
+    - zeromq
-    - pyzmq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -51,70 +51,46 @@ requirements:
 
 
 outputs:
-  - name: sls_detector_lib
+  - name: slsdetlib
     script: copy_lib.sh
 
-  - name: sls_detector
+    requirements:
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+        - zeromq
+
+  - name: slsdet
+
     script: build_pylib.sh
 
     requirements:
       build:
+        - python
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
-        - python {{ python }}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
         - setuptools
-        - sls_detector_lib
+
-        - pyzmq
-        - pybind11 2.2
       host:
         - python
-        - pybind11 2.2 
+
-        - pyzmq
+      run:
-        - sls_detector_lib
         - libstdcxx-ng
         - libgcc-ng
-      run:
         - python
         - numpy
-        - sls_detector_lib=developer
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - pyzmq
+
-        - libstdcxx-ng
+
-        - libgcc-ng
     test:
       imports:
-        - sls_detector
+        - slsdet
 
-    # requirements:
+  - name: slsdetgui
-    #   build:
+    script: copy_gui.sh
-    #     - {{ compiler('c') }}
+    requirements:
-    #     - {{compiler('cxx')}}
+      run:
-
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
-  # - name: sls_detector_gui
+        - qwt 6.*
-  #   version: "refactor"
+        - qt 4.8.*
-  #   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

@@ -71,6 +71,11 @@ target_link_libraries(ctbRootLib PUBLIC
     ${ROOT_EXE_LINKER_FLAGS}
 )
 
+set_target_properties(
+    ctbRootLib PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
 target_link_libraries(ctbGui PUBLIC 
     slsDetectorShared
     slsSupportLib
@@ -80,4 +85,5 @@ target_link_libraries(ctbGui PUBLIC
 
 set_target_properties(ctbGui PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+
 )

ctbGui/ctbAcquisition.cpp

@@ -29,9 +29,10 @@
 #include "sls_detector_defs.h"
 #include "ctbMain.h"
 #include "moench03CtbData.h" 
-#include "moench03TCtbData.h" 
+//#include "moench03TCtbData.h" 
-#include "moench03T1CtbData.h" 
+//#include "moench03T1CtbData.h" 
 #include "moench03CommonMode.h" 
+#include "moench03T1ZmqDataNew.h" 
 #include "moench02CtbData.h" 
 //#include "jungfrau10ModuleData.h" 
 #include "moenchCommonMode.h" 
@@ -43,6 +44,9 @@
 #include "moench04CtbZmq10GbData.h"
 #include "deserializer.h"
 #include "detectorData.h"
+#include "imageZmq16bit.h"
+#include "imageZmq32bit.h"
+
 
 using namespace std;
 
@@ -232,7 +236,10 @@ hframe=new TGHorizontalFrame(this, 800,50);
   cbDetType->AddEntry("MOENCH02", MOENCH02);
   cbDetType->AddEntry("MOENCH04", MOENCH04);
   // cbDetType->AddEntry("JUNGFRAU1.0", 2);
-  //cbDetType->AddEntry("MOENCH03 T", iiii++);
+  cbDetType->AddEntry("MOENCH03",MOENCH03);
+  cbDetType->AddEntry("IMAGE32BIT",IMAGE32B);
+  cbDetType->AddEntry("IMAGE16BIT",IMAGE16B);
+
   //cbDetType->AddEntry("MOENCH03", iiii++);
   // cbDetType->AddEntry("MYTHEN3 0.1", MYTHEN301);
   // cbDetType->AddEntry("ADCSAR2", ADCSAR2);
@@ -271,7 +278,7 @@ hframe=new TGHorizontalFrame(this, 800,50);
 
 
 
-    cout << "off "<< endl;
+  //  cout << "off "<< endl;
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -290,8 +297,8 @@ hframe=new TGHorizontalFrame(this, 800,50);
                                                TGNumberFormat::kNEANonNegative, 
 			     TGNumberFormat::kNELLimitMinMax,0,16535);
    hframe->AddFrame(eSerOff,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eSerOff->MapWindow();;
+   eSerOff->MapWindow();
-   eSerOff->SetNumber(5);
+   eSerOff->SetNumber(0);
    e= eSerOff->TGNumberEntry::GetNumberEntry();
    eSerOff->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeSerialOffset(Long_t)");
    e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeSerialOffset()");
@@ -337,6 +344,53 @@ hframe=new TGHorizontalFrame(this, 800,50);
    
 
 
+  hframe=new TGHorizontalFrame(this, 800,50);
+  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
+  hframe->MapWindow();
+    
+ 
+
+  label=new TGLabel(hframe,"Image Pixels");
+  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
+  label->MapWindow();
+  label->SetTextJustify(kTextLeft);
+
+
+  label=new TGLabel(hframe,"X: ");
+  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
+  label->MapWindow();
+  label->SetTextJustify(kTextRight);
+
+
+  ePixX=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
+                                               TGNumberFormat::kNEANonNegative, 
+			     TGNumberFormat::kNELLimitMinMax,0,16535);
+   hframe->AddFrame(ePixX,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
+   ePixX->MapWindow();
+   ePixX->SetNumber(400);
+   e= ePixX->TGNumberEntry::GetNumberEntry();
+   ePixX->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
+   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
+
+
+
+  label=new TGLabel(hframe,"Y: ");
+  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
+  label->MapWindow();
+  label->SetTextJustify(kTextRight);
+
+
+  ePixY=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
+                                               TGNumberFormat::kNEANonNegative, 
+			     TGNumberFormat::kNELLimitMinMax,0,16535);
+   hframe->AddFrame(ePixY,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
+   ePixY->MapWindow();
+   ePixY->SetNumber(400);
+   e= ePixY->TGNumberEntry::GetNumberEntry();
+   ePixY->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
+   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
+
+
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -610,7 +664,9 @@ hframe=new TGHorizontalFrame(this, 800,50);
   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") 
   cout <<"Done" << endl;
   
     //  mgAdcs=new TMultiGraph();
@@ -832,7 +888,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 
   //  cout <<"global plot is " << globalPlot << endl;
   // cout << "*******************************************" <<endl;
-  // cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
+   cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " nx:" << data->nx << " ny: " << data->ny << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
   if (globalPlot || cbGetPedestal->IsOn()) {
     //#ifdef TESTADC
     //  cout <<"------"<<  index << " " << ip << " " << data->npoints << endl;
@@ -859,6 +915,11 @@ 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;
@@ -923,7 +984,8 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
       for (int y=0; y<ny; y++) {
 	ped=0;
 	aval=dataStructure->getValue(data->data,x,y);
-      
+	//aval=dataStructure->getChannel(data->data,x,y);
+	cout << x << " " <<y << " "<< aval << endl;
 	if (cbGetPedestal->IsOn()) {
 	  if (photonFinder) {
 	    photonFinder->addToPedestal(aval,x,y);
@@ -1095,7 +1157,19 @@ 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++)
@@ -1200,6 +1274,9 @@ void ctbAcquisition::changeDetector(){
    eNumCount->SetState(kFALSE);
   eDynRange->SetState(kFALSE);
   eSerOff->SetState(kFALSE);
+  ePixX->SetState(kFALSE);
+  ePixY->SetState(kFALSE);
+    
   deserializer=0;
   if (rb2D->IsOn() ) {//|| rbScan->IsOn()
     switch  (cbDetType->GetSelected()) {
@@ -1210,7 +1287,6 @@ void ctbAcquisition::changeDetector(){
       // commonMode=new moench03CommonMode();
       break;
      case MOENCH04:
-
       try {
         auto retval = myDet->getTenGiga().tsquash("Different values");
         if (retval) {
@@ -1223,6 +1299,54 @@ void 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;
@@ -1286,6 +1410,7 @@ void ctbAcquisition::changeDetector(){
 	photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode 
 	//photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode
 	dataStructure->getDetectorSize(nx,ny);
+	
       }
       if (deserializer) {
 	ny=1;
@@ -1511,13 +1636,13 @@ void ctbAcquisition::update() {
 
    if (dataStructure) {
      cout << cbDetType->GetSelected()<< endl;
-    if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+    // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
-      cout << "settings deserialiation parameters for MYTHEN" << endl;
+    //   cout << "settings deserialiation parameters for MYTHEN" << endl;
-      mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+    //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-      eSerOff->SetNumber( ms->setSerialOffset(-1));
+    //   eSerOff->SetNumber( ms->setSerialOffset(-1));
-      eDynRange->SetNumber( ms->setDynamicRange(-1));
+    //   eDynRange->SetNumber( ms->setDynamicRange(-1));
-      eNumCount->SetNumber( ms->setNumberOfCounters(-1));
+    //   eNumCount->SetNumber( ms->setNumberOfCounters(-1));
-    }
+    // }
     
    }
 
@@ -1977,20 +2102,22 @@ void ctbAcquisition::ChangeNumberOfChannels(Long_t a){
 
 
 void ctbAcquisition::ChangeSerialOffset(){
+  changeDetector();
   // if (dataStructure) {
 
-  //   //  cout << cbDetType->GetSelected()<< endl;
+  //    cout << cbDetType->GetSelected()<< endl;
-  //   // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
+  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
-  //   //   cout << "settings offsets for MYTHEN" << endl;
+  //     cout << "settings offsets for MYTHEN" << endl;
-  //   //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-  //   //   ms->setSerialOffset(eSerOff->GetIntNumber());
+  //     ms->setSerialOffset(eSerOff->GetIntNumber());
       
-  //   // }
+  //   }
   // }
 };
 
 
 void ctbAcquisition::ChangeDynamicRange(){
+  changeDetector();
   // if (dataStructure) {
 
   //    cout << cbDetType->GetSelected()<< endl;
@@ -2004,6 +2131,7 @@ void ctbAcquisition::ChangeDynamicRange(){
 };
 
 void ctbAcquisition::ChangeNumberOfChannels(){
+  changeDetector();
   // if (dataStructure) {
   //    cout << cbDetType->GetSelected()<< endl;
   //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
@@ -2017,6 +2145,24 @@ void ctbAcquisition::ChangeNumberOfChannels(){
     changePlot();
 };
 
+void ctbAcquisition::ChangeImagePixels(Long_t a){
+  ChangeImagePixels();
+};
+
+void ctbAcquisition::ChangeImagePixels(){
+  changeDetector();
+  // if (dataStructure) {
+  //    cout << cbDetType->GetSelected()<< endl;
+  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+  //     cout << "settings number of channels for MYTHEN" << endl;
+  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //     ms->setNumberOfCounters(eNumCount->GetIntNumber());
+      
+  //   }
+  // }
+  // if (deserializer)
+  //  changePlot();
+};
 
 
 void ctbAcquisition::ChangeHistoLimitsPedSub(Long_t a){

ctbGui/ctbAcquisition.h

@@ -42,7 +42,7 @@ using namespace std;
 class ctbAcquisition : public TGGroupFrame {
 
 
-  enum {DESERIALIZER, MOENCH04, MOENCH02, ADCSAR2, MYTHEN301, MYTHEN302};
+  enum {DESERIALIZER, MOENCH04, MOENCH02, MOENCH03, IMAGE32B, IMAGE16B, ADCSAR2, MYTHEN301, MYTHEN302};
 
 
  private:
@@ -57,6 +57,9 @@ class ctbAcquisition : public TGGroupFrame {
   TGNumberEntry *eNumCount;
 
 
+  TGNumberEntry *ePixX;
+  TGNumberEntry *ePixY;
+
   TGNumberEntry *eFitADC;
   TGNumberEntry *eBitPlot;
   TGNumberEntry *eMinRaw;
@@ -231,7 +234,8 @@ class ctbAcquisition : public TGGroupFrame {
    void ChangeNumberOfChannels(Long_t);
    void ChangeDynamicRange();
    void ChangeDynamicRange(Long_t);
-
+   void ChangeImagePixels();
+   void ChangeImagePixels(Long_t);
 
    void canvasClicked();
    void FitADC();

ctbGui/ctbDacs.cpp

@@ -108,15 +108,26 @@ string ctbDac::getLabel() {
 
 }
 
+int ctbDac::getMoenchDacId() {
+  slsDetectorDefs::dacIndex moenchDacIndices[8] = {slsDetectorDefs::VBP_COLBUF, slsDetectorDefs::VIPRE, slsDetectorDefs::VIN_CM, slsDetectorDefs::VB_SDA, slsDetectorDefs::VCASC_SFP, slsDetectorDefs::VOUT_CM, slsDetectorDefs::VIPRE_CDS, slsDetectorDefs::IBIAS_SFP}; 
+
+  if (id >= 8) {
+    return id;
+  }
+  return static_cast<int>(moenchDacIndices[id]);
+}
 
 void ctbDac::setValue(Long_t a) {setValue();}
 
 void ctbDac::setValue() {
-
   cout << "setting dac! "<< id << " value " << dacsEntry->GetIntNumber() << " units " << dacsUnit->IsOn() << endl;
 
   try {
-    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(id), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
+    int sid = id;
+    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+      sid = getMoenchDacId();
+    }
+    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
   } CATCH_DISPLAY ("Could not set dac " + to_string(id) + ".", "ctbDac::setValue")
 
   getValue();
@@ -128,7 +139,11 @@ void ctbDac::setOn(Bool_t b) {
     setValue();
   } else {
     try {
-      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(id), -100, false);
+      int sid = id;
+      if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+	sid = getMoenchDacId();
+      }
+      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), -100, false);
     } CATCH_DISPLAY ("Could not power off dac " + to_string(id) + ".", "ctbDac::setOn")
   }
   getValue();
@@ -136,7 +151,11 @@ void ctbDac::setOn(Bool_t b) {
 
 int ctbDac::getValue() { 
   try {
-    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(id), dacsUnit->IsOn()).tsquash("Different values"); 
+    int sid = id;
+    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+      sid = getMoenchDacId();
+    }
+    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsUnit->IsOn()).tsquash("Different values"); 
     cout << "dac " << id << " " << val << endl;
     dacsValue->SetText(to_string(val).c_str());
     if (val >= 0) {

ctbGui/ctbDacs.h

@@ -45,7 +45,7 @@ class ctbDac : public TGHorizontalFrame {
    
    int setLabel(char *tit, int mv);
    string getLabel();
-
+int getMoenchDacId();
 
 
    ClassDef(ctbDac,0)
@@ -54,8 +54,6 @@ class ctbDac : public TGHorizontalFrame {
 class ctbDacs : public TGGroupFrame {
 private:
   
-
-
    ctbDac *dacs[NDACS+2];
 
    sls::Detector* myDet;

ctbGui/ctbDefs.h

@@ -71,10 +71,10 @@ class ctbDefs {
                     std::string exceptionMessage,
                     std::string source) {
         // because sls_detector_exceptions cannot be included
-        if (exceptionMessage.find("hared memory")) {
+      if (exceptionMessage.find("hared memory") != std::string::npos) {
             throw;
         }
-        if (exceptionMessage.find("annot connect")) {
+      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());

ctbGui/ctbMain.cpp

@@ -259,8 +259,10 @@ 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")
+
    setADCEnable(adcs->setEnable());
    setAnalogSamples(pat->getAnalogSamples());
    setDigitalSamples(pat->getDigitalSamples());

ctbGui/ctbPattern.cpp

@@ -1036,8 +1036,13 @@ void ctbPattern::readoutModeChanged(int flags) {
 }
 
 int ctbPattern::getReadoutMode() {  
+ int retval=slsDetectorDefs::ANALOG_ONLY;
+    
+ if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
    try{
-    auto retval = myDet->getReadoutMode().tsquash("Different values");
+     retval = myDet->getReadoutMode().tsquash("Different values");
+   } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
+      
    switch(retval) {
    case slsDetectorDefs::ANALOG_AND_DIGITAL:
      cout << "analog and digital" << endl;
@@ -1057,11 +1062,15 @@ int ctbPattern::getReadoutMode() {
    default:
      throw("unknown readout flag");
    }
+ } else {
+   cbAnalog->SetOn(kTRUE);
+   cbDigital->SetOn(kFALSE);    
+ }
+    
     Emit("readoutModeChanged(int)",static_cast<int>(retval));
     return retval;
-  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
  
-  return -1;
+ 
 }
 
 int ctbPattern::getAnalogSamples() {
@@ -1076,12 +1085,16 @@ int ctbPattern::getAnalogSamples() {
 }
    
 int ctbPattern::getDigitalSamples() { 
+  int retval=0;
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
     try{
       auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values"); 
+    } CATCH_DISPLAY ("Could not get number of digital samples.", "ctbPattern::getDigitalSamples")
+	}
   eDigitalSamples->SetNumber((Double_t)retval);
   Emit("digitalSamplesChanged(const int)", eDigitalSamples->GetNumber());
   return eDigitalSamples->GetNumber();
-  } CATCH_DISPLAY ("Could not get number of triggers.", "ctbPattern::update")
+ 
 
   return -1;
 }

docs/src/pyexamples.rst

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

examples/jctb_moench03_T1.config

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

examples/moench03_T1.config

@@ -0,0 +1,61 @@
+#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 "multiSlsDetector.h"
+#include "DetectorImpl.h"
 #include "string_utils.h"
 #include "tests/globals.h"
 #include <iostream>
 
 class MultiDetectorFixture {
   protected:
-    multiSlsDetector d;
+    DetectorImpl d;
 
   public:
     MultiDetectorFixture() : d(0, true, true) {

integrationTests/test-integrationDectector.cpp

@@ -3,7 +3,7 @@
 
 #include "ClientSocket.h"
 #include "logger.h"
-#include "multiSlsDetector.h"
+#include "DetectorImpl.h"
 #include "slsDetector.h"
 #include "sls_detector_defs.h"
 
@@ -252,7 +252,7 @@ TEST_CASE(
     int ratecorr = 125;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure eiger detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -302,7 +302,7 @@ TEST_CASE("Chiptestboard Loading Patterns", "[.ctbintegration]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -387,7 +387,7 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegrat
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(m.getDetectorTypeAsEnum() == c.type_enum);
@@ -457,7 +457,7 @@ TEST_CASE("Eiger or Jungfrau startingfnum", "[.eigerintegration][.jungfrauintegr
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
     REQUIRE(((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) || (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::JUNGFRAU)));
@@ -495,7 +495,7 @@ TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
-    multiSlsDetector m(0);
+    DetectorImpl m(0);
 
     // ensure detector type, hostname
     REQUIRE((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER));

integrationTests/test-integrationMulti.cpp

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

libs/rapidjson/rapidjson/document.h

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

libs/rapidjson/rapidjson/encodedstream.h

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

libs/rapidjson/rapidjson/internal/strtod.h

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

libs/rapidjson/rapidjson/rapidjson.h

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

libs/rapidjson/rapidjson/reader.h

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

manual/manual-client/Eiger_short.tex

@@ -176,6 +176,7 @@ 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:
@@ -609,18 +610,19 @@ The detector can be setup such to receive external triggers. Connect a LEMO sign
 \begin{verbatim}
 sls_detector_put 0-timing [auto/trigger/burst_trigger/gating]
 sls_detector_put 0-frames x
-sls_detector_put 0-triggers y
+sls_detector_put 0-cycles y
 sls_detector_acquire 0-
 \end{verbatim}
 No timeout is expected between the start of the acquisition and the arrival of the first trigger. 
 
 Here are the implemented options so far:
 \begin{itemize}
-\item {\tt{auto}} is the software controlled acquisition (does not use triggers), where {\tt{exptime}} and {\tt{period}} have to be set. Set number of triggers (i.e. triggers) to 1 using {\tt{triggers}}. Set number of frames using {\tt{frames}}.
+\item {\tt{auto}} is the software controlled acquisition (does not use triggers), where {\tt{exptime}} and {\tt{period}} have to be set. Set number of cycles (i.e. triggers) to 1 using {\tt{cycles}}. Set number of frames using {\tt{frames}}.
-\item {\tt{trigger}} 1 frame taken for 1 trigger. Your {\tt{frames}} needs to be  1 always, {\tt{triggers}} can be changed and defines how many triggers are considered.  {\tt{exptime}} needs to be set. In the GUI this is called trigger exposure series.  
+\item {\tt{trigger}} 1 frame taken for 1 trigger. Your {\tt{frames}} needs to be  1 always, {\tt{cycles}} can be changed and defines how many triggers are considered.  {\tt{exptime}} needs to be set. In the GUI this is called trigger exposure series.  
-\item {\tt{burst\_trigger}} gets only 1 trigger, but allows to take many frames. With {\tt{frames}} one can change the number of frames. {\tt{triggers}} needs to be 1.  {\tt{exptime}} and {\tt{period}} have to be set. In the gui it is called trigger readout.
+\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{triggers}} allows to select how many gates to consider.  Set number of frames to 1 using {\tt{frames}}. IMPORTANT: Up to firmware 23, the last subframe is oblige to finish being taken, despite the gate signal going down. This will be configurable from later fw and software version. Also, in gating mode, due to timimg of the state machine, you need to leave 500~$\mu$s deadtime between the end on an acquisition and the next. This is as the state machine is unable to check for changes in the status in the first 500~$\mu$s. ATTENTION: if you are in 16 bit mode and you are applying online rate corrections, as now the exptime is generated by the trigger, you might not have correct rate corrections. If you know what the exposure time is in the gating signal, then you can set the {\tt{exptime}} once and the rate corrections will be correct. In 32 bit mode, it does not matter as the rate corrections depends on the {\tt{subexptime}} which is software set independently from the gate exptime.
+\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}}.  
 
@@ -628,13 +630,13 @@ However, from 4.1.0, in gating mode, an option to immediately terminate the subf
 
 Hardware-wise, the ENABLE OUT signal outputs when the chips are really acquiring. This means that the single subframes will be output in 32 bit mode. The TRIGGER OUT outputs the sum-up-signal at the moment (which is useless). This will be changed in the future to output the envelop of the enable signal. 
 
-We are planning to change some functionality, i.e. unify the {\tt{trigger}} and {\tt{burst\_trigger}} trigger modes and make both {\tt{frames}} and {\tt{triggers}} configurable at the same time.
+We are planning to change some functionality, i.e. unify the {\tt{trigger}} and {\tt{burst\_trigger}} trigger modes and make both {\tt{frames}} and {\tt{cycles}} configurable at the same time.
 
 There is the possibility to use {\tt{timing trigger/burst\_trigger}} and send software single commands to fake the trigger. This is done with:
 \begin{verbatim}
 sls_detector_put 0-timing [trigger/burst_trigger]
 sls_detector_put 0-frames x
-sls_detector_put 0-triggers y
+sls_detector_put 0-cycles y
 sls_detector_status trigger
 \end{verbatim}
  Note that this functionality is very (!) useful if you need to do something between and acquisition and the next. This can be used to do a fast threshold scan for example. See section~\ref{sec:fastthresholdscan}.
@@ -715,7 +717,7 @@ If \textbf{dr} is 32 and \textbf{clkdivider} is not 2, whatever the detector get
 Here is a list of parameters that should be reset:
 \begin{enumerate}
 \item  \textbf{resetframescaught} should be reset to zero after every acquisition taken with {\tt{receiver start}},{\tt{status start}},{\tt{receiver stop}}. If the acquisition is taken with {\tt{sls\_detector\_acquire}}, there is no need to reset this.
-\item After changing the {\tt{timing}} mode of the detector, one should reset to '1' the unused value, in that specific timing mode, between \textbf{frames} and \textbf{triggers}. See section~\ref{triggering} for how to use the timing. At the present moment the detector will acquire more frames than planned if the variable not used between \textbf{frames} and \textbf{triggers} is not reset. In future releases, the unused variable will be ignored. Still resetting is a good practice.
+\item After changing the {\tt{timing}} mode of the detector, one should reset to '1' the unused value, in that specific timing mode, between \textbf{frames} and \textbf{cycles}. See section~\ref{triggering} for how to use the timing. At the present moment the detector will acquire more frames than planned if the variable not used between \textbf{frames} and \textbf{cycles} is not reset. In future releases, the unused variable will be ignored. Still resetting is a good practice.
       
 \end{enumerate}
 
@@ -988,13 +990,14 @@ Packets Caught Mask        : 64 bytes
 Note that if one wants to  reconstruct the real time the detector was acquiring in 32 bit (autosumming mode), one would have to multiply the SubExptime (ns) for the SubFrame Number. 
 
 \subsection{Offline image reconstruction}
-The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. The code is still available doing \\
+The offline image reconstruction{\tt{slsImageReconstruction}} is not part of the package anymore. However, it can be retrieved from \\
-{\tt{git clone git@git.psi.ch:sls\_detectors\_software/sls\_image\_reconstruction.git slsImageReconstruction}}.
+{\tt{git clone https://github.com/slsdetectorgroup/slsImageReconstruction.git slsImageReconstruction}}.\\
-Checkout the {\tt{developer}} 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.
+Checkout the {\tt{v3.1}} branch if in a 3.1.X release, the {\tt{v4.0.0}} branch if in 4.0.X release, or the {\tt{v4.1}} branch if in 4.1.X release of the {\tt{slsDetector}} code. There is a {\tt{developer}} branch that has newer updates but needs to be tested.
 
-Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5} and \textbf{root} format. The detector writes 4 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
+Three possible conversions are possible: into \textbf{cbf}, \textbf{hdf5}. \textbf{tiff} and  \textbf{root} format. The detector writes 2 raw files per receiver. An offline image reconstruction executable has been written to collate the possible files together and produce output files. By default an interpolation between the values of the large pixels is performed. Gap pixels between modules are also inserted.
 
-Note that the number of images per file 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 in the 3.1.X release is hardcoded and needs to match whatever you are using in \\
+{\tt{slsDetectorsPackage/slsReceiverSoftware/include/sls\_receiver\_defs.h}}:
 \begin{verbatim}
 #define EIGER_MAX_FRAMES_PER_FILE	2000
 \end{verbatim}
@@ -1043,11 +1046,12 @@ cbfMaker9M [file_name_with_dir]
 contain the hardcoded geometry for the 1.5M (3 modules horizontal on the long side), the 1.5M OMNY geometry (3 modules next to each other on the long side) and for the 9M at cSAXS: 6(short side)$\times$3 (long side) modules.\\ 
 Missing packets in a frame and border pixels ($\times 2$ and $\times 4$ are given with value $-1$ at the present time.
 
+From the new {{v4.1.1}} all the define that you see below need only to be modified in the Makefile.
+
 Make sure the following options are uncommented in the {\tt{slsImageReconstruction/src/main\_csaxs.cpp}} file. 
 \begin{verbatim}
 #define MYCBF
-##following line only if you need to process with 
+##following line only if you need to process with BUBBLE
-##BUBBLE (Material Science / uXAS beamlines).
 #define MSHeader 
 \end{verbatim}
 Compile it with: 
@@ -1096,6 +1100,10 @@ To use it any geometry:\\
 eg.
 {\tt image /scratch/run\_63\_d0\_f000000000000\_3.raw  3072 512 1 2 ``Eiger'' 0}.\\
 
+With new new software, the new options to run the cbfMaker/hdf5Maker executablesare: 
+
+./hdf5Maker -f [filename] -d [outdirname] -x [npix\_x] -y [npix\_y] -v  (v flags that longedge is vertical, no argument) -n [name\_of\_hdf5\_dataset] -m (mask\_hot\_pixels, need to be in file maskpix.txt in the samedir as executable, no argument) -g [0,no filling/1,division/2,interpolation/3,interpolate,alternative]  
+
 \subsection{Read temperatures/HV from boards}
 
 With an updated kernel on the linux boards (ask to the SLS detector group for specifications), it is possible to monitor the temperature on the boards: 
@@ -1257,7 +1265,7 @@ We have also been requested if we could speed up the threshold scan. At the mome
 ./sls_detector_put enablefwrite 0
 ./sls_detector_put resetframescaught 0 
 ./sls_detector_put index 0
-./sls_detector_put triggers 21
+./sls_detector_put cycles 21
 ./sls_detector_put receiver start
 ./sls_detector_put status start 
 for i in $(seq 0 20); 
@@ -1515,8 +1523,8 @@ frames number
 where {\tt{number}} is a string to be interpreted as an integer.
 
 \item \begin{verbatim}
-sls_detector_get triggers
+sls_detector_get cycles
-triggers number 
+cycles number 
 \end{verbatim}
 where {\tt{number}} is a string to be interpreted as an integer.
 

python/CMakeLists.txt

@@ -1,19 +1,22 @@
 
-pybind11_add_module(_sls_detector 
+# find_package (Python COMPONENTS Interpreter Development)
+
+pybind11_add_module(_slsdet 
     src/main.cpp 
     src/enums.cpp
-    src/experimental.cpp
+    src/detector.cpp
+    src/network.cpp
 )
 
-target_link_libraries(_sls_detector PUBLIC 
+target_link_libraries(_slsdet PUBLIC 
                         slsDetectorShared
                         slsReceiverShared
                         slsSupportLib
-                        zmq )  
+                        )  
 
 
 
-set_target_properties(_sls_detector PROPERTIES
+set_target_properties(_slsdet PROPERTIES
                         LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
                     )
 
@@ -24,20 +27,21 @@ set( PYTHON_FILES
     dacs.py
     decorators.py
     detector_property.py
-    # detector.py
+    detector.py
-    # eiger.py
+    eiger.py
     errors.py
-    experimental.py
+    ctb.py
-    # jungfrau_ctb.py
+    jungfrau.py
-    # jungfrau.py
+    mythen3.py
     registers.py
+    lookup.py
     utils.py
 
 )
 
 foreach(FILE ${PYTHON_FILES})
-    configure_file( sls_detector/${FILE}  
+    configure_file( slsdet/${FILE}  
-    ${CMAKE_BINARY_DIR}/bin/sls_detector/${FILE}  )
+    ${CMAKE_BINARY_DIR}/bin/slsdet/${FILE}  )
 
 endforeach(FILE ${PYTHON_FILES})
 

python/scripts/basic.py

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

python/scripts/cmd_python.py

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

@@ -9,19 +9,7 @@ enums.cpp
 import re
 import subprocess
 
-
+from parse import remove_comments
-# 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)
 
 def extract_enums(lines):
     line_iter = iter(lines)

python/scripts/generate_functions.py

@@ -0,0 +1,84 @@
+"""
+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,11 +1,19 @@
+"""
+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
-from pathlib import Path
+
+#General python stuff
 import os
 import locale
 import argparse
-path  = Path('../../slsDetectorSoftware/tests/')
 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()
@@ -15,15 +23,12 @@ 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)
+            tested.append([cmd, fname])
 
 out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.getpreferredencoding())
 all_cmd = out.stdout.splitlines()
@@ -33,18 +38,18 @@ 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.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]
-not_tested = [cmd for cmd in all_cmd if cmd not in tested]
+misnamed = [cmd for cmd in tn if cmd not in all_cmd]
-misnamed = [cmd for cmd in tested if cmd not in all_cmd]
+tested = [cmd for cmd in tested if cmd[0] in all_cmd]
-tested = [cmd for cmd in tested if cmd in all_cmd]
 
 
 print("\nThe following commands are tested:")
 for cmd in tested:
-    print(cmd)
+    print(f'{cmd[0]:>18} : {cmd[1]}')
 
 print("\nThe following commands are NOT tested:")
 for cmd in not_tested:

python/scripts/parse.py

@@ -1,4 +1,9 @@
 import re
+import subprocess
+from subprocess import PIPE
+import os
+
+
 def remove_comments(text):
     def replacer(match):
         s = match.group(0)
@@ -11,3 +16,41 @@ def remove_comments(text):
         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/setup.py

@@ -8,7 +8,7 @@ import sys
 import setuptools
 import os
 
-__version__ = 'refactor'
+__version__ = os.environ.get('GIT_DESCRIBE_TAG', 'developer')
 
 
 def get_conda_path():
@@ -19,30 +19,32 @@ def get_conda_path():
     return os.environ['CONDA_PREFIX']
 
 
-class get_pybind_include(object):
+# class get_pybind_include(object):
-    """Helper class to determine the pybind11 include path
+#     """Helper class to determine the pybind11 include path
-    The purpose of this class is to postpone importing pybind11
+#     The purpose of this class is to postpone importing pybind11
-    until it is actually installed, so that the ``get_include()``
+#     until it is actually installed, so that the ``get_include()``
-    method can be invoked. """
+#     method can be invoked. """
 
-    def __init__(self, user=False):
+#     def __init__(self, user=False):
-        self.user = user
+#         self.user = user
 
-    def __str__(self):
+#     def __str__(self):
-        import pybind11
+#         import pybind11
-        return pybind11.get_include(self.user)
+#         return pybind11.get_include(self.user)
 
 
 ext_modules = [
     Extension(
-        '_sls_detector',
+        '_slsdet',
         ['src/main.cpp',
         'src/enums.cpp',
-        'src/experimental.cpp'],
+        'src/detector.cpp',
+        'src/network.cpp'],
         include_dirs=[
             # Path to pybind11 headers
-            get_pybind_include(),
+            # get_pybind_include(),
-            get_pybind_include(user=True),
+            # get_pybind_include(user=True),
+            os.path.join('../libs/pybind11/include'),
             os.path.join(get_conda_path(), 'include/slsDetectorPackage'),
 
         ],
@@ -108,20 +110,28 @@ 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='sls_detector',
+    name='slsdet',
     version=__version__,
     author='Erik Frojdh',
     author_email='erik.frojdh@psi.ch',
-    url='https://github.com/slsdetectorgroup/sls_detector',
+    url='https://github.com/slsdetectorgroup/slsDetectorPackage',
     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

@@ -1,17 +0,0 @@
-# from .detector import Detector, DetectorError, free_shared_memory
-# from .eiger import Eiger
-from .experimental import Detector
-
-# from .jungfrau import Jungfrau
-# from .jungfrau_ctb import JungfrauCTB
-# from _sls_detector import DetectorApi
-
-import _sls_detector
-
-defs = _sls_detector.slsDetectorDefs
-runStatus = _sls_detector.slsDetectorDefs.runStatus
-speedLevel = _sls_detector.slsDetectorDefs.speedLevel
-timingMode = _sls_detector.slsDetectorDefs.timingMode
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
-detectorType = _sls_detector.slsDetectorDefs.detectorType
-detectorSettings = _sls_detector.slsDetectorDefs.detectorSettings

python/sls_detector/eiger.py

@@ -1,596 +0,0 @@
-#!/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/slsdet/__init__.py

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

@@ -0,0 +1,43 @@
+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/dacs.py

@@ -1,7 +1,9 @@
 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
@@ -14,11 +16,11 @@ class Dac(DetectorProperty):
 
 
     """
-    def __init__(self, name, low, high, default, detector):
+    def __init__(self, name, enum, low, high, default, detector):
 
-        super().__init__(partial(detector._api.getDac, name),
+        super().__init__(partial(detector.getDAC, enum, False),
-                         partial(detector._api.setDac, name),
+                         lambda x, y : detector.setDAC(enum, x, False, y),
-                         detector._api.getNumberOfDetectors,
+                         detector.size,
                          name)
 
         self.min_value = low
@@ -29,30 +31,16 @@ class Dac(DetectorProperty):
 
     def __repr__(self):
         """String representation for a single dac in all modules"""
-        r_str = ['{:10s}: '.format(self.__name__)]
+        dacstr = ''.join([f'{item:5d}' for item in self.get()])
-        r_str += ['{:5d}, '.format(self.get(i)) for i in range(self.get_nmod())]
+        return f'{self.__name__:10s}:{dacstr}'
-        return ''.join(r_str).strip(', ')
-
 
+# a = Dac('vrf', dacIndex.VRF, 0, 4000, 2500, d )
+# @freeze
 class DetectorDacs:
-    _dacs = [('vsvp',    0, 4000,    0),
+    _dacs = []
-             ('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
@@ -65,6 +53,8 @@ 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)
 
@@ -73,8 +63,11 @@ 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
@@ -95,7 +88,7 @@ class DetectorDacs:
         """
         Read the dacs into a numpy array with dimensions [ndacs, nmodules]
         """
-        dac_array = np.zeros((len(self._dacs), self._detector.n_modules))
+        dac_array = np.zeros((len(self._dacs), len(self._detector)))
         for i, _d in enumerate(self):
             dac_array[i,:] = _d[:]
         return dac_array
@@ -115,11 +108,3 @@ 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/slsdet/detector.py

@@ -1,37 +1,23 @@
-from _sls_detector import CppDetectorApi
+from _slsdet import CppDetectorApi
-from _sls_detector import slsDetectorDefs
+from _slsdet import slsDetectorDefs
 
 runStatus = slsDetectorDefs.runStatus
 speedLevel = slsDetectorDefs.speedLevel
 dacIndex = slsDetectorDefs.dacIndex
 
-from .utils import element_if_equal, all_equal
+from .utils import element_if_equal, all_equal, get_set_bits, list_to_bitmask
-from .utils import Geometry, to_geo
+from .utils import Geometry, to_geo, element
+from .registers import Register, Adc_register
 import datetime as dt
 
 from functools import wraps
 from collections import namedtuple
 
-class Register:
-    """
-    Helper class to read and write to registers using a
-    more Pythonic syntax
-    """
-    def __init__(self, detector):
-        self._detector = detector
-
-    def __getitem__(self, key):
-        return self._detector.readRegister(key)
-
-    def __setitem__(self, key, value):
-        self._detector.writeRegister(key, value)
-
-
 def freeze(cls):
-    cls.__frozen = False
+    cls._frozen = False
 
     def frozensetattr(self, key, value):
-        if self.__frozen and not hasattr(self, key):
+        if self._frozen and not hasattr(self, key):
             raise AttributeError(
                 "Class {} is frozen. Cannot set {} = {}".format(
                     cls.__name__, key, value
@@ -44,7 +30,7 @@ def freeze(cls):
         @wraps(func)
         def wrapper(self, *args, **kwargs):
             func(self, *args, **kwargs)
-            self.__frozen = True
+            self._frozen = True
 
         return wrapper
 
@@ -69,6 +55,9 @@ class Detector(CppDetectorApi):
         """
         super().__init__(multi_id)
         self._register = Register(self)
+        self._adc_register = Adc_register(self)
+
+
 
     # CONFIGURATION
     def __len__(self):
@@ -197,6 +186,18 @@ class Detector(CppDetectorApi):
         else:
             self.setSubExptime(dt.timedelta(seconds=t))
 
+    @property
+    def subdeadtime(self):
+        res = self.getSubDeadTime()
+        return element_if_equal([it.total_seconds() for it in res])
+
+    @subdeadtime.setter
+    def subdeadtime(self, t):
+        if isinstance(t, dt.timedelta):
+            self.setSubDeadTime(t)
+        else:
+            self.setSubDeadTime(dt.timedelta(seconds=t))
+
 
     @property
     def period(self):
@@ -215,12 +216,8 @@ class Detector(CppDetectorApi):
     
   
     # Time
-
-
-
-    #TODO! Rename to rx_framescaught
     @property
-    def framescaught(self):
+    def rx_framescaught(self):
         return element_if_equal(self.getFramesCaught())
     
 
@@ -232,14 +229,7 @@ class Detector(CppDetectorApi):
     def startingfnum(self, value):
         self.setStartingFrameNumber(value)
 
-   #TODO! testing switches on automatically?
-    @property
-    def flowcontrol_10g(self):
-        return element_if_equal(self.getTenGigaFlowControl())
 
-    @flowcontrol_10g.setter
-    def flowcontrol_10g(self, enable):
-        self.setTenGigaFlowControl(enable)
 
      #TODO! add txdelay
 
@@ -459,6 +449,22 @@ class Detector(CppDetectorApi):
         self.getDestinationUDPMAC2(mac)
 
 
+    @property
+    def udp_srcip(self):
+        return element_if_equal(self.getSourceUDPIP())
+
+    @udp_srcip.setter
+    def udp_srcip(self, ip):
+        self.setSourceUDPIP(ip)
+
+    @property
+    def udp_srcip2(self):
+        return element_if_equal(self.getSourceUDPIP2())
+
+    @udp_srcip2.setter
+    def udp_srcip2(self, ip):
+        self.setSourceUDPIP2(ip)
+
     @property
     def udp_dstport(self):
         return element_if_equal(self.getDestinationUDPPort())
@@ -582,6 +588,19 @@ class Detector(CppDetectorApi):
     def reg(self):
         return self._register
 
+    @property
+    def adcreg(self):
+        return self._adc_register
+
+
+    @property
+    def led(self):
+        return element_if_equal(self.getLEDEnable())
+
+    @led.setter
+    def led(self, value):
+        self.setLEDEnable(value)
+
     @property
     def ratecorr(self):
         """ tau in ns """
@@ -631,3 +650,439 @@ class Detector(CppDetectorApi):
     @property
     def vthreshold(self):
         return element_if_equal(self.getDAC(dacIndex.THRESHOLD))
+
+    
+
+    @property
+    def type(self):
+        return element_if_equal(self.getDetectorType())
+
+    @property
+    def rx_frameindex(self):
+        return element_if_equal(self.getRxCurrentFrameIndex())
+
+    @property
+    def rx_missingpackets(self):
+        return element_if_equal(self.getNumMissingPackets())
+
+
+    """
+    Some Eiger stuff, does this have to be here or can we move it to subclass?
+    """
+    @property
+    def partialreset(self):
+        return element_if_equal(self.getPartialReset())
+
+    @partialreset.setter
+    def partialreset(self, value):
+        self.setPartialReset(value)
+
+    @property
+    def tengiga(self):
+        return element_if_equal(self.getTenGiga())
+    
+    @tengiga.setter
+    def tengiga(self, value):
+        self.setTenGiga(value)
+
+    @property
+    def overflow(self):
+        return element_if_equal(self.getOverFlowMode())
+
+    @overflow.setter
+    def overflow(self, value):
+        self.setOverFlowMode(value)
+
+    @property
+    def flowcontrol10g(self):
+        return element_if_equal(self.getTenGigaFlowControl())
+
+    @flowcontrol10g.setter
+    def flowcontrol10g(self, enable):
+        self.setTenGigaFlowControl(enable)
+
+    @property
+    def interruptsubframe(self):
+        return element_if_equal(self.getInterruptSubframe())
+
+    @interruptsubframe.setter
+    def interruptsubframe(self, value):
+        self.setInterruptSubframe(value)
+
+    @property
+    def gappixels(self):
+        return element_if_equal(self.getRxAddGapPixels())
+
+    @gappixels.setter
+    def gappixels(self, value):
+        self.setRxAddGapPixels(value)
+
+    @property
+    def measuredperiod(self):
+        res = self.getMeasuredPeriod()
+        return element_if_equal([it.total_seconds() for it in res])
+
+    @property
+    def measuredsubperiod(self):
+        res = self.getMeasuredSubFramePeriod()
+        return element_if_equal([it.total_seconds() for it in res])
+
+
+    @property
+    def storeinram(self):
+        return element_if_equal(self.getStoreInRamMode())
+
+    @storeinram.setter
+    def storeinram(self, value):
+        self.setStoreInRamMode(value)
+
+
+    """
+    Mythen3 specific
+    """
+
+    @property
+    def counters(self):
+        mask = self.getCounterMask()
+        mask = element_if_equal(mask)
+        if type(mask) == int:
+            return get_set_bits(mask)
+        else:
+            return [get_set_bits(m) for m in mask]
+
+
+    @counters.setter
+    def counters(self, values):
+        self.setCounterMask(list_to_bitmask(values))
+        
+    """
+    CTB stuff 
+    """
+
+    @property
+    def runclk(self):
+        return element_if_equal(self.getRUNClock())
+
+    @runclk.setter
+    def runclk(self, freq):
+        self.setRUNClock(freq)
+
+    @property
+    def romode(self):
+        return element_if_equal(self.getReadoutMode())
+
+    @romode.setter
+    def romode(self, mode):
+        self.setReadoutMode(mode)
+
+    @property
+    def asamples(self):
+        return element_if_equal(self.getNumberOfAnalogSamples())
+
+    @asamples.setter
+    def asamples(self, N):
+        self.setNumberOfAnalogSamples(N)
+
+    @property
+    def dsamples(self):
+        return element_if_equal(self.getNumberOfDigitalSamples())
+
+    @dsamples.setter
+    def dsamples(self, N):
+        self.setNumberOfDigitalSamples(N)
+
+    @property
+    def dbitphase(self):
+        return element_if_equal(self.getDBITPhase())
+
+    @dbitphase.setter
+    def dbitphase(self, value):
+        self.setDBITPhase(value)
+
+    @property
+    def dbitclk(self):
+        return element_if_equal(self.getDBITClock())
+    
+    @dbitclk.setter
+    def dbitclk(self, value):
+        self.setDBITClock(value)
+
+    @property
+    def dbitpipeline(self):
+        return element_if_equal(self.getDBITPipeline())
+
+    @dbitpipeline.setter
+    def dbitpipeline(self, value):
+        self.setDBITPipeline(value)
+
+    @property
+    def maxdbitphaseshift(self):
+        return element_if_equal(self.getMaxDBITPhaseShift())
+
+    @property
+    def rx_dbitlist(self):
+        return element_if_equal(self.getRxDbitList())
+
+    @rx_dbitlist.setter
+    def rx_dbitlist(self, value):
+        self.setRxDbitList(value)
+
+    @property
+    def rx_dbitoffset(self):
+        return element_if_equal(self.getRxDbitOffset())
+
+    @rx_dbitoffset.setter
+    def rx_dbitoffset(self, value):
+        self.setRxDbitOffset(value)
+
+    @property
+    def maxadcphaseshift(self):
+        return element_if_equal(self.getMaxADCPhaseShift())
+
+    @property
+    def adcphase(self):
+        return element_if_equal(self.getADCPhase())
+    
+    @adcphase.setter
+    def adcphase(self, value):
+        self.setADCPhase(value)
+
+    @property
+    def adcpipeline(self):
+        return element_if_equal(self.getADCPipeline())
+
+    @adcpipeline.setter
+    def adcpipeline(self, value):
+        self.setADCPipeline(value)
+
+    @property
+    def adcclk(self):
+        return element_if_equal(self.getADCClock())
+
+    @adcclk.setter
+    def adcclk(self, value):
+        self.setADCClock(value)
+
+    @property
+    def syncclk(self):
+        return element_if_equal(self.getSYNCClock())
+    
+    @property
+    def pattern(self):
+        #TODO! Clean fix
+        print("Set only")
+        return 0
+
+    @property
+    def patclkctrl(self):
+        return element_if_equal(self.getPatternClockControl())
+
+    @patclkctrl.setter
+    def patclkctrl(self, mask):
+        self.setPatternClockControl(mask)
+
+    # patioctrl
+    @property
+    def patioctrl(self):
+        return element_if_equal(self.getPatternIOControl())
+
+    @patioctrl.setter
+    def patioctrl(self, mask):
+        self.setPatternIOControl(mask)
+
+    @property
+    def patlimits(self):
+        return element_if_equal(self.getPatternLoopAddresses(-1))
+
+    @patlimits.setter
+    def patlimits(self, lim):
+        self.setPatternLoopAddresses(-1, lim[0], lim[1])
+
+    @property
+    def patmask(self):
+        return element_if_equal(self.getPatternMask())
+
+    @patmask.setter
+    def patmask(self, mask):
+        self.setPatternMask(mask)
+
+    @pattern.setter
+    def pattern(self, fname):
+        self.setPattern(fname)
+
+    @property
+    def patwait0(self):
+        return element_if_equal(self.getPatternWaitAddr(0))
+
+    @patwait0.setter
+    def patwait0(self, addr):
+        self.setPatternWaitAddr(0, addr)
+
+    @property
+    def patwait1(self):
+        return element_if_equal(self.getPatternWaitAddr(1))
+
+    @patwait1.setter
+    def patwait1(self, addr):
+        self.setPatternWaitAddr(1, addr)
+
+    @property
+    def patwait2(self):
+        return element_if_equal(self.getPatternWaitAddr(2))
+
+    @patwait2.setter
+    def patwait2(self, addr):
+        self.setPatternWaitAddr(2, addr)
+
+    @property
+    def patwaittime0(self):
+        return element_if_equal(self.getPatternWaitTime(0))
+
+    @patwaittime0.setter
+    def patwaittime0(self, nclk):
+        self.setPatternWaitTime(0, nclk)
+
+    @property
+    def patwaittime1(self):
+        return element_if_equal(self.getPatternWaitTime(1))
+
+    @patwaittime1.setter
+    def patwaittime1(self, nclk):
+        self.setPatternWaitTime(1, nclk)
+
+    @property
+    def patwaittime2(self):
+        return element_if_equal(self.getPatternWaitTime(2))
+
+    @patwaittime2.setter
+    def patwaittime2(self, nclk):
+        self.setPatternWaitTime(2, nclk)
+
+
+    @property
+    def patloop0(self):
+        return element_if_equal(self.getPatternLoopAddresses(0))
+
+    @patloop0.setter
+    def patloop0(self, addr):
+        self.setPatternLoopAddresses(0, addr[0], addr[1])
+
+    @property
+    def patloop1(self):
+        return element_if_equal(self.getPatternLoopAddresses(1))
+
+    @patloop1.setter
+    def patloop1(self, addr):
+        self.setPatternLoopAddresses(1, addr[0], addr[1])
+
+    @property
+    def patloop2(self):
+        return element_if_equal(self.getPatternLoopAddresses(2))
+
+    @patloop2.setter
+    def patloop2(self, addr):
+        self.setPatternLoopAddresses(2, addr[0], addr[1])
+
+    @property
+    def patnloop0(self):
+        return element_if_equal(self.getPatternLoopCycles(0))
+
+    @patnloop0.setter
+    def patnloop0(self, n):
+        self.setPatternLoopCycles(0, n)
+
+    @property
+    def patnloop1(self):
+        return element_if_equal(self.getPatternLoopCycles(1))
+
+    @patnloop1.setter
+    def patnloop1(self, n):
+        self.setPatternLoopCycles(1, n)
+
+    @property
+    def patnloop2(self):
+        return element_if_equal(self.getPatternLoopCycles(2))
+
+    @patnloop2.setter
+    def patnloop2(self, n):
+        self.setPatternLoopCycles(2, n)
+
+
+    @property
+    @element
+    def v_a(self):
+        return self.getDAC(dacIndex.V_POWER_A, True)
+
+    @v_a.setter
+    def v_a(self, value):
+        self.setDAC(dacIndex.V_POWER_A, value, True)
+
+    @property
+    @element
+    def v_b(self):
+        return self.getDAC(dacIndex.V_POWER_B, True)
+
+    @v_b.setter
+    def v_b(self, value):
+        self.setDAC(dacIndex.V_POWER_B, value, True)
+
+    @property
+    @element
+    def v_c(self):
+        return self.getDAC(dacIndex.V_POWER_C, True)
+
+    @v_c.setter
+    def v_c(self, value):
+        self.setDAC(dacIndex.V_POWER_C, value, True)
+
+    @property
+    @element
+    def v_d(self):
+        return self.getDAC(dacIndex.V_POWER_D, True)
+
+    @v_d.setter
+    def v_d(self, value):
+        self.setDAC(dacIndex.V_POWER_D, value, True)
+
+    @property
+    @element
+    def v_io(self):
+        return self.getDAC(dacIndex.V_POWER_IO, True)
+
+    @v_io.setter
+    def v_io(self, value):
+        self.setDAC(dacIndex.V_POWER_IO, value, True)
+
+    @property
+    @element
+    def v_limit(self):
+        return self.getDAC(dacIndex.V_LIMIT, True)
+
+    @v_limit.setter
+    def v_limit(self, value):
+        self.setDAC(dacIndex.V_LIMIT, value, True)
+
+    @property
+    @element
+    def im_a(self):
+        return self.getMeasuredCurrent(dacIndex.I_POWER_A)
+
+    @property
+    @element
+    def im_b(self):
+        return self.getMeasuredCurrent(dacIndex.I_POWER_B)
+
+    @property
+    @element
+    def im_c(self):
+        return self.getMeasuredCurrent(dacIndex.I_POWER_C)
+
+    @property
+    @element
+    def im_d(self):
+        return self.getMeasuredCurrent(dacIndex.I_POWER_D)
+
+    @property
+    @element
+    def im_io(self):
+        return self.getMeasuredCurrent(dacIndex.I_POWER_IO)

python/slsdet/detector_property.py

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

python/slsdet/eiger.py

@@ -0,0 +1,476 @@
+#!/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)]
+
+

python/slsdet/jungfrau.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+This file contains the specialization for the Jungfrau detector
+"""
+
+
+from .detector import Detector, freeze
+
+# from .adcs import Adc, DetectorAdcs
+from .dacs import DetectorDacs
+import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
+from .detector_property import DetectorProperty
+
+# @freeze
+class JungfrauDacs(DetectorDacs):
+    """
+    Jungfrau specific DACs
+    """
+    _dacs = [('vb_comp',    dacIndex.VB_COMP, 0, 4000,    1220),
+             ('vdd_prot',   dacIndex.VDD_PROT, 0, 4000,    3000),
+             ('vin_com',    dacIndex.VIN_COM, 0, 4000,    1053),
+             ('vref_prech', dacIndex.VREF_PRECH, 0, 4000,    1450),
+             ('vb_pixbuff', dacIndex.VB_PIXBUF, 0, 4000,     750),
+             ('vb_ds',      dacIndex.VB_DS, 0, 4000,    1000),
+             ('vref_ds',    dacIndex.VREF_DS, 0, 4000,     480),
+             ('vref_comp',  dacIndex.VREF_COMP, 0, 4000,     420),
+            ]
+    _dacnames = [_d[0] for _d in _dacs]
+
+
+
+
+@freeze
+class Jungfrau(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 = JungfrauDacs(self)
+    
+    @property
+    def dacs(self):
+        return self._dacs

python/slsdet/lookup.py

@@ -0,0 +1,9 @@
+from .detector import Detector
+
+def view(name, det = Detector):
+    names =  find(name, det)
+    for n in names:
+        print(n)
+
+def find(name, det = Detector):
+    return [n for n in dir(det) if name.lower() in n.lower()]

python/slsdet/mythen3.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+This file contains the specialization for the Jungfrau detector
+"""
+
+
+from .detector import Detector, freeze
+
+# from .adcs import Adc, DetectorAdcs
+from .dacs import DetectorDacs
+import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
+from .detector_property import DetectorProperty
+
+# vcassh 1200, 
+# vth2 2800, 
+# vshaper 1280, 
+# vshaperneg 2800, 
+# vipre_out 1220, 
+# vth3 2800, 
+# vth1 2800, 
+# vicin 1708, 
+# vcas 1800, 
+# vpreamp 1100, 
+# vpl 1100, 
+# vipre 2624, 
+# viinsh 1708, 
+# vph 1712, 
+# vtrim 2800, 
+# vdcsh 800
+
+
+# @freeze
+class Mythen3Dacs(DetectorDacs):
+    """
+    Jungfrau specific DACs
+    """
+    _dacs = [('vcassh',     dacIndex.CASSH,     0, 4000, 1220),
+             ('vth2',       dacIndex.VTH2,      0, 4000, 2800),
+             ('vshaper',    dacIndex.SHAPER1,   0, 4000, 1280),
+             ('vshaperneg', dacIndex.SHAPER2,   0, 4000, 2800),
+             ('vipre_out',  dacIndex.VIPRE_OUT, 0, 4000, 1220),
+             ('vth3',       dacIndex.VTH3,      0, 4000, 2800),
+             ('vth1',       dacIndex.THRESHOLD,      0, 4000,  2800),
+             ('vicin',      dacIndex.VICIN,     0, 4000,  1708),
+             ('vcas',       dacIndex.CAS,       0, 4000,  1800),
+             ('vpreamp',    dacIndex.PREAMP,    0, 4000,  1100),
+             ('vpl',        dacIndex.VPL,       0, 4000,  1100),
+             ('vipre',      dacIndex.VIPRE,     0, 4000,  2624),
+             ('viinsh',     dacIndex.VIINSH,    0, 4000,  1708),
+             ('vph',    dacIndex.CALIBRATION_PULSE,    0, 4000,  1712),
+             ('vtrim',    dacIndex.TRIMBIT_SIZE,    0, 4000,  2800),
+             ('vdcsh',    dacIndex.VDCSH,    0, 4000,  800),
+            ]
+    _dacnames = [_d[0] for _d in _dacs]
+
+
+
+
+@freeze
+class Mythen3(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 = Mythen3Dacs(self)
+    
+    @property
+    def dacs(self):
+        return self._dacs

python/slsdet/registers.py

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

python/slsdet/utils.py

@@ -2,13 +2,34 @@
 Utility functions that are useful for testing and troubleshooting
 but not directly used in controlling the detector
 """
+
+
 from collections import namedtuple
-import _sls_detector #C++ lib
+import _slsdet #C++ lib
+import functools
+
 
 Geometry = namedtuple('Geometry', ['x', 'y'])
 
+def get_set_bits(mask):
+    """
+    Return a list of the set bits in a python integer
+    """
+    return [i for i in range(mask.bit_length()) if (mask>>i)&1]
+
+def list_to_bitmask(values):
+    """
+    Convert a list of integers to a bitmask with set bits
+    where the list indicates
+    """
+    mask = int(0)
+    values = list(set(values)) #Remove duplicates
+    for v in values:
+        mask += 1 << v
+    return mask
+
 def to_geo(value):
-    if isinstance(value, _sls_detector.xy):
+    if isinstance(value, _slsdet.xy):
         return Geometry(x = value.x, y = value.y)
     else:
         raise ValueError("Can only convert sls_detector.xy")
@@ -28,6 +49,14 @@ def element_if_equal(mylist):
     else:
         return mylist
 
+def element(func):
+    """
+    Wrapper to return either list or element
+    """
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        return element_if_equal(func(self, *args, **kwargs))
+    return wrapper
 
 def eiger_register_to_time(register):
     """
@@ -39,3 +68,4 @@ def eiger_register_to_time(register):
     clocks = register >> 3
     exponent = register & 0b111
     return clocks*10**exponent / 100e6
+

python/sphinx/cpp_api.rst

@@ -2,7 +2,7 @@ C++ API
 =====================================================
 
 
-.. py:currentmodule:: _sls_detector
+.. py:currentmodule:: _slsdet
 
 .. autoclass:: DetectorApi
     :members:  

python/sphinx/index.rst

@@ -2,7 +2,7 @@ sls_detector - Python interface for the slsDetectorsPackage
 ==============================================================
 
 sls_detector provide Python bindings to the slsDetectorsPackage using mainly the 
-multiSlsDetector API. This module contains two parts, a compiled C module to
+DetectorImpl API. This module contains two parts, a compiled C module to
 expose the API and a Python class to offer a more Pythonic interface.
 
 

python/src/detector.cpp

@@ -1,3 +1,6 @@
+/* WARINING This file is auto generated any edits might be overwritten without
+ * warning */
+
 #include <pybind11/chrono.h>
 #include <pybind11/operators.h>
 #include <pybind11/pybind11.h>
@@ -9,55 +12,60 @@
 #include "sls_detector_defs.h"
 #include "typecaster.h"
 namespace py = pybind11;
-void init_experimental(py::module &m) {
+void init_det(py::module &m) {
     using sls::Detector;
     using sls::Positions;
-    using defs = slsDetectorDefs;
 
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi
         .def(py::init<int>())
 
-        // Configuration
+        .def("freeSharedMemory", &Detector::freeSharedMemory)
-        .def("freeSharedMemory", (void (Detector::*)()) &Detector::freeSharedMemory)
+        .def("loadConfig", &Detector::loadConfig, py::arg())
-        .def("loadConfig", &Detector::loadConfig)
+        .def("loadParameters", &Detector::loadParameters, py::arg())
-        .def("loadParameters", &Detector::loadParameters)
-        .def("setHostname", &Detector::setHostname)
         .def("getHostname", &Detector::getHostname, py::arg() = Positions{})
+        .def("setHostname", &Detector::setHostname, py::arg())
+        .def("setVirtualDetectorServers", &Detector::setVirtualDetectorServers,
+             py::arg(), py::arg())
         .def("getShmId", &Detector::getShmId)
+        .def("getPackageVersion", &Detector::getPackageVersion)
+        .def("getClientVersion", &Detector::getClientVersion)
         .def("getFirmwareVersion", &Detector::getFirmwareVersion,
              py::arg() = Positions{})
         .def("getDetectorServerVersion", &Detector::getDetectorServerVersion,
              py::arg() = Positions{})
         .def("getSerialNumber", &Detector::getSerialNumber,
              py::arg() = Positions{})
-        .def("getClientVersion", &Detector::getClientVersion)
         .def("getReceiverVersion", &Detector::getReceiverVersion,
              py::arg() = Positions{})
         .def("getDetectorType", &Detector::getDetectorType,
              py::arg() = Positions{})
         .def("size", &Detector::size)
+        .def("empty", &Detector::empty)
         .def("getModuleGeometry", &Detector::getModuleGeometry)
         .def("getModuleSize", &Detector::getModuleSize, py::arg() = Positions{})
         .def("getDetectorSize", &Detector::getDetectorSize)
-        .def("setDetectorSize", &Detector::setDetectorSize)
+        .def("setDetectorSize", &Detector::setDetectorSize, py::arg())
         .def("getSettings", &Detector::getSettings, py::arg() = Positions{})
         .def("setSettings", &Detector::setSettings, py::arg(),
              py::arg() = Positions{})
-
+        .def("registerAcquisitionFinishedCallback",
-        // TODO! Python funcs for callbacks?
+             &Detector::registerAcquisitionFinishedCallback, py::arg(),
-
+             py::arg())
-        // Acquisition Parameters
+        .def("registerDataCallback", &Detector::registerDataCallback, py::arg(),
-        .def("getNumberOfFrames", &Detector::getNumberOfFrames)
+             py::arg())
-        .def("setNumberOfFrames", &Detector::setNumberOfFrames)
+        .def("getNumberOfFrames", &Detector::getNumberOfFrames,
-        .def("getNumberOfTriggers", &Detector::getNumberOfTriggers)
+             py::arg() = Positions{})
-        .def("setNumberOfTriggers", &Detector::setNumberOfTriggers)
+        .def("setNumberOfFrames", &Detector::setNumberOfFrames, py::arg())
+        .def("getNumberOfTriggers", &Detector::getNumberOfTriggers,
+             py::arg() = Positions{})
+        .def("setNumberOfTriggers", &Detector::setNumberOfTriggers, py::arg())
+        .def("getExptime", &Detector::getExptime, py::arg() = Positions{})
         .def("setExptime", &Detector::setExptime, py::arg(),
              py::arg() = Positions{})
-        .def("getExptime", &Detector::getExptime, py::arg() = Positions{})
+        .def("getPeriod", &Detector::getPeriod, py::arg() = Positions{})
         .def("setPeriod", &Detector::setPeriod, py::arg(),
              py::arg() = Positions{})
-        .def("getPeriod", &Detector::getPeriod, py::arg() = Positions{})
         .def("getDelayAfterTrigger", &Detector::getDelayAfterTrigger,
              py::arg() = Positions{})
         .def("setDelayAfterTrigger", &Detector::setDelayAfterTrigger, py::arg(),
@@ -66,198 +74,129 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("getNumberOfTriggersLeft", &Detector::getNumberOfTriggersLeft,
              py::arg() = Positions{})
+        .def("getPeriodLeft", &Detector::getPeriodLeft, py::arg() = Positions{})
         .def("getDelayAfterTriggerLeft", &Detector::getDelayAfterTriggerLeft,
              py::arg() = Positions{})
+        .def("getTimingMode", &Detector::getTimingMode, py::arg() = Positions{})
+        .def("setTimingMode", &Detector::setTimingMode, py::arg(),
+             py::arg() = Positions{})
         .def("getSpeed", &Detector::getSpeed, py::arg() = Positions{})
         .def("setSpeed", &Detector::setSpeed, py::arg(),
              py::arg() = Positions{})
         .def("getADCPhase", &Detector::getADCPhase, py::arg() = Positions{})
-
         .def("setADCPhase", &Detector::setADCPhase, py::arg(),
              py::arg() = Positions{})
+        .def("getMaxADCPhaseShift", &Detector::getMaxADCPhaseShift,
+             py::arg() = Positions{})
         .def("getADCPhaseInDegrees", &Detector::getADCPhaseInDegrees,
              py::arg() = Positions{})
         .def("setADCPhaseInDegrees", &Detector::setADCPhaseInDegrees, py::arg(),
              py::arg() = Positions{})
+        .def("getClockFrequency", &Detector::getClockFrequency, py::arg(),
+             py::arg() = Positions{})
+        .def("setClockFrequency", &Detector::setClockFrequency, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getClockPhase", &Detector::getClockPhase, py::arg(),
+             py::arg() = Positions{})
+        .def("setClockPhase", &Detector::setClockPhase, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("getMaxClockPhaseShift", &Detector::getMaxClockPhaseShift,
+             py::arg(), py::arg() = Positions{})
+        .def("getClockPhaseinDegrees", &Detector::getClockPhaseinDegrees,
+             py::arg(), py::arg() = Positions{})
+        .def("setClockPhaseinDegrees", &Detector::setClockPhaseinDegrees,
+             py::arg(), py::arg(), py::arg() = Positions{})
+        .def("getClockDivider", &Detector::getClockDivider, py::arg(),
+             py::arg() = Positions{})
+        .def("setClockDivider", &Detector::setClockDivider, py::arg(),
+             py::arg(), py::arg() = Positions{})
         .def("getHighVoltage", &Detector::getHighVoltage,
              py::arg() = Positions{})
+        .def("getPowerChip", &Detector::getPowerChip, py::arg() = Positions{})
+        .def("setPowerChip", &Detector::setPowerChip, py::arg(),
+             py::arg() = Positions{})
         .def("setHighVoltage", &Detector::setHighVoltage, py::arg(),
              py::arg() = Positions{})
-
         .def("getTemperature", &Detector::getTemperature, py::arg(),
              py::arg() = Positions{})
-
+        .def("getDAC", &Detector::getDAC, py::arg(), py::arg(),
-        .def("getDAC", &Detector::getDAC, py::arg(), py::arg() = false,
              py::arg() = Positions{})
         .def("setDAC", &Detector::setDAC, py::arg(), py::arg(), py::arg(),
              py::arg() = Positions{})
-
+        .def("getOnChipDAC", &Detector::getOnChipDAC, py::arg(), py::arg(),
-        .def("getTimingMode", &Detector::getTimingMode, py::arg() = Positions{})
-
-        .def("setTimingMode", &Detector::setTimingMode, py::arg(),
              py::arg() = Positions{})
-
+        .def("setOnChipDAC", &Detector::setOnChipDAC, py::arg(), py::arg(),
-        // ACQUISITION
+             py::arg(), py::arg() = Positions{})
         .def("acquire", &Detector::acquire)
-        .def("startDetector", &Detector::startDetector)
+        .def("clearAcquiringFlag", &Detector::clearAcquiringFlag)
-        .def("stopDetector", &Detector::stopDetector)
         .def("startReceiver", &Detector::startReceiver)
         .def("stopReceiver", &Detector::stopReceiver)
-        .def("clearAcquiringFlag", &Detector::clearAcquiringFlag)
+        .def("startDetector", &Detector::startDetector)
+        .def("stopDetector", &Detector::stopDetector)
         .def("getDetectorStatus", &Detector::getDetectorStatus,
              py::arg() = Positions{})
         .def("getReceiverStatus", &Detector::getReceiverStatus,
              py::arg() = Positions{})
-
         .def("getFramesCaught", &Detector::getFramesCaught,
              py::arg() = Positions{})
-
+        .def("getNumMissingPackets", &Detector::getNumMissingPackets,
+             py::arg() = Positions{})
         .def("getStartingFrameNumber", &Detector::getStartingFrameNumber,
              py::arg() = Positions{})
         .def("setStartingFrameNumber", &Detector::setStartingFrameNumber,
              py::arg(), py::arg() = Positions{})
-
         .def("sendSoftwareTrigger", &Detector::sendSoftwareTrigger,
              py::arg() = Positions{})
-
-        // Network Configuration (Detector<->Receiver)
         .def("getNumberofUDPInterfaces", &Detector::getNumberofUDPInterfaces,
              py::arg() = Positions{})
-
         .def("setNumberofUDPInterfaces", &Detector::setNumberofUDPInterfaces,
              py::arg(), py::arg() = Positions{})
         .def("getSelectedUDPInterface", &Detector::getSelectedUDPInterface,
              py::arg() = Positions{})
-
         .def("selectUDPInterface", &Detector::selectUDPInterface, py::arg(),
              py::arg() = Positions{})
-
+        .def("getSourceUDPIP", &Detector::getSourceUDPIP,
-        // Using lambda to allow for conversion from IpAddr
-        .def("getSourceUDPIP",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getSourceUDPIP(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-
+        .def("setSourceUDPIP", &Detector::setSourceUDPIP, py::arg(),
-        .def("setSourceUDPIP",
-             [](Detector &d, std::string ip, Positions pos) {
-                 d.setSourceUDPIP(sls::IpAddr(ip), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-        .def("getSourceUDPIP2",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getSourceUDPIP2(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-        .def("setSourceUDPIP2",
+        .def("getSourceUDPIP2", &Detector::getSourceUDPIP2,
-             [](Detector &d, std::string ip, Positions pos) {
-                 d.setSourceUDPIP2(sls::IpAddr(ip), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-        .def("getSourceUDPMAC",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getSourceUDPMAC(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-        .def("setSourceUDPMAC",
+        .def("setSourceUDPIP2", &Detector::setSourceUDPIP2, py::arg(),
-             [](Detector &d, std::string mac, Positions pos) {
-                 d.setSourceUDPMAC(sls::MacAddr(mac), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-
-        .def("getSourceUDPMAC2",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getSourceUDPMAC2(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-        .def("setSourceUDPMAC2",
+        .def("getSourceUDPMAC", &Detector::getSourceUDPMAC,
-             [](Detector &d, std::string mac, Positions pos) {
-                 d.setSourceUDPMAC2(sls::MacAddr(mac), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-
-        .def("getDestinationUDPIP",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getDestinationUDPIP(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-        .def("setDestinationUDPIP",
+        .def("setSourceUDPMAC", &Detector::setSourceUDPMAC, py::arg(),
-             [](Detector &d, std::string ip, Positions pos) {
-                 d.setDestinationUDPIP(sls::IpAddr(ip), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-
-        .def("getDestinationUDPIP2",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getDestinationUDPIP2(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-        .def("setDestinationUDPIP2",
+        .def("getSourceUDPMAC2", &Detector::getSourceUDPMAC2,
-             [](Detector &d, std::string ip, Positions pos) {
-                 d.setDestinationUDPIP2(sls::IpAddr(ip), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-
-        .def("getDestinationUDPMAC",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getDestinationUDPMAC(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-
+        .def("setSourceUDPMAC2", &Detector::setSourceUDPMAC2, py::arg(),
-        .def("setDestinationUDPMAC",
-             [](Detector &d, std::string mac, Positions pos) {
-                 d.setDestinationUDPMAC(sls::MacAddr(mac), pos);
-             },
-             py::arg(), py::arg() = Positions{})
-
-        .def("getDestinationUDPMAC2",
-             [](const Detector &d, Positions pos) {
-                 std::vector<std::string> res;
-                 for (const auto &s : d.getDestinationUDPMAC2(pos))
-                     res.push_back(s.str());
-                 return res;
-             },
              py::arg() = Positions{})
-
+        .def("getDestinationUDPIP", &Detector::getDestinationUDPIP,
-        .def("setDestinationUDPMAC2",
+             py::arg() = Positions{})
-             [](Detector &d, std::string mac, Positions pos) {
+        .def("setDestinationUDPIP", &Detector::setDestinationUDPIP, py::arg(),
-                 d.setDestinationUDPMAC2(sls::MacAddr(mac), pos);
+             py::arg() = Positions{})
-             },
+        .def("getDestinationUDPIP2", &Detector::getDestinationUDPIP2,
+             py::arg() = Positions{})
+        .def("setDestinationUDPIP2", &Detector::setDestinationUDPIP2, py::arg(),
+             py::arg() = Positions{})
+        .def("getDestinationUDPMAC", &Detector::getDestinationUDPMAC,
+             py::arg() = Positions{})
+        .def("setDestinationUDPMAC", &Detector::setDestinationUDPMAC, py::arg(),
+             py::arg() = Positions{})
+        .def("getDestinationUDPMAC2", &Detector::getDestinationUDPMAC2,
+             py::arg() = Positions{})
+        .def("setDestinationUDPMAC2", &Detector::setDestinationUDPMAC2,
              py::arg(), py::arg() = Positions{})
-
         .def("getDestinationUDPPort", &Detector::getDestinationUDPPort,
              py::arg() = Positions{})
         .def("setDestinationUDPPort", &Detector::setDestinationUDPPort,
-             py::arg(), py::arg() = Positions{})
+             py::arg(), py::arg())
         .def("getDestinationUDPPort2", &Detector::getDestinationUDPPort2,
              py::arg() = Positions{})
         .def("setDestinationUDPPort2", &Detector::setDestinationUDPPort2,
-             py::arg(), py::arg() = Positions{})
+             py::arg(), py::arg())
-
         .def("printRxConfiguration", &Detector::printRxConfiguration,
              py::arg() = Positions{})
-
         .def("getTenGiga", &Detector::getTenGiga, py::arg() = Positions{})
         .def("setTenGiga", &Detector::setTenGiga, py::arg(),
              py::arg() = Positions{})
@@ -269,7 +208,6 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("setTransmissionDelayFrame", &Detector::setTransmissionDelayFrame,
              py::arg(), py::arg() = Positions{})
-
         .def("getTransmissionDelayLeft", &Detector::getTransmissionDelayLeft,
              py::arg() = Positions{})
         .def("setTransmissionDelayLeft", &Detector::setTransmissionDelayLeft,
@@ -278,21 +216,13 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("setTransmissionDelayRight", &Detector::setTransmissionDelayRight,
              py::arg(), py::arg() = Positions{})
-
-        /**************************************************
-         *                                                *
-         *    RECEIVER CONFIG                             *
-         *                                                *
-         * ************************************************/
-
         .def("getUseReceiverFlag", &Detector::getUseReceiverFlag,
              py::arg() = Positions{})
         .def("getRxHostname", &Detector::getRxHostname, py::arg() = Positions{})
         .def("setRxHostname", &Detector::setRxHostname, py::arg(),
              py::arg() = Positions{})
         .def("getRxPort", &Detector::getRxPort, py::arg() = Positions{})
-        .def("setRxPort", &Detector::setRxPort, py::arg(),
+        .def("setRxPort", &Detector::setRxPort, py::arg(), py::arg())
-             py::arg() = Positions{})
         .def("getRxFifoDepth", &Detector::getRxFifoDepth,
              py::arg() = Positions{})
         .def("setRxFifoDepth", &Detector::setRxFifoDepth, py::arg(),
@@ -320,12 +250,6 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("getRxLastClientIP", &Detector::getRxLastClientIP,
              py::arg() = Positions{})
-
-        /**************************************************
-         *                                                *
-         *    FILE                                        *
-         *                                                *
-         * ************************************************/
         .def("getFileFormat", &Detector::getFileFormat, py::arg() = Positions{})
         .def("setFileFormat", &Detector::setFileFormat, py::arg(),
              py::arg() = Positions{})
@@ -336,36 +260,25 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("setFileNamePrefix", &Detector::setFileNamePrefix, py::arg(),
              py::arg() = Positions{})
-        .def("getFilePath", &Detector::getFilePath)
-        .def("setFilePath", &Detector::setFilePath, py::arg(),
-             py::arg() = Positions{})
-
         .def("getAcquisitionIndex", &Detector::getAcquisitionIndex,
              py::arg() = Positions{})
         .def("setAcquisitionIndex", &Detector::setAcquisitionIndex, py::arg(),
              py::arg() = Positions{})
-        .def("setFileWrite", &Detector::setFileWrite, py::arg(),
-             py::arg() = Positions{})
         .def("getFileWrite", &Detector::getFileWrite, py::arg() = Positions{})
-        .def("setFileOverWrite", &Detector::setFileOverWrite, py::arg(),
+        .def("setFileWrite", &Detector::setFileWrite, py::arg(),
-             py::arg() = Positions{})
-        .def("getFileOverWrite", &Detector::getFileOverWrite,
-             py::arg() = Positions{})
-        .def("setMasterFileWrite", &Detector::setMasterFileWrite, py::arg(),
              py::arg() = Positions{})
         .def("getMasterFileWrite", &Detector::getMasterFileWrite,
              py::arg() = Positions{})
-        .def("setFramesPerFile", &Detector::setFramesPerFile, py::arg(),
+        .def("setMasterFileWrite", &Detector::setMasterFileWrite, py::arg(),
+             py::arg() = Positions{})
+        .def("getFileOverWrite", &Detector::getFileOverWrite,
+             py::arg() = Positions{})
+        .def("setFileOverWrite", &Detector::setFileOverWrite, py::arg(),
              py::arg() = Positions{})
         .def("getFramesPerFile", &Detector::getFramesPerFile,
              py::arg() = Positions{})
-
+        .def("setFramesPerFile", &Detector::setFramesPerFile, py::arg(),
-        /**************************************************
+             py::arg() = Positions{})
-         *                                                *
-         *    ZMQ Streaming Parameters (Receiver<->Client)*
-         *                                                *
-         * ************************************************/
-
         .def("getRxZmqDataStream", &Detector::getRxZmqDataStream,
              py::arg() = Positions{})
         .def("setRxZmqDataStream", &Detector::setRxZmqDataStream, py::arg(),
@@ -378,29 +291,21 @@ void init_experimental(py::module &m) {
         .def("setRxZmqTimer", &Detector::setRxZmqTimer, py::arg(),
              py::arg() = Positions{})
         .def("getRxZmqPort", &Detector::getRxZmqPort, py::arg() = Positions{})
-        .def("setRxZmqPort", &Detector::setRxZmqPort, py::arg(),
+        .def("setRxZmqPort", &Detector::setRxZmqPort, py::arg(), py::arg())
-             py::arg() = Positions{})
         .def("getRxZmqIP", &Detector::getRxZmqIP, py::arg() = Positions{})
         .def("setRxZmqIP", &Detector::setRxZmqIP, py::arg(),
              py::arg() = Positions{})
         .def("getClientZmqPort", &Detector::getClientZmqPort,
              py::arg() = Positions{})
         .def("setClientZmqPort", &Detector::setClientZmqPort, py::arg(),
-             py::arg() = -1)
+             py::arg())
         .def("getClientZmqIp", &Detector::getClientZmqIp,
              py::arg() = Positions{})
         .def("setClientZmqIp", &Detector::setClientZmqIp, py::arg(),
              py::arg() = Positions{})
-
-        /**************************************************
-         *                                                *
-         *    Eiger Specific                              *
-         *                                                *
-         * ************************************************/
-
         .def("getDynamicRange", &Detector::getDynamicRange,
              py::arg() = Positions{})
-        .def("setDynamicRange", &Detector::setDynamicRange)
+        .def("setDynamicRange", &Detector::setDynamicRange, py::arg())
         .def("getSubExptime", &Detector::getSubExptime, py::arg() = Positions{})
         .def("setSubExptime", &Detector::setSubExptime, py::arg(),
              py::arg() = Positions{})
@@ -408,12 +313,10 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("setSubDeadTime", &Detector::setSubDeadTime, py::arg(),
              py::arg() = Positions{})
-
         .def("getThresholdEnergy", &Detector::getThresholdEnergy,
              py::arg() = Positions{})
         .def("setThresholdEnergy", &Detector::setThresholdEnergy, py::arg(),
-             py::arg() = defs::STANDARD, py::arg() = true,
+             py::arg(), py::arg(), py::arg() = Positions{})
-             py::arg() = Positions{})
         .def("getSettingsPath", &Detector::getSettingsPath,
              py::arg() = Positions{})
         .def("setSettingsPath", &Detector::setSettingsPath, py::arg(),
@@ -422,7 +325,7 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("getRxAddGapPixels", &Detector::getRxAddGapPixels,
              py::arg() = Positions{})
-        .def("setRxAddGapPixels", &Detector::setRxAddGapPixels)
+        .def("setRxAddGapPixels", &Detector::setRxAddGapPixels, py::arg())
         .def("getParallelMode", &Detector::getParallelMode,
              py::arg() = Positions{})
         .def("setParallelMode", &Detector::setParallelMode, py::arg(),
@@ -448,10 +351,10 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("getRateCorrection", &Detector::getRateCorrection,
              py::arg() = Positions{})
-        .def("setRateCorrection", &Detector::setRateCorrection, py::arg(),
-             py::arg() = Positions{})
         .def("setDefaultRateCorrection", &Detector::setDefaultRateCorrection,
              py::arg() = Positions{})
+        .def("setRateCorrection", &Detector::setRateCorrection, py::arg(),
+             py::arg() = Positions{})
         .def("getPartialReadout", &Detector::getPartialReadout,
              py::arg() = Positions{})
         .def("setPartialReadout", &Detector::setPartialReadout, py::arg(),
@@ -460,7 +363,6 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("setInterruptSubframe", &Detector::setInterruptSubframe, py::arg(),
              py::arg() = Positions{})
-
         .def("getMeasuredPeriod", &Detector::getMeasuredPeriod,
              py::arg() = Positions{})
         .def("getMeasuredSubFramePeriod", &Detector::getMeasuredSubFramePeriod,
@@ -476,7 +378,6 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("setPartialReset", &Detector::setPartialReset, py::arg(),
              py::arg() = Positions{})
-
         .def("pulsePixel", &Detector::pulsePixel, py::arg(), py::arg(),
              py::arg() = Positions{})
         .def("pulsePixelNMove", &Detector::pulsePixelNMove, py::arg(),
@@ -484,13 +385,7 @@ void init_experimental(py::module &m) {
         .def("pulseChip", &Detector::pulseChip, py::arg(),
              py::arg() = Positions{})
         .def("getQuad", &Detector::getQuad, py::arg() = Positions{})
-        .def("setQuad", &Detector::setQuad)
+        .def("setQuad", &Detector::setQuad, py::arg())
-
-        /**************************************************
-         *                                                *
-         *    Jungfrau Specific                           *
-         *                                                *
-         * ************************************************/
         .def("getThresholdTemperature", &Detector::getThresholdTemperature,
              py::arg() = Positions{})
         .def("setThresholdTemperature", &Detector::setThresholdTemperature,
@@ -503,78 +398,68 @@ void init_experimental(py::module &m) {
              py::arg() = Positions{})
         .def("resetTemperatureEvent", &Detector::resetTemperatureEvent,
              py::arg() = Positions{})
-
-        .def("getPowerChip", &Detector::getPowerChip, py::arg() = Positions{})
-        .def("setPowerChip", &Detector::setPowerChip, py::arg(),
-             py::arg() = Positions{})
         .def("getAutoCompDisable", &Detector::getAutoCompDisable,
              py::arg() = Positions{})
         .def("setAutoCompDisable", &Detector::setAutoCompDisable, py::arg(),
              py::arg() = Positions{})
-
         .def("getNumberOfAdditionalStorageCells",
-             &Detector::getNumberOfAdditionalStorageCells)
+             &Detector::getNumberOfAdditionalStorageCells,
+             py::arg() = Positions{})
         .def("setNumberOfAdditionalStorageCells",
-             &Detector::setNumberOfAdditionalStorageCells)
+             &Detector::setNumberOfAdditionalStorageCells, py::arg())
         .def("getStorageCellStart", &Detector::getStorageCellStart,
              py::arg() = Positions{})
         .def("setStoragecellStart", &Detector::setStoragecellStart, py::arg(),
              py::arg() = Positions{})
-
+        .def("getStorageCellDelay", &Detector::getStorageCellDelay,
+             py::arg() = Positions{})
         .def("setStorageCellDelay", &Detector::setStorageCellDelay, py::arg(),
              py::arg() = Positions{})
-
+        .def("getROI", &Detector::getROI, py::arg() = Positions{})
-        // Bits and registers
+        .def("setROI", &Detector::setROI, py::arg(), py::arg())
-        .def("setBit", &Detector::setBit, py::arg(), py::arg(),
+        .def("clearROI", &Detector::clearROI, py::arg() = Positions{})
+        .def("getExptimeLeft", &Detector::getExptimeLeft,
              py::arg() = Positions{})
-        .def("clearBit", &Detector::clearBit, py::arg(), py::arg(),
+        .def("getExternalSignalFlags", &Detector::getExternalSignalFlags,
              py::arg() = Positions{})
-        .def("readRegister", &Detector::readRegister, py::arg(),
+        .def("setExternalSignalFlags", &Detector::setExternalSignalFlags,
-             py::arg() = Positions{})
-
-        .def("writeRegister", &Detector::writeRegister, py::arg(), py::arg(),
-             py::arg() = Positions{})
-
-        .def("getStartingFrameNumber", &Detector::getStartingFrameNumber,
-             py::arg() = Positions{})
-        .def("setStartingFrameNumber", &Detector::setStartingFrameNumber,
              py::arg(), py::arg() = Positions{})
-
+        .def("getImageTestMode", &Detector::getImageTestMode,
-        /**************************************************
-         *                                                *
-         *    Insignificant                               *
-         *                                                *
-         * ************************************************/
-
-        .def("getControlPort", &Detector::getControlPort,
              py::arg() = Positions{})
-        .def("setControlPort", &Detector::setControlPort, py::arg(),
+        .def("setImageTestMode", &Detector::setImageTestMode, py::arg(),
              py::arg() = Positions{})
-        .def("getStopPort", &Detector::getStopPort, py::arg() = Positions{})
+        .def("getNumberOfBursts", &Detector::getNumberOfBursts,
-        .def("setStopPort", &Detector::setStopPort, py::arg(),
              py::arg() = Positions{})
-        .def("getDetectorLock", &Detector::getDetectorLock,
+        .def("setNumberOfBursts", &Detector::setNumberOfBursts, py::arg())
+        .def("getBurstPeriod", &Detector::getBurstPeriod,
              py::arg() = Positions{})
-        .def("setDetectorLock", &Detector::setDetectorLock, py::arg(),
+        .def("setBurstPeriod", &Detector::setBurstPeriod, py::arg(),
              py::arg() = Positions{})
-        .def("getLastClientIP", &Detector::getLastClientIP,
+        .def("getInjectChannel", &Detector::getInjectChannel,
              py::arg() = Positions{})
-        .def("executeCommand", &Detector::executeCommand, py::arg(),
+        .def("setInjectChannel", &Detector::setInjectChannel, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getVetoPhoton", &Detector::getVetoPhoton, py::arg(),
              py::arg() = Positions{})
-        .def("getNumberOfFramesFromStart",
+        .def("setVetoPhoton", &Detector::setVetoPhoton, py::arg(), py::arg(),
-             &Detector::getNumberOfFramesFromStart, py::arg() = Positions{})
+             py::arg(), py::arg(), py::arg() = Positions{})
-        .def("getActualTime", &Detector::getActualTime, py::arg() = Positions{})
+        .def("setVetoReference", &Detector::setVetoReference, py::arg(),
-        .def("getMeasurementTime", &Detector::getMeasurementTime,
+             py::arg(), py::arg() = Positions{})
+        .def("getBurstMode", &Detector::getBurstMode, py::arg() = Positions{})
+        .def("setBurstMode", &Detector::setBurstMode, py::arg(),
              py::arg() = Positions{})
-        .def("getUserDetails", &Detector::getUserDetails)
+        .def("getCurrentSource", &Detector::getCurrentSource,
-        .def("getRxCurrentFrameIndex", &Detector::getRxCurrentFrameIndex,
+             py::arg() = Positions{})
+        .def("setCurrentSource", &Detector::setCurrentSource, py::arg(),
+             py::arg() = Positions{})
+        .def("getTimingSource", &Detector::getTimingSource,
+             py::arg() = Positions{})
+        .def("setTimingSource", &Detector::setTimingSource, py::arg(),
+             py::arg() = Positions{})
+        .def("getCounterMask", &Detector::getCounterMask,
+             py::arg() = Positions{})
+        .def("setCounterMask", &Detector::setCounterMask, py::arg(),
              py::arg() = Positions{})
-
-        /**************************************************
-         *                                                *
-         *    CTB Specific                                *
-         *                                                *
-         * ************************************************/
         .def("getNumberOfAnalogSamples", &Detector::getNumberOfAnalogSamples,
              py::arg() = Positions{})
         .def("setNumberOfAnalogSamples", &Detector::setNumberOfAnalogSamples,
@@ -606,11 +491,163 @@ void init_experimental(py::module &m) {
         .def("setRUNClock", &Detector::setRUNClock, py::arg(),
              py::arg() = Positions{})
         .def("getSYNCClock", &Detector::getSYNCClock, py::arg() = Positions{})
-
+        .def("getADCPipeline", &Detector::getADCPipeline,
-        // Time
-
-        .def("setSubExptime", &Detector::setSubExptime, py::arg(),
              py::arg() = Positions{})
-        .def("getSubExptime", &Detector::getSubExptime,
+        .def("setADCPipeline", &Detector::setADCPipeline, py::arg(),
+             py::arg() = Positions{})
+        .def("getDBITPipeline", &Detector::getDBITPipeline,
+             py::arg() = Positions{})
+        .def("setDBITPipeline", &Detector::setDBITPipeline, py::arg(),
+             py::arg() = Positions{})
+        .def("getVoltage", &Detector::getVoltage, py::arg(),
+             py::arg() = Positions{})
+        .def("setVoltage", &Detector::setVoltage, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("getMeasuredVoltage", &Detector::getMeasuredVoltage, py::arg(),
+             py::arg() = Positions{})
+        .def("getMeasuredCurrent", &Detector::getMeasuredCurrent, py::arg(),
+             py::arg() = Positions{})
+        .def("getSlowADC", &Detector::getSlowADC, py::arg(),
+             py::arg() = Positions{})
+        .def("getADCEnableMask", &Detector::getADCEnableMask,
+             py::arg() = Positions{})
+        .def("setADCEnableMask", &Detector::setADCEnableMask, py::arg(),
+             py::arg() = Positions{})
+        .def("getTenGigaADCEnableMask", &Detector::getTenGigaADCEnableMask,
+             py::arg() = Positions{})
+        .def("setTenGigaADCEnableMask", &Detector::setTenGigaADCEnableMask,
+             py::arg(), py::arg() = Positions{})
+        .def("getADCInvert", &Detector::getADCInvert, py::arg() = Positions{})
+        .def("setADCInvert", &Detector::setADCInvert, py::arg(),
+             py::arg() = Positions{})
+        .def("getExternalSamplingSource", &Detector::getExternalSamplingSource,
+             py::arg() = Positions{})
+        .def("setExternalSamplingSource", &Detector::setExternalSamplingSource,
+             py::arg(), py::arg() = Positions{})
+        .def("getExternalSampling", &Detector::getExternalSampling,
+             py::arg() = Positions{})
+        .def("setExternalSampling", &Detector::setExternalSampling, py::arg(),
+             py::arg() = Positions{})
+        .def("getRxDbitList", &Detector::getRxDbitList, py::arg() = Positions{})
+        .def("setRxDbitList", &Detector::setRxDbitList, py::arg(),
+             py::arg() = Positions{})
+        .def("getRxDbitOffset", &Detector::getRxDbitOffset,
+             py::arg() = Positions{})
+        .def("setRxDbitOffset", &Detector::setRxDbitOffset, py::arg(),
+             py::arg() = Positions{})
+        .def("setDigitalIODelay", &Detector::setDigitalIODelay, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getLEDEnable", &Detector::getLEDEnable, py::arg() = Positions{})
+        .def("setLEDEnable", &Detector::setLEDEnable, py::arg(),
+             py::arg() = Positions{})
+        .def("setPattern", &Detector::setPattern, py::arg(),
+             py::arg() = Positions{})
+        .def("savePattern", &Detector::savePattern, py::arg())
+        .def("getPatternIOControl", &Detector::getPatternIOControl,
+             py::arg() = Positions{})
+        .def("setPatternIOControl", &Detector::setPatternIOControl, py::arg(),
+             py::arg() = Positions{})
+        .def("getPatternClockControl", &Detector::getPatternClockControl,
+             py::arg() = Positions{})
+        .def("setPatternClockControl", &Detector::setPatternClockControl,
+             py::arg(), py::arg() = Positions{})
+        .def("getPatternWord", &Detector::getPatternWord, py::arg(),
+             py::arg() = Positions{})
+        .def("setPatternWord", &Detector::setPatternWord, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("getPatternLoopAddresses", &Detector::getPatternLoopAddresses,
+             py::arg(), py::arg() = Positions{})
+        .def("setPatternLoopAddresses", &Detector::setPatternLoopAddresses,
+             py::arg(), py::arg(), py::arg(), py::arg() = Positions{})
+        .def("getPatternLoopCycles", &Detector::getPatternLoopCycles, py::arg(),
+             py::arg() = Positions{})
+        .def("setPatternLoopCycles", &Detector::setPatternLoopCycles, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getPatternWaitAddr", &Detector::getPatternWaitAddr, py::arg(),
+             py::arg() = Positions{})
+        .def("setPatternWaitAddr", &Detector::setPatternWaitAddr, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getPatternWaitTime", &Detector::getPatternWaitTime, py::arg(),
+             py::arg() = Positions{})
+        .def("setPatternWaitTime", &Detector::setPatternWaitTime, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getPatternMask", &Detector::getPatternMask,
+             py::arg() = Positions{})
+        .def("setPatternMask", &Detector::setPatternMask, py::arg(),
+             py::arg() = Positions{})
+        .def("getPatternBitMask", &Detector::getPatternBitMask,
+             py::arg() = Positions{})
+        .def("setPatternBitMask", &Detector::setPatternBitMask, py::arg(),
+             py::arg() = Positions{})
+        .def("getAdditionalJsonHeader", &Detector::getAdditionalJsonHeader,
+             py::arg() = Positions{})
+        .def("setAdditionalJsonHeader", &Detector::setAdditionalJsonHeader,
+             py::arg(), py::arg() = Positions{})
+        .def("getAdditionalJsonParameter",
+             &Detector::getAdditionalJsonParameter, py::arg(),
+             py::arg() = Positions{})
+        .def("setAdditionalJsonParameter",
+             &Detector::setAdditionalJsonParameter, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("getDetectorMinMaxEnergyThreshold",
+             &Detector::getDetectorMinMaxEnergyThreshold, py::arg(),
+             py::arg() = Positions{})
+        .def("setDetectorMinMaxEnergyThreshold",
+             &Detector::setDetectorMinMaxEnergyThreshold, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("getFrameMode", &Detector::getFrameMode, py::arg() = Positions{})
+        .def("setFrameMode", &Detector::setFrameMode, py::arg(),
+             py::arg() = Positions{})
+        .def("getDetectorMode", &Detector::getDetectorMode,
+             py::arg() = Positions{})
+        .def("setDetectorMode", &Detector::setDetectorMode, py::arg(),
+             py::arg() = Positions{})
+        .def("programFPGA", &Detector::programFPGA, py::arg(),
+             py::arg() = Positions{})
+        .def("resetFPGA", &Detector::resetFPGA, py::arg() = Positions{})
+        .def("copyDetectorServer", &Detector::copyDetectorServer, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("rebootController", &Detector::rebootController,
+             py::arg() = Positions{})
+        .def("updateFirmwareAndServer", &Detector::updateFirmwareAndServer,
+             py::arg(), py::arg(), py::arg(), py::arg() = Positions{})
+        .def("readRegister", &Detector::readRegister, py::arg(),
+             py::arg() = Positions{})
+        .def("writeRegister", &Detector::writeRegister, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("setBit", &Detector::setBit, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("clearBit", &Detector::clearBit, py::arg(), py::arg(),
+             py::arg() = Positions{})
+        .def("executeFirmwareTest", &Detector::executeFirmwareTest,
+             py::arg() = Positions{})
+        .def("executeBusTest", &Detector::executeBusTest,
+             py::arg() = Positions{})
+        .def("writeAdcRegister", &Detector::writeAdcRegister, py::arg(),
+             py::arg(), py::arg() = Positions{})
+        .def("getInitialChecks", &Detector::getInitialChecks)
+        .def("setInitialChecks", &Detector::setInitialChecks, py::arg())
+        .def("getControlPort", &Detector::getControlPort,
+             py::arg() = Positions{})
+        .def("setControlPort", &Detector::setControlPort, py::arg(),
+             py::arg() = Positions{})
+        .def("getStopPort", &Detector::getStopPort, py::arg() = Positions{})
+        .def("setStopPort", &Detector::setStopPort, py::arg(),
+             py::arg() = Positions{})
+        .def("getDetectorLock", &Detector::getDetectorLock,
+             py::arg() = Positions{})
+        .def("setDetectorLock", &Detector::setDetectorLock, py::arg(),
+             py::arg() = Positions{})
+        .def("getLastClientIP", &Detector::getLastClientIP,
+             py::arg() = Positions{})
+        .def("executeCommand", &Detector::executeCommand, py::arg(),
+             py::arg() = Positions{})
+        .def("getNumberOfFramesFromStart",
+             &Detector::getNumberOfFramesFromStart, py::arg() = Positions{})
+        .def("getActualTime", &Detector::getActualTime, py::arg() = Positions{})
+        .def("getMeasurementTime", &Detector::getMeasurementTime,
+             py::arg() = Positions{})
+        .def("getUserDetails", &Detector::getUserDetails)
+        .def("getRxCurrentFrameIndex", &Detector::getRxCurrentFrameIndex,
              py::arg() = Positions{});
 }

python/src/detector_in.cpp

@@ -0,0 +1,21 @@
+#include <pybind11/chrono.h>
+#include <pybind11/operators.h>
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+#include "Detector.h"
+#include "ToString.h"
+#include "network_utils.h"
+#include "sls_detector_defs.h"
+#include "typecaster.h"
+namespace py = pybind11;
+void init_det(py::module &m) {
+    using sls::Detector;
+    using sls::Positions;
+    
+    py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
+    CppDetectorApi
+        .def(py::init<int>())
+
+    [[FUNCTIONS]]
+}

python/src/enums.cpp

@@ -169,7 +169,7 @@ void init_enums(py::module &m) {
         .value("VB_COMP_FE", slsDetectorDefs::dacIndex::VB_COMP_FE)
         .value("VB_COMP_ADC", slsDetectorDefs::dacIndex::VB_COMP_ADC)
         .value("VCOM_CDS", slsDetectorDefs::dacIndex::VCOM_CDS)
-        .value("VREF_RESTORE", slsDetectorDefs::dacIndex::VREF_RESTORE)
+        .value("VREF_RSTORE", slsDetectorDefs::dacIndex::VREF_RSTORE)
         .value("VB_OPA_1ST", slsDetectorDefs::dacIndex::VB_OPA_1ST)
         .value("VREF_COMP_FE", slsDetectorDefs::dacIndex::VREF_COMP_FE)
         .value("VCOM_ADC1", slsDetectorDefs::dacIndex::VCOM_ADC1)
@@ -278,4 +278,17 @@ void init_enums(py::module &m) {
                slsDetectorDefs::detectorModeType::INTERPOLATING)
         .value("ANALOG", slsDetectorDefs::detectorModeType::ANALOG)
         .export_values();
+
+    py::enum_<slsDetectorDefs::burstMode>(Defs, "burstMode")
+        .value("BURST_OFF", slsDetectorDefs::burstMode::BURST_OFF)
+        .value("BURST_INTERNAL", slsDetectorDefs::burstMode::BURST_INTERNAL)
+        .value("BURST_EXTERNAL", slsDetectorDefs::burstMode::BURST_EXTERNAL)
+        .export_values();
+
+    py::enum_<slsDetectorDefs::timingSourceType>(Defs, "timingSourceType")
+        .value("TIMING_INTERNAL",
+               slsDetectorDefs::timingSourceType::TIMING_INTERNAL)
+        .value("TIMING_EXTERNAL",
+               slsDetectorDefs::timingSourceType::TIMING_EXTERNAL)
+        .export_values();
 }

python/src/main.cpp

@@ -17,7 +17,9 @@ using ds = std::chrono::duration<double>;
 namespace py = pybind11;
 void init_enums(py::module &);
 void init_experimental(py::module &);
-PYBIND11_MODULE(_sls_detector, m) {
+void init_det(py::module &);
+void init_network(py::module &);
+PYBIND11_MODULE(_slsdet, m) {
     m.doc() = R"pbdoc(
         C/C++ API
         -----------------------
@@ -29,7 +31,9 @@ PYBIND11_MODULE(_sls_detector, m) {
     )pbdoc";
 
      init_enums(m);
-     init_experimental(m);
+     init_det(m);
+     init_network(m);
+    //  init_experimental(m);
     
 
     py::module io = m.def_submodule("io", "Submodule for io");

python/src/network.cpp

@@ -0,0 +1,39 @@
+/*
+This file contains Python bindings for the IpAddr and MacAddr
+classes. 
+*/
+
+
+#include <pybind11/chrono.h>
+#include <pybind11/operators.h>
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+#include "network_utils.h"
+namespace py = pybind11;
+using sls::IpAddr;
+using sls::MacAddr;
+void init_network(py::module &m) {
+
+    py::class_ <IpAddr> IpAddr(m, "IpAddr");
+    IpAddr.def(py::init())
+    .def(py::init<const std::string&>())
+    .def(py::init<uint32_t>())
+    .def("hex", &IpAddr::hex)
+    .def("uint32", &IpAddr::uint32)
+    .def(py::self == py::self)
+    .def("__repr__", &IpAddr::str)
+    .def("str", &IpAddr::str);
+
+
+    py::class_ <MacAddr> MacAddr(m, "MacAddr");
+    MacAddr.def(py::init())
+    .def(py::init<const std::string&>())
+    .def(py::init<uint64_t>())
+    .def("hex", &MacAddr::hex)
+    .def(py::self == py::self)
+    .def("uint64", &MacAddr::uint64)
+    .def("__repr__", &MacAddr::str)
+    .def("str", &MacAddr::str);
+
+}

python/unit-tests/detector_eiger.py

@@ -16,12 +16,12 @@ def d():
 
 
 def test_acq_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.acq')
+    m = mocker.patch('_slsdet.DetectorApi.acq')
     d.acq()
     m.assert_called_once_with()
 
 def test_busy_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getAcquiringFlag')
+    m = mocker.patch('_slsdet.DetectorApi.getAcquiringFlag')
     m.return_value = False
     assert d.busy == False
 
@@ -31,103 +31,103 @@ def test_assign_to_detector_type(d):
         d.detector_type = 'Eiger'
 
 def test_det_type(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDetectorType')
+    m = mocker.patch('_slsdet.DetectorApi.getDetectorType')
     m.return_value = 'Eiger'
     assert d.detector_type == 'Eiger'
 
 def test_set_dynamic_range_4(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDynamicRange')
+    m = mocker.patch('_slsdet.DetectorApi.setDynamicRange')
     d.dynamic_range = 4
     m.assert_called_with(4)
 
 def test_set_dynamic_range_8(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDynamicRange')
+    m = mocker.patch('_slsdet.DetectorApi.setDynamicRange')
     d.dynamic_range = 8
     m.assert_called_with(8)
 
 
 def test_set_dynamic_range_16(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDynamicRange')
+    m = mocker.patch('_slsdet.DetectorApi.setDynamicRange')
     d.dynamic_range = 16
     m.assert_called_with(16)
 
 def test_set_dynamic_range_32(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDynamicRange')
+    m = mocker.patch('_slsdet.DetectorApi.setDynamicRange')
     d.dynamic_range = 32
     m.assert_called_with(32)
 
 def test_set_dynamic_range_raises_exception(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setDynamicRange')
+    mocker.patch('_slsdet.DetectorApi.setDynamicRange')
     with pytest.raises(ValueError):
         d.dynamic_range = 17
 
 def test_get_dynamic_range_32(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDynamicRange')
+    m = mocker.patch('_slsdet.DetectorApi.getDynamicRange')
     m.return_value = 32
     dr = d.dynamic_range
     assert dr == 32
 
 def test_eiger_matrix_reset(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getCounterBit')
+    m = mocker.patch('_slsdet.DetectorApi.getCounterBit')
     m.return_value = True
     assert d.eiger_matrix_reset == True
 
 def test_set_eiger_matrix_reset(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setCounterBit')
+    m = mocker.patch('_slsdet.DetectorApi.setCounterBit')
     d.eiger_matrix_reset = True
     m.assert_called_once_with(True)
 
 
 def test_get_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getExposureTime')
+    m = mocker.patch('_slsdet.DetectorApi.getExposureTime')
     m.return_value = 100000000
     assert d.exposure_time == 0.1
 
 def test_set_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setExposureTime')
+    m = mocker.patch('_slsdet.DetectorApi.setExposureTime')
     d.exposure_time = 1.5
     m.assert_called_once_with(1500000000)
 
 def test_set_exposure_time_less_than_zero(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setExposureTime')
+    mocker.patch('_slsdet.DetectorApi.setExposureTime')
     with pytest.raises(ValueError):
         d.exposure_time = -7
 
 
 def test_get_file_index(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getFileIndex')
+    m = mocker.patch('_slsdet.DetectorApi.getFileIndex')
     m.return_value = 8
     assert d.file_index == 8
 
 def test_set_file_index(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFileIndex')
+    m = mocker.patch('_slsdet.DetectorApi.setFileIndex')
     d.file_index = 9
     m.assert_called_with(9)
 
 
 def test_set_file_index_raises_on_neg(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setFileIndex')
+    mocker.patch('_slsdet.DetectorApi.setFileIndex')
     with pytest.raises(ValueError):
         d.file_index = -9
 
 
 def test_get_file_name(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getFileName')
+    m = mocker.patch('_slsdet.DetectorApi.getFileName')
     d.file_name
     m.assert_called_once_with()
 
 def test_set_file_name(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFileName')
+    m = mocker.patch('_slsdet.DetectorApi.setFileName')
     d.file_name = 'hej'
     m.assert_called_once_with('hej')
 
 def test_get_file_path(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getFilePath')
+    m = mocker.patch('_slsdet.DetectorApi.getFilePath')
     d.file_path
     m.assert_called_once_with()
 
 def test_set_file_path_when_path_exists(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFilePath')
+    m = mocker.patch('_slsdet.DetectorApi.setFilePath')
     #To avoid raising an exception because path is not there
     mock_os = mocker.patch('os.path.exists')
     mock_os.return_value = True
@@ -135,25 +135,25 @@ def test_set_file_path_when_path_exists(d, mocker):
     m.assert_called_once_with('/path/to/something/')
 
 def test_set_file_path_raises_when_not_exists(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setFilePath')
+    mocker.patch('_slsdet.DetectorApi.setFilePath')
     mock_os = mocker.patch('os.path.exists')
     mock_os.return_value = False
     with pytest.raises(FileNotFoundError):
         d.file_path = '/path/to/something/'
 
 def test_get_file_write(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getFileWrite')
+    m = mocker.patch('_slsdet.DetectorApi.getFileWrite')
     m.return_value = False
     assert d.file_write == False
 
 def test_set_file_write(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFileWrite')
+    m = mocker.patch('_slsdet.DetectorApi.setFileWrite')
     d.file_write = True
     m.assert_called_once_with(True)
 
 
 def test_get_firmware_version(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getFirmwareVersion')
+    m = mocker.patch('_slsdet.DetectorApi.getFirmwareVersion')
     m.return_value = 20
     assert d.firmware_version == 20
 
@@ -162,38 +162,38 @@ def test_cannot_set_fw_version(d):
         d.firmware_version = 20
 
 def test_get_high_voltage_call_signature(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDac')
+    m = mocker.patch('_slsdet.DetectorApi.getDac')
     d.high_voltage
     m.assert_called_once_with('vhighvoltage', -1)
 
 def test_get_high_voltage(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDac')
+    m = mocker.patch('_slsdet.DetectorApi.getDac')
     m.return_value = 80
     assert d.high_voltage == 80
 
 #self._api.setDac('vhighvoltage', -1, voltage)
 def test_set_high_voltage(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDac')
+    m = mocker.patch('_slsdet.DetectorApi.setDac')
     d.high_voltage = 80
     m.assert_called_once_with('vhighvoltage', -1, 80)
 
 def test_decode_hostname_two_names(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getHostname')
+    m = mocker.patch('_slsdet.DetectorApi.getHostname')
     m.return_value = 'beb059+beb048+'
     assert d.hostname == ['beb059', 'beb048']
 
 def test_decode_hostname_four_names(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getHostname')
+    m = mocker.patch('_slsdet.DetectorApi.getHostname')
     m.return_value = 'beb059+beb048+beb120+beb153+'
     assert d.hostname == ['beb059', 'beb048', 'beb120', 'beb153']
 
 def test_decode_hostname_blank(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getHostname')
+    m = mocker.patch('_slsdet.DetectorApi.getHostname')
     m.return_value = ''
     assert d.hostname == []
 
 def test_get_image_size_gives_correct_size(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getImageSize')
+    m = mocker.patch('_slsdet.DetectorApi.getImageSize')
     m.return_value = (512,1024)
     im_size = d.image_size
     assert im_size.rows == 512
@@ -202,7 +202,7 @@ def test_get_image_size_gives_correct_size(d, mocker):
 
 
 def test_load_config(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.readConfigurationFile')
+    m = mocker.patch('_slsdet.DetectorApi.readConfigurationFile')
     #To avoid raising an exception because path is not there
     mock_os = mocker.patch('os.path.isfile')
     mock_os.return_value = True
@@ -210,14 +210,14 @@ def test_load_config(d, mocker):
     m.assert_called_once_with('/path/to/my/file.config')
 
 def test_load_config_raises_when_file_is_not_found(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.readConfigurationFile')
+    mocker.patch('_slsdet.DetectorApi.readConfigurationFile')
     mock_os = mocker.patch('os.path.isfile')
     mock_os.return_value = False
     with pytest.raises(FileNotFoundError):
         d.load_config('/path/to/my/file.config')
 
 def test_load_parameters(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.readParametersFile')
+    m = mocker.patch('_slsdet.DetectorApi.readParametersFile')
     #To avoid raising an exception because path is not there
     mock_os = mocker.patch('os.path.isfile')
     mock_os.return_value = True
@@ -225,7 +225,7 @@ def test_load_parameters(d, mocker):
     m.assert_called_once_with('/path/to/my/file.par')
 
 def test_load_parameters_raises_when_file_is_not_found(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.readParametersFile')
+    mocker.patch('_slsdet.DetectorApi.readParametersFile')
     mock_os = mocker.patch('os.path.isfile')
     mock_os.return_value = False
     with pytest.raises(FileNotFoundError):
@@ -233,14 +233,14 @@ def test_load_parameters_raises_when_file_is_not_found(d, mocker):
 
 #getDetectorGeometry
 def test_get_module_geometry_gives_correct_size(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDetectorGeometry')
+    m = mocker.patch('_slsdet.DetectorApi.getDetectorGeometry')
     m.return_value = (13,7)
     g = d.module_geometry
     assert g.vertical == 7
     assert g.horizontal == 13
 
 def test_get_module_geometry_access(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDetectorGeometry')
+    m = mocker.patch('_slsdet.DetectorApi.getDetectorGeometry')
     m.return_value = (12,3)
     assert d.module_geometry[0] == 12
     assert d.module_geometry[1] == 3
@@ -248,237 +248,237 @@ def test_get_module_geometry_access(d, mocker):
     assert d.module_geometry.horizontal == 12
 
 def test_get_n_frames(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNumberOfFrames')
+    m = mocker.patch('_slsdet.DetectorApi.getNumberOfFrames')
     m.return_value = 3
     assert d.n_frames == 3
 
 def test_set_n_frames(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setNumberOfFrames')
+    m = mocker.patch('_slsdet.DetectorApi.setNumberOfFrames')
     d.n_frames = 9
     m.assert_called_once_with(9)
 
 def test_set_n_frames_raises_on_neg(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setNumberOfFrames')
+    mocker.patch('_slsdet.DetectorApi.setNumberOfFrames')
     with pytest.raises(ValueError):
         d.n_frames = -1
 
 def test_set_n_frames_raises_on_zero(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setNumberOfFrames')
+    mocker.patch('_slsdet.DetectorApi.setNumberOfFrames')
     with pytest.raises(ValueError):
         d.n_frames = 0
 
 def test_get_n_modules(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNumberOfDetectors')
+    m = mocker.patch('_slsdet.DetectorApi.getNumberOfDetectors')
     m.return_value = 12
     assert d.n_modules == 12
 
 def test_get_period_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getPeriod')
+    m = mocker.patch('_slsdet.DetectorApi.getPeriod')
     m.return_value = 130000000
     assert d.period == 0.13
 
 def test_set_period_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setPeriod')
+    m = mocker.patch('_slsdet.DetectorApi.setPeriod')
     d.period = 1.953
     m.assert_called_once_with(1953000000)
 
 def test_set_period_time_less_than_zero(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setPeriod')
+    mocker.patch('_slsdet.DetectorApi.setPeriod')
     with pytest.raises(ValueError):
         d.period = -7
 
 def test_pulse_chip_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.pulseChip')
+    m = mocker.patch('_slsdet.DetectorApi.pulseChip')
     d.pulse_chip(15)
     m.assert_called_once_with(15)
 
 def test_pulse_chip_call_minus_one(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.pulseChip')
+    m = mocker.patch('_slsdet.DetectorApi.pulseChip')
     d.pulse_chip(-1)
     m.assert_called_once_with(-1)
 
 def test_pulse_chip_asserts_on_smaller_than_minus_one(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.pulseChip')
+    mocker.patch('_slsdet.DetectorApi.pulseChip')
     with pytest.raises(ValueError):
         d.pulse_chip(-3)
 #--------------------------------------------------------------------subexptime
 def test_get_sub_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getSubExposureTime')
+    m = mocker.patch('_slsdet.DetectorApi.getSubExposureTime')
     m.return_value = 2370000
     assert d.sub_exposure_time == 0.00237
 
 
 def test_set_sub_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setSubExposureTime')
+    m = mocker.patch('_slsdet.DetectorApi.setSubExposureTime')
     d.sub_exposure_time = 0.002
     m.assert_called_once_with(2000000)
 
 def test_set_sub_exposure_time_raises_on_zero(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setSubExposureTime')
+    mocker.patch('_slsdet.DetectorApi.setSubExposureTime')
     with pytest.raises(ValueError):
         d.sub_exposure_time = 0
 
 #-------------------------------------------------------------Rate correction
 def test_get_rate_correction(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getRateCorrection')
+    m = mocker.patch('_slsdet.DetectorApi.getRateCorrection')
     m.return_value = [132,129]
     assert d.rate_correction == [132,129]
 
 def test_set_rate_correction(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setRateCorrection')
+    m = mocker.patch('_slsdet.DetectorApi.setRateCorrection')
-    mock_n = mocker.patch('_sls_detector.DetectorApi.getNumberOfDetectors')
+    mock_n = mocker.patch('_slsdet.DetectorApi.getNumberOfDetectors')
     mock_n.return_value = 3
     d.rate_correction = [123,90,50]
     m.assert_called_once_with([123,90,50])
 
 def test_set_rate_correction_raises_on_wrong_number_of_values(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setRateCorrection')
+    mocker.patch('_slsdet.DetectorApi.setRateCorrection')
-    mock_n = mocker.patch('_sls_detector.DetectorApi.getNumberOfDetectors')
+    mock_n = mocker.patch('_slsdet.DetectorApi.getNumberOfDetectors')
     mock_n.return_value = 4
     with pytest.raises(ValueError):
         d.rate_correction = [123,90,50]
 
 #----------------------------------------------------------------Readout clock
 def test_get_readout_clock_0(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
     m.return_value = 0
     assert d.readout_clock == 'Full Speed'
 
 def test_get_readout_clock_1(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
     m.return_value = 1
     assert d.readout_clock == 'Half Speed'
 
 def test_get_readout_clock_2(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
     m.return_value = 2
     assert d.readout_clock == 'Quarter Speed'
 
 def test_get_readout_clock_3(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
     m.return_value = 3
     assert d.readout_clock == 'Super Slow Speed'
 
 def test_set_readout_clock_0(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
     d.readout_clock = 'Full Speed'
     m.assert_called_once_with(0)
 
 def test_set_readout_clock_1(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
     d.readout_clock = 'Half Speed'
     m.assert_called_once_with(1)
 
 def test_set_readout_clock_2(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
     d.readout_clock = 'Quarter Speed'
     m.assert_called_once_with(2)
 
 def test_set_readout_clock_3(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+    m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
     d.readout_clock = 'Super Slow Speed'
     m.assert_called_once_with(3)
 
 #----------------------------------------------------------------rx_datastream
 def test_get_rx_datastream(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getRxDataStreamStatus')
+    m = mocker.patch('_slsdet.DetectorApi.getRxDataStreamStatus')
     m.return_value = False
     assert d.rx_datastream == False
 
 def test_set_rx_datastream(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setRxDataStreamStatus')
+    m = mocker.patch('_slsdet.DetectorApi.setRxDataStreamStatus')
     d.rx_datastream = True
     m.assert_called_once_with(True)
 
 def test_get_rx_zmqip(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+    m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
     d.rx_zmqip
     m.assert_called_once_with('rx_zmqip')
 
 def test_get_rx_zmqport_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+    m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
     d.rx_zmqport
     m.assert_called_once_with('rx_zmqport')
 
 def test_get_rx_zmqport_decode(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+    m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
     m.return_value = '30001+30003+'
     assert d.rx_zmqport == [30001, 30002, 30003, 30004]
 
 def test_get_rx_zmqport_empty(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+    m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
     m.return_value = ''
     assert d.rx_zmqport == []
 
 
 #--------------------------------------------------------------------status
 def test_status_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getRunStatus')
+    m = mocker.patch('_slsdet.DetectorApi.getRunStatus')
     d.status
     m.assert_called_once_with()
 
 def test_start_acq_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.startAcquisition')
+    m = mocker.patch('_slsdet.DetectorApi.startAcquisition')
     d.start_acq()
     m.assert_called_once_with()
 
 def test_stop_acq_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.stopAcquisition')
+    m = mocker.patch('_slsdet.DetectorApi.stopAcquisition')
     d.stop_acq()
     m.assert_called_once_with()
 
 #--------------------------------------------------------------------subexptime
 def test_get_sub_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getSubExposureTime')
+    m = mocker.patch('_slsdet.DetectorApi.getSubExposureTime')
     m.return_value = 2370000
     assert d.sub_exposure_time == 0.00237
 
 
 def test_set_sub_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setSubExposureTime')
+    m = mocker.patch('_slsdet.DetectorApi.setSubExposureTime')
     d.sub_exposure_time = 0.002
     m.assert_called_once_with(2000000)
 
 def test_set_sub_exposure_time_raises_on_zero(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setSubExposureTime')
+    mocker.patch('_slsdet.DetectorApi.setSubExposureTime')
     with pytest.raises(ValueError):
         d.sub_exposure_time = 0
 
 #------------------------------------------------------------------timing mode
 def test_get_timing_mode(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getTimingMode')
+    m = mocker.patch('_slsdet.DetectorApi.getTimingMode')
     d.timing_mode
     m.assert_called_once_with()
 
 def test_set_timing_mode(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setTimingMode')
+    m = mocker.patch('_slsdet.DetectorApi.setTimingMode')
     d.timing_mode = 'auto'
     m.assert_called_once_with('auto')
 
 #----------------------------------------------------------------vthreshold
 def test_get_vthreshold(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDac')
+    m = mocker.patch('_slsdet.DetectorApi.getDac')
     d.vthreshold
     m.assert_called_once_with('vthreshold', -1)
 
 def test_set_vthreshold(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDac')
+    m = mocker.patch('_slsdet.DetectorApi.setDac')
     d.vthreshold = 1675
     m.assert_called_once_with('vthreshold', -1, 1675)
 
 #----------------------------------------------------------------trimbits
 def test_get_trimbits(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getAllTrimbits')
+    m = mocker.patch('_slsdet.DetectorApi.getAllTrimbits')
     d.trimbits
     m.assert_called_once_with()
 
 def test_set_trimbits(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setAllTrimbits')
+    m = mocker.patch('_slsdet.DetectorApi.setAllTrimbits')
     d.trimbits = 15
     m.assert_called_once_with(15)
 
 def test_set_trimbits_raises_outside_range(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setAllTrimbits')
+    mocker.patch('_slsdet.DetectorApi.setAllTrimbits')
 
     with pytest.raises(ValueError):
         d.trimbits = 69

python/unit-tests/detector_test.py

@@ -1,8 +1,13 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
-Testing parameters and methods of the Detector class using mocks
+Testing the Detector python class by mocking calls. 
+Should only be used when there is functionality in 
+the detector.py file. 
+
+An example is converting a mask to a list of set bits.
 """
+
 from unittest.mock import Mock
 import pytest
 from pytest_mock import mocker
@@ -10,462 +15,474 @@ from pytest_mock import mocker
 import sys
 sys.path.append('/home/l_frojdh/slsdetectorgrup/sls_detector')
 
-import _sls_detector
+import _slsdet
 from sls_detector.errors import DetectorValueError, DetectorError
 from sls_detector.utils import all_equal, element_if_equal
+
 @pytest.fixture
 def d():
     from sls_detector import Detector
     return Detector()
 
+def test_length(d, mocker):
+    m = mocker.patch('sls_detector.Detector.size')
+    m.return_value = 5
+    assert(len(d) == 5)
 
-def test_length_zero(d):
+def test_counters_single(d, mocker):
-    assert len(d) == 0
+    m = mocker.patch('sls_detector.Detector.getCounterMask')
+    m.return_value = [7]
+    assert(d.counters == [0,1,2])
 
-def test_acq_call(d, mocker):
+def test_counters_multi(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.acq')
+    m = mocker.patch('sls_detector.Detector.getCounterMask')
-    d.acq()
+    m.return_value = [7, 9]
-    m.assert_called_once_with()
+    assert(d.counters == [[0,1,2],[0,3]])
-
+
-
+def test_set_counters_single(d, mocker):
-
+    m = mocker.patch('sls_detector.Detector.setCounterMask')
-def test_busy_call(d, mocker):
+    d.counters = [0,2]
-    m = mocker.patch('_sls_detector.DetectorApi.getAcquiringFlag')
+    m.assert_called_once_with(5)
-    m.return_value = False
+
-    assert d.busy == False
+
-
+
-def test_set_busy(d):
+# def test_busy_call(d, mocker):
-    d.busy = True
+#     m = mocker.patch('_slsdet.DetectorApi.getAcquiringFlag')
-    assert d.busy == True
+#     m.return_value = False
-    assert d._api.getAcquiringFlag() == True
+#     assert d.busy == False
-    d.busy = False
+
-    assert d.busy == False
+# def test_set_busy(d):
-    assert d._api.getAcquiringFlag() == False
+#     d.busy = True
-
+#     assert d.busy == True
-def test_error_mask(d):
+#     assert d._api.getAcquiringFlag() == True
-    d._api.setErrorMask(1)
+#     d.busy = False
-    assert d.error_mask == 1
+#     assert d.busy == False
-    d.clear_errors()
+#     assert d._api.getAcquiringFlag() == False
-
+
-def test_error_handling(d):
+# def test_error_mask(d):
-    with pytest.raises(DetectorError):
+#     d._api.setErrorMask(1)
-        d._provoke_error()
+#     assert d.error_mask == 1
-
+#     d.clear_errors()
-def test_assign_to_detector_type(d):
+
-    with pytest.raises(AttributeError):
+# def test_error_handling(d):
-        d.detector_type = 'Eiger'
+#     with pytest.raises(DetectorError):
-
+#         d._provoke_error()
-def test_det_type(d, mocker):
+
-    m = mocker.patch('_sls_detector.DetectorApi.getDetectorType')
+# def test_assign_to_detector_type(d):
-    m.return_value = 'Eiger'
+#     with pytest.raises(AttributeError):
-    assert d.detector_type == 'Eiger'
+#         d.detector_type = 'Eiger'
-
+
-
+# def test_det_type(d, mocker):
-def test_get_exposure_time(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.getDetectorType')
-    m = mocker.patch('_sls_detector.DetectorApi.getExposureTime')
+#     m.return_value = 'Eiger'
-    m.return_value = 100000000
+#     assert d.detector_type == 'Eiger'
-    assert d.exposure_time == 0.1
+
-
+
-def test_set_exposure_time(d, mocker):
+# def test_get_exposure_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setExposureTime')
+#     m = mocker.patch('_slsdet.DetectorApi.getExposureTime')
-    d.exposure_time = 1.5
+#     m.return_value = 100000000
-    m.assert_called_once_with(1500000000)
+#     assert d.exposure_time == 0.1
-
+
-def test_set_exposure_time_less_than_zero(d, mocker):
+# def test_set_exposure_time(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setExposureTime')
+#     m = mocker.patch('_slsdet.DetectorApi.setExposureTime')
-    with pytest.raises(DetectorValueError):
+#     d.exposure_time = 1.5
-        d.exposure_time = -7
+#     m.assert_called_once_with(1500000000)
-
+
-
+# def test_set_exposure_time_less_than_zero(d, mocker):
-def test_get_file_index(d, mocker):
+#     mocker.patch('_slsdet.DetectorApi.setExposureTime')
-    m = mocker.patch('_sls_detector.DetectorApi.getFileIndex')
+#     with pytest.raises(DetectorValueError):
-    m.return_value = 8
+#         d.exposure_time = -7
-    assert d.file_index == 8
+
-
+
-def test_set_file_index(d, mocker):
+# def test_get_file_index(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFileIndex')
+#     m = mocker.patch('_slsdet.DetectorApi.getFileIndex')
-    d.file_index = 9
+#     m.return_value = 8
-    m.assert_called_with(9)
+#     assert d.file_index == 8
-
+
-
+# def test_set_file_index(d, mocker):
-def file_index_with_no_detector(d):
+#     m = mocker.patch('_slsdet.DetectorApi.setFileIndex')
-    assert d.file_index == -100
+#     d.file_index = 9
-
+#     m.assert_called_with(9)
-def dr_with_no_detector(d):
+
-    assert d.dynamic_range == -100
+
-
+# def file_index_with_no_detector(d):
-def test_set_file_index_raises_on_neg(d, mocker):
+#     assert d.file_index == -100
-    mocker.patch('_sls_detector.DetectorApi.setFileIndex')
+
-    with pytest.raises(ValueError):
+# def dr_with_no_detector(d):
-        d.file_index = -9
+#     assert d.dynamic_range == -100
-
+
-
+# def test_set_file_index_raises_on_neg(d, mocker):
-def test_get_file_name(d, mocker):
+#     mocker.patch('_slsdet.DetectorApi.setFileIndex')
-    m = mocker.patch('_sls_detector.DetectorApi.getFileName')
+#     with pytest.raises(ValueError):
-    d.file_name
+#         d.file_index = -9
-    m.assert_called_once_with()
+
-
+
-def test_set_file_name(d, mocker):
+# def test_get_file_name(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFileName')
+#     m = mocker.patch('_slsdet.DetectorApi.getFileName')
-    d.file_name = 'hej'
+#     d.file_name
-    m.assert_called_once_with('hej')
+#     m.assert_called_once_with()
-
+
-def test_get_file_path(d, mocker):
+# def test_set_file_name(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getFilePath')
+#     m = mocker.patch('_slsdet.DetectorApi.setFileName')
-    d.file_path
+#     d.file_name = 'hej'
-    m.assert_called_once_with()
+#     m.assert_called_once_with('hej')
-
+
-def test_set_file_path_when_path_exists(d, mocker):
+# def test_get_file_path(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFilePath')
+#     m = mocker.patch('_slsdet.DetectorApi.getFilePath')
-    #To avoid raising an exception because path is not there
+#     d.file_path
-    mock_os = mocker.patch('os.path.exists')
+#     m.assert_called_once_with()
-    mock_os.return_value = True
+
-    d.file_path = '/path/to/something/'
+# def test_set_file_path_when_path_exists(d, mocker):
-    m.assert_called_once_with('/path/to/something/')
+#     m = mocker.patch('_slsdet.DetectorApi.setFilePath')
-
+#     #To avoid raising an exception because path is not there
-def test_set_file_path_raises_when_not_exists(d, mocker):
+#     mock_os = mocker.patch('os.path.exists')
-    mocker.patch('_sls_detector.DetectorApi.setFilePath')
+#     mock_os.return_value = True
-    mock_os = mocker.patch('os.path.exists')
+#     d.file_path = '/path/to/something/'
-    mock_os.return_value = False
+#     m.assert_called_once_with('/path/to/something/')
-    with pytest.raises(FileNotFoundError):
+
-        d.file_path = '/path/to/something/'
+# def test_set_file_path_raises_when_not_exists(d, mocker):
-
+#     mocker.patch('_slsdet.DetectorApi.setFilePath')
-def test_get_file_write(d, mocker):
+#     mock_os = mocker.patch('os.path.exists')
-    m = mocker.patch('_sls_detector.DetectorApi.getFileWrite')
+#     mock_os.return_value = False
-    m.return_value = False
+#     with pytest.raises(FileNotFoundError):
-    assert d.file_write == False
+#         d.file_path = '/path/to/something/'
-
+
-def test_set_file_write(d, mocker):
+# def test_get_file_write(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setFileWrite')
+#     m = mocker.patch('_slsdet.DetectorApi.getFileWrite')
-    d.file_write = True
+#     m.return_value = False
-    m.assert_called_once_with(True)
+#     assert d.file_write == False
-
+
-
+# def test_set_file_write(d, mocker):
-def test_get_firmware_version(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.setFileWrite')
-    m = mocker.patch('_sls_detector.DetectorApi.getFirmwareVersion')
+#     d.file_write = True
-    m.return_value = 20
+#     m.assert_called_once_with(True)
-    assert d.firmware_version == 20
+
-
+
-def test_cannot_set_fw_version(d):
+# def test_get_firmware_version(d, mocker):
-    with pytest.raises(AttributeError):
+#     m = mocker.patch('_slsdet.DetectorApi.getFirmwareVersion')
-        d.firmware_version = 20
+#     m.return_value = 20
-
+#     assert d.firmware_version == 20
-def test_get_high_voltage_call_signature(d, mocker):
+
-    m = mocker.patch('_sls_detector.DetectorApi.getDac')
+# def test_cannot_set_fw_version(d):
-    d.high_voltage
+#     with pytest.raises(AttributeError):
-    m.assert_called_once_with('vhighvoltage', -1)
+#         d.firmware_version = 20
-
+
-def test_get_high_voltage(d, mocker):
+# def test_get_high_voltage_call_signature(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getDac')
+#     m = mocker.patch('_slsdet.DetectorApi.getDac')
-    m.return_value = 80
+#     d.high_voltage
-    assert d.high_voltage == 80
+#     m.assert_called_once_with('vhighvoltage', -1)
-
+
-#self._api.setDac('vhighvoltage', -1, voltage)
+# def test_get_high_voltage(d, mocker):
-def test_set_high_voltage(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.getDac')
-    m = mocker.patch('_sls_detector.DetectorApi.setDac')
+#     m.return_value = 80
-    d.high_voltage = 80
+#     assert d.high_voltage == 80
-    m.assert_called_once_with('vhighvoltage', -1, 80)
+
-
+# #self._api.setDac('vhighvoltage', -1, voltage)
-def test_decode_hostname_two_names(d, mocker):
+# def test_set_high_voltage(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getHostname')
+#     m = mocker.patch('_slsdet.DetectorApi.setDac')
-    m.return_value = 'beb059+beb048+'
+#     d.high_voltage = 80
-    assert d.hostname == ['beb059', 'beb048']
+#     m.assert_called_once_with('vhighvoltage', -1, 80)
-
+
-def test_decode_hostname_four_names(d, mocker):
+# def test_decode_hostname_two_names(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getHostname')
+#     m = mocker.patch('_slsdet.DetectorApi.getHostname')
-    m.return_value = 'beb059+beb048+beb120+beb153+'
+#     m.return_value = 'beb059+beb048+'
-    assert d.hostname == ['beb059', 'beb048', 'beb120', 'beb153']
+#     assert d.hostname == ['beb059', 'beb048']
-
+
-def test_decode_hostname_blank(d, mocker):
+# def test_decode_hostname_four_names(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getHostname')
+#     m = mocker.patch('_slsdet.DetectorApi.getHostname')
-    m.return_value = ''
+#     m.return_value = 'beb059+beb048+beb120+beb153+'
-    assert d.hostname == []
+#     assert d.hostname == ['beb059', 'beb048', 'beb120', 'beb153']
-
+
-def test_get_image_size_gives_correct_size(d, mocker):
+# def test_decode_hostname_blank(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getImageSize')
+#     m = mocker.patch('_slsdet.DetectorApi.getHostname')
-    m.return_value = (512,1024)
+#     m.return_value = ''
-    im_size = d.image_size
+#     assert d.hostname == []
-    assert im_size.rows == 512
+
-    assert im_size.cols == 1024
+# def test_get_image_size_gives_correct_size(d, mocker):
-
+#     m = mocker.patch('_slsdet.DetectorApi.getImageSize')
-
+#     m.return_value = (512,1024)
-
+#     im_size = d.image_size
-def test_load_config(d, mocker):
+#     assert im_size.rows == 512
-    m = mocker.patch('_sls_detector.DetectorApi.readConfigurationFile')
+#     assert im_size.cols == 1024
-    #To avoid raising an exception because path is not there
+
-    mock_os = mocker.patch('os.path.isfile')
+
-    mock_os.return_value = True
+
-    d.load_config('/path/to/my/file.config')
+# def test_load_config(d, mocker):
-    m.assert_called_once_with('/path/to/my/file.config')
+#     m = mocker.patch('_slsdet.DetectorApi.readConfigurationFile')
-
+#     #To avoid raising an exception because path is not there
-def test_load_config_raises_when_file_is_not_found(d, mocker):
+#     mock_os = mocker.patch('os.path.isfile')
-    mocker.patch('_sls_detector.DetectorApi.readConfigurationFile')
+#     mock_os.return_value = True
-    mock_os = mocker.patch('os.path.isfile')
+#     d.load_config('/path/to/my/file.config')
-    mock_os.return_value = False
+#     m.assert_called_once_with('/path/to/my/file.config')
-    with pytest.raises(FileNotFoundError):
+
-        d.load_config('/path/to/my/file.config')
+# def test_load_config_raises_when_file_is_not_found(d, mocker):
-
+#     mocker.patch('_slsdet.DetectorApi.readConfigurationFile')
-def test_load_parameters(d, mocker):
+#     mock_os = mocker.patch('os.path.isfile')
-    m = mocker.patch('_sls_detector.DetectorApi.readParametersFile')
+#     mock_os.return_value = False
-    #To avoid raising an exception because path is not there
+#     with pytest.raises(FileNotFoundError):
-    mock_os = mocker.patch('os.path.isfile')
+#         d.load_config('/path/to/my/file.config')
-    mock_os.return_value = True
+
-    d.load_parameters('/path/to/my/file.par')
+# def test_load_parameters(d, mocker):
-    m.assert_called_once_with('/path/to/my/file.par')
+#     m = mocker.patch('_slsdet.DetectorApi.readParametersFile')
-
+#     #To avoid raising an exception because path is not there
-def test_load_parameters_raises_when_file_is_not_found(d, mocker):
+#     mock_os = mocker.patch('os.path.isfile')
-    mocker.patch('_sls_detector.DetectorApi.readParametersFile')
+#     mock_os.return_value = True
-    mock_os = mocker.patch('os.path.isfile')
+#     d.load_parameters('/path/to/my/file.par')
-    mock_os.return_value = False
+#     m.assert_called_once_with('/path/to/my/file.par')
-    with pytest.raises(FileNotFoundError):
+
-        d.load_parameters('/path/to/my/file.par')
+# def test_load_parameters_raises_when_file_is_not_found(d, mocker):
-
+#     mocker.patch('_slsdet.DetectorApi.readParametersFile')
-#getDetectorGeometry
+#     mock_os = mocker.patch('os.path.isfile')
-def test_get_module_geometry_gives_correct_size(d, mocker):
+#     mock_os.return_value = False
-    m = mocker.patch('_sls_detector.DetectorApi.getDetectorGeometry')
+#     with pytest.raises(FileNotFoundError):
-    m.return_value = (13,7)
+#         d.load_parameters('/path/to/my/file.par')
-    g = d.module_geometry
+
-    assert g.vertical == 7
+# #getDetectorGeometry
-    assert g.horizontal == 13
+# def test_get_module_geometry_gives_correct_size(d, mocker):
-
+#     m = mocker.patch('_slsdet.DetectorApi.getDetectorGeometry')
-def test_get_module_geometry_access(d, mocker):
+#     m.return_value = (13,7)
-    m = mocker.patch('_sls_detector.DetectorApi.getDetectorGeometry')
+#     g = d.module_geometry
-    m.return_value = (12,3)
+#     assert g.vertical == 7
-    assert d.module_geometry[0] == 12
+#     assert g.horizontal == 13
-    assert d.module_geometry[1] == 3
+
-    assert d.module_geometry.vertical == 3
+# def test_get_module_geometry_access(d, mocker):
-    assert d.module_geometry.horizontal == 12
+#     m = mocker.patch('_slsdet.DetectorApi.getDetectorGeometry')
-
+#     m.return_value = (12,3)
-def test_module_geometry_without_detectors(d):
+#     assert d.module_geometry[0] == 12
-    t = d.module_geometry
+#     assert d.module_geometry[1] == 3
-    assert t.horizontal == 0
+#     assert d.module_geometry.vertical == 3
-    assert t.vertical == 0
+#     assert d.module_geometry.horizontal == 12
-
+
-def test_get_n_frames(d, mocker):
+# def test_module_geometry_without_detectors(d):
-    m = mocker.patch('_sls_detector.DetectorApi.getNumberOfFrames')
+#     t = d.module_geometry
-    m.return_value = 3
+#     assert t.horizontal == 0
-    assert d.n_frames == 3
+#     assert t.vertical == 0
-
+
-def test_set_n_frames(d, mocker):
+# def test_get_n_frames(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setNumberOfFrames')
+#     m = mocker.patch('_slsdet.DetectorApi.getNumberOfFrames')
-    d.n_frames = 9
+#     m.return_value = 3
-    m.assert_called_once_with(9)
+#     assert d.n_frames == 3
-
+
-def test_nframes_without_detector(d):
+# def test_set_n_frames(d, mocker):
-    assert d.n_frames == -100
+#     m = mocker.patch('_slsdet.DetectorApi.setNumberOfFrames')
-
+#     d.n_frames = 9
-def test_set_n_frames_raises_on_neg(d, mocker):
+#     m.assert_called_once_with(9)
-    mocker.patch('_sls_detector.DetectorApi.setNumberOfFrames')
+
-    with pytest.raises(DetectorValueError):
+# def test_nframes_without_detector(d):
-        d.n_frames = -1
+#     assert d.n_frames == -100
-
+
-def test_set_n_frames_raises_on_zero(d, mocker):
+# def test_set_n_frames_raises_on_neg(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setNumberOfFrames')
+#     mocker.patch('_slsdet.DetectorApi.setNumberOfFrames')
-    with pytest.raises(DetectorValueError):
+#     with pytest.raises(DetectorValueError):
-        d.n_frames = 0
+#         d.n_frames = -1
-
+
-def test_n_cycles_without_detector(d):
+# def test_set_n_frames_raises_on_zero(d, mocker):
-    assert d.n_cycles == -100
+#     mocker.patch('_slsdet.DetectorApi.setNumberOfFrames')
-
+#     with pytest.raises(DetectorValueError):
-def test_set_n_cycles_raises_on_zero(d, mocker):
+#         d.n_frames = 0
-    mocker.patch('_sls_detector.DetectorApi.setCycles')
+
-    with pytest.raises(DetectorValueError):
+# def test_n_cycles_without_detector(d):
-        d.n_cycles = 0
+#     assert d.n_cycles == -100
-
+
-def test_set_n_cycles(d, mocker):
+# def test_set_n_cycles_raises_on_zero(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setCycles')
+#     mocker.patch('_slsdet.DetectorApi.setCycles')
-    d.n_cycles = 56
+#     with pytest.raises(DetectorValueError):
-    m.assert_called_once_with(56)
+#         d.n_cycles = 0
-
+
-
+# def test_set_n_cycles(d, mocker):
-
+#     m = mocker.patch('_slsdet.DetectorApi.setCycles')
-def test_n_measurements_without_detector(d):
+#     d.n_cycles = 56
-    assert d.n_measurements == -100
+#     m.assert_called_once_with(56)
-
+
-def test_set_n_measurements_raises_on_zero(d, mocker):
+
-    mocker.patch('_sls_detector.DetectorApi.setNumberOfMeasurements')
+
-    with pytest.raises(DetectorValueError):
+# def test_n_measurements_without_detector(d):
-        d.n_measurements = 0
+#     assert d.n_measurements == -100
-
+
-def test_set_n_measurements(d, mocker):
+# def test_set_n_measurements_raises_on_zero(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setNumberOfMeasurements')
+#     mocker.patch('_slsdet.DetectorApi.setNumberOfMeasurements')
-    d.n_measurements = 560
+#     with pytest.raises(DetectorValueError):
-    m.assert_called_once_with(560)
+#         d.n_measurements = 0
-
+
-def test_get_n_modules_no_detector(d):
+# def test_set_n_measurements(d, mocker):
-    assert d.n_modules == 0
+#     m = mocker.patch('_slsdet.DetectorApi.setNumberOfMeasurements')
-
+#     d.n_measurements = 560
-def test_get_n_modules(d, mocker):
+#     m.assert_called_once_with(560)
-    m = mocker.patch('_sls_detector.DetectorApi.getNumberOfDetectors')
+
-    m.return_value = 12
+# def test_get_n_modules_no_detector(d):
-    assert d.n_modules == 12
+#     assert d.n_modules == 0
-
+
-def test_get_period_time(d, mocker):
+# def test_get_n_modules(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getPeriod')
+#     m = mocker.patch('_slsdet.DetectorApi.getNumberOfDetectors')
-    m.return_value = 130000000
+#     m.return_value = 12
-    assert d.period == 0.13
+#     assert d.n_modules == 12
-
+
-def test_set_period_time(d, mocker):
+# def test_get_period_time(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setPeriod')
+#     m = mocker.patch('_slsdet.DetectorApi.getPeriod')
-    d.period = 1.953
+#     m.return_value = 130000000
-    m.assert_called_once_with(1953000000)
+#     assert d.period == 0.13
-
+
-def test_set_period_time_less_than_zero(d, mocker):
+# def test_set_period_time(d, mocker):
-    mocker.patch('_sls_detector.DetectorApi.setPeriod')
+#     m = mocker.patch('_slsdet.DetectorApi.setPeriod')
-    with pytest.raises(ValueError):
+#     d.period = 1.953
-        d.period = -7
+#     m.assert_called_once_with(1953000000)
-
+
-
+# def test_set_period_time_less_than_zero(d, mocker):
-def test_get_online(d, mocker):
+#     mocker.patch('_slsdet.DetectorApi.setPeriod')
-    m = mocker.patch('_sls_detector.DetectorApi.getOnline')
+#     with pytest.raises(ValueError):
-    d.online
+#         d.period = -7
-    m.assert_called_once_with()
+
-
+
-def test_set_online(d, mocker):
+# def test_get_online(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setOnline')
+#     m = mocker.patch('_slsdet.DetectorApi.getOnline')
-    d.online = True
+#     d.online
-    m.assert_called_once_with(True)
+#     m.assert_called_once_with()
-
+
-def test_last_client_ip_no_detector(d):
+# def test_set_online(d, mocker):
-    assert d.last_client_ip == ''
+#     m = mocker.patch('_slsdet.DetectorApi.setOnline')
-
+#     d.online = True
-def test_last_cliten_ip_call(d, mocker):
+#     m.assert_called_once_with(True)
-    m = mocker.patch('_sls_detector.DetectorApi.getLastClientIP')
+
-    d.last_client_ip
+# def test_last_client_ip_no_detector(d):
-    m.assert_called_once_with()
+#     assert d.last_client_ip == ''
-
+
-#-------------------------------------------------------------Rate correction
+# def test_last_cliten_ip_call(d, mocker):
-def test_get_rate_correction(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.getLastClientIP')
-    m = mocker.patch('_sls_detector.DetectorApi.getRateCorrection')
+#     d.last_client_ip
-    m.return_value = [132,129]
+#     m.assert_called_once_with()
-    assert d.rate_correction == [132,129]
+
-
+# #-------------------------------------------------------------Rate correction
-def test_set_rate_correction(d, mocker):
+# def test_get_rate_correction(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setRateCorrection')
+#     m = mocker.patch('_slsdet.DetectorApi.getRateCorrection')
-    mock_n = mocker.patch('_sls_detector.DetectorApi.getNumberOfDetectors')
+#     m.return_value = [132,129]
-    mock_n.return_value = 3
+#     assert d.rate_correction == [132,129]
-    d.rate_correction = [123,90,50]
+
-    m.assert_called_once_with([123,90,50])
+# def test_set_rate_correction(d, mocker):
-
+#     m = mocker.patch('_slsdet.DetectorApi.setRateCorrection')
-def test_set_rate_correction_raises_on_wrong_number_of_values(d, mocker):
+#     mock_n = mocker.patch('_slsdet.DetectorApi.getNumberOfDetectors')
-    mocker.patch('_sls_detector.DetectorApi.setRateCorrection')
+#     mock_n.return_value = 3
-    mock_n = mocker.patch('_sls_detector.DetectorApi.getNumberOfDetectors')
+#     d.rate_correction = [123,90,50]
-    mock_n.return_value = 4
+#     m.assert_called_once_with([123,90,50])
-    with pytest.raises(ValueError):
+
-        d.rate_correction = [123,90,50]
+# def test_set_rate_correction_raises_on_wrong_number_of_values(d, mocker):
-
+#     mocker.patch('_slsdet.DetectorApi.setRateCorrection')
-#----------------------------------------------------------------Readout clock
+#     mock_n = mocker.patch('_slsdet.DetectorApi.getNumberOfDetectors')
-def test_get_readout_clock_0(d, mocker):
+#     mock_n.return_value = 4
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+#     with pytest.raises(ValueError):
-    m.return_value = 0
+#         d.rate_correction = [123,90,50]
-    assert d.readout_clock == 'Full Speed'
+
-
+# #----------------------------------------------------------------Readout clock
-def test_get_readout_clock_1(d, mocker):
+# def test_get_readout_clock_0(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
-    m.return_value = 1
+#     m.return_value = 0
-    assert d.readout_clock == 'Half Speed'
+#     assert d.readout_clock == 'Full Speed'
-
+
-def test_get_readout_clock_2(d, mocker):
+# def test_get_readout_clock_1(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
-    m.return_value = 2
+#     m.return_value = 1
-    assert d.readout_clock == 'Quarter Speed'
+#     assert d.readout_clock == 'Half Speed'
-
+
-def test_get_readout_clock_3(d, mocker):
+# def test_get_readout_clock_2(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
-    m.return_value = 3
+#     m.return_value = 2
-    assert d.readout_clock == 'Super Slow Speed'
+#     assert d.readout_clock == 'Quarter Speed'
-
+
-def test_set_readout_clock_0(d, mocker):
+# def test_get_readout_clock_3(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.getReadoutClockSpeed')
-    d.readout_clock = 'Full Speed'
+#     m.return_value = 3
-    m.assert_called_once_with(0)
+#     assert d.readout_clock == 'Super Slow Speed'
-
+
-def test_set_readout_clock_1(d, mocker):
+# def test_set_readout_clock_0(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
-    d.readout_clock = 'Half Speed'
+#     d.readout_clock = 'Full Speed'
-    m.assert_called_once_with(1)
+#     m.assert_called_once_with(0)
-
+
-def test_set_readout_clock_2(d, mocker):
+# def test_set_readout_clock_1(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
-    d.readout_clock = 'Quarter Speed'
+#     d.readout_clock = 'Half Speed'
-    m.assert_called_once_with(2)
+#     m.assert_called_once_with(1)
-
+
-def test_set_readout_clock_3(d, mocker):
+# def test_set_readout_clock_2(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setReadoutClockSpeed')
+#     m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
-    d.readout_clock = 'Super Slow Speed'
+#     d.readout_clock = 'Quarter Speed'
-    m.assert_called_once_with(3)
+#     m.assert_called_once_with(2)
-
+
-#----------------------------------------------------------------rx_datastream
+# def test_set_readout_clock_3(d, mocker):
-def test_get_rx_datastream(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.setReadoutClockSpeed')
-    m = mocker.patch('_sls_detector.DetectorApi.getRxDataStreamStatus')
+#     d.readout_clock = 'Super Slow Speed'
-    m.return_value = False
+#     m.assert_called_once_with(3)
-    assert d.rx_datastream == False
+
-
+# #----------------------------------------------------------------rx_datastream
-def test_set_rx_datastream(d, mocker):
+# def test_get_rx_datastream(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setRxDataStreamStatus')
+#     m = mocker.patch('_slsdet.DetectorApi.getRxDataStreamStatus')
-    d.rx_datastream = True
+#     m.return_value = False
-    m.assert_called_once_with(True)
+#     assert d.rx_datastream == False
-
+
-def test_get_rx_zmqip(d, mocker):
+# def test_set_rx_datastream(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+#     m = mocker.patch('_slsdet.DetectorApi.setRxDataStreamStatus')
-    d.rx_zmqip
+#     d.rx_datastream = True
-    m.assert_called_once_with('rx_zmqip')
+#     m.assert_called_once_with(True)
-
+
-def test_get_rx_zmqport_call(d, mocker):
+# def test_get_rx_zmqip(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+#     m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
-    d.rx_zmqport
+#     d.rx_zmqip
-    m.assert_called_once_with('rx_zmqport')
+#     m.assert_called_once_with('rx_zmqip')
-
+
-def test_get_rx_zmqport_decode(d, mocker):
+# def test_get_rx_zmqport_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+#     m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
-    m.return_value = ['30001', '30003']
+#     d.rx_zmqport
-    assert d.rx_zmqport == [30001, 30003]
+#     m.assert_called_once_with('rx_zmqport')
-
+
-def test_get_rx_zmqport_empty(d, mocker):
+# def test_get_rx_zmqport_decode(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.getNetworkParameter')
+#     m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
-    m.return_value = ''
+#     m.return_value = ['30001', '30003']
-    assert d.rx_zmqport == []
+#     assert d.rx_zmqport == [30001, 30003]
-
+
-
+# def test_get_rx_zmqport_empty(d, mocker):
-#--------------------------------------------------------------------status
+#     m = mocker.patch('_slsdet.DetectorApi.getNetworkParameter')
-def test_status_call(d, mocker):
+#     m.return_value = ''
-    m = mocker.patch('_sls_detector.DetectorApi.getRunStatus')
+#     assert d.rx_zmqport == []
-    d.status
+
-    m.assert_called_once_with()
+
-
+# #--------------------------------------------------------------------status
-def test_start_detecor(d, mocker):
+# def test_status_call(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.startAcquisition')
+#     m = mocker.patch('_slsdet.DetectorApi.getRunStatus')
-    d.start_detector()
+#     d.status
-    m.assert_called_once_with()
+#     m.assert_called_once_with()
-
+
-def test_stop_acq_call(d, mocker):
+# def test_start_detecor(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.stopAcquisition')
+#     m = mocker.patch('_slsdet.DetectorApi.startAcquisition')
-    d.stop_detector()
+#     d.start_detector()
-    m.assert_called_once_with()
+#     m.assert_called_once_with()
-
+
-
+# def test_stop_acq_call(d, mocker):
-
+#     m = mocker.patch('_slsdet.DetectorApi.stopAcquisition')
-#------------------------------------------------------------------timing mode
+#     d.stop_detector()
-def test_get_timing_mode(d, mocker):
+#     m.assert_called_once_with()
-    m = mocker.patch('_sls_detector.DetectorApi.getTimingMode')
+
-    d.timing_mode
+
-    m.assert_called_once_with()
+
-
+# #------------------------------------------------------------------timing mode
-def test_set_timing_mode(d, mocker):
+# def test_get_timing_mode(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setTimingMode')
+#     m = mocker.patch('_slsdet.DetectorApi.getTimingMode')
-    d.timing_mode = 'auto'
+#     d.timing_mode
-    m.assert_called_once_with('auto')
+#     m.assert_called_once_with()
-
+
-#----------------------------------------------------------------vthreshold
+# def test_set_timing_mode(d, mocker):
-def test_get_vthreshold(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.setTimingMode')
-    m = mocker.patch('_sls_detector.DetectorApi.getDac')
+#     d.timing_mode = 'auto'
-    d.vthreshold
+#     m.assert_called_once_with('auto')
-    m.assert_called_once_with('vthreshold', -1)
+
-
+# #----------------------------------------------------------------vthreshold
-def test_set_vthreshold(d, mocker):
+# def test_get_vthreshold(d, mocker):
-    m = mocker.patch('_sls_detector.DetectorApi.setDac')
+#     m = mocker.patch('_slsdet.DetectorApi.getDac')
-    d.vthreshold = 1675
+#     d.vthreshold
-    m.assert_called_once_with('vthreshold', -1, 1675)
+#     m.assert_called_once_with('vthreshold', -1)
+
+# def test_set_vthreshold(d, mocker):
+#     m = mocker.patch('_slsdet.DetectorApi.setDac')
+#     d.vthreshold = 1675
+#     m.assert_called_once_with('vthreshold', -1, 1675)
 
 
 

python/unit-tests/test_utils.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
-Testing parameters and methods of the Detector class using mocks
+Testing functions from utils.py
 """
 
 import pytest
-from sls_detector.utils import eiger_register_to_time
+from sls_detector.utils import *
-from sls_detector.utils import all_equal, element_if_equal
+
 
 def test_convert_zero():
     assert eiger_register_to_time(0) == 0
@@ -48,3 +48,15 @@ def test_element_if_equal_str():
 
 def test_element_if_equal_int_fails():
     assert element_if_equal([5, 6, 7]) == [5, 6, 7]
+
+def test_get_set_bits():
+    assert(get_set_bits(0) == [])
+    assert get_set_bits(7) == [0, 1, 2]
+    
+def test_list_to_mask():
+    assert(list_to_bitmask([0,1,2]) == 7)
+    assert(list_to_bitmask([]) == 0)
+    assert(list_to_bitmask([0]) == 1)
+    assert(list_to_bitmask([1]) == 2)
+    assert(list_to_bitmask([3]) == 8)
+    assert(list_to_bitmask([1,1,1]) == 2)

sample/CMakeLists.txt

@@ -19,3 +19,18 @@ target_link_libraries(result
 set_target_properties(result PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
+
+add_executable(udp udp.cpp)
+target_link_libraries(udp 
+    slsDetectorShared
+    slsSupportLib
+    pthread
+    rt
+    fmt
+)  
+
+set_target_properties(udp PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+

sample/udp.cpp

@@ -0,0 +1,65 @@
+#include "UdpRxSocket.h"
+#include "sls_detector_defs.h"
+#include <chrono>
+#include <fmt/format.h>
+#include <iostream>
+#include <thread>
+#include "network_utils.h"
+
+// Assume packages arrive in order
+
+// Assume frame nr starts from 0
+
+using header_t = slsDetectorDefs::sls_detector_header;
+
+int main() {
+    fmt::print("Hej!\n");
+
+
+    constexpr ssize_t packet_size = 4144;
+    constexpr ssize_t payload_size = packet_size - sizeof(header_t);
+    int port = 50012;
+
+    char * buffer = new char[packet_size];
+
+    sls::UdpRxSocket s(port, packet_size, "10.1.1.107");
+    int n = 0;
+    while(true){
+        // s.ReceiveDataOnly(buffer);
+        if (s.ReceivePacket())
+            std::cout << n++ << std::endl;
+    }
+
+    // auto header = reinterpret_cast<header_t *>(s.buffer());
+    // char *data = s.buffer() + sizeof(header_t);
+    // fmt::print("buffer start: {}\nheader: {}\ndata: {}\n", fmt::ptr(s.buffer()),
+    //            fmt::ptr(header), fmt::ptr(data));
+
+    // int n = 0;
+
+    // fmt::print("Buffer size: {}\n", s.buffer_size());
+    // std::vector<uint16_t> image(n_pixels);
+    // char *image_data = (char *)image.data();
+    // uint64_t frame_nr = 0;
+    // while (true) {
+
+    //     if (s.ReceivePacket()) {
+
+    //         // fmt::print("frame: {} pkt: {} dst: {}\n", header->frameNumber,
+    //         // header->packetNumber, header->packetNumber*payload_size);
+    //         if (header->frameNumber != frame_nr) {
+    //             // dispatch frame
+    //             fmt::print("frame {} done! got: {} pkgs\n", frame_nr, n);
+    //             frame_nr = header->frameNumber;
+    //             n = 0;
+    //             std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    //         }
+    //         ++n;
+    //         memcpy(image_data + header->packetNumber * payload_size, data,
+    //                payload_size);
+
+    //     } else {
+    //         std::cout << "timeout\n";
+    //     }
+    // }
+}

slsDetectorCalibration/analogDetector.h

@@ -423,7 +423,7 @@ template <class dataType> class analogDetector {
 	  if (g==0) g=-1.;
 	}
       
-	return stat[iy][ix].getPedestalRMS()/g;//divide by gain?
+	return stat[iy][ix].getPedestalRMS();//divide by gain?
       }
       return -1;
     };

slsDetectorCalibration/dataStructures/deserializer.h

@@ -1,6 +1,7 @@
 #ifndef DESERIALIZER_H
 #define DESERIALIZER_H
 #include <vector>
+#include "slsDetectorData.h"
 
 class deserializer : public slsDetectorData<int> {
 
@@ -52,7 +53,13 @@ class deserializer : public slsDetectorData<int> {
  static int* deserializeAll(char *ptr, std::vector <int> dbl, int dr=24,  int nch=64*3, int off=5) {
    // off=0;
    //int iarg;
-   int64_t word, *wp;
+
+
+    cout <<"** deserializer: " << endl;
+    cout << "** Number of chans:\t" << nch << endl;
+    cout << "** Serial Offset:\t" << off << endl;
+    cout << "** Dynamic range:\t" << dr << endl;
+    int64_t word, *wp, ww,one=1, bit ;
    int* val=new int[nch];
    int ioff=0;
    int idr=0;
@@ -67,38 +74,61 @@ class deserializer : public slsDetectorData<int> {
    }
    wp=(int64_t*)ptr;
 
-   for (iw=0; iw<nch/nb; iw) {
+   int nw=nch/nb;
+
+   cout << "** Number of bits:\t" << nb << endl;
+   cout << "** Samples:\t" << nw << endl;
+    
+  for (ib=0; ib<nb; ib++) {
+    cout << dbl[ib] << " " ;
+  }
+  cout << endl;
+   
+  for (ib=0; ib<nch; ib++) {
+    val[ib]=0;
+  }
+   
+   for (iw=0; iw<nw; iw) {
      word=*wp;;
      if (ioff<off) {
        ioff++;
        // cout <<"*";
      }  else {
        //if (idr<16) {
-       ib=0;
+       //ib=0; 
-	for (const auto &bit : dbl) {
+       // cout << hex << "*************" << word << endl;
-	  ich=iw+nch/nb*(ib);
+      for (ib=0; ib<nb; ib++) {
-	  if (word&(1<<bit) && ich<nch)  {
+	//	for (const auto &bit : dbl) {
+	  ich=iw+nch*ib/nb;
+	  /* if (ich>1060) */
+	  /* cout << iw << " " << idr << " " << ib << " " << bit << " " << ich << " " << val[ich] << " **  " ; */ 
+	  bit=dbl[ib];
+	  ww=one<<bit;
+	  if (word&(ww) && ich<nch)  {
 	    //cout << "+" ;
 	    val[ich]|=(1<<idr);
-	  }  //else { 
+	  }
+	  /* if (ich>1060) */
+	  /*   cout << val[ich]  << " " << hex << word << " " << ww << " " << (word&(ww)) << dec <<endl; */
+	  /* //else {  */
 	  //cout << "-" ; 
 	  //}
-	  ib++;
+	  //ib++;
-	}
-	
 	}
 	
       idr++; 
+     }
+     
      if (idr==dr) {
        idr=0;
 	//  cout << dec << " " << iw << " " << val[iw] << " " << val[iw+nch/2] << endl;
-       cout <<dec << iw<<endl;
+       // cout <<dec << iw<<endl;
        iw++;
      }//end if()
      
       //end else()
      wp+=1;
-     ii++;
+     // ii++;
    }//end for
    
     
@@ -117,7 +147,7 @@ class deserializer : public slsDetectorData<int> {
    int ii=0;
    int ich;
    int nb=dbl.size();
-
+   int bit;
    char *dval;
 
    idr=0;
@@ -128,7 +158,12 @@ class deserializer : public slsDetectorData<int> {
    
    ib=0;
    ich=0; 
-   for (const auto &bit : dbl) {
+     for (ib=0; ib<nb; ib++) {
+       //	for (const auto &bit : dbl) {
+
+       /* if (ich>1060) */
+       /* cout << iw << " " << idr << " " << ib << " " << bit << " " << ich << " " << val[ich] << " **  " ; */ 
+       bit=dbl[ib];
      //ioff=off;
      idr=0;
      for (iw=0; iw<(nch*dr/nb)/8; iw++) {
@@ -141,7 +176,7 @@ class deserializer : public slsDetectorData<int> {
        }	
      }
      ii++;
-     ib++;
+     // ib++;
    }//end for
    
     

slsDetectorCalibration/dataStructures/imageZmq16bit.h

@@ -0,0 +1,125 @@
+#ifndef IMAGEZMQ16BIT_H
+#define  IMAGEZMQ16BIT_H
+#include "slsDetectorData.h"
+
+
+class imageZmq16bit : public slsDetectorData<uint16_t> {
+ 
+ private:
+  
+  // int iframe;
+ public:
+
+
+
+
+  /**
+     Implements the slsReceiverData structure for the moench02 prototype read out by a module i.e. using the slsReceiver
+     (160x160 pixels, 40 packets 1286 large etc.)
+     \param c crosstalk parameter for the output buffer
+
+  */
+  // moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
+ imageZmq16bit(int nnx=400, int nny=400): slsDetectorData<uint16_t>(nnx, nny, 2*nnx*nny) {
+    cout << "* " << nx << " " << ny << endl;
+    int is=0;
+    for (int row=0; row<ny; row++){
+      for(int col=0;col<nx;col++){
+	dataMap[row][col]=is*2;
+	is++;  
+      }
+    }
+ 
+
+  };
+
+  virtual double getValue(char *data, int ix, int iy=0) {
+   
+    cout << ix << " " << ix <<  dataMap[iy][ix] << 2*nx*ny << " "<< endl;
+    uint16_t val=getChannel(data, ix, iy)&0x3fff;
+    return val;
+  };
+
+
+  int getFrameNumber(char *buff){return *((int*)buff);};//*((int*)(buff+5))&0xffffff;};   
+
+ 
+  int getPacketNumber(char *buff){return 0;}//((*(((int*)(buff+4))))&0xff)+1;};   
+
+  virtual char *readNextFrame(ifstream &filebin) {
+    int ff=-1, np=-1;
+    return readNextFrame(filebin, ff, np);
+  };
+
+  virtual char *readNextFrame(ifstream &filebin, int &ff) {
+    int np=-1;
+    return readNextFrame(filebin, ff, np);
+  };
+
+  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np) {
+	  char *data=new char[2*nx*ny];
+	  char *d=readNextFrame(filebin, ff, np, data);
+	  if (d==NULL) {delete [] data; data=NULL;}
+	  return data;
+  }
+
+
+
+
+  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np, char *data) {
+    //char *retval=0;
+    //	  int  nd;
+    //int fnum = -1;
+	  np=0;
+	  //	  int  pn;
+	  
+
+	  //  if (ff>=0)
+	  //  fnum=ff;
+
+	  if (filebin.is_open()) {
+	    if (filebin.read(data, 2*nx*ny) ){
+	      // iframe++;
+	      //ff=iframe;
+	      return data;
+	    }
+	  }
+	    return NULL;
+	    
+	    
+	  
+  };
+
+
+
+  virtual  char *findNextFrame(char *data, int &ndata, int dsize){
+    if (dsize<2*nx*ny) ndata=dsize;
+    else ndata=2*nx*ny;
+    return data;
+
+  }
+  
+
+
+
+
+
+  // virtual int setFrameNumber(int ff){iframe=ff};
+
+
+
+
+
+
+
+
+
+
+int getPacketNumber(int x, int y) {return 0;};
+
+};
+
+
+
+
+#endif

slsDetectorCalibration/dataStructures/imageZmq32bit.h

@@ -0,0 +1,125 @@
+#ifndef IMAGEZMQ32BIT_H
+#define  IMAGEZMQ32BIT_H
+#include "slsDetectorData.h"
+
+
+class imageZmq32bit : public slsDetectorData<uint16_t> {
+ 
+ private:
+  
+  // int iframe;
+ public:
+
+
+
+
+  /**
+     Implements the slsReceiverData structure for the moench02 prototype read out by a module i.e. using the slsReceiver
+     (160x160 pixels, 40 packets 1286 large etc.)
+     \param c crosstalk parameter for the output buffer
+
+  */
+  // moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
+ imageZmq32bit(int nnx=400, int nny=400): slsDetectorData<uint16_t>(nnx, nny, sizeof(uint32_t)*nnx*nny) {
+    cout << "* " << nx << " " << ny << endl;
+    int is=0;
+    for (int row=0; row<ny; row++){
+      for(int col=0;col<nx;col++){
+	dataMap[row][col]=is*sizeof(uint32_t);
+	is++;  
+      }
+    }
+ 
+
+  };
+
+  /* virtual double getValue(char *data, int ix, int iy=0) { */
+   
+  /*   //cout << ix << " " << ix <<  dataMap[iy][ix] << 2*nx*ny << " "<< endl; */
+  /*   uint16_t val=getChannel(data, ix, iy); */
+  /*   return val; */
+  /* }; */
+
+
+  int getFrameNumber(char *buff){return *((int*)buff);};//*((int*)(buff+5))&0xffffff;};   
+
+ 
+  int getPacketNumber(char *buff){return 0;}//((*(((int*)(buff+4))))&0xff)+1;};   
+
+  virtual char *readNextFrame(ifstream &filebin) {
+    int ff=-1, np=-1;
+    return readNextFrame(filebin, ff, np);
+  };
+
+  virtual char *readNextFrame(ifstream &filebin, int &ff) {
+    int np=-1;
+    return readNextFrame(filebin, ff, np);
+  };
+
+  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np) {
+	  char *data=new char[2*nx*ny];
+	  char *d=readNextFrame(filebin, ff, np, data);
+	  if (d==NULL) {delete [] data; data=NULL;}
+	  return data;
+  }
+
+
+
+
+  virtual char *readNextFrame(ifstream &filebin, int& ff, int &np, char *data) {
+    //char *retval=0;
+    //	  int  nd;
+    //int fnum = -1;
+	  np=0;
+	  //	  int  pn;
+	  
+
+	  //  if (ff>=0)
+	  //  fnum=ff;
+
+	  if (filebin.is_open()) {
+	    if (filebin.read(data, 2*nx*ny) ){
+	      // iframe++;
+	      //ff=iframe;
+	      return data;
+	    }
+	  }
+	    return NULL;
+	    
+	    
+	  
+  };
+
+
+
+  virtual  char *findNextFrame(char *data, int &ndata, int dsize){
+    if (dsize<2*nx*ny) ndata=dsize;
+    else ndata=2*nx*ny;
+    return data;
+
+  }
+  
+
+
+
+
+
+  // virtual int setFrameNumber(int ff){iframe=ff};
+
+
+
+
+
+
+
+
+
+
+int getPacketNumber(int x, int y) {return 0;};
+
+};
+
+
+
+
+#endif

slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h

@@ -28,7 +28,8 @@ class moench03T1ZmqDataNew : public slsDetectorData<uint16_t> {
      \param c crosstalk parameter for the output buffer
 
   */
- moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
+  // moench03T1ZmqDataNew(int ns=5000): slsDetectorData<uint16_t>(400, 400, ns*32*2+sizeof(int)), nSamples(ns), offset(sizeof(int)), xtalk(0.00021) {
+ moench03T1ZmqDataNew(int ns=5000, int oo=0): slsDetectorData<uint16_t>(400, 400, ns*32*2+oo), nSamples(ns), offset(oo), xtalk(0.00021) {
 
     int nadc=32;
     int sc_width=25;
@@ -137,6 +138,7 @@ class moench03T1ZmqDataNew : public slsDetectorData<uint16_t> {
     /* vout+=0.0008*val-6224; */
     /* return vout; //(double)getChannel(data, ix, iy);
      */
+    // cout << ix << " "<< iy << " " << dataMap[iy][ix] << endl;
     return ((double)getChannel(data, ix, iy))+xtalk*getGhost(iy,iy);
   };
 

slsDetectorCalibration/moenchExecutables/Makefile.zmq

@@ -1,15 +1,19 @@
 
-INCDIR=   -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/
+INCDIR=   -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../../libs/rapidjson/
 LDFLAG= -L/usr/lib64/ -lpthread -lm  -lstdc++  -lzmq -pthread -lrt -ltiff   -O3 -g -std=c++11 -Wall
 #-L../../bin -lhdf5  -L.
 
 #DESTDIR?=../bin
 
-all:  moenchZmqProcess
+all:  moenchZmqProcess moenchZmqProcessCtbGui
+
 
 moenchZmqProcess:  moenchZmqProcess.cpp   clean
 		      g++ -o moenchZmqProcess  moenchZmqProcess.cpp  $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)  -DNEWZMQ -DINTERP
 
+moenchZmqProcessCtbGui:  moenchZmqProcess.cpp   clean
+		      g++ -o moenchZmqProcessCtbGui  moenchZmqProcess.cpp  $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF)  -DNEWZMQ -DINTERP -DCTBGUI
+
 clean: 	
 	rm -f  moenchZmqProcess  
 

slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp

@@ -149,6 +149,7 @@ int main(int argc, char *argv[]) {
   if (argc>=9) {
     nframes=atoi(argv[8]);
   }
+
   int xmin=0, xmax=nx, ymin=0, ymax=ny;
   if (argc>=13) {
     xmin=atoi(argv[9]);
@@ -185,6 +186,7 @@ int main(int argc, char *argv[]) {
     cout << "pedestal file is " << pedfile << endl;
  if (thr>0) 
     cout << "threshold is " << thr << endl;
+ cout << "Nframes is " << nframes << endl;
  
  uint32 nnx, nny;
  double *gmap;

slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp

@@ -74,6 +74,14 @@ int main(int argc, char *argv[]) {
   // high_resolution_clock::time_point t1;
   // high_resolution_clock::time_point t2 ;
   time_t begin,end,finished;
+  int rms=0;
+
+  int nped=1000, nped0=100;
+
+#ifdef PTC
+  nped=10000;
+  nped0=10000;
+#endif
 
 
   if (argc > 4) {
@@ -111,7 +119,7 @@ int main(int argc, char *argv[]) {
   }
 
   //slsDetectorData *det=new moench03T1ZmqDataNew(); 
-  moench03T1ZmqDataNew *det=new moench03T1ZmqDataNew(); 
+  moench03T1ZmqDataNew *det=new moench03T1ZmqDataNew(5000,sizeof(int)); 
   cout << endl << " det" <<endl;
   int npx, npy;
   det->getDetectorSize(npx, npy);
@@ -129,8 +137,15 @@ int main(int argc, char *argv[]) {
 
   int ncol_cm=CM_ROWS;
   double xt_ghost=C_GHOST;
-  moench03CommonMode *cm=new moench03CommonMode(ncol_cm);
+
-  moench03GhostSummation *gs=new moench03GhostSummation(det, xt_ghost);
+
+  moench03CommonMode *cm=NULL;
+  moench03GhostSummation *gs=NULL;
+#ifdef CORR
+  cm=new moench03CommonMode(ncol_cm);
+  gs=new moench03GhostSummation(det, xt_ghost);
+#endif
+
   double *gainmap=NULL;
   float *gm;
   double *gmap=NULL;
@@ -158,7 +173,7 @@ int main(int argc, char *argv[]) {
 
   //analogDetector<uint16_t> *filter=new analogDetector<uint16_t>(det,1,NULL,1000);
 #ifndef INTERP
-  singlePhotonDetector *filter=new singlePhotonDetector(det,3, nSigma, 1, cm, 1000, 10, -1, -1, gainmap, gs);
+  singlePhotonDetector *filter=new singlePhotonDetector(det,3, nSigma, 1, cm, nped, nped0, -1, -1, gainmap, gs);
 
     multiThreadedCountingDetector *mt=new multiThreadedCountingDetector(filter,nthreads,fifosize);
 
@@ -169,7 +184,7 @@ int main(int argc, char *argv[]) {
 
   if (etafname) interp->readFlatField(etafname);
 
-  interpolatingDetector *filter=new interpolatingDetector(det,interp, nSigma, 1, cm,  1000, 10, -1, -1, gainmap, gs);
+  interpolatingDetector *filter=new interpolatingDetector(det,interp, nSigma, 1, cm,  nped, nped0, -1, -1, gainmap, gs);
   multiThreadedInterpolatingDetector *mt=new multiThreadedInterpolatingDetector(filter,nthreads,fifosize);
 #endif
 
@@ -293,7 +308,8 @@ int main(int argc, char *argv[]) {
 	uint8_t detType = 0;
 	uint8_t version = 0;
 	//	int* flippedData = 0;
-	char* additionalJsonHeader = 0;
+	string* additionalJsonHeader = 0;
+	//char* additionalJsonHeader = 0;
 
 	int32_t threshold=0;
 	
@@ -356,6 +372,11 @@ int main(int argc, char *argv[]) {
 	      sprintf(ofname,"%s_%ld_ped.tiff",fname,fileindex);
 	      mt->writePedestal(ofname);
 	       cout << "Writing pedestal to " << ofname << endl;
+	       if (rms) {
+	      sprintf(ofname,"%s_%ld_var.tiff",fname,fileindex);
+	      mt->writePedestalRMS(ofname);
+	       cout << "Writing pedestal variance to " << ofname << endl;
+	       }
 	    }
 #ifdef INTERP
 	    else if  (fMode==eFlat) {
@@ -388,7 +409,7 @@ int main(int argc, char *argv[]) {
 	
 		  dout[ix]=ped[ix];
 		  // if (ix<100*400)
-		  //   cout << ix << " " << ped[ix] << endl;
+		  // cout << ix << " " << ped[ix] << " "<< dout[ix] << endl;
 	      }
 	      
 	    }
@@ -448,43 +469,20 @@ int main(int argc, char *argv[]) {
 
 	    //  cout << "Sending image size " << nnx << " " << nny << endl;
 
-#ifndef DEVELOPER
+// #ifndef DEVELOPER
-#ifndef MOENCH_BRANCH
+// #ifndef MOENCH_BRANCH
-	    zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, 0,0, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex,0 , packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, additionalJsonHeader);
+// 	    zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, 1,1, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex,0 , packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, additionalJsonHeader);
-#endif
+// #endif
-#endif
+// #endif
-
-#ifdef DEVELOPER
-	    zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader);
-#endif	
-#ifdef MOENCH_BRANCH
-	    /*
- int SendHeaderData ( int index, bool dummy, uint32_t jsonversion, uint32_t dynamicrange = 0, uint64_t fileIndex = 0,
-                        uint32_t npixelsx = 0, uint32_t npixelsy = 0, uint32_t imageSize = 0,
-                        uint64_t acqIndex = 0, uint64_t fIndex = 0, char* fname = NULL,
-                        uint64_t frameNumber = 0, uint32_t expLength = 0, uint32_t packetNumber = 0,
-                        uint64_t bunchId = 0, uint64_t timestamp = 0,
-                        uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0,
-                        uint32_t debug = 0, uint16_t roundRNumber = 0,
-                        uint8_t detType = 0, uint8_t version = 0, int* flippedData = 0,
-                        char* additionalJsonHeader = 0) {
-int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEADER_VERSION , uint32_t dr, uint64_t fileindex, uint32_t 0, uint32_t 0, uint32_t, uint64_t, uint64_t, char*, uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t, int*, char*)
-
-	     */
-	    //zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version);//, 0,additionalJsonHeader);
-	    zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex, subFrameIndex, packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, flippedData, additionalJsonHeader);
-
-	    /* old 
-	       zmqsocket2->SendHeaderData (0, false, SLS_DETECTOR_JSON_HEADER_VERSION, dr, fileindex, nnx, nny, nnx*nny*dr/8,acqIndex, frameIndex, fname, acqIndex, subFrameIndex, packetNumber,bunchId, timestamp, modId, xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, flippedData, additionalJsonHeader);
-	    */
-	    /*
 
 
-	      new
+// #ifdef DEVELOPER
-	      zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,additionalJsonHeader);
+// #ifdef CTBGUI
-	     */
+//  	    zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 0,0,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader);
-#endif		
+// #endif
-	       
+// #ifndef CTBGUI
+ 	    zmqsocket2->SendHeaderData (0, false,SLS_DETECTOR_JSON_HEADER_VERSION , dr, fileindex, 1,1,nnx,nny,nnx*nny*dr/8,acqIndex, frameIndex, fname,acqIndex,0 , packetNumber,bunchId, timestamp, modId,xCoord, yCoord, zCoord,debug, roundRNumber, detType, version, 0,0, 0,additionalJsonHeader);
+	    //#endif
 		
 
 		zmqsocket2->SendData((char*)dout,nnx*nny*dr/8);
@@ -577,6 +575,7 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 	      /* Analog detector commands */
 	      //isPedestal=0;
 	      //isFlat=0;
+	      rms=0;
 	      fMode=eFrame;
 	      frameMode_s="frame";
 	      cprintf(MAGENTA, "Frame mode: ");
@@ -586,11 +585,17 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 		  if (frameMode_s == "pedestal"){
 		    fMode=ePedestal;
 		    //isPedestal=1;
-		  } else if (frameMode_s == "newPedestal"){
+		  } else if (frameMode_s == "newpedestal"){
 		    mt->newDataSet(); //resets pedestal  
 		    // cprintf(MAGENTA, "Resetting pedestal\n");
 		    fMode=ePedestal;
 		    //isPedestal=1;
+		  } else if (frameMode_s == "variance"){
+		    mt->newDataSet(); //resets pedestal  
+		    // cprintf(MAGENTA, "Resetting pedestal\n");
+		    fMode=ePedestal;
+		    rms=1;
+		    //isPedestal=1;
 		  }
 #ifdef INTERP 
 		  else if (frameMode_s == "flatfield") {
@@ -611,11 +616,13 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 		    frameMode_s="frame";
 		  }
 		}
-	      }
 		cprintf(MAGENTA, "%s\n" , frameMode_s.c_str());
+	      } else
+		cprintf(RED, "%s\n" , frameMode_s.c_str());
+
 	      mt->setFrameMode(fMode);
 
-	      // threshold=0;
+	      threshold=0;
 	      cprintf(MAGENTA, "Threshold: ");
 	      if (doc.HasMember("threshold")) {	
 		if (doc["threshold"].IsInt()) {
@@ -683,10 +690,11 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 		    }
 		  }
 		  
-	      }
+		cprintf(MAGENTA, "%s\n" , detectorMode_s.c_str());
+	      } else
+		cprintf(RED, "%s\n" , frameMode_s.c_str());
 
 	      mt->setDetectorMode(dMode);
-	      cprintf(MAGENTA, "%s\n" , detectorMode_s.c_str());
 
 	      // cout << "done " << endl;
 
@@ -737,7 +745,7 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 
 	    // cout << "file" << endl;
 	    //  cout << "data " << endl;
-	  if (of==NULL) {
+	  if (of==NULL && dMode!=eAnalog && fMode!=ePedestal && threshold<=0) {
 #ifdef WRITE_QUAD
 	    sprintf(ofname,"%s_%ld.clust2",filename.c_str(),fileindex);
 #endif
@@ -772,15 +780,13 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 		mt->pushData(buff);
 		mt->nextThread();
 		mt->popFree(buff);
+		cprintf(GREEN, "Frame\n");
 	      } else {
 		cprintf(RED, "Incomplete frame: received only %d packet\n", packetNumber);
 		//length = 
 		  zmqsocket->ReceiveData(0, dummybuff, size);
 
 	      }
-	
-	  
-	  
 	  iframe++;
 
 	}	// exiting infinite loop

slsDetectorCalibration/multiThreadedAnalogDetector.h

@@ -17,7 +17,7 @@
 #include <pthread.h>
 
 #include "analogDetector.h"
-#include "circularFifo.h"
+#include "CircularFifo.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -462,6 +462,50 @@ public:
   };
    
   
+  virtual double *getPedestalRMS(){
+    int nx, ny;
+    dets[0]->getDetectorSize(nx,ny);
+    // if (ped) delete [] ped;
+    double *rms=new double[nx*ny];
+    double *p0=new double[nx*ny];
+    
+    for (int i=0; i<nThreads; i++) {
+      //inte=(slsInterpolation*)dets[i]->getInterpolation(nb,emi,ema);
+      //  cout << i << endl;
+      p0=dets[i]->getPedestalRMS(p0);
+      if (p0) {
+	if (i==0) {
+	  
+	  for (int ib=0; ib<nx*ny; ib++) {
+	    rms[ib]=p0[ib]*p0[ib]/((double)nThreads);
+	  //  cout << p0[ib] << " ";
+	}
+	} else {
+	for (int ib=0; ib<nx*ny; ib++) {
+	  rms[ib]+=p0[ib]*p0[ib]/((double)nThreads);
+	  //  cout << p0[ib] << " ";
+	}
+	}
+      }
+	
+    }
+    delete [] p0;
+    
+    /* for (int ib=0; ib<nx*ny; ib++) { */
+    /*   if (rms[ib]>0) */
+    /* 	rms[ib]=sqrt(ped[ib]); */
+    /*   else */
+    /* 	rms[ib]=0; */
+    /* } */
+
+
+    return rms;
+  };
+   
+  
+
+
+   
    virtual double *setPedestal(double *h=NULL){
      //int nb=0;
     
@@ -498,6 +542,27 @@ public:
    };
 
 
+   virtual void *writePedestalRMS(const char * imgname){     
+    
+     int nx, ny;
+     dets[0]->getDetectorSize(nx,ny);
+   
+      double *rms=getPedestalRMS();
+      float *gm=new float[nx*ny];
+      if (gm) {
+       for (int ix=0; ix<nx*ny; ix++) {
+	 gm[ix]=rms[ix];
+       }    
+       WriteToTiff(gm,imgname ,nx, ny); 
+       delete [] gm;
+       delete [] rms;
+     } else cout << "Could not allocate float image " << endl;
+    
+    return NULL;
+
+   };
+
+
   virtual void *readPedestal(const char * imgname, int nb=-1, double emin=1, double emax=0){
     
     int nx, ny;

slsDetectorGui/CMakeLists.txt

@@ -1,5 +1,8 @@
 set(CMAKE_AUTOMOC ON)
 
+find_package(PNG REQUIRED)
+find_package(ZLIB REQUIRED)
+
 set(SOURCES
     slsDetectorPlotting/src/SlsQt1DPlot.cxx
     slsDetectorPlotting/src/SlsQt1DZoomer.cxx
@@ -89,8 +92,8 @@ target_link_libraries(slsDetectorGui PUBLIC
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTGUI_LIBRARIES}
     ${QWT_LIBRARIES}
-    png
+    PNG::PNG
-    z
+    ZLIB::ZLIB
     Qt4::QtOpenGL
     Qt4::QtSvg
 )

slsDetectorGui/forms/form_cloneplot.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
+    <width>376</width>
-    <height>350</height>
+    <height>425</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -240,7 +240,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>500</width>
+     <width>376</width>
      <height>28</height>
     </rect>
    </property>

slsDetectorGui/forms/form_detectormain.ui

@@ -145,6 +145,10 @@
   <property name="windowTitle">
    <string>SLS Detector GUI</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../include/icons.qrc">
+    <normaloff>:/icons/images/mountain.png</normaloff>:/icons/images/mountain.png</iconset>
+  </property>
   <property name="inputMethodHints">
    <set>Qt::ImhNone</set>
   </property>
@@ -371,101 +375,6 @@ p, li { white-space: pre-wrap; }
     </property>
    </widget>
   </widget>
-  <action name="actionOpenSetup">
-   <property name="text">
-    <string>&amp;Load &amp;Setup</string>
-   </property>
-   <property name="font">
-    <font/>
-   </property>
-  </action>
-  <action name="actionSaveSetup">
-   <property name="text">
-    <string>&amp;Save &amp;Setup</string>
-   </property>
-   <property name="font">
-    <font/>
-   </property>
-  </action>
-  <action name="actionMeasurementWizard">
-   <property name="text">
-    <string>&amp;Measurement Wizard</string>
-   </property>
-  </action>
-  <action name="actionOpenConfiguration">
-   <property name="text">
-    <string>&amp;Load &amp;Configuration</string>
-   </property>
-  </action>
-  <action name="actionSaveConfiguration">
-   <property name="text">
-    <string>&amp;Save &amp;Configuration</string>
-   </property>
-  </action>
-  <action name="actionEnergyCalibration">
-   <property name="text">
-    <string>&amp;Energy Calibration</string>
-   </property>
-  </action>
-  <action name="actionAngularCalibration">
-   <property name="text">
-    <string>&amp;Angular Calibration</string>
-   </property>
-  </action>
-  <action name="actionDebug">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Debug</string>
-   </property>
-  </action>
-  <action name="actionBeamline">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Beamline</string>
-   </property>
-  </action>
-  <action name="actionExpert">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Expert</string>
-   </property>
-  </action>
-  <action name="actionConfiguration">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Configuration</string>
-   </property>
-  </action>
-  <action name="actionVersion">
-   <property name="text">
-    <string>&amp;Version</string>
-   </property>
-  </action>
-  <action name="actionAbout">
-   <property name="text">
-    <string>&amp;About</string>
-   </property>
-  </action>
   <action name="actionLoadConfiguration">
    <property name="text">
     <string>Load Configuration</string>
@@ -476,6 +385,11 @@ p, li { white-space: pre-wrap; }
     <string>Load Trimbits</string>
    </property>
   </action>
+  <action name="actionLoadParameters">
+   <property name="text">
+    <string>Load Parameters</string>
+   </property>
+  </action>
   <action name="actionDebug">
    <property name="checkable">
     <bool>true</bool>
@@ -500,12 +414,14 @@ p, li { white-space: pre-wrap; }
     <string>Dockable Windows</string>
    </property>
   </action>
-  <action name="actionLoadParameters">
+  <action name="actionAbout">
    <property name="text">
-    <string>Load Parameters</string>
+    <string>&amp;About</string>
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="../include/icons.qrc"/>
+ </resources>
  <connections/>
 </ui>

slsDetectorGui/forms/form_tab_measurement.ui

@@ -432,19 +432,6 @@
       <property name="verticalSpacing">
        <number>4</number>
       </property>
-      <item row="5" column="0">
-       <widget class="QLabel" name="lblNumTriggers">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>Number of Triggers:</string>
-        </property>
-       </widget>
-      </item>
       <item row="4" column="3">
        <widget class="QComboBox" name="comboPeriodUnit">
         <property name="enabled">
@@ -666,108 +653,6 @@ Frame period between exposures.
         </item>
        </widget>
       </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="lblDelay">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="toolTip">
-         <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-        </property>
-        <property name="text">
-         <string>Delay After Trigger:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="2" colspan="2">
-       <widget class="QSpinBox" name="spinNumTriggers">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Number of Triggers to be expected.
- #triggers#</string>
-        </property>
-        <property name="statusTip">
-         <string/>
-        </property>
-        <property name="whatsThis">
-         <string/>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="keyboardTracking">
-         <bool>false</bool>
-        </property>
-        <property name="suffix">
-         <string/>
-        </property>
-        <property name="minimum">
-         <number>-1</number>
-        </property>
-        <property name="maximum">
-         <number>2000000000</number>
-        </property>
-        <property name="value">
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="2">
-       <widget class="QDoubleSpinBox" name="spinDelay">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="keyboardTracking">
-         <bool>false</bool>
-        </property>
-        <property name="decimals">
-         <number>9</number>
-        </property>
-        <property name="minimum">
-         <double>-1.000000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>2000000000.000000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.000000000000000</double>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="2">
        <widget class="QDoubleSpinBox" name="spinExpTime">
         <property name="enabled">
@@ -903,65 +788,6 @@ Exposure Time of a frame.
         </property>
        </widget>
       </item>
-      <item row="6" column="3">
-       <widget class="QComboBox" name="comboDelayUnit">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
-#delay#</string>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="currentIndex">
-         <number>2</number>
-        </property>
-        <item>
-         <property name="text">
-          <string>hr</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>min</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>s</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>ms</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>us</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>ns</string>
-         </property>
-        </item>
-       </widget>
-      </item>
       <item row="3" column="3">
        <widget class="QComboBox" name="comboExpUnit">
         <property name="enabled">
@@ -1084,6 +910,577 @@ Frame period between exposures.
         </property>
        </spacer>
       </item>
+      <item row="5" column="0">
+       <widget class="QStackedWidget" name="stackedLblTriggerBurst">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>171</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>171</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="pageLblTrigger">
+         <layout class="QGridLayout" name="gridLblTrigger">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblNumTriggers">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Number of Triggers:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="pageLblBurst">
+         <layout class="QGridLayout" name="gridLblBurst">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblNumBursts">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Number of Bursts:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item row="5" column="2">
+       <widget class="QStackedWidget" name="stackedSpinTriggerBurst">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>208</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>208</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="pageSpinTrigger">
+         <layout class="QGridLayout" name="gridSpinTrigger">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QSpinBox" name="spinNumTriggers">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Number of Triggers to be expected.
+ #triggers#</string>
+            </property>
+            <property name="statusTip">
+             <string/>
+            </property>
+            <property name="whatsThis">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+            <property name="keyboardTracking">
+             <bool>false</bool>
+            </property>
+            <property name="suffix">
+             <string/>
+            </property>
+            <property name="minimum">
+             <number>-1</number>
+            </property>
+            <property name="maximum">
+             <number>2000000000</number>
+            </property>
+            <property name="value">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="pageSpinBurst">
+         <layout class="QGridLayout" name="gridSpinBurst">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QSpinBox" name="spinNumBursts">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Number of Triggers to be expected.
+ #triggers#</string>
+            </property>
+            <property name="statusTip">
+             <string/>
+            </property>
+            <property name="whatsThis">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+            <property name="keyboardTracking">
+             <bool>false</bool>
+            </property>
+            <property name="suffix">
+             <string/>
+            </property>
+            <property name="minimum">
+             <number>-1</number>
+            </property>
+            <property name="maximum">
+             <number>2000000000</number>
+            </property>
+            <property name="value">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QStackedWidget" name="stackedLblDelayBurstPeriod">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>171</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>171</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="pageLblDelay">
+         <layout class="QGridLayout" name="gridLblDelay">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblDelay">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Delay After Trigger:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="pageLblBurstPeriod">
+         <layout class="QGridLayout" name="gridLblBurstPeriod">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="1">
+           <widget class="QLabel" name="lblBurstPeriod">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of Triggers to be expected.&lt;/p&gt;&lt;p&gt; #triggers#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Burst Period:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item row="6" column="2">
+       <widget class="QStackedWidget" name="stackedSpinDelayBurstPeriod">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>152</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>152</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="pageSpinDelay">
+         <layout class="QGridLayout" name="gridSpinDelay">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QDoubleSpinBox" name="spinDelay">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+            <property name="keyboardTracking">
+             <bool>false</bool>
+            </property>
+            <property name="decimals">
+             <number>9</number>
+            </property>
+            <property name="minimum">
+             <double>-1.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>2000000000.000000000000000</double>
+            </property>
+            <property name="value">
+             <double>0.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="pageSpinBurstPeriod">
+         <layout class="QGridLayout" name="gridSpinBurstPeriod">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QDoubleSpinBox" name="spinBurstPeriod">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+            <property name="keyboardTracking">
+             <bool>false</bool>
+            </property>
+            <property name="decimals">
+             <number>9</number>
+            </property>
+            <property name="minimum">
+             <double>-1.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>2000000000.000000000000000</double>
+            </property>
+            <property name="value">
+             <double>0.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+      <item row="6" column="3">
+       <widget class="QStackedWidget" name="stackedComboDelayBurstPeriod">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>50</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>50</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="pageComboDelay">
+         <layout class="QGridLayout" name="gridComboDelay">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="comboDelayUnit">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+            </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="currentIndex">
+             <number>2</number>
+            </property>
+            <item>
+             <property name="text">
+              <string>hr</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>min</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>s</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>ms</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>us</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>ns</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="pageComboBurstPeriod">
+         <layout class="QGridLayout" name="gridComboBurstPeriod">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="comboBurstPeriodUnit">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>The Delay between Trigger Edge and Start of Exposure ( or Readout). 
+#delay#</string>
+            </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="currentIndex">
+             <number>2</number>
+            </property>
+            <item>
+             <property name="text">
+              <string>hr</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>min</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>s</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>ms</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>us</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>ns</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -1116,9 +1513,6 @@ Frame period between exposures.
   <tabstop>comboExpUnit</tabstop>
   <tabstop>spinPeriod</tabstop>
   <tabstop>comboPeriodUnit</tabstop>
-  <tabstop>spinNumTriggers</tabstop>
-  <tabstop>spinDelay</tabstop>
-  <tabstop>comboDelayUnit</tabstop>
   <tabstop>spinNumSamples</tabstop>
  </tabstops>
  <resources>

slsDetectorGui/forms/form_tab_plot.ui

@@ -822,7 +822,7 @@ Displays minimum, maximum and sum of values for each plot.
       <item row="0" column="1">
        <widget class="QStackedWidget" name="stackedWidget1D">
         <property name="currentIndex">
-         <number>3</number>
+         <number>5</number>
         </property>
         <widget class="QWidget" name="pageSuperImpose">
          <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -1360,6 +1360,27 @@ Displays minimum, maximum and sum of values for each plot.
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QCheckBox" name="chkGainPlot1D">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>&lt;nobr&gt;
+Displays minimum, maximum and sum of values for each plot.
+&lt;nobr&gt;</string>
+            </property>
+            <property name="text">
+             <string>Gain Plot</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </widget>
@@ -2347,7 +2368,6 @@ Displays minimum, maximum and sum of values for each plot.
   <zorder>box1D</zorder>
   <zorder>boxFrequency</zorder>
   <zorder>box2D</zorder>
-  <zorder>horizontalSpacer_6</zorder>
   <zorder>boxPlotAxis</zorder>
   <zorder>boxSave</zorder>
  </widget>

slsDetectorGui/forms/form_tab_settings.ui

@@ -214,6 +214,46 @@
        <string>Very Low Gain</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>G1_HG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G1_LG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G2_HC_HG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G2_HC_LG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G2_LC_HG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G2_LC_LG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G4_HG</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>G4_LG</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Undefined</string>

slsDetectorGui/include/qCloneWidget.h

@@ -16,7 +16,7 @@ class qCloneWidget : public QMainWindow, private Ui::ClonePlotObject {
     Q_OBJECT
 
   public:
-    qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2, SlsQt2DPlot *gp,
+    qCloneWidget(QWidget *parent, SlsQt1DPlot *p1, SlsQt2DPlot *p2, SlsQt1DPlot *gp1, SlsQt2DPlot *gp,
                  QString title, QString filePath, QString fileName,
                  int64_t aIndex, bool displayStats, QString min, QString max,
                  QString sum);
@@ -37,6 +37,7 @@ class qCloneWidget : public QMainWindow, private Ui::ClonePlotObject {
     int id;
     SlsQt1DPlot *plot1d{nullptr};
     SlsQt2DPlot *plot2d{nullptr};
+    SlsQt1DPlot *gainplot1d{nullptr};
     SlsQt2DPlot *gainplot2d{nullptr};
     QString filePath{"/"};
     QString fileName{"run"};

slsDetectorGui/include/qDefs.h

@@ -31,6 +31,7 @@ class qDefs : public QWidget {
 
     static const int Q_FONT_SIZE=9;
     static const int DATA_GAIN_PLOT_RATIO=5;
+    static const int MIN_HEIGHT_GAIN_PLOT_1D=75;
 
     static void DisplayExceptions(std::string emsg, std::string src) {
         try {

slsDetectorGui/include/qDetectorMain.h

@@ -30,8 +30,7 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
     Q_OBJECT
 
   public:
-    qDetectorMain(int argc, char **argv, QApplication *app,
+    qDetectorMain(int multiId, std::string fname, bool isDevel);
-                  QWidget *parent = 0);
     ~qDetectorMain();
 
   private slots:

slsDetectorGui/include/qDrawPlot.h

@@ -12,7 +12,6 @@ class detectorData;
 #include "Detector.h"
 
 class QResizeEvent;
-#include <QFutureWatcher>
 
 #include <mutex>
 
@@ -64,11 +63,11 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
 
   private slots:
     void SetSaveFileName(QString val);
-    void AcquireFinished();
+    void AcquireThread();
     void UpdatePlot();
   
-
   signals:
+    void StartAcquireSignal();
     void AcquireFinishedSignal();
     void AbortSignal();
     void UpdateSignal();
@@ -81,7 +80,6 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
     void DetachHists();
     static void GetAcquisitionFinishedCallBack(double currentProgress, int detectorStatus, void *this_pointer);
     static void GetDataCallBack(detectorData *data, uint64_t frameIndex, uint32_t subFrameIndex, void *this_pointer);
-    std::string AcquireThread();
     void AcquisitionFinished(double currentProgress, int detectorStatus);
     void GetData(detectorData *data, uint64_t frameIndex, uint32_t subFrameIndex);
     void toDoublePixelData(double *dest, char *source, int size, int databytes, int dr, double *gaindest = NULL);
@@ -98,9 +96,10 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
 
     SlsQt1DPlot *plot1d{nullptr};
 	  QVector<SlsQtH1D *> hists1d;
+    SlsQt1DPlot *gainplot1d{nullptr};
+	  SlsQtH1D * gainhist1d{nullptr};
     SlsQt2DPlot *plot2d{nullptr};
     SlsQt2DPlot *gainplot2d{nullptr};
-    QFutureWatcher<std::string> *acqResultWatcher;
 
     bool is1d{true};
     bool isRunning{false};
@@ -124,6 +123,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
     int nHists{1};
     double *datax1d{nullptr};
     std::vector<double *> datay1d;
+    double *gainDatay1d{nullptr};
     double *data2d{nullptr};
     double *gainData{nullptr};
 
@@ -158,6 +158,7 @@ class qDrawPlot : public QWidget, private Ui::PlotObject {
 
     unsigned int nPixelsX{0};
     unsigned int nPixelsY{0};
-    const static int npixelsx_jctb = 400;
+    uint32_t pixelMask{0};
-    int npixelsy_jctb{0};
+    uint32_t gainMask{0};
+    int gainOffset{0};
 };

slsDetectorGui/include/qTabMeasurement.h

@@ -26,10 +26,12 @@ private slots:
 	void SetNumMeasurements(int val);
 	void SetNumFrames(int val);
 	void SetNumTriggers(int val);
+	void SetNumBursts(int val);
 	void SetNumSamples(int val);
 	void SetExposureTime();
 	void SetAcquisitionPeriod();
 	void SetDelay();
+	void SetBurstPeriod();
 	void SetFileWrite(bool val);
 	void SetFileName();
 	void SetRunIndex(int val);
@@ -41,17 +43,24 @@ private slots:
 private:
 	void SetupWidgetWindow();
 	void Initialization();
+	/** default, show trigger and delay,
+	 * otherwise for gotthard2 in auto timing mode and burst mode, 
+	 * show bursts and burst period
+	*/
+	void ShowTriggerDelay();
 	void SetupTimingMode();
 	void EnableWidgetsforTimingMode();
 
 	void GetTimingMode();
 	void GetNumFrames();
 	void GetNumTriggers();
+	void GetNumBursts();
 	void GetNumSamples();
 	void GetExposureTime();
 	void GetAcquisitionPeriod();
 	void CheckAcqPeriodGreaterThanExp();
 	void GetDelay();
+	void GetBurstPeriod();
 	void GetFileWrite();
 	void GetFileName();
 	void GetRunIndex();

slsDetectorGui/include/qTabSettings.h

@@ -41,6 +41,14 @@ private:
 		FORCESWITCHG1, 
 		FORCESWITCHG2, 
 		VERLOWGAIN,
+        G1_HIGHGAIN,
+        G1_LOWGAIN,
+        G2_HIGHCAP_HIGHGAIN,
+        G2_HIGHCAP_LOWGAIN,
+        G2_LOWCAP_HIGHGAIN,
+        G2_LOWCAP_LOWGAIN,
+        G4_HIGHGAIN,
+        G4_LOWGAIN,		
 		UNDEFINED, 
 		UNINITIALIZED, 
 		NUMSETTINGS

slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h

@@ -77,14 +77,14 @@ class SlsQtH1D:public QwtPlotCurve{
   int    ndata;
   int    n_array;
   double dx;
-  double *x,*y;
+  double *x{nullptr},*y{nullptr};
   double ymin,ymax;
   double firstXgt0,firstYgt0;
   void Initailize();
   int  SetUpArrays(int n);
   int  CheckIndex(int bx);
 
-  QPen* pen_ptr;
+  QPen* pen_ptr{nullptr};
 };
 
 
@@ -132,6 +132,7 @@ class SlsQt1DPlot:public QwtPlot{
   void DisableZoom(bool disable);
   void EnableXAutoScaling() {setAxisAutoScale(QwtPlot::xBottom, true);Update();};
   void EnableYAutoScaling() {setAxisAutoScale(QwtPlot::yLeft, true);Update();};
+  void SetYStep (int step) {ystep = step;};
   void SetXMinMax(double min,double max){setAxisScale(QwtPlot::xBottom,min,max);};
   void SetYMinMax(double min,double max){setAxisScale(QwtPlot::yLeft,min,max);};
   double GetXMinimum(){return hist_list->Hist()->GetXMin();};
@@ -150,13 +151,14 @@ class SlsQt1DPlot:public QwtPlot{
   void SetLogY(bool yes=1);
  private:
   
-  SlsQtH1DList*     hist_list;
+  SlsQtH1DList*     hist_list{nullptr};
-  SlsQt1DZoomer*    zoomer;
+  SlsQt1DZoomer*    zoomer{nullptr};
-  QwtPlotPanner* panner;
+  QwtPlotPanner* panner{nullptr};
 
-  QwtPlotMarker *hline;
+  QwtPlotMarker *hline{nullptr};
-  QwtPlotMarker *vline;
+  QwtPlotMarker *vline{nullptr};
   bool disableZoom{false};
+  int ystep{0};
   
   void SetupZoom();
   void UnknownStuff();

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h

@@ -26,7 +26,7 @@ class SlsQt2DHist: public QwtRasterData{
   double  x_width,y_width;
 
   int     nx,ny,nb;
-  double  *data;
+  double  *data{nullptr};
   double  z_min,z_mean,z_max;
   bool    z_mean_has_been_calculated;
   

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h

@@ -20,7 +20,7 @@ class SlsQt2DPlot: public QwtPlot{
 
 public:
     SlsQt2DPlot(QWidget * = NULL);
-
+    ~SlsQt2DPlot();
     void SetTitle(QString title);
     void SetXTitle(QString title);
     void SetYTitle(QString title);
@@ -77,17 +77,17 @@ private:
     QwtLinearColorMap* myColourMap(QVector<double> colourStops);
     QwtLinearColorMap* myColourMap(int log=0);
 
-    QwtPlotSpectrogram *d_spectrogram;
+    QwtPlotSpectrogram *d_spectrogram{nullptr};
-    SlsQt2DHist* hist;
+    SlsQt2DHist* hist{nullptr};
-    SlsQt2DZoomer* zoomer;
+    SlsQt2DZoomer* zoomer{nullptr};
-    QwtPlotPanner* panner;
+    QwtPlotPanner* panner{nullptr};
-    QwtScaleWidget *rightAxis;
+    QwtScaleWidget *rightAxis{nullptr};
 
-    QwtLinearColorMap* colorMapLinearScale;
+    QwtLinearColorMap* colorMapLinearScale{nullptr};
-    QwtLinearColorMap* colorMapLogScale;
+    QwtLinearColorMap* colorMapLogScale{nullptr};
 #if QWT_VERSION<0x060000
-    QwtValueList* contourLevelsLinear;
+    QwtValueList* contourLevelsLinear{nullptr};
-    QwtValueList* contourLevelsLog;
+    QwtValueList* contourLevelsLog{nullptr};
 #else 
     QList<double> contourLevelsLinear;
     QList<double> contourLevelsLog;

slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cxx

@@ -21,7 +21,7 @@
 #define QwtLog10ScaleEngine QwtLogScaleEngine
 #endif
 
-SlsQtH1D::SlsQtH1D(QString title, int n, double min, double max, double *data) : QwtPlotCurve(title) {
+SlsQtH1D::SlsQtH1D(QString title, int n, double min, double max, double *data) : QwtPlotCurve(title), x(nullptr), y(nullptr), pen_ptr(nullptr) {
     Initailize();
     SetData(n, min, max, data);
 }
@@ -33,14 +33,17 @@ SlsQtH1D::SlsQtH1D(QString title, int n, double *data_x, double *data_y) : QwtPl
 
 void SlsQtH1D::Initailize() {
     ndata = n_array = 0;
-    x = y = 0;
+    x = y = nullptr;
     pen_ptr = new QPen();
     SetLineColor();
 }
 
 SlsQtH1D::~SlsQtH1D() {
-    delete x;
+    if (x)
-    delete y;
+        delete [] x;
+    if (y)
+        delete [] y;
+    if (pen_ptr)   
         delete pen_ptr;
 }
 
@@ -358,12 +361,16 @@ SlsQt1DPlot::SlsQt1DPlot(QWidget *parent) : QwtPlot(parent) {
 }
 
 SlsQt1DPlot::~SlsQt1DPlot() {
+    if (hist_list)
         delete hist_list;
-
     if (hline)
         delete hline;
     if (vline)
         delete vline;
+    if (zoomer)
+        delete zoomer;
+     if (panner)
+        delete panner;       
 }
 
 void SlsQt1DPlot::CalculateNResetZoomBase() {

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cxx

@@ -52,6 +52,32 @@ SlsQt2DPlot::SlsQt2DPlot(QWidget *parent) : QwtPlot(parent) {
 }
 
 
+SlsQt2DPlot::~SlsQt2DPlot() {
+    if (d_spectrogram) {
+        d_spectrogram->detach();
+        //delete d_spectrogram;
+    }
+    if (hist) {
+        delete hist;  
+    }
+    if (colorMapLinearScale)
+        delete colorMapLinearScale;   
+    if (colorMapLogScale)
+        delete colorMapLogScale;  
+
+
+    if (zoomer)
+        delete zoomer;   
+    if (panner)
+        delete panner;   
+#if QWT_VERSION<0x060000        
+     if (contourLevelsLinear)
+        delete contourLevelsLinear;   
+     if (contourLevelsLog)
+        delete contourLevelsLog;  
+#endif 
+}
+
 void SlsQt2DPlot::SetTitle(QString title) {
 	setTitle(title);
 }

slsDetectorGui/src/qCloneWidget.cpp

@@ -11,10 +11,10 @@
 
 int qCloneWidget::NumClones{0};
 
-qCloneWidget::qCloneWidget(QWidget *parent, SlsQt1DPlot* p1, SlsQt2DPlot* p2, SlsQt2DPlot* gp, 
+qCloneWidget::qCloneWidget(QWidget *parent, SlsQt1DPlot* p1, SlsQt2DPlot* p2, SlsQt1DPlot *gp1, SlsQt2DPlot* gp, 
                 QString title, QString fPath, QString fName, int64_t aIndex, 
                  bool displayStats, QString min, QString max, QString sum):
-                 QMainWindow(parent), plot1d(p1), plot2d(p2), gainplot2d(gp), filePath(fPath), fileName(fName), acqIndex(aIndex) {
+                 QMainWindow(parent), plot1d(p1), plot2d(p2), gainplot1d(gp1), gainplot2d(gp), filePath(fPath), fileName(fName), acqIndex(aIndex) {
     setupUi(this);  
     id = qCloneWidget::NumClones++;   
     SetupWidgetWindow(title);
@@ -26,6 +26,8 @@ qCloneWidget::~qCloneWidget() {
         delete plot1d;
     if (plot2d)
         delete plot2d;
+    if (gainplot1d)
+        delete gainplot1d;        
     if (gainplot2d)
         delete gainplot2d;      
 }
@@ -40,21 +42,35 @@ void qCloneWidget::SetupWidgetWindow(QString title) {
     
     // 1d
     if (plot1d != nullptr) {
+        if (gainplot1d == nullptr) {
             plotLayout->addWidget(plot1d);
+        } else {
+            int ratio = qDefs::DATA_GAIN_PLOT_RATIO - 1;
+            plotLayout->addWidget(plot1d, 0, 0, ratio, ratio);
+            plotLayout->addWidget(gainplot1d, ratio, 0, 1, ratio, Qt::AlignTop);
+        }
     } 
     // 2d
     else {
         if (gainplot2d == nullptr) {
             plotLayout->addWidget(plot2d);
         } else {
-            gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO);
-            gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
             int ratio = qDefs::DATA_GAIN_PLOT_RATIO - 1;
             plotLayout->addWidget(plot2d, 0, 0, ratio, ratio);
             plotLayout->addWidget(gainplot2d, 0, ratio, 1, 1, Qt::AlignRight | Qt::AlignTop);
         }
     }
     connect(actionSaveClone, SIGNAL(triggered()), this, SLOT(SavePlot()));
+    this->show();
+    if (gainplot1d != nullptr) {
+        gainplot1d->setMinimumHeight(qDefs::MIN_HEIGHT_GAIN_PLOT_1D);
+        gainplot1d->setFixedWidth(plot1d->width());
+       // gainplot1d->setFixedHeight(plot1d->height() / qDefs::DATA_GAIN_PLOT_RATIO - 1);
+    }
+    if (gainplot2d != nullptr) {
+        gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO);
+        gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
+    }
 }
 
 void qCloneWidget::DisplayStats(bool enable, QString min, QString max, QString sum) {
@@ -92,6 +108,10 @@ void qCloneWidget::SavePlot() {
 }
 
 void qCloneWidget::resizeEvent(QResizeEvent *event) {
+    if (gainplot1d != nullptr) {
+        gainplot1d->setFixedWidth(plot1d->width());
+        gainplot1d->setFixedHeight(plot1d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
+    }
     if (gainplot2d != nullptr) {
         gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO);
         gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO);

slsDetectorGui/src/qDetectorMain.cpp

@@ -26,27 +26,10 @@
 #include <sys/stat.h>
 
 int main(int argc, char **argv) {
-    QApplication *theApp = new QApplication(argc, argv);
-    theApp->setStyle(new QPlastiqueStyle);
-    theApp->setWindowIcon(QIcon(":/icons/images/mountain.png"));
-    try {
-        qDetectorMain *det = new qDetectorMain(argc, argv, theApp, 0);
-        det->show();
-        theApp->exec();
-    } catch (const std::exception &e) {
-        qDefs::Message(qDefs::CRITICAL,
-                       std::string(e.what()) + "\nExiting Gui :'( ", "main");
-    }
-    return 0;
-}
-
-qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app,
-                             QWidget *parent)
-    : QMainWindow(parent), detType(slsDetectorDefs::GENERIC), isDeveloper(0),
-      heightPlotWindow(0), heightCentralWidget(0) {
 
     // options
     std::string fname = "";
+    bool isDeveloper = false;
     int64_t tempval = 0;
     int multiId = 0;
 
@@ -81,7 +64,7 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app,
             break;
 
         case 'd':
-            isDeveloper = 1;
+            isDeveloper = true;
             break;
 
         case 'i':
@@ -92,7 +75,7 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app,
             tempval = APIGUI;
             FILE_LOG(logINFO) << "SLS Detector GUI " << GITBRANCH << " (0x"
                               << std::hex << tempval << ")";
-            return;
+            return 0;
 
         case 'h':
         default:
@@ -107,10 +90,29 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app,
                 "\t                            only when more than one multi "
                 "detector object is needed.\n\n";
             FILE_LOG(logERROR) << help_message;
-            exit(EXIT_FAILURE);
+            return -1;
         }
     }
 
+
+    QApplication app(argc, argv);
+    app.setStyle(new QPlastiqueStyle);
+    //app.setWindowIcon(QIcon(":/icons/images/mountain.png"));
+    try {
+        qDetectorMain det(multiId, fname, isDeveloper);
+        det.show();
+        app.exec();
+    } catch (const std::exception &e) {
+        qDefs::Message(qDefs::CRITICAL,
+                       std::string(e.what()) + "\nExiting Gui :'( ", "main");
+    }
+    return 0;
+}
+
+qDetectorMain::qDetectorMain(int multiId, std::string fname, bool isDevel)
+    : QMainWindow(0), detType(slsDetectorDefs::GENERIC), isDeveloper(isDevel),
+      heightPlotWindow(0), heightCentralWidget(0) {
+
     setupUi(this);
     SetUpDetector(fname, multiId);
     SetUpWidgetWindow();
@@ -229,6 +231,7 @@ void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
     case slsDetectorDefs::JUNGFRAU:
     case slsDetectorDefs::MOENCH:
     case slsDetectorDefs::MYTHEN3:
+    case slsDetectorDefs::GOTTHARD2:
          break;
     default:
         std::ostringstream os;
@@ -428,8 +431,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
 
 void qDetectorMain::ExecuteHelp(QAction *action) {
     if (action == actionAbout) {
-        FILE_LOG(logINFO) << "About Common GUI for Eiger, Gotthard, Jungfrau "
+        FILE_LOG(logINFO) << "About Common GUI for Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and Moench detectors";
-                             "and Moench detectors";
 
         std::string guiVersion = std::to_string(APIGUI);
         std::string clientVersion = "unknown";
@@ -446,7 +448,7 @@ void qDetectorMain::ExecuteHelp(QAction *action) {
                            clientVersion +
                            "<br><br>"
                            "Common GUI to control the SLS Detectors: "
-                           "Eiger, Gotthard, Jungfrau and Moench.<br><br>"
+                           "Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and Moench.<br><br>"
                            "It can be operated in parallel with the command "
                            "line interface:<br>"
                            "sls_detector_put,<br>sls_detector_get,<br>sls_"

slsDetectorGui/src/qDrawPlot.cpp

@@ -13,7 +13,6 @@
 #include <QtConcurrentRun>
 #include <QResizeEvent>
 
-
 qDrawPlot::qDrawPlot(QWidget *parent, sls::Detector *detector) : QWidget(parent), det(detector) {
     setupUi(this);
     SetupWidgetWindow();
@@ -32,6 +31,8 @@ qDrawPlot::~qDrawPlot() {
         delete [] datax1d;
     for (auto &it : datay1d)
         delete [] it;
+    if (gainDatay1d)
+        delete [] gainDatay1d;    
     if (data2d)
         delete [] data2d;
      if (gainData)
@@ -39,6 +40,10 @@ qDrawPlot::~qDrawPlot() {
 
     if (plot1d)
         delete plot1d;
+    if (gainhist1d)
+        delete gainhist1d;  
+    if (gainplot1d)
+        delete gainplot1d;    
     if (plot2d)
         delete plot2d;
     if (gainplot2d)
@@ -52,6 +57,24 @@ qDrawPlot::~qDrawPlot() {
 
 void qDrawPlot::SetupWidgetWindow() {
     detType = det->getDetectorType().squash();
+    switch (detType) {
+        case slsDetectorDefs::JUNGFRAU:
+            pixelMask = ((1 << 14) - 1);
+            gainMask = (3 << 14);
+            gainOffset = 14;
+            FILE_LOG(logINFO) << "Pixel Mask: " << std::hex << pixelMask 
+            << ", Gain Mask:" << gainMask << ", Gain Offset:" << std::dec << gainOffset;
+            break;
+        case slsDetectorDefs::GOTTHARD2:
+            pixelMask = ((1 << 12) - 1);
+            gainMask = (3 << 12);
+            gainOffset = 12;
+            FILE_LOG(logINFO) << "Pixel Mask: " << std::hex << pixelMask 
+            << ", Gain Mask:" << gainMask << ", Gain Offset:" << std::dec << gainOffset;
+            break;
+        default:
+            break;
+    }
     // save
     try {
         std::string temp = det->getFilePath().squash("/tmp/");
@@ -67,15 +90,12 @@ void qDrawPlot::SetupWidgetWindow() {
     SetupPlots();
     SetDataCallBack(true);
     det->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack), this);
-    // future watcher to watch result of AcquireThread only because it uses signals/slots to handle acquire exception
-    acqResultWatcher = new QFutureWatcher<std::string>();
-
     Initialization();
 }
 
 void qDrawPlot::Initialization() {
     connect(this, SIGNAL(UpdateSignal()), this, SLOT(UpdatePlot()));
-    connect(acqResultWatcher, SIGNAL(finished()), this, SLOT(AcquireFinished()));
+    connect(this, SIGNAL(StartAcquireSignal()), this, SLOT(AcquireThread()));
 }
 
 void qDrawPlot::SetupPlots() {
@@ -86,13 +106,6 @@ void qDrawPlot::SetupPlots() {
     nPixelsX = res.x;
     nPixelsY = res.y;
     switch(detType) {
-    case slsDetectorDefs::MOENCH:
-        try{
-            npixelsy_jctb = (det->getNumberOfAnalogSamples().tsquash("Inconsistent values for number of analog samples") * 2)/25;// for moench 03
-            nPixelsX = npixelsx_jctb;
-            nPixelsY = npixelsy_jctb;
-        } CATCH_DISPLAY ("Could not get number of analog samples.", "qDrawPlot::SetupPlots")
-        break;
     case slsDetectorDefs::EIGER:
         try{
             if (det->getQuad().tsquash("Inconsistent values for quad type")) {
@@ -141,12 +154,40 @@ void qDrawPlot::SetupPlots() {
     plot1d->SetTitleFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
     plot1d->SetXFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
     plot1d->SetYFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
-    plot1d->SetTitle("--");
+    plot1d->SetTitle("");
     plot1d->SetXTitle(xTitle1d);
     plot1d->SetYTitle(yTitle1d);
     h->Attach(plot1d);
     plot1d->hide();
 
+    if (gainDatay1d)
+    delete[] gainDatay1d;
+   gainDatay1d = new double[nPixelsX];
+    // default display data
+    for (unsigned int px = 0; px < nPixelsX; ++px) {
+        gainDatay1d[px] = 0;
+    }
+    // set gain hist 
+    gainhist1d = new SlsQtH1D("", nPixelsX, datax1d, gainDatay1d);
+    gainhist1d->SetLineColor(0);
+    gainhist1d->setStyleLinesorDots(isLines);
+    gainhist1d->setSymbolMarkers(isMarkers);
+    // setup 1d gain plot
+    gainplot1d = new SlsQt1DPlot(boxPlot);
+    gainplot1d->SetTitleFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+    gainplot1d->SetYFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+    gainplot1d->SetTitle("");
+    gainplot1d->SetYTitle("Gain");
+    // set ticks to just 3
+    QList<double> majorTicks({0, 1, 2, 3});
+    QwtScaleDiv div( 0, 3, QList<double>(), QList<double>(), majorTicks); 
+    gainplot1d->setAxisScaleDiv( QwtPlot::yLeft, div);
+    //gainplot1d->axisScaleDraw(QwtPlot::xBottom)->enableComponent(QwtScaleDraw::Ticks, false);
+    //gainplot1d->axisScaleDraw(QwtPlot::yLeft)->enableComponent(QwtScaleDraw::Labels, false);
+    gainhist1d->setItemAttribute(QwtPlotItem::Legend, false);
+    gainhist1d->Attach(gainplot1d);
+    gainplot1d->hide();
+
     // setup 2d data
     if (data2d)
         delete [] data2d;    
@@ -184,17 +225,21 @@ void qDrawPlot::SetupPlots() {
 
     gainplot2d = new SlsQt2DPlot(boxPlot);
     gainplot2d->SetData(nPixelsX, -0.5, nPixelsX - 0.5, nPixelsY, -0.5, nPixelsY - 0.5, gainData);
-    gainplot2d->setFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+    gainplot2d->SetTitleFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
-    gainplot2d->setTitle("");
+    gainplot2d->setTitle("Gain");
-    gainplot2d->enableAxis(0, false);
+    gainplot2d->SetZTitle(""); 
-    gainplot2d->enableAxis(1, false);
+    gainplot2d->enableAxis(QwtPlot::yLeft, false);
-    gainplot2d->enableAxis(2, false);
+    //gainplot2d->enableAxis(1, false);
+    gainplot2d->enableAxis(QwtPlot::xBottom, false);
+    // set ticks to just 3
+    gainplot2d->setAxisScaleDiv( QwtPlot::yRight, div);
     gainplot2d->hide();
 
     // layout of plots
     int ratio = qDefs::DATA_GAIN_PLOT_RATIO - 1;
     plotLayout->addWidget(plot1d, 0, 0, ratio, ratio);
     plotLayout->addWidget(plot2d, 0, 0, ratio, ratio);
+    plotLayout->addWidget(gainplot1d, ratio, 0, 1, ratio, Qt::AlignTop);
     plotLayout->addWidget(gainplot2d, 0, ratio, 1, 1, Qt::AlignRight | Qt::AlignTop);
 }
 
@@ -203,6 +248,10 @@ void qDrawPlot::resizeEvent(QResizeEvent *event) {
         gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO);
         gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
     }
+    if (gainplot1d->isVisible()) {
+        gainplot1d->setFixedWidth(plot1d->width());
+        gainplot1d->setFixedHeight(plot1d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
+    }   
     event->accept();
 }
 
@@ -317,9 +366,11 @@ void qDrawPlot::SetDataCallBack(bool enable) {
     FILE_LOG(logINFO) << "Setting data call back to " << std::boolalpha << enable << std::noboolalpha;
     if (enable) {
         isPlot = true;
+        det->setRxZmqDataStream(true);
         det->registerDataCallback(&(GetDataCallBack), this); 
     } else {
         isPlot = false;
+        det->setRxZmqDataStream(false);
         det->registerDataCallback(nullptr, this);
     }
   
@@ -432,6 +483,7 @@ void qDrawPlot::ClonePlot() {
     
     SlsQt1DPlot* cloneplot1D = nullptr;
     SlsQt2DPlot* cloneplot2D = nullptr;
+    SlsQt1DPlot* clonegainplot1D = nullptr;
     SlsQt2DPlot* clonegainplot2D = nullptr;
 
     if (is1d) {
@@ -453,6 +505,24 @@ void qDrawPlot::ClonePlot() {
             cloneplotHists1D.append(h);
             h->Attach(cloneplot1D);
         }
+        if (isGainDataExtracted) {
+            SlsQtH1D *h = new SlsQtH1D("", nPixelsX, datax1d, gainDatay1d);
+            h->SetLineColor(0);
+            h->setStyleLinesorDots(isLines);
+            h->setSymbolMarkers(isMarkers);
+            h->setItemAttribute(QwtPlotItem::Legend, false);
+            clonegainplot1D = new SlsQt1DPlot();
+            clonegainplot1D->SetTitleFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+            clonegainplot1D->SetYFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+            clonegainplot1D->SetTitle("");
+            clonegainplot1D->SetYTitle("Gain");
+            // set ticks to just 3
+            QList<double> majorTicks({0, 1, 2, 3});
+            QwtScaleDiv div( 0, 3, QList<double>(), QList<double>(), majorTicks); 
+            clonegainplot1D->setAxisScaleDiv( QwtPlot::yLeft, div);              
+            h->Attach(clonegainplot1D);
+  
+        }
     } else  {
         FILE_LOG(logDEBUG) << "Cloning 2D Image";
         cloneplot2D = new SlsQt2DPlot();
@@ -470,19 +540,26 @@ void qDrawPlot::ClonePlot() {
 
         if (isGainDataExtracted) {
             clonegainplot2D = new SlsQt2DPlot();
-            clonegainplot2D->setFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+            clonegainplot2D->SetTitleFont(QFont("Sans Serif", qDefs::Q_FONT_SIZE, QFont::Normal));
+            clonegainplot2D->SetTitle("Gain"); 
+            clonegainplot2D->SetZTitle(""); 
+            clonegainplot2D->enableAxis(QwtPlot::yLeft, false);
+            clonegainplot2D->enableAxis(QwtPlot::xBottom, false);
+            // set ticks to just 3
+            QList<double> majorTicks({0, 1, 2, 3});
+            QwtScaleDiv div( 0, 3, QList<double>(), QList<double>(), majorTicks); 
+            clonegainplot2D->setAxisScaleDiv( QwtPlot::yRight, div);
+
             clonegainplot2D->enableAxis(0, false);
             clonegainplot2D->enableAxis(1, false);
             clonegainplot2D->enableAxis(2, false);
             clonegainplot2D->SetData(nPixelsX, -0.5, nPixelsX - 0.5, nPixelsY, -0.5, nPixelsY - 0.5, gainData);
-            clonegainplot2D->SetTitle(""); 
         }
     }
 
-    qCloneWidget* q = new qCloneWidget(this, cloneplot1D, cloneplot2D, clonegainplot2D,
+    new qCloneWidget(this, cloneplot1D, cloneplot2D, clonegainplot1D,             
-        boxPlot->title(), fileSavePath, fileSaveName, currentAcqIndex, 
+        clonegainplot2D, boxPlot->title(), fileSavePath, fileSaveName, currentAcqIndex, 
         displayStatistics, lblMinDisp->text(), lblMaxDisp->text(), lblSumDisp->text());
-    q->show(); 
 }
 
 void qDrawPlot::SavePlot() {
@@ -532,6 +609,9 @@ void qDrawPlot::DetachHists() {
     for (QVector<SlsQtH1D *>::iterator h = hists1d.begin(); h != hists1d.end(); ++h) {
         (*h)->Detach(plot1d);
     }
+    if (gainhist1d) {
+        gainhist1d->Detach(gainplot1d);
+    }
 }
 
 void qDrawPlot::StartAcquisition() {
@@ -556,16 +636,19 @@ void qDrawPlot::StartAcquisition() {
         xyRangeChanged = true; 
     }
 
-    // acquisition in another thread
+    emit StartAcquireSignal();
-    QFuture<std::string> future = QtConcurrent::run(this, &qDrawPlot::AcquireThread);
-    acqResultWatcher->setFuture(future);
-
     FILE_LOG(logDEBUG) << "End of Starting Acquisition in qDrawPlot";
 }
 
-void qDrawPlot::AcquireFinished() {
+void qDrawPlot::AcquireThread() {
-    FILE_LOG(logDEBUG) << "Acquisition Finished";
+    FILE_LOG(logDEBUG) << "Acquire Thread";
-    std::string mess = acqResultWatcher->result();
+    std::string mess;
+    try {
+        det->acquire();
+    } catch (const std::exception &e) {
+        mess = std::string(e.what());
+    }
+    FILE_LOG(logINFO) << "Acquisition Finished";
     // exception in acquire will not call acquisition finished call back, so handle it
     if (!mess.empty()) {
         FILE_LOG(logERROR) << "Acquisition Finished with an exception: " << mess;
@@ -581,16 +664,6 @@ void qDrawPlot::AcquireFinished() {
     FILE_LOG(logDEBUG) << "End of Acquisition Finished";    
 }
 
-std::string qDrawPlot::AcquireThread() {
-    FILE_LOG(logDEBUG) << "Acquire Thread";
-    try {
-        det->acquire();
-    } catch (const std::exception &e) {
-        return std::string(e.what());
-    }
-    return std::string("");
-}
-
 void qDrawPlot::GetAcquisitionFinishedCallBack(double currentProgress, int detectorStatus, void *this_pointer) {
     ((qDrawPlot *)this_pointer)->AcquisitionFinished(currentProgress, detectorStatus);
     FILE_LOG(logDEBUG) << "Acquisition Finished Call back successful";
@@ -651,7 +724,8 @@ void qDrawPlot::GetData(detectorData *data, uint64_t frameIndex, uint32_t subFra
     unsigned int nPixels = nPixelsX * (is1d ? 1 : nPixelsY);
     double* rawData = new double[nPixels];
     if (hasGainData) {
-        toDoublePixelData(rawData, data->data, nPixels, data->databytes, data->dynamicRange, gainData);
+        toDoublePixelData(rawData, data->data, nPixels, data->databytes, data->dynamicRange, 
+            is1d ? gainDatay1d : gainData);
         isGainDataExtracted = true;
     } else {
         toDoublePixelData(rawData, data->data, nPixels, data->databytes, data->dynamicRange);
@@ -701,6 +775,7 @@ void qDrawPlot::GetData(detectorData *data, uint64_t frameIndex, uint32_t subFra
     } else {   
         Get2dData(rawData);
     }
+    delete [] rawData;
 
     FILE_LOG(logDEBUG) << "End of Get Data";
     emit UpdateSignal();
@@ -804,6 +879,20 @@ void qDrawPlot::Update1dPlot() {
             h->Attach(plot1d);
         }
     }
+    if (isGainDataExtracted) {
+        gainhist1d->SetData(nPixelsX, datax1d, gainDatay1d);
+        gainhist1d->SetLineColor(0);
+        gainhist1d->setStyleLinesorDots(isLines);
+        gainhist1d->setSymbolMarkers(isMarkers);
+        gainhist1d->Attach(gainplot1d); 
+        if (!gainplot1d->isVisible()) {
+            gainplot1d->setFixedWidth(plot1d->width() );
+            gainplot1d->setFixedHeight(plot1d->height() / qDefs::DATA_GAIN_PLOT_RATIO);
+            gainplot1d->show();
+          }
+    } else if (gainplot1d->isVisible()) {
+        gainplot1d->hide();  
+    }
     if (xyRangeChanged) {
         Update1dXYRange();
         xyRangeChanged = false;
@@ -879,7 +968,7 @@ void qDrawPlot::toDoublePixelData(double *dest, char *source, int size, int data
     int halfbyte = 0;
     char cbyte = '\0';
 
-    // mythen 3 debugging
+    // mythen3 / gotthard2 debugging
     int discardBits = numDiscardBits;
 
     switch (dr) {
@@ -903,14 +992,14 @@ void qDrawPlot::toDoublePixelData(double *dest, char *source, int size, int data
 
     case 16:
         if (detType == slsDetectorDefs::JUNGFRAU ||
-            detType == slsDetectorDefs::MOENCH) {
+            detType == slsDetectorDefs::GOTTHARD2) {
 
             // show gain plot
             if (gaindest != NULL) {
                 for (ichan = 0; ichan < size; ++ichan) {
                     uint16_t temp = (*((u_int16_t *)source));
-                    gaindest[ichan] = ((temp & 0xC000) >> 14);
+                    gaindest[ichan] = ((temp & gainMask) >> gainOffset);
-                    dest[ichan] = (temp & 0x3FFF);
+                    dest[ichan] = (temp & pixelMask);
                     source += 2;
                 }
             }
@@ -918,7 +1007,7 @@ void qDrawPlot::toDoublePixelData(double *dest, char *source, int size, int data
             // only data plot
             else {
                 for (ichan = 0; ichan < size; ++ichan) {
-                    dest[ichan] = ((*((u_int16_t *)source)) & 0x3FFF);
+                    dest[ichan] = ((*((u_int16_t *)source)) & pixelMask);
                     source += 2;
                 }
             }

slsDetectorGui/src/qTabAdvanced.cpp

@@ -30,6 +30,7 @@ void qTabAdvanced::SetupWidgetWindow() {
         tab_roi->setEnabled(true);
         break;
     case slsDetectorDefs::MYTHEN3:
+    case slsDetectorDefs::GOTTHARD2:
         lblDiscardBits->setEnabled(true);
         spinDiscardBits->setEnabled(true);
     default:
@@ -361,7 +362,7 @@ void qTabAdvanced::SetDetectorUDPIP() {
     std::string s = dispDetectorUDPIP->text().toAscii().constData();
     FILE_LOG(logINFO) << "Setting Detector UDP IP:" << s;
     try {
-        det->setSourceUDPIP(s, {comboDetector->currentIndex()});
+        det->setSourceUDPIP(sls::IpAddr{s}, {comboDetector->currentIndex()});
     } CATCH_HANDLE ("Could not set Detector UDP IP.",
                                 "qTabAdvanced::SetDetectorUDPIP", this,
                                 &qTabAdvanced::GetDetectorUDPIP)
@@ -371,7 +372,7 @@ void qTabAdvanced::SetDetectorUDPMAC() {
     std::string s = dispDetectorUDPMAC->text().toAscii().constData();
     FILE_LOG(logINFO) << "Setting Detector UDP MAC:" << s;
     try {
-        det->setSourceUDPMAC(s, {comboDetector->currentIndex()});
+        det->setSourceUDPMAC(sls::MacAddr{s}, {comboDetector->currentIndex()});
     } CATCH_HANDLE ("Could not set Detector UDP MAC.",
                                 "qTabAdvanced::SetDetectorUDPMAC", this,
                                 &qTabAdvanced::GetDetectorUDPMAC)
@@ -390,7 +391,7 @@ void qTabAdvanced::SetCltZMQIP() {
     std::string s = dispZMQIP->text().toAscii().constData();
     FILE_LOG(logINFO) << "Setting Client ZMQ IP:" << s;
     try {
-        det->setClientZmqIp(s, {comboDetector->currentIndex()});
+        det->setClientZmqIp(sls::IpAddr{s}, {comboDetector->currentIndex()});
     } CATCH_HANDLE ("Could not set Client ZMQ IP.",
                                 "qTabAdvanced::SetCltZMQIP", this,
                                 &qTabAdvanced::GetCltZMQIP)
@@ -431,7 +432,7 @@ void qTabAdvanced::SetRxrUDPIP() {
     std::string s = dispRxrUDPIP->text().toAscii().constData();
     FILE_LOG(logINFO) << "Setting Receiver UDP IP:" << s;
     try {
-        det->setDestinationUDPIP(s, {comboDetector->currentIndex()});
+        det->setDestinationUDPIP(sls::IpAddr{s}, {comboDetector->currentIndex()});
     } CATCH_HANDLE ("Could not set Receiver UDP IP.",
                                 "qTabAdvanced::SetRxrUDPIP", this,
                                 &qTabAdvanced::GetRxrUDPIP)
@@ -441,7 +442,7 @@ void qTabAdvanced::SetRxrUDPMAC() {
     std::string s = dispRxrUDPMAC->text().toAscii().constData();
     FILE_LOG(logINFO) << "Setting Receiver UDP MAC:" << s;
     try {
-        det->setDestinationUDPMAC(s, {comboDetector->currentIndex()});
+        det->setDestinationUDPMAC(sls::MacAddr{s}, {comboDetector->currentIndex()});
     } CATCH_HANDLE ("Could not set Receiver UDP MAC.",
                                 "qTabAdvanced::SetRxrUDPMAC", this,
                                 &qTabAdvanced::GetRxrUDPMAC)
@@ -460,7 +461,7 @@ void qTabAdvanced::SetRxrZMQIP() {
     std::string s = dispRxrZMQIP->text().toAscii().constData();
     FILE_LOG(logINFO) << "Setting Receiver ZMQ IP:" << s;
     try {
-        det->setRxZmqIP(s, {comboDetector->currentIndex()});
+        det->setRxZmqIP(sls::IpAddr{s}, {comboDetector->currentIndex()});
     } CATCH_HANDLE ("Could not set Receiver ZMQ IP.",
                                 "qTabAdvanced::SetRxrZMQIP", this,
                                 &qTabAdvanced::GetRxrZMQIP)