WIP

* removed pointer, slight cleaning of loop

* removed semaphore, use getters

* removed redundant log msg

* removed comment

* added const

* removed comment

* changed header

.clang-tidy

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

.gitignore

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

.travis.yml

@@ -4,39 +4,25 @@ language: cpp
 
 os: linux
 
-env: 
+dist: bionic
-  matrix: 
-     - CONDA_PY=3.6
-     - CONDA_PY=3.7
-     - CONDA_PY=3.8
-
-
-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:
@@ -45,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,8 +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)
@@ -44,6 +44,19 @@ 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)
+
+# Use ld.gold if it is available and isn't disabled explicitly
+option(SLS_USE_LD_GOLD "Use GNU gold linker" ON)
+if (SLS_USE_LD_GOLD)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+    if ("${LD_VERSION}" MATCHES "GNU gold")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+    else ()
+        message(WARNING "GNU gold linker isn't available, using the default system linker.")
+    endif ()
+endif ()
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -111,6 +124,11 @@ if(SLS_USE_SANITIZER)
     # 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
@@ -126,7 +144,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)
 
@@ -159,7 +177,7 @@ endif (SLS_USE_RECEIVER)
 
 if (SLS_USE_GUI)   
     find_package(Qt4 REQUIRED)
-    find_package(Qwt 6 REQUIRED)
+    find_package(Qwt 6.1 REQUIRED)
     if (QT4_FOUND AND QWT_FOUND)
         add_subdirectory(slsDetectorGui)
     endif()
@@ -174,6 +192,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)
@@ -194,11 +213,9 @@ if(SLS_BUILD_DOCS)
     add_subdirectory(docs)
 endif(SLS_BUILD_DOCS)
 
-
-
 if(SLS_MASTER_PROJECT)
     # Set install dir CMake packages
-    set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/sls)
+    set(CMAKE_INSTALL_DIR "share/cmake/${PROJECT_NAME}")
     # Set the list of exported targets
     set(PROJECT_LIBRARIES slsSupportLib slsDetectorShared slsReceiverShared)
     # Generate and install package config file and version

README.md

@@ -2,90 +2,67 @@
 Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)
 
 ### Binaries
-Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui)
+Binaries for the slsDetectorPackage are available through conda. 
+```
+#Add conda channels
+conda config --add channels conda-forge
+conda config --add channels slsdetectorgroup
+
+conda install slsdetlib   #only shared lib and command line
+conda install slsdet      #python bindings (includes slsdetlib)
+conda install slsdetgui   #gui (includes qt4)
+
+#Install specific version
+conda install slsdet=2020.03.02.dev0 #developer version from 3 March 2020
+
+```
 
 ### Source code
-One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
+One can also obtain the source code from this repository and compile.
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
 
 ```
-#### Setup dependencies 
+#### 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)

cmake/package_config.cmake

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

cmk.sh

@@ -11,6 +11,7 @@ PYTHON=0
 TESTS=0
 SIMULATOR=0
 CTBGUI=0
+MANUALS=0
 
 
 CLEAN=0
@@ -19,7 +20,7 @@ CMAKE_PRE=""
 CMAKE_POST=""
 
 usage() { echo -e "
-Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
+Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
  -[no option]: only make
  -c: Clean
  -b: Builds/Rebuilds CMake files normal mode
@@ -34,6 +35,7 @@ Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>]
  -j: Number of threads to compile through
  -e: Debug mode
  -i: Builds tests
+ -m: Manuals
 
 Rebuild when you switch to a new build and compile in parallel:
 ./cmk.sh -bj5
@@ -69,7 +71,7 @@ For rebuilding only certain sections
  
  " ; exit 1; }
 
-while getopts ":bpchd:j:trgeisu" opt ; do
+while getopts ":bpchd:j:trgeisum" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
@@ -124,6 +126,10 @@ while getopts ":bpchd:j:trgeisu" opt ; do
 		echo "Compiling Options: Simulator" 
 		SIMULATOR=1
 		;; 
+	m)	
+		echo "Compiling Manuals"
+		MANUALS=1
+		;;
 	u)
 		echo "Compiling Options: Chip Test Gui"
 		CTBGUI=1
@@ -187,8 +193,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 
 
@@ -198,6 +204,12 @@ if [ $SIMULATOR -eq 1 ]; then
 	echo "Simulator Option enabled"
 fi 
 
+#Manuals
+if [ $MANUALS -eq 1 ]; then
+	CMAKE_POST+=" -DSLS_BUILD_DOCS=ON "
+	echo "Manuals Option enabled"
+fi 
+
 #Chip Test Gui
 if [ $CTBGUI -eq 1 ]; then
 	CMAKE_POST+=" -DSLS_USE_CTBGUI=ON "
@@ -251,6 +263,9 @@ else
 	make
 fi
 
+if [ $MANUALS -eq 1 ]; then
+	make docs
+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/copy_lib.sh

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

conda-recepie/meta.yaml

@@ -1,13 +1,14 @@
 
 package:
   name: sls_detector_software
-  version: "developer"
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
 
 source:
   - path: ..
 
 build:
-  number: 1
+  number: 0
+  binary_relocation: True
   rpaths:
     - lib/
 
@@ -16,10 +17,9 @@ requirements:
     - {{ compiler('c') }}
     - {{compiler('cxx')}}
     - cmake
-    # - qwt 6.* #require qt5 investigate befor activating gui
+    - qwt 6.*
-    # - qt=4.8.7=7
+    - qt 4.8.*
-    - zeromq=4.2.5=hfc679d8_5
+    - zeromq
-    - pyzmq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -37,6 +37,7 @@ requirements:
   host:
     - libstdcxx-ng
     - libgcc-ng
+    - zeromq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -46,75 +47,52 @@ requirements:
     - xorg-libxfixes
 
   run:
+    - zeromq
     - libstdcxx-ng
     - libgcc-ng 
 
 
 outputs:
-  - name: sls_detector_lib
+  - name: slsdetlib
     script: copy_lib.sh
 
-  - name: sls_detector
+    requirements:
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+        - zeromq
+
+  - name: slsdet
+
     script: build_pylib.sh
 
     requirements:
       build:
+        - python
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
-        - python {{ python }}
+        - {{ pin_subpackage('slsdetlib', exact=True) }}
         - setuptools
-        - sls_detector_lib
+
-        - pyzmq
-        - pybind11 2.4
       host:
         - python
-        - pybind11 2.4 
+
-        - 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,20 +1636,23 @@ 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));
-    }
+    // }
     
    }
 
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    dBitOffset = 0;
+  } else {
     try {
       dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
     } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::update")
-
+  }
   try {
     tenG = myDet->getTenGiga().tsquash("Different values");
   } CATCH_DISPLAY ("Could not get ten giga enable", "ctbAcquisition::update")
@@ -1610,9 +1738,13 @@ void ctbAcquisition::toggleAcquisition() {
     setDigitalSamples(retval);
   } CATCH_DISPLAY ("Could not get number of digital samples", "ctbAcquisition::toggleAcquisition")
   
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    dBitOffset = 0;
+  } else {
   try {
       dBitOffset = myDet->getRxDbitOffset().tsquash("Different values");
     } CATCH_DISPLAY ("Could not get receiver dbit offset", "ctbAcquisition::toggleAcquisition")
+  }
 
   try {
     roMode = static_cast<int>(myDet->getReadoutMode().tsquash("Different values"));
@@ -1849,6 +1981,9 @@ void ctbAcquisition::setDbitEnable(Int_t reg){
 void ctbAcquisition::updateChans() {
 
   // dbit list
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    dbitlist.clear();
+  } else {
     try {
       auto retval = myDet->getRxDbitList().tsquash("Different values");
       dbitlist.clear();
@@ -1857,6 +1992,7 @@ void ctbAcquisition::updateChans() {
           dbitlist.push_back(value);
       }
     } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbAcquisition::updateChans")
+  }
 
   // adc mask
   try { 
@@ -1977,20 +2113,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 +2142,7 @@ void ctbAcquisition::ChangeDynamicRange(){
 };
 
 void ctbAcquisition::ChangeNumberOfChannels(){
+  changeDetector();
   // if (dataStructure) {
   //    cout << cbDetType->GetSelected()<< endl;
   //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
@@ -2017,6 +2156,24 @@ void ctbAcquisition::ChangeNumberOfChannels(){
     changePlot();
 };
 
+void ctbAcquisition::ChangeImagePixels(Long_t a){
+  ChangeImagePixels();
+};
+
+void ctbAcquisition::ChangeImagePixels(){
+  changeDetector();
+  // if (dataStructure) {
+  //    cout << cbDetType->GetSelected()<< endl;
+  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+  //     cout << "settings number of channels for MYTHEN" << endl;
+  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //     ms->setNumberOfCounters(eNumCount->GetIntNumber());
+      
+  //   }
+  // }
+  // if (deserializer)
+  //  changePlot();
+};
 
 
 void ctbAcquisition::ChangeHistoLimitsPedSub(Long_t a){

ctbGui/ctbAcquisition.h

@@ -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;
 }

ctbGui/ctbSignals.cpp

@@ -374,6 +374,16 @@ void ctbSignals::update() {
 
   } CATCH_DISPLAY ("Could not get patternIOcontrol.", "ctbSignals::update")
 
+  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+    // enable all
+    for (int is=0; is<64; is++) {
+      signals[is]->setDbitList(1);
+    } 
+    eDbitOffset->SetNumber(0);
+  } 
+  
+  // ctb
+  else {
     try {
 
       auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
@@ -400,7 +410,7 @@ void ctbSignals::update() {
       auto val = myDet->getRxDbitOffset().tsquash("Different values");
       eDbitOffset->SetNumber(val);
     } CATCH_DISPLAY ("Could not get receiver dbit offset.", "ctbSignals::update")
-
+  }
 }
 
 

docs/CMakeLists.txt

@@ -1,9 +1,9 @@
-find_package(Doxygen)
+find_package(Doxygen REQUIRED)
-find_package(Sphinx)
+find_package(Sphinx REQUIRED)
+
+
 
 
-if (DOXYGEN_FOUND AND SPHINX_FOUND)
-    message(${CMAKE_PROJECT_SORURCE_DIR}/slsDetectorSoftware/src)
 # Utility to generate command line documentation
 add_executable(gendoc src/gendoc.cpp)
 # This is a bit hacky, but better than exposing stuff? 
@@ -30,6 +30,7 @@ if (DOXYGEN_FOUND AND SPHINX_FOUND)
 set(SPHINX_SOURCE_FILES
   src/commandline.rst
   src/container_utils.rst
+  src/consuming.rst
   src/dependencies.rst
   src/detector.rst
   src/index.rst
@@ -41,6 +42,7 @@ if (DOXYGEN_FOUND AND SPHINX_FOUND)
   src/result.rst
   src/type_traits.rst
   src/ToString.rst
+  src/examples.rst
   
 )
 
@@ -64,6 +66,4 @@ if (DOXYGEN_FOUND AND SPHINX_FOUND)
               ${SPHINX_BUILD}/html
               COMMENT "Generating documentation with Sphinx")
 
-else (DOXYGEN_FOUND AND SPHINX_FOUND)
+
-  message("Doxygen and Sphinx are needed to build documentation")
-endif (DOXYGEN_FOUND AND SPHINX_FOUND)

docs/src/consuming.rst

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

docs/src/dependencies.rst

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

docs/src/examples.rst

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

docs/src/index.rst

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

docs/src/installation.rst

@@ -2,4 +2,68 @@
 Installation
 ==============================================
 
-get the source etc.
+Build from source using CMake
+---------------------------------
+
+.. note :: 
+
+    The default branch of our git repository is developer. It contains the 
+    latest development version. It is expected to compile and work but 
+    features might be added or tweaked. In some cases the API might also change
+    without being communicated. If absolute stability of the API is needed please
+    use one of the release versions. 
+
+.. code-block:: bash
+
+    git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
+    mkdir build && cd build
+    cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
+    make -j12
+    make install
+
+Install binaries using conda
+--------------------------------
+
+.. code-block:: bash
+
+    #Add channels for dependencies and our library
+    conda config --add channels conda-forge
+    conda config --add channels slsdetectorgroup
+    conda config --set channel_priority strict
+
+    #cerate an environment with our library, then activate
+    conda create -n myenv slsdetlib=2020.03.18.dev2
+    codna activate myenv
+
+    #ready to use
+    sls_detector_get exptime
+    etc ...
+
+
+
+Build from source on old distributions
+-----------------------------------------
+
+If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
+it's possible to install a newer gcc using conda and build the slsDetectorPackage
+using this compiler
+
+.. code-block:: bash
+
+    #Create an environment with the dependencies
+    conda create -n myenv gxx_linux-64 cmake zmq
+    conda activate myenv
+    cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
+    make -j12
+
+
+Build this documentation
+-------------------------------
+
+The documentation for the slsDetectorPackage is build using a combination 
+of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
+is to use conda 
+
+.. code-block:: bash
+
+    conda create -n myenv python sphinx sphinx_rtd_theme

docs/src/pydetector.rst

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

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

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,8 +3,8 @@
 
 #include "ClientSocket.h"
 #include "logger.h"
-#include "multiSlsDetector.h"
+#include "DetectorImpl.h"
-#include "slsDetector.h"
+#include "Module.h"
 #include "sls_detector_defs.h"
 
 #include "Timer.h"
@@ -23,10 +23,10 @@
 // extern dt type;
 
 TEST_CASE("Single detector no receiver", "[.integration][.single]") {
-    auto t = slsDetector::getTypeFromDetector(test::hostname);
+    auto t = Module::getTypeFromDetector(test::hostname);
     CHECK(t == test::type);
 
-    slsDetector d(t);
+    Module d(t);
     CHECK(d.getDetectorTypeAsEnum() == t);
     CHECK(d.getDetectorTypeAsString() == test::detector_type);
 
@@ -51,7 +51,7 @@ TEST_CASE("Set control port then create a new object with this control port",
     int new_cport = 1993;
     int new_sport = 2000;
     {
-        slsDetector d(test::type);
+        Module d(test::type);
         d.setHostname(test::hostname);
         CHECK(d.getControlPort() == old_cport);
         d.setControlPort(new_cport);
@@ -60,7 +60,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
     {
-        slsDetector d(test::type);
+        Module d(test::type);
         d.setHostname(test::hostname);
         d.setControlPort(new_cport);
         d.setStopPort(new_sport);
@@ -73,7 +73,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
 
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.getStopPort() == DEFAULT_PORTNO + 1);
     d.freeSharedMemory();
@@ -86,11 +86,11 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
     SingleDetectorConfig c;
 
     // Read type by connecting to the detector
-    auto type = slsDetector::getTypeFromDetector(c.hostname);
+    auto type = Module::getTypeFromDetector(c.hostname);
     CHECK(type == c.type_enum);
 
-    // Create slsDetector of said type and set hostname and detector online
+    // Create Module of said type and set hostname and detector online
-    slsDetector d(type);
+    Module d(type);
     CHECK(d.getDetectorTypeAsEnum() == type);
     CHECK(d.getDetectorTypeAsString() == c.type_string);
 
@@ -133,7 +133,7 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
 
 
 TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
 
     // Check that detector server is unlocked then lock
@@ -155,7 +155,7 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
 }
 
 TEST_CASE("Set settings", "[.integration][.single]"){
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD);
 }
@@ -185,7 +185,7 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
     // MEASURED_SUBPERIOD,	/**< measured subperiod */
     // MAX_TIMERS
 
-    slsDetector d(test::type);
+    Module d(test::type);
     d.setHostname(test::hostname);
 
     // Number of frames
@@ -226,8 +226,8 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
 
 // TEST_CASE("Aquire", "[.integration][eiger]"){
 //     SingleDetectorConfig c;
-//     auto type = slsDetector::getTypeFromDetector(c.hostname);
+//     auto type = Module::getTypeFromDetector(c.hostname);
-//     slsDetector d(type);
+//     Module d(type);
 //     d.setHostname(c.hostname);
 
 //     auto period = 1000000000;
@@ -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

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,20 +1,22 @@
 
-pybind11_add_module(_sls_detector 
+# find_package (Python COMPONENTS Interpreter Development)
+
+pybind11_add_module(_slsdet 
     src/main.cpp 
     src/enums.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
                     )
 
@@ -32,13 +34,14 @@ set( PYTHON_FILES
     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

@@ -3,13 +3,13 @@ import sys
 import numpy as np
 sys.path.append(os.path.join(os.getcwd(), 'bin'))
 
-from sls_detector import Detector, Mythen3, Eiger, Jungfrau, DetectorDacs, Dac, Ctb
+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()
+c = Ctb()
 # j = Jungfrau()
-m = Mythen3()
+# m = Mythen3()
 

python/scripts/cmd_python.py

@@ -4,13 +4,14 @@ out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.ge
 cmd = out.stdout.splitlines()
 cmd.pop(0)
 
-from sls_detector import Detector, Eiger, Ctb
+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_restore', 'vref_cds',
+'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'

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

@@ -18,7 +18,13 @@ 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)
+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)
@@ -26,7 +32,7 @@ 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++')
+syspath = system_include_paths("clang++")
 incargs = ["-I" + inc for inc in syspath]
 args = args + incargs
 
@@ -39,6 +45,7 @@ ag = []
 
 lines = []
 
+ag2 = []
 
 def get_arguments(node):
     args = [a.type.spelling for a in node.get_arguments()]
@@ -46,9 +53,21 @@ def get_arguments(node):
         "py::arg() = Positions{}" if item == "sls::Positions" else "py::arg()"
         for item in args
     ]
-    args = ', '.join(args)
+    args = ", ".join(args)
     if args:
-        args = f', {args}'
+        args = f", {args}"
+    return args
+
+
+def get_fdec(node):
+    args = [a.type.spelling for a in node.get_arguments()]
+    if node.result_type.spelling:
+        return_type = node.result_type.spelling
+    else:
+        return_type = 'void'
+    
+    args = ", ".join(args)
+    args = f'({return_type}(Detector::*)({args}))'
     return args
 
 
@@ -62,23 +81,36 @@ def visit(node):
                 ):
                     m.append(child)
                     args = get_arguments(child)
-                    lines.append(f'.def(\"{child.spelling}\", &Detector::{child.spelling}{args})')
+                    fs = get_fdec(child)
+                    lines.append(
+                        f'.def("{child.spelling}",{fs} &Detector::{child.spelling}{args})'
+                    )
     for child in node.get_children():
         visit(child)
 
+        # .def("setRxHostname",
+        #      (void (Detector::*)(const std::string &, Positions)) &
+        #          Detector::setRxHostname,
+        #      py::arg(), py::arg() = Positions{})
+        # .def("setRxHostname",
+        #      (void (Detector::*)(const std::vector<std::string> &)) &
+        #          Detector::setRxHostname,
+        #      py::arg())
+
 
 visit(tu.cursor)
 
 
-with open('../src/detector_in.cpp') as f:
+with open("../src/detector_in.cpp") as f:
     data = f.read()
-s = ''.join(lines)
+s = "".join(lines)
-s += ';'
+s += ";"
-text = data.replace('[[FUNCTIONS]]', s)
+text = data.replace("[[FUNCTIONS]]", s)
-warning = '/* WARINING This file is auto generated any edits might be overwritten without warning */\n\n'
+warning = "/* WARINING This file is auto generated any edits might be overwritten without warning */\n\n"
-with open('../src/detector.cpp', 'w') as f:
+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'])
+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/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,32 +19,33 @@ 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/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(get_conda_path(), 'include/slsDetectorPackage'),
+            os.path.join('../libs/pybind11/include'),
+            os.path.join(get_conda_path(), 'include'),
 
         ],
         libraries=['SlsDetector', 'SlsReceiver', 'zmq'],
@@ -109,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,22 +0,0 @@
-# from .detector import Detector, DetectorError, free_shared_memory
-from .eiger import Eiger
-from .ctb import Ctb
-from .dacs import DetectorDacs, Dac
-from .detector import Detector
-from .jungfrau import Jungfrau
-from .mythen3 import Mythen3
-# from .jungfrau_ctb import JungfrauCTB
-# from _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
-
-IpAddr = _sls_detector.IpAddr
-MacAddr = _sls_detector.MacAddr

python/sls_detector/ctb.py

@@ -1,121 +0,0 @@
-from .detector import Detector
-from .utils import element_if_equal
-from .dacs import DetectorDacs
-import _sls_detector
-dacIndex = _sls_detector.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
-
-    @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/__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,9 +1,9 @@
 from .detector_property import DetectorProperty
 from functools import partial
 import numpy as np
-import _sls_detector
+import _slsdet
 from .detector import freeze
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 class Dac(DetectorProperty):
     """
     This class represents a dac on the detector. One instance handles all

python/slsdet/detector.py

@@ -1,38 +1,25 @@
-from _sls_detector import CppDetectorApi
+from _slsdet import CppDetectorApi
-from _sls_detector import slsDetectorDefs
+from _slsdet import slsDetectorDefs
+from _slsdet import IpAddr, MacAddr
 
 runStatus = slsDetectorDefs.runStatus
 speedLevel = slsDetectorDefs.speedLevel
 dacIndex = slsDetectorDefs.dacIndex
 
 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
-
+import socket
-# 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
 
     def frozensetattr(self, key, value):
-        if self._frozen and not hasattr(self, key):
+        if self._frozen and not key in dir(self):
             raise AttributeError(
                 "Class {} is frozen. Cannot set {} = {}".format(
                     cls.__name__, key, value
@@ -73,7 +60,6 @@ class Detector(CppDetectorApi):
         self._adc_register = Adc_register(self)
 
 
-
     # CONFIGURATION
     def __len__(self):
         return self.size()
@@ -86,9 +72,6 @@ class Detector(CppDetectorApi):
     def free(self):
         self.freeSharedMemory()
 
-
-
-
     @property
     def config(self):
         return NotImplementedError("config is set only")
@@ -107,6 +90,7 @@ class Detector(CppDetectorApi):
 
     @property
     def hostname(self):
+        print('getting host!')
         return self.getHostname()
 
     @hostname.setter
@@ -437,7 +421,9 @@ class Detector(CppDetectorApi):
 
     @udp_dstip.setter
     def udp_dstip(self, ip):
-        self.getDestinationUDPIP(ip)
+        if ip == 'auto':
+            ip = socket.gethostbyname(self.rx_hostname)
+        self.setDestinationUDPIP(IpAddr(ip))
 
     @property
     def udp_dstip2(self):
@@ -445,7 +431,9 @@ class Detector(CppDetectorApi):
 
     @udp_dstip2.setter
     def udp_dstip2(self, ip):
-        self.getDestinationUDPIP2(ip)
+        if ip == 'auto':
+            ip = socket.gethostbyname(self.rx_hostname)
+        self.setDestinationUDPIP2(IpAddr(ip))
 
     @property
     def udp_dstmac(self):
@@ -453,7 +441,7 @@ class Detector(CppDetectorApi):
 
     @udp_dstmac.setter
     def udp_dstmac(self, mac):
-        self.getDestinationUDPMAC2(mac)
+        self.setDestinationUDPMAC(MacAddr(mac))
 
     @property
     def udp_dstmac2(self):
@@ -461,7 +449,7 @@ class Detector(CppDetectorApi):
 
     @udp_dstmac2.setter
     def udp_dstmac2(self, mac):
-        self.getDestinationUDPMAC2(mac)
+        self.setDestinationUDPMAC2(MacAddr(mac))
 
 
     @property
@@ -470,7 +458,7 @@ class Detector(CppDetectorApi):
 
     @udp_srcip.setter
     def udp_srcip(self, ip):
-        self.setSourceUDPIP(ip)
+        self.setSourceUDPIP(IpAddr(ip))
 
     @property
     def udp_srcip2(self):
@@ -502,7 +490,7 @@ class Detector(CppDetectorApi):
 
     @src_udpmac.setter
     def src_udpmac(self, mac):
-        self.setSourceUDPMAC(mac)
+        self.setSourceUDPMAC(MacAddr(mac))
 
     @property
     def src_udpip2(self):
@@ -510,7 +498,7 @@ class Detector(CppDetectorApi):
 
     @src_udpip2.setter
     def src_udpip2(self, ip):
-        self.setSourceUDPIP(ip)
+        self.setSourceUDPIP(IpAddr(ip))
 
     @property
     def src_udpip(self):
@@ -518,7 +506,7 @@ class Detector(CppDetectorApi):
 
     @src_udpip.setter
     def src_udpip(self, ip):
-        self.setSourceUDPIP(ip)
+        self.setSourceUDPIP(IpAddr(ip))
 
 
     @property
@@ -527,7 +515,7 @@ class Detector(CppDetectorApi):
 
     @src_udpmac2.setter
     def src_udpmac2(self, mac):
-        self.setSourceUDPMAC2(mac)
+        self.setSourceUDPMAC2(MacAddr(mac))
 
     @property
     def vhighvoltage(self):
@@ -774,6 +762,22 @@ class Detector(CppDetectorApi):
     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())
@@ -839,9 +843,249 @@ class Detector(CppDetectorApi):
         return element_if_equal(self.getMaxADCPhaseShift())
 
     @property
-    def maxclkphaseshift(self):
+    def adcphase(self):
-        return element_if_equal(self.getMaxClockPhaseShift())
+        return element_if_equal(self.getADCPhase())
+    
+    @adcphase.setter
+    def adcphase(self, value):
+        self.setADCPhase(value)
 
     @property
-    def adcphase(self):
+    def adcpipeline(self):
-        return element_if_equal()
+        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/eiger.py

@@ -11,8 +11,8 @@ from .detector import Detector
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-import _sls_detector
+import _slsdet
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 # from .utils import element_if_equal
 # from sls_detector.errors import DetectorValueError, DetectorError

python/slsdet/jungfrau.py

@@ -9,8 +9,8 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-import _sls_detector
+import _slsdet
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 
 # @freeze

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

@@ -9,8 +9,8 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-import _sls_detector
+import _slsdet
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 
 # vcassh 1200, 

python/slsdet/utils.py

@@ -2,10 +2,13 @@
 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):
@@ -26,7 +29,7 @@ def list_to_bitmask(values):
     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")
@@ -65,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_in.cpp

@@ -12,6 +12,8 @@ namespace py = pybind11;
 void init_det(py::module &m) {
     using sls::Detector;
     using sls::Positions;
+    using sls::Result;
+    using sls::defs;
     
     py::class_<Detector> CppDetectorApi(m, "CppDetectorApi");
     CppDetectorApi

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)
@@ -184,6 +184,11 @@ void init_enums(py::module &m) {
         .value("VB_PIXBUF", slsDetectorDefs::dacIndex::VB_PIXBUF)
         .value("VIN_COM", slsDetectorDefs::dacIndex::VIN_COM)
         .value("VDD_PROT", slsDetectorDefs::dacIndex::VDD_PROT)
+        .value("VBP_COLBUF", slsDetectorDefs::dacIndex::VBP_COLBUF)
+        .value("VB_SDA", slsDetectorDefs::dacIndex::VB_SDA)
+        .value("VCASC_SFP", slsDetectorDefs::dacIndex::VCASC_SFP)
+        .value("VIPRE_CDS", slsDetectorDefs::dacIndex::VIPRE_CDS)
+        .value("IBIAS_SFP", slsDetectorDefs::dacIndex::IBIAS_SFP)
         .value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A)
         .value("V_POWER_B", slsDetectorDefs::dacIndex::V_POWER_B)
         .value("V_POWER_C", slsDetectorDefs::dacIndex::V_POWER_C)
@@ -224,6 +229,18 @@ void init_enums(py::module &m) {
         .value("FORCESWITCHG2",
                slsDetectorDefs::detectorSettings::FORCESWITCHG2)
         .value("VERYLOWGAIN", slsDetectorDefs::detectorSettings::VERYLOWGAIN)
+        .value("G1_HIGHGAIN", slsDetectorDefs::detectorSettings::G1_HIGHGAIN)
+        .value("G1_LOWGAIN", slsDetectorDefs::detectorSettings::G1_LOWGAIN)
+        .value("G2_HIGHCAP_HIGHGAIN",
+               slsDetectorDefs::detectorSettings::G2_HIGHCAP_HIGHGAIN)
+        .value("G2_HIGHCAP_LOWGAIN",
+               slsDetectorDefs::detectorSettings::G2_HIGHCAP_LOWGAIN)
+        .value("G2_LOWCAP_HIGHGAIN",
+               slsDetectorDefs::detectorSettings::G2_LOWCAP_HIGHGAIN)
+        .value("G2_LOWCAP_LOWGAIN",
+               slsDetectorDefs::detectorSettings::G2_LOWCAP_LOWGAIN)
+        .value("G4_HIGHGAIN", slsDetectorDefs::detectorSettings::G4_HIGHGAIN)
+        .value("G4_LOWGAIN", slsDetectorDefs::detectorSettings::G4_LOWGAIN)
         .value("UNDEFINED", slsDetectorDefs::detectorSettings::UNDEFINED)
         .value("UNINITIALIZED",
                slsDetectorDefs::detectorSettings::UNINITIALIZED)
@@ -278,4 +295,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

@@ -19,7 +19,7 @@ void init_enums(py::module &);
 void init_experimental(py::module &);
 void init_det(py::module &);
 void init_network(py::module &);
-PYBIND11_MODULE(_sls_detector, m) {
+PYBIND11_MODULE(_slsdet, m) {
     m.doc() = R"pbdoc(
         C/C++ API
         -----------------------

python/src/network.cpp

@@ -15,10 +15,11 @@ using sls::IpAddr;
 using sls::MacAddr;
 void init_network(py::module &m) {
 
-    py::class_ <IpAddr> IpAddr(m, "IpAddr");
+    py::class_ <IpAddr>(m, "IpAddr")
-    IpAddr.def(py::init())
+    .def(py::init())
     .def(py::init<const std::string&>())
     .def(py::init<uint32_t>())
+    .def(py::init<const IpAddr&>())
     .def("hex", &IpAddr::hex)
     .def("uint32", &IpAddr::uint32)
     .def(py::self == py::self)
@@ -26,10 +27,11 @@ void init_network(py::module &m) {
     .def("str", &IpAddr::str);
 
 
-    py::class_ <MacAddr> MacAddr(m, "MacAddr");
+    py::class_ <MacAddr>(m, "MacAddr")
-    MacAddr.def(py::init())
+    .def(py::init())
     .def(py::init<const std::string&>())
     .def(py::init<uint64_t>())
+    .def(py::init<const MacAddr&>())
     .def("hex", &MacAddr::hex)
     .def(py::self == py::self)
     .def("uint64", &MacAddr::uint64)

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

@@ -15,7 +15,7 @@ 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
 
@@ -47,7 +47,7 @@ def test_set_counters_single(d, mocker):
 
 
 # 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
 
@@ -73,34 +73,34 @@ def test_set_counters_single(d, mocker):
 #         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_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(DetectorValueError):
 #         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)
 
@@ -112,28 +112,28 @@ def test_set_counters_single(d, mocker):
 #     assert d.dynamic_range == -100
 
 # 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
@@ -141,25 +141,25 @@ def test_set_counters_single(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
 
@@ -168,38 +168,38 @@ def test_set_counters_single(d, mocker):
 #         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
@@ -208,7 +208,7 @@ def test_set_counters_single(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
@@ -216,14 +216,14 @@ def test_set_counters_single(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
@@ -231,7 +231,7 @@ def test_set_counters_single(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):
@@ -239,14 +239,14 @@ def test_set_counters_single(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
@@ -259,12 +259,12 @@ def test_set_counters_single(d, mocker):
 #     assert t.vertical == 0
 
 # 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)
 
@@ -272,12 +272,12 @@ def test_set_counters_single(d, mocker):
 #     assert d.n_frames == -100
 
 # 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):
 #         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(DetectorValueError):
 #         d.n_frames = 0
 
@@ -285,12 +285,12 @@ def test_set_counters_single(d, mocker):
 #     assert d.n_cycles == -100
 
 # def test_set_n_cycles_raises_on_zero(d, mocker):
-#     mocker.patch('_sls_detector.DetectorApi.setCycles')
+#     mocker.patch('_slsdet.DetectorApi.setCycles')
 #     with pytest.raises(DetectorValueError):
 #         d.n_cycles = 0
 
 # def test_set_n_cycles(d, mocker):
-#     m = mocker.patch('_sls_detector.DetectorApi.setCycles')
+#     m = mocker.patch('_slsdet.DetectorApi.setCycles')
 #     d.n_cycles = 56
 #     m.assert_called_once_with(56)
 
@@ -300,12 +300,12 @@ def test_set_counters_single(d, mocker):
 #     assert d.n_measurements == -100
 
 # def test_set_n_measurements_raises_on_zero(d, mocker):
-#     mocker.patch('_sls_detector.DetectorApi.setNumberOfMeasurements')
+#     mocker.patch('_slsdet.DetectorApi.setNumberOfMeasurements')
 #     with pytest.raises(DetectorValueError):
 #         d.n_measurements = 0
 
 # def test_set_n_measurements(d, mocker):
-#     m = mocker.patch('_sls_detector.DetectorApi.setNumberOfMeasurements')
+#     m = mocker.patch('_slsdet.DetectorApi.setNumberOfMeasurements')
 #     d.n_measurements = 560
 #     m.assert_called_once_with(560)
 
@@ -313,33 +313,33 @@ def test_set_counters_single(d, mocker):
 #     assert d.n_modules == 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_get_online(d, mocker):
-#     m = mocker.patch('_sls_detector.DetectorApi.getOnline')
+#     m = mocker.patch('_slsdet.DetectorApi.getOnline')
 #     d.online
 #     m.assert_called_once_with()
 
 # def test_set_online(d, mocker):
-#     m = mocker.patch('_sls_detector.DetectorApi.setOnline')
+#     m = mocker.patch('_slsdet.DetectorApi.setOnline')
 #     d.online = True
 #     m.assert_called_once_with(True)
 
@@ -347,116 +347,116 @@ def test_set_counters_single(d, mocker):
 #     assert d.last_client_ip == ''
 
 # def test_last_cliten_ip_call(d, mocker):
-#     m = mocker.patch('_sls_detector.DetectorApi.getLastClientIP')
+#     m = mocker.patch('_slsdet.DetectorApi.getLastClientIP')
 #     d.last_client_ip
 #     m.assert_called_once_with()
 
 # #-------------------------------------------------------------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, 30003]
 
 # 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_detecor(d, mocker):
-#     m = mocker.patch('_sls_detector.DetectorApi.startAcquisition')
+#     m = mocker.patch('_slsdet.DetectorApi.startAcquisition')
 #     d.start_detector()
 #     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_detector()
 #     m.assert_called_once_with()
 
@@ -464,23 +464,23 @@ def test_set_counters_single(d, mocker):
 
 # #------------------------------------------------------------------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)
 

sample/CMakeLists.txt

@@ -1,21 +1,35 @@
-add_executable(a api.cpp)
+add_executable(using_logger using_logger.cpp)
-target_link_libraries(a 
+target_link_libraries(using_logger 
-    slsDetectorShared
     slsSupportLib
     pthread
     rt
 )  
 
-set_target_properties(a PROPERTIES
+set_target_properties(using_logger PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
 
 
-add_executable(result useResult.cpp)
+# add_executable(result useResult.cpp)
-target_link_libraries(result 
+# target_link_libraries(result 
-    slsDetectorShared
+#     slsDetectorShared
-)  
+# )  
+
+# 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
+# )
+
 
-set_target_properties(result 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";
+    //     }
+    // }
+}

sample/using_logger.cpp

@@ -0,0 +1,42 @@
+#include "logger.h"
+#include <iostream>
+#include <chrono>
+int main() {
+
+    //compare old and new
+    std::cout << "Compare output between old and new:\n";
+    LOG(logINFO) << "Some info message";
+    LOG(logERROR) << "This is an error";
+    LOG(logWARNING) << "While this is only a warning";
+
+    //Logging level can be configure at runtime
+    std::cout << "\n\n";
+    std::cout << "The default macro controlled level is: "
+              << sls::Logger::ToString(LOG_MAX_REPORTING_LEVEL) << '\n';
+    
+    sls::Logger::ReportingLevel() = logERROR;
+    LOG(logINFO) << "Now this is not written";
+    LOG(logWARNING) << "and also not this";
+
+    sls::Logger::ReportingLevel() = logINFO;
+    LOG(logINFO) << "But now we can see it";
+
+
+    //The output can be redirected to another buffer 
+    std::ostringstream local;
+    auto clog_buff = std::clog.rdbuf();
+    std::clog.rdbuf(local.rdbuf());
+
+    LOG(logINFOBLUE) << "A message";
+    LOG(logWARNING) << "And another one";
+
+    std::clog.rdbuf(clog_buff); // restore
+
+    std::cout << "local buf:\n" << local.str(); 
+
+    LOG(logINFO) << "After reset we should print directly";
+    LOG(logINFOBLUE) << "some infoBLUE text";
+    LOG(logINFOGREEN) << "some infoGREEN text";
+    LOG(logINFORED) << "some infoRED text";
+
+}

slsDetectorCalibration/MovingStat.h

@@ -14,8 +14,8 @@ class MovingStat
       /** constructor
 	  \param nn number of samples  parameter to be used
       */
-      MovingStat(int nn=1000) : n(nn), m_n(0) {}
+    MovingStat(int nn) : n(nn), m_n(0), m_newM(0),m_newM2(0)  {}
-
+      //  void setPointers(double *me, double *va) {mean=me; var=va;}
 	/**
 	   clears the moving average number of samples parameter, mean and standard deviation
 	*/
@@ -31,10 +31,10 @@ class MovingStat
 	*/
         void Set(double val, double rms=0, int m=-1)
         {
-	  if (m>0) m_n = m;  else m_n = n; 
+	  if (m>=0) m_n = m;  else m_n = n; 
 	  m_newM=val*m_n; 
-	  // cout << "set " << val << " " << m << " " << m_n << " " << m_newM << endl;
 	  SetRMS(rms);
+	  // cout << "set " << val << " " << m << " " << m_n << " " << m_newM << endl;
         }
 	/**
 	   clears the moving average number of samples parameter, mean and standard deviation
@@ -42,12 +42,15 @@ class MovingStat
         void SetRMS(double rms)
         {
 	  if (rms<=0) {
-	    m_newM2=m_newM*m_newM/n;
+	    if (m_n>0)
+	      m_newM2=m_newM*m_newM/m_n;
+	    else
+	      m_newM2=0;
 	    //m_n=0;
 	  } else {
-	    if (m_n>0)
+	    if (m_n>0) {
 	      m_newM2=(m_n*rms*rms+m_newM*m_newM/m_n);
-	    else {
+	    } else {
 	      m_newM2=(m_n*rms*rms+m_newM*m_newM/n);
 	      m_n=0;
 	    }
@@ -102,7 +105,8 @@ class MovingStat
 	      m_newM = x;
 	      m_newM2 = x*x;
 	      m_n++;
-            }             else             {
+            }             
+	  else             {
 	    m_newM = m_newM + x - m_newM/m_n;
 	    m_newM2 = m_newM2 + x*x - m_newM2/m_n;
 	  }
@@ -122,6 +126,8 @@ class MovingStat
         inline double Mean() const
         {
 	  //  cout << "get " <<  m_n << " " << m_newM << " " << m_newM/m_n << endl;
+	 
+	  
 	    return (m_n > 0) ? m_newM/m_n : 0.0;
         }
 
@@ -138,7 +144,7 @@ class MovingStat
 	 */
         inline double Variance() const
         {
-	  return ( (m_n > 1) ? (M2()-Mean()*Mean()) : 0.0 );
+	  return (m_n > 0) ? m_newM2/m_n-m_newM/m_n*m_newM/m_n : 0.0;
         }
 
 	/** returns the standard deviation, 0 if no elements are inside
@@ -146,7 +152,8 @@ class MovingStat
 	 */
         inline double StandardDeviation() const
         {
-	  return ( (Variance() > 0) ? sqrt( Variance() ) : -1 );
+	  
+	  return sqrt(Variance());//
         }
 
     private:

slsDetectorCalibration/analogDetector.h

@@ -68,10 +68,15 @@ template <class dataType> class analogDetector {
       det->getDetectorSize(nx,ny);
     
     stat=new pedestalSubtraction*[ny];
+    /* pedMean=new double*[ny]; */
+    /* pedVariance=new double*[ny]; */
     for (int i=0; i<ny; i++) {
       stat[i]=new pedestalSubtraction[nx];
-      for (int ix=0; ix<nx; ix++) {
+      /* pedMean[i]=new double[nx]; */
+      /* pedVariance[i]=new double[nx]; */
+      for (ix=0; ix<nx; ++ix) {
 	stat[i][ix].SetNPedestals(nped);
+	/* stat[i][ix].setPointers(&(pedMean[iy][ix]),&(pedVariance[iy][ix])); */
       }
     }
     image=new int[nx*ny];
@@ -95,7 +100,16 @@ template <class dataType> class analogDetector {
   /**
      destructor. Deletes the pdestalSubtraction array and the image
   */
-  virtual ~analogDetector() {for (int i=0; i<ny; i++) delete [] stat[i]; delete [] stat; delete [] image;
+  virtual ~analogDetector() {
+    for (int i=0; i<ny; i++) {
+      delete [] stat[i]; 
+      /* delete [] pedMean[i];  */
+      /* delete [] pedVariance[i]; */
+    }; 
+    /* delete [] pedMean;  */
+    /* delete [] pedVariance; */ 
+    delete [] stat; 
+    delete [] image;
 #ifdef ROOTSPECTRUM
     delete hs;
 #ifdef ROOTCLUST
@@ -132,16 +146,23 @@ template <class dataType> class analogDetector {
     
 
     stat=new pedestalSubtraction*[ny];
+    /* pedMean=new double*[ny]; */
+    /* pedVariance=new double*[ny]; */
     for (int i=0; i<ny; i++) {
       stat[i]=new pedestalSubtraction[nx];
+      /* pedMean[i]=new double[nx]; */
+      /* pedVariance[i]=new double[nx]; */
     }
     
     int nped=orig->SetNPedestals();
     //cout << nped << " " << orig->getPedestal(ix,iy) << orig->getPedestalRMS(ix,iy) << endl;
-    for (int iy=0; iy<ny; iy++) {
+    for (iy=0; iy<ny; ++iy) {
-      for (int ix=0; ix<nx; ix++) {
+      for (ix=0; ix<nx; ++ix) {
+	//stat[iy][ix].setPointers(&(pedMean[iy][ix]),&(pedVariance[iy][ix]));
 	stat[iy][ix].SetNPedestals(nped);
 	setPedestal(ix,iy,orig->getPedestal(ix,iy),orig->getPedestalRMS(ix,iy),orig->GetNPedestals(ix,iy));
+	/* if (ix==50 && iy==50)  */
+	/*   cout << "clone ped " <<  " " << ix << " " << iy << " " << getPedestal(ix,iy) << " " << getPedestalRMS(ix,iy)<< " " << GetNPedestals(ix,iy) << endl; */
       }
     }
     image=new int[nx*ny];
@@ -199,7 +220,7 @@ template <class dataType> class analogDetector {
      \param nns reference to number of subpixels for interpolating detector, will always be 1 in this case
      \returns number of pixels of the detector image
    */
-  virtual int getImageSize(int &nnx, int &nny, int &nns){nnx=nx; nny=ny; nns=1; return nx*ny;}; 
+  virtual int getImageSize(int &nnx, int &nny, int &nnsx, int &nnsy){nnx=nx; nny=ny; nnsx=1; nnsy=1; return nx*ny;}; 
  /**
      Returns data size of the detector image matrix
      \param nnx reference to pixel size in x
@@ -231,8 +252,8 @@ template <class dataType> class analogDetector {
     if (gm) {
       if (gmap) delete [] gmap; 
       gmap=new double[nnx*nny];
-      for (int iy=0; iy<nny; iy++) {
+      for (iy=0; iy<nny; ++iy) {
-	for (int ix=0; ix<nnx; ix++) {
+	for (ix=0; ix<nnx; ++ix) {
 	  gmap[iy*nnx+ix]=gm[iy*nnx+ix];
 	  // cout << gmap[iy*nnx+ix] << " " ;
 	}
@@ -251,8 +272,8 @@ template <class dataType> class analogDetector {
     void *ret;
     if (gmap)  {
       gm=new float[nx*ny];
-	for (int iy=0; iy<ny; iy++) {
+      for (iy=0; iy<ny; ++iy) {
-      for (int ix=0; ix<nx; ix++) {
+	for (ix=0; ix<nx; ++ix) {
 	  gm[iy*nx+ix]=gmap[iy*nx+ix];
 	}
       }
@@ -267,8 +288,8 @@ template <class dataType> class analogDetector {
     
   virtual void newDataSet(){
     iframe=-1; 
-    for (int iy=0; iy<ny; iy++) 
+    for (iy=0; iy<ny; ++iy) 
-      for (int ix=0; ix<nx; ix++) {
+      for (ix=0; ix<nx; ++ix) {
 	stat[iy][ix].Clear(); 
 	image[iy*nx+ix]=0;
       }
@@ -285,12 +306,14 @@ template <class dataType> class analogDetector {
   };  
   
   /** resets the commonModeSubtraction and increases the frame index */
-  virtual void newFrame(){iframe++; if (cmSub) cmSub->newFrame();};
+  virtual void newFrame(){iframe++; if (cmSub) cmSub->newFrame(); det->newFrame();};
 
   /** resets the commonModeSubtraction and increases the frame index */
   virtual void newFrame(char *data){
     iframe++; 
     if (cmSub) cmSub->newFrame(); 
+    det->newFrame();
+    // det->getData(data);
     calcGhost(data); 
     //    cout << getId() << " Calc ghost " <<  getGhost(15,15) << endl;
   };
@@ -359,8 +382,8 @@ template <class dataType> class analogDetector {
       // cout << "+"<< getId() << endl;
       if (cmSub) {
 	//cout << "*" << endl;
-	  for (int iy=ymin; iy<ymax; iy++) { 
+	for (iy=ymin; iy<ymax; ++iy) { 
-	for (int ix=xmin; ix<xmax; ix++) {
+	  for (ix=xmin; ix<xmax; ++ix) {
 	    // if (getNumpedestals(ix,iy)>0) 
 	  //  if (det->isGood(ix,iy)) {
 	      addToCommonMode(data, ix, iy);
@@ -403,8 +426,10 @@ template <class dataType> class analogDetector {
       if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
 	if (cmSub && cm>0) {
 	  return stat[iy][ix].getPedestal()+getCommonMode(ix,iy); 
-	  
+	  //return pedMean[iy][ix]+getCommonMode(ix,iy); 
-	}     	else return stat[iy][ix].getPedestal(); 
+	} 
+	//return pedMean[iy][ix];
+	return stat[iy][ix].getPedestal(); 
       } else return -1;
     };
 
@@ -422,7 +447,7 @@ template <class dataType> class analogDetector {
 	  g=gmap[iy*nx+ix];
 	  if (g==0) g=-1.;
 	}
-      
+	//	return sqrt(pedVariance[iy][ix])/g;
 	return stat[iy][ix].getPedestalRMS()/g;//divide by gain?
       }
       return -1;
@@ -441,10 +466,11 @@ template <class dataType> class analogDetector {
        \returns pedestal value
     */
     virtual double* getPedestal(double *ped){
-      if (ped==NULL)
+      if (ped==NULL) {
 	ped=new double[nx*ny];
-      for (int iy=0; iy<ny; iy++) {
+      }
-	for (int ix=0; ix<nx; ix++) {
+      for (iy=0; iy<ny; ++iy) {
+	for (ix=0; ix<nx; ++ix) {
 	  ped[iy*nx+ix]=stat[iy][ix].getPedestal();
 	    //cout << ped[iy*nx+ix] << " " ;
 	}
@@ -459,10 +485,11 @@ template <class dataType> class analogDetector {
        \returns pedestal rms
     */
     virtual double* getPedestalRMS(double *ped=NULL){
-      if (ped==NULL)
+      if (ped==NULL) {
 	ped=new double[nx*ny];
-	for (int iy=0; iy<ny; iy++) {
+      }
-      for (int ix=0; ix<nx; ix++) {
+      for (iy=0; iy<ny; ++iy) {
+	for (ix=0; ix<nx; ++ix) {
 	  ped[iy*nx+ix]=stat[iy][ix].getPedestalRMS();
 	}
       }
@@ -501,8 +528,8 @@ template <class dataType> class analogDetector {
     */
     virtual void setPedestal(double *ped, double *rms=NULL, int m=-1){
       double rr=0;
-      for (int iy=ymin; iy<ymax; iy++) {
+      for (iy=ymin; iy<ymax; ++iy) {
-	for (int ix=xmin; ix<xmax; ix++) {
+	for (ix=xmin; ix<xmax; ++ix) {
 	  if (rms) rr=rms[iy*nx+ix];
 	  stat[iy][ix].setPedestal(ped[iy*nx+ix],rr, m);
 	  //  cout << ix << " " << iy << " " << ped[iy*nx+ix] << " " << stat[iy][ix].getPedestal() << endl;
@@ -531,8 +558,8 @@ template <class dataType> class analogDetector {
        \param rms pointer to array of pedestal rms
     */
  virtual void setPedestalRMS(double *rms){
-	for (int iy=ymin; iy<ymax; iy++) {
+   for (iy=ymin; iy<ymax; ++iy) {
-      for (int ix=xmin; ix<xmax; ix++) {
+     for (ix=xmin; ix<xmax; ++ix) {
 	  stat[iy][ix].setPedestalRMS(rms[iy*nx+ix]);
 	};
       };
@@ -572,8 +599,8 @@ template <class dataType> class analogDetector {
 
 #endif
       gm=new float[nx*ny];
-	for (int iy=0; iy<ny; iy++) {
+      for (iy=0; iy<ny; ++iy) {
-      for (int ix=0; ix<nx; ix++) {
+	for (ix=0; ix<nx; ++ix) {
 	    gm[iy*nx+ix]=image[iy*nx+ix];
 #ifdef ROOTSPECTRUM
 	    hmap->SetBinContent(ix+1, iy+1,image[iy*nx+ix]);
@@ -620,8 +647,8 @@ template <class dataType> class analogDetector {
       TH2F *hmap=new TH2F("hmap","hmap",nx, -0.5,nx-0.5, ny, -0.5, ny-0.5);
 
 #endif
-      for (int iy=0; iy<ny; iy++) {
+      for (iy=0; iy<ny; ++iy) {
-    for (int ix=0; ix<nx; ix++) {
+	for (ix=0; ix<nx; ++ix) {
 	/* if (cmSub)  */
 	/*     gm[iy*nx+ix]=stat[iy][ix].getPedestal()-cmSub->getCommonMode(); */
 	/* else */
@@ -667,15 +694,15 @@ template <class dataType> class analogDetector {
 
 
     if (gm) {
-	for (int iy=0; iy<nny; iy++) {
+      for (iy=0; iy<nny; ++iy) {
-      for (int ix=0; ix<nnx; ix++) {
+	for (ix=0; ix<nnx; ++ix) {
 	  stat[iy][ix].setPedestal(gm[iy*nx+ix],-1,-1);
 	}
       }
       delete [] gm;
       return 1;
     }
-    return NULL;
+    return 0;
   }
   
  /**
@@ -692,15 +719,15 @@ template <class dataType> class analogDetector {
 
 
     if (gm) {
-	for (int iy=0; iy<nny; iy++) {
+      for (iy=0; iy<nny; ++iy) {
-      for (int ix=0; ix<nnx; ix++) {
+	for (ix=0; ix<nnx; ++ix) {
 	  image[iy*nx+ix]=gm[iy*nx+ix];
 	}
       }
       delete [] gm;
       return 1;
     }
-    return NULL;
+    return 0;
   }
   
    
@@ -718,8 +745,8 @@ template <class dataType> class analogDetector {
     float *gm=NULL;
     void *ret;
       gm=new float[nx*ny];
-	for (int iy=0; iy<ny; iy++) {
+      for (iy=0; iy<ny; ++iy) {
-      for (int ix=0; ix<nx; ix++) {
+	for (ix=0; ix<nx; ++ix) {
 	  gm[iy*nx+ix]=stat[iy][ix].getPedestalRMS();
 	}
       }
@@ -740,8 +767,8 @@ template <class dataType> class analogDetector {
     if (nnx>nx) nnx=nx;
     if (nny>ny) nny=ny;
     if (gm) {
-	for (int iy=0; iy<nny; iy++) {
+      for (iy=0; iy<nny; ++iy) {
-      for (int ix=0; ix<nnx; ix++) {
+	for (ix=0; ix<nnx; ++ix) {
 	  stat[iy][ix].setPedestalRMS(gm[iy*nx+ix]);
 	}
       }
@@ -777,11 +804,13 @@ template <class dataType> class analogDetector {
             
       //cout << xmin << " " << xmax << endl;
       // cout << ymin << " " << ymax << endl;
-      for (int iy=ymin; iy<ymax; iy++) {
+      for (iy=ymin; iy<ymax; ++iy) {
-	for (int ix=xmin; ix<xmax; ix++) {
+	for (ix=xmin; ix<xmax; ++ix) {
 	  if (det->isGood(ix,iy)) {
 	    // addToPedestal(data,ix,iy,1);
 	    addToPedestal(data,ix,iy,cm);
+	/* if (ix==50 && iy==50) */
+	/*   cout<< "*ped* " << id << " " << ix << " " << iy << " " << det->getChannel(data,ix,iy) << " " << stat[iy][ix].getPedestal() << " " <<  stat[iy][ix].getPedestalRMS() <<" " << stat[iy][ix]. GetNPedestals() << endl; */
 	  //if (ix==10 && iy==10) 
 	  // cout <<ix << " " << iy << " " << getPedestal(ix,iy)<< endl;
 #ifdef ROOTSPECTRUM 
@@ -905,8 +934,8 @@ template <class dataType> class analogDetector {
       
       //calcGhost(data);
 
-      for (int iy=ymin; iy<ymax; iy++) {
+      for (iy=ymin; iy<ymax; ++iy) {
-	for (int ix=xmin; ix<xmax; ix++) {
+	for (ix=xmin; ix<xmax; ++ix) {
 	  if (det->isGood(ix,iy))
 	    val[iy*nx+ix]+=subtractPedestal(data, ix, iy,cm);
 	}
@@ -952,8 +981,8 @@ template <class dataType> class analogDetector {
 	hs->Fill(val,(iy-ymin)*(xmax-xmin)+(ix-xmin));
 #ifdef ROOTCLUST
 	double v3=0,v5=0,v7=0,v9=0;
-	for (int iix=-4; iix<5; iix++)
+	for (int iix=-4; iix<5; i++ix)
-	  for (int iiy=-4; iiy<5; iiy++) {
+	  for (int iiy=-4; iiy<5; i++iy) {
 	    if (det)
 	      val= (dataSign*det->getValue(data, ix+iix, iy+iiy)-getPedestal(ix+iix,iy+iiy,cm))/g;
 	    else
@@ -1047,8 +1076,8 @@ template <class dataType> class analogDetector {
 
        //calcGhost(data);
        addToCommonMode(data);
-       for (int iy=ymin; iy<ymax; iy++) {
+       for (iy=ymin; iy<ymax; ++iy) {
-	 for (int ix=xmin; ix<xmax; ix++) {
+	 for (ix=xmin; ix<xmax; ++ix) {
 	   if (det->isGood(ix,iy))
 	     nph[iy*nx+ix]+=getNPhotons(data, ix, iy);
 	 }
@@ -1062,8 +1091,8 @@ template <class dataType> class analogDetector {
      
     */
    virtual void clearImage(){  
-       for (int iy=0; iy<ny; iy++) { 
+       for (iy=0; iy<ny; ++iy) { 
-     for (int ix=0; ix<nx; ix++) {
+     for (ix=0; ix<nx; ++ix) {
 	 image[iy*nx+ix]=0;
        }
      }
@@ -1093,8 +1122,8 @@ template <class dataType> class analogDetector {
     int SetNPedestals(int i=-1) {
       int ix=0, iy=0; 
       if (i>0) 
-	  for (iy=0; iy<ny; iy++) 
+	  for (iy=0; iy<ny; ++iy) 
-	for (ix=0; ix<nx; ix++) 
+	for (ix=0; ix<nx; ++ix) 
 	    stat[iy][ix].SetNPedestals(i); 
       return stat[0][0].SetNPedestals();
     };
@@ -1129,8 +1158,8 @@ template <class dataType> class analogDetector {
       newFrame(data);
       //calcGhost(data);
       addToCommonMode(data);
-      for (int iy=ymi; iy<yma; iy++)
+      for (iy=ymi; iy<yma; ++iy)
-	for (int ix=xmi; ix<xma; ix++)
+	for (ix=xmi; ix<xma; ++ix)
 	  if (det->isGood(ix,iy)) {
 	    if (ix>=0 && ix<nx && iy>=0 && iy<ny) 
 	      val+=getNPhotons(data, ix, iy);
@@ -1233,6 +1262,8 @@ FILE *getFilePointer(){return myFile;};
     int nx; /**< Size of the detector in x direction */
     int ny; /**< Size of the detector in y direction */
     pedestalSubtraction **stat; /**< pedestalSubtraction class */
+    /* double **pedMean; /\**< pedestalSubtraction class *\/ */
+    /* double **pedVariance; /\**< pedestalSubtraction class *\/ */
     commonModeSubtraction *cmSub;/**< commonModeSubtraction class */
     int dataSign; /**< sign of the data i.e. 1 if photon is positive, -1 if negative */
     int iframe;  /**< frame number (not from file but incremented within the dataset every time newFrame is called */
@@ -1250,6 +1281,7 @@ FILE *getFilePointer(){return myFile;};
     frameMode fMode; /**< current detector frame mode */
     detectorMode dMode; /**< current detector frame mode */
     FILE *myFile; /**< file pointer to write to */
+    int ix, iy;
 #ifdef ROOTSPECTRUM
     TH2F *hs;
 #ifdef ROOTCLUST

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/dataStructures/moench04CtbZmq10GbData.h

@@ -44,6 +44,28 @@ class moench04CtbZmq10GbData : public slsDetectorData<uint16_t> {
 
     int adc_nr[32]={9, 8,11,10,13,12,15,14,1,0,3,2,5,4,7,6,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24 };
 
+    /* 
+       iadc=ptr%32
+       isample=ptr/32
+
+       col=(adc_nr[iadc]%16)*25+isample%25
+       if (adc_nr[iadc]<16)
+       row=199-isample/25;
+       else
+       row=200+isample/25
+
+
+       adc0 col(9*25..10*25-1) row(199..0)
+       adc1 col(8*25..9*25-1)  row(199..0)
+       adc2 col(11*25..12*25-1) row(199..0)
+       adc3 col(10*25..11*25-1) row(199..0)
+       adc4 col(13*25..14*25-1) row(199..0)
+       adc5 col(12*25..13*25-1) row(199..0)
+       adc6 col(15*25..16*25-1) row(199..0)
+       adc7 col(14*25..15*25-1) row(199..0)
+       adc8 col(1*25..2*25-1) row(199..0)
+     */
+
     int row, col;
 
     //int isample;

slsDetectorCalibration/dataStructures/slsDetectorData.h

@@ -20,6 +20,8 @@ class slsDetectorData {
   int **dataROIMask; /**< Array of size nx*ny 1 if channel is good (or in the ROI), 0 if bad channel (or out of ROI)   */
   int *xmap;
   int *ymap;
+  dataType **orderedData; 
+  int isOrdered;
   
  public:
   
@@ -37,35 +39,29 @@ class slsDetectorData {
   \param dROI Array of size nx*ny. The elements are 1s if the channel is good or in the ROI, 0 is bad or out of the ROI. NULL (default) means all 1s. 
   
   */
- slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize) {
+ slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize), orderedData(NULL), isOrdered(0) {
+    
+   int el=dsize/sizeof(dataType);
+    xmap=new int[el];
+    ymap=new int[el];
     
 
-    xmap=new int[dsize/sizeof(dataType)];
-    ymap=new int[dsize/sizeof(dataType)];
     
-
+    orderedData=new dataType*[ny];
-    //  if (dataMask==NULL) {
-    dataMask=new dataType*[ny];
-    for(int i = 0; i < ny; i++) {
-      dataMask[i] = new dataType[nx];
-    }
-    // }
-    
-    // if (dataMap==NULL) {
     dataMap=new int*[ny];
-    for(int i = 0; i < ny; i++) {
+    dataMask=new dataType*[ny];
-      dataMap[i] = new int[nx];
-      }
-    // }
-    // if (dataROIMask==NULL) {
     dataROIMask=new int*[ny];
     for(int i = 0; i < ny; i++) {
+      dataMap[i] = new int[nx];
+      orderedData[i]=new dataType[nx];
+      dataMask[i] = new dataType[nx];
       dataROIMask[i] = new int[nx];
       for (int j=0; j<nx; j++)
 	dataROIMask[i][j]=1;
+    
     }    
-    // }
+  
-    for (int ip=0; ip<dsize/sizeof(dataType); ip++){
+    for (int ip=0; ip<el; ip++){
       xmap[ip]=-1;
       ymap[ip]=-1;
       }
@@ -74,22 +70,24 @@ class slsDetectorData {
     setDataMask(dMask);
     setDataROIMask(dROI);
     
-  };
+  }
   
   virtual ~slsDetectorData() {
     for(int i = 0; i < ny; i++) {
       delete [] dataMap[i];
       delete [] dataMask[i];
       delete [] dataROIMask[i];
+      delete [] orderedData[i];
     }
     delete [] dataMap;
     delete [] dataMask;
     delete [] dataROIMask;
+    delete [] orderedData;
     delete [] xmap;
     delete [] ymap;
   };
   
-  
+  virtual int getPointer(int ix,int iy) {return dataMap[iy][ix];};
   /**
      defines the data map (as offset) - no error checking if datasize and offsets are compatible!
      \param dMap array of size nx*ny storing the pointers to the data in the dataset (as offset). If NULL (default),the data are arranged as if read out row by row (dataMap[iy][ix]=(iy*nx+ix)*sizeof(dataType);)
@@ -205,23 +203,28 @@ class slsDetectorData {
 virtual void getPixel(int ip, int &x, int &y) {x=xmap[ip]; y=ymap[ip];};
   
 virtual dataType **getData(char *ptr, int dsize=-1) {
-    
+    int el=dsize/sizeof(dataType);
-    dataType **data;
+    //dataType **data;
     int ix,iy;
-    data=new dataType*[ny];
+    //data=new dataType*[ny];
-    for(int i = 0; i < ny; i++) {
+    //for(int i = 0; i < ny; i++) {
-      data[i]=new dataType[nx];
+    //  data[i]=new dataType[nx];
-    }
+    //}
+     isOrdered=0;
     if (dsize<=0 || dsize>dataSize) dsize=dataSize;
-    for (int ip=0; ip<(dsize/sizeof(dataType)); ip++) {
+
+    for (int ip=0; ip<(el); ip++) {
       getPixel(ip,ix,iy);
       if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
-	data[iy][ix]=getChannel(ptr,ix,iy);
+	//data[iy][ix]=getChannel(ptr,ix,iy);
+	orderedData[iy][ix]=*(ptr+ip);//getChannel(ptr,ix,iy);
       }
     }
-    return data;
+    isOrdered=1;
+    return orderedData;
+}
 
-  };
+ void newFrame(){isOrdered=0;};
 
   virtual double **getImage(char *ptr, int dsize=-1) {
     
@@ -231,15 +234,15 @@ class slsDetectorData {
     for(int i = 0; i < ny; i++) {
       data[i]=new double[nx];
     }
+    int el=dsize/sizeof(dataType);
     if (dsize<=0 || dsize>dataSize) dsize=dataSize;
-    for (int ip=0; ip<(dsize/sizeof(dataType)); ip++) {
+    for (int ip=0; ip<el; ip++) {
       getPixel(ip,ix,iy);
       if (ix>=0 && ix<nx && iy>=0 && iy<ny) {
 	data[iy][ix]=getValue(ptr,ix,iy);
       }
     }
     return data;   
-    
   };
   
   /** 
@@ -256,7 +259,10 @@ class slsDetectorData {
       // cout << ix << " " << iy << " " ;
       //cout << dataMap[ix][iy] << " " << (void*)data << " " << dataSize<< endl;
       m=dataMask[iy][ix];
-      d=*((dataType*)(data+dataMap[iy][ix]));
+        if (isOrdered==0)
+	  d=*((dataType*)(data+getPointer(ix,iy)));
+      else
+	d=orderedData[iy][ix];
     }  
     return d^m;
   };

slsDetectorCalibration/ghostSummation.h

@@ -13,7 +13,7 @@ template <class dataType> class ghostSummation {
   /** constructor
       \param xt crosstalk
   */
- ghostSummation(slsDetectorData<dataType> *d, double xt) : xtalk(xt),det(d)  {
+  ghostSummation(slsDetectorData<dataType> *d, double xt) : xtalk(xt),det(d), nx(1), ny(1)  {
     if (det)
       det->getDetectorSize(nx,ny);
     ghost=new double[nx*ny];
@@ -22,6 +22,9 @@ template <class dataType> class ghostSummation {
   ghostSummation(ghostSummation *orig) {
     xtalk=orig->xtalk; 
     det=orig->det;
+    nx=1;
+    ny=1;
+    det->getDetectorSize(nx,ny);
     ghost=new double[nx*ny];
     
   }

slsDetectorCalibration/interpolatingDetector.h

@@ -107,11 +107,11 @@ class interpolatingDetector : public singlePhotonDetector {
       singlePhotonDetector::clearImage();
   };
 
-  int getImageSize(int &nnx, int &nny, int &ns) {
+  int getImageSize(int &nnx, int &nny, int &nsx, int &nsy) {
     if (interp) 
-      return interp->getImageSize(nnx, nny, ns); 
+      return interp->getImageSize(nnx, nny, nsx, nsy); 
     else 
-      return analogDetector<uint16_t>::getImageSize(nnx, nny, ns);
+      return analogDetector<uint16_t>::getImageSize(nnx, nny, nsx, nsy);
   };
 
 
@@ -251,6 +251,7 @@ int addFrame(char *data,  int *ph=NULL, int ff=0) {
     }
 
     virtual int getNSubPixels(){ if (interp) return interp->getNSubPixels(); else return 1;}
+
     virtual int setNSubPixels(int ns)  { 
       if (interp) {
 	pthread_mutex_lock(fi); 

slsDetectorCalibration/interpolations/eta2InterpolationBase.h

@@ -13,7 +13,7 @@
 class eta2InterpolationBase : public virtual etaInterpolationBase {
   
  public:
- eta2InterpolationBase(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) :  etaInterpolationBase(nx,ny, ns, nb, emin, emax) {
+ eta2InterpolationBase(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) :  etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax) {
     
     /* if (etamin>=etamax) { */
     /*   etamin=-1; */
@@ -37,7 +37,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
     
     int corner;
     corner=calcQuad(data, tot, totquad, sDum); 
-    if (nSubPixels>2) 
+    if (nSubPixelsX>2 || nSubPixelsY>2) 
       calcEta(totquad, sDum, etax, etay); 
     getInterpolatedPosition(x,y,etax,etay,corner,int_x,int_y);
 
@@ -53,7 +53,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
     
     int corner;
     corner=calcQuad(data, tot, totquad, sDum); 
-    if (nSubPixels>2) 
+    if (nSubPixelsX>2 || nSubPixelsY>2  ) 
       calcEta(totquad, sDum, etax, etay); 
     getInterpolatedPosition(x,y,etax,etay,corner,int_x,int_y);
 
@@ -93,7 +93,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
        ;
      } 
      double etax=0, etay=0;
-     if (nSubPixels>2) { 
+     if (nSubPixelsX>2 || nSubPixelsY>2) { 
        cc[0][0]=cl[xoff+3*yoff];
        cc[1][0]=cl[xoff+3*(yoff+1)];
        cc[0][1]=cl[xoff+1+3*yoff];
@@ -133,7 +133,7 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
        ;
      } 
      double etax=0, etay=0;
-     if (nSubPixels>2) { 
+     if (nSubPixelsX>2 || nSubPixelsY>2) { 
        cc[0][0]=cl[xoff+3*yoff];
        cc[1][0]=cl[xoff+3*(yoff+1)];
        cc[0][1]=cl[xoff+1+3*yoff];
@@ -182,31 +182,31 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
       }
     
 
-     if (nSubPixels>2) { 
+     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
 
-       ex=(etax-etamin)/etastep;
+       ex=(etax-etamin)/etastepX;
-       ey=(etay-etamin)/etastep;
+       ey=(etay-etamin)/etastepY;
        if (ex<0) {
 	 cout << "x*"<< ex << endl;
 	 ex=0;
        } 
-       if (ex>=nbeta) {
+       if (ex>=nbetaX) {
 	 cout << "x?"<< ex << endl;
-	 ex=nbeta-1;
+	 ex=nbetaX-1;
        }
        if (ey<0) {
-	 cout << "y*"<< ey << endl;
+	 cout << "y*"<< ey << " " << nbetaY << endl;
 	 ey=0;
        } 
-       if (ey>=nbeta) {
+       if (ey>=nbetaY) {
-	 cout << "y?"<< ey << endl;
+	 cout << "y?"<< ey << " " << nbetaY << endl;
-	 ey=nbeta-1;
+	 ey=nbetaY-1;
        }
     
     
    
-       xpos_eta=(((double)hhx[(ey*nbeta+ex)]))+dX ;///((double)nSubPixels);
+       xpos_eta=(((double)hhx[(ey*nbetaX+ex)]))+dX ;///((double)nSubPixels);
-       ypos_eta=(((double)hhy[(ey*nbeta+ex)]))+dY ;///((double)nSubPixels);
+       ypos_eta=(((double)hhy[(ey*nbetaX+ex)]))+dY ;///((double)nSubPixels);
        
      } else {
        xpos_eta=0.5*dX+0.25;
@@ -347,10 +347,10 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
 #endif
 #ifndef MYROOT1
     int ex,ey; 
-    ex=(etax-etamin)/etastep;
+    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastep;
+    ey=(etay-etamin)/etastepY;
-    if (ey<nbeta && ex<nbeta && ex>=0 && ey>=0)
+    if (ey<nbetaY && ex<nbetaX && ex>=0 && ey>=0)
-      heta[ey*nbeta+ex]++; 
+      heta[ey*nbetaX+ex]++; 
 #endif
     return 0;    
   };
@@ -360,22 +360,22 @@ class eta2InterpolationBase : public virtual etaInterpolationBase {
    // cout << "ff" << endl;
    calcDiff(1, hhx, hhy); //get flat
    double avg=0;
-   for (ipx=0; ipx<nSubPixels; ipx++)
+   for (ipx=0; ipx<nSubPixelsX; ipx++)
-     for (ipy=0; ipy<nSubPixels; ipy++)
+     for (ipy=0; ipy<nSubPixelsY; ipy++)
-       avg+=flat[ipx+ipy*nSubPixels];
+       avg+=flat[ipx+ipy*nSubPixelsX];
-   avg/=nSubPixels*nSubPixels;
+   avg/=nSubPixelsY*nSubPixelsX;
 
-   for (int ibx=0 ; ibx<nSubPixels*nPixelsX; ibx++) {
+   for (int ibx=0 ; ibx<nSubPixelsX*nPixelsX; ibx++) {
-     ipx=ibx%nSubPixels-nSubPixels/2;
+     ipx=ibx%nSubPixelsX-nSubPixelsX/2;
-       if (ipx<0) ipx=nSubPixels+ipx;
+       if (ipx<0) ipx=nSubPixelsX+ipx;
-     for (int iby=0 ; iby<nSubPixels*nPixelsY; iby++) {
+     for (int iby=0 ; iby<nSubPixelsY*nPixelsY; iby++) {
-       ipy=iby%nSubPixels-nSubPixels/2;
+       ipy=iby%nSubPixelsY-nSubPixelsY/2;
-     if (ipy<0) ipy=nSubPixels+ipy;
+     if (ipy<0) ipy=nSubPixelsY+ipy;
      // cout << ipx << " " << ipy << " " << ibx << " " << iby << endl;
-     if (flat[ipx+ipy*nSubPixels]>0)
+     if (flat[ipx+ipy*nSubPixelsX]>0)
-       hintcorr[ibx+iby*nSubPixels*nPixelsX]=hint[ibx+iby*nSubPixels*nPixelsX]*(avg/flat[ipx+ipy*nSubPixels]);
+       hintcorr[ibx+iby*nSubPixelsX*nPixelsX]=hint[ibx+iby*nSubPixelsX*nPixelsX]*(avg/flat[ipx+ipy*nSubPixelsX]);
      else
-       hintcorr[ibx+iby*nSubPixels*nPixelsX]=hint[ibx+iby*nSubPixels*nPixelsX];
+       hintcorr[ibx+iby*nSubPixelsX*nPixelsX]=hint[ibx+iby*nSubPixelsX*nPixelsX];
 
 
      }

slsDetectorCalibration/interpolations/eta3InterpolationBase.h

@@ -13,35 +13,12 @@
 class eta3InterpolationBase : public virtual etaInterpolationBase  {
   
  public:
- eta3InterpolationBase(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx, ny, ns, nb, emin, emax) {
+ eta3InterpolationBase(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx, ny, ns, nsy, nb, nby, emin, emax) {
     //  cout << "e3ib " << nb << " " << emin << " " << emax << endl; 
     /* if (nbeta<=0) { */
     /*   nbeta=nSubPixels*10;    */
     /* } */
-    if (etamin>=etamax) {
-      etamin=-1;
-      etamax=1; 
-    }
   
-    etastep=(etamax-etamin)/nbeta;
-#ifdef MYROOT1
-    delete heta;
-    delete hhx;
-    delete hhy;
-    heta=new TH2D("heta","heta",nbeta,etamin,etamax,nbeta,etamin,etamax);
-    hhx=new TH2D("hhx","hhx",nbeta,etamin,etamax,nbeta,etamin,etamax);
-    hhy=new TH2D("hhy","hhy",nbeta,etamin,etamax,nbeta,etamin,etamax);
-#endif
-#ifndef MYROOT1
-    /* delete [] heta; */
-    /* delete [] hhx; */
-    /* delete [] hhy; */
-
-    /* heta=new int[nbeta*nbeta]; */
-    /* hhx=new float[nbeta*nbeta]; */
-    /* hhy=new float[nbeta*nbeta]; */
-    
-#endif
     //   cout << nbeta << " " << etamin << " " << etamax << endl;
 };
   
@@ -88,7 +65,7 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
     
   
     double etax, etay;
-     if (nSubPixels>2) { 
+     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
        calcEta3(cl,etax,etay, totquad);
      } 
      return getInterpolatedPosition(x,y,etax, etay,quad,int_x,int_y);
@@ -101,7 +78,7 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
     
     
      double etax, etay;
-     if (nSubPixels>2) { 
+     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
        calcEta3(cl,etax,etay, totquad);
      }
      return getInterpolatedPosition(x,y,etax, etay,quad,int_x,int_y);
@@ -117,38 +94,38 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
     double xpos_eta=0,ypos_eta=0;
     int ex,ey;
 
-     if (nSubPixels>2) { 
+     if (nSubPixelsX>2 || nSubPixelsY>2 ) { 
 
 #ifdef MYROOT1
-    xpos_eta=(hhx->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixels);
+    xpos_eta=(hhx->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixelsX);
-    ypos_eta=(hhy->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixels);
+    ypos_eta=(hhy->GetBinContent(hhx->GetXaxis()->FindBin(etax),hhy->GetYaxis()->FindBin(etay)))/((double)nSubPixelsY);
 #endif
 #ifndef MYROOT1
-    ex=(etax-etamin)/etastep;
+    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastep;
+    ey=(etay-etamin)/etastepY;
     if (ex<0) {
       /* cout << etax << " " << etamin << " "; */
       /*  cout << "3x*"<< ex << endl; */
       ex=0;
 	} 
-    if (ex>=nbeta) {
+    if (ex>=nbetaX) {
       /* cout << etax << " " << etamin << " "; */
       /* cout << "3x?"<< ex << endl; */
-      ex=nbeta-1;
+      ex=nbetaX-1;
     }
     if (ey<0) {
       /* cout << etay << " " << etamin << " "; */
       /* cout << "3y*"<< ey << endl; */
       ey=0;
 	} 
-    if (ey>=nbeta) {
+    if (ey>=nbetaY) {
       /* cout << etay << " " << etamin << " "; */
       /* cout << "3y?"<< ey << endl; */
-      ey=nbeta-1;
+      ey=nbetaY-1;
       
     }
-    xpos_eta=(((double)hhx[(ey*nbeta+ex)]));///((double)nSubPixels);
+    xpos_eta=(((double)hhx[(ey*nbetaX+ex)]));///((double)nSubPixels);
-    ypos_eta=(((double)hhy[(ey*nbeta+ex)]));///((double)nSubPixels);
+    ypos_eta=(((double)hhy[(ey*nbetaX+ex)]));///((double)nSubPixels);
 
 #endif
    
@@ -265,10 +242,10 @@ class eta3InterpolationBase : public virtual etaInterpolationBase  {
 #endif
 #ifndef MYROOT1
     int ex,ey; 
-    ex=(etax-etamin)/etastep;
+    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastep;
+    ey=(etay-etamin)/etastepY;
-    if (ey<nbeta && ex<nbeta && ex>=0 && ey>=0)
+    if (ey<nbetaY && ex<nbetaX && ex>=0 && ey>=0)
-      heta[ey*nbeta+ex]++; 
+      heta[ey*nbetaX+ex]++; 
 #endif
     return 0;    
   };

slsDetectorCalibration/interpolations/etaInterpolationBase.h

@@ -7,7 +7,7 @@
 #include <TH2D.h>
 #include <TH2F.h>
 #endif
-
+#include <cmath> 
 #include "slsInterpolation.h"
 #include "tiffIO.h"
 
@@ -15,44 +15,51 @@ class etaInterpolationBase : public slsInterpolation {
   
  public:
  
- etaInterpolationBase(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : slsInterpolation(nx,ny,ns), hhx(NULL), hhy(NULL), heta(NULL), nbeta(nb), etamin(emin), etamax(emax) {
+ etaInterpolationBase(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : slsInterpolation(nx,ny,ns,nsy), hhx(NULL), hhy(NULL), heta(NULL), nbetaX(nb), nbetaY(nby), etamin(emin), etamax(emax) {
     // cout << "eb " << nb << " " << emin << " " << emax << endl;  
     // cout << nb << " " << etamin << " " << etamax << endl;
-    if (nbeta<=0) {
+    if (nbetaX<=0) {
       //cout << "aaa:" <<endl;
-      nbeta=nSubPixels*10;
+      nbetaX=nSubPixelsX*10;
+    } 
+    if (nbetaY<=0) {
+      //cout << "aaa:" <<endl;
+      nbetaY=nSubPixelsY*10;
     }
     if (etamin>=etamax) {
       etamin=-1;
       etamax=2;
     }
-    etastep=(etamax-etamin)/nbeta;
+    etastepX=(etamax-etamin)/nbetaX;
-    heta=new int[nbeta*nbeta];
+    etastepY=(etamax-etamin)/nbetaY;
-    hhx=new float[nbeta*nbeta];
+    heta=new int[nbetaX*nbetaY];
-    hhy=new float[nbeta*nbeta];
+    hhx=new float[nbetaX*nbetaY];
+    hhy=new float[nbetaX*nbetaY];
     rangeMin=etamin;
     rangeMax=etamax;
-    flat= new double[nSubPixels*nSubPixels];
+    flat= new double[nSubPixelsX*nSubPixelsY];
-    hintcorr=new int [nSubPixels*nSubPixels*nPixelsX*nPixelsY];
+    hintcorr=new int [nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY];
     
   };
   
  etaInterpolationBase(etaInterpolationBase *orig): slsInterpolation(orig){
-   nbeta=orig->nbeta;
+   nbetaX=orig->nbetaX;
+   nbetaY=orig->nbetaY;
    etamin=orig->etamin;
    etamax=orig->etamax;
    rangeMin=orig->rangeMin;
    rangeMax=orig->rangeMax;
 
 
-    etastep=(etamax-etamin)/nbeta;
+    etastepX=(etamax-etamin)/nbetaX;
-    heta=new int[nbeta*nbeta];
+    etastepY=(etamax-etamin)/nbetaY;
-    memcpy(heta,orig->heta,nbeta*nbeta*sizeof(int));
+    heta=new int[nbetaX*nbetaY];
-    hhx=new float[nbeta*nbeta];
+    memcpy(heta,orig->heta,nbetaX*nbetaY*sizeof(int));
-    memcpy(hhx,orig->hhx,nbeta*nbeta*sizeof(float));
+    hhx=new float[nbetaX*nbetaY];
-    hhy=new float[nbeta*nbeta];
+    memcpy(hhx,orig->hhx,nbetaX*nbetaY*sizeof(float));
-    memcpy(hhy,orig->hhy,nbeta*nbeta*sizeof(float));
+    hhy=new float[nbetaX*nbetaY];
-    hintcorr=new int [nSubPixels*nSubPixels*nPixelsX*nPixelsY];
+    memcpy(hhy,orig->hhy,nbetaX*nbetaY*sizeof(float));
+    hintcorr=new int [nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY];
 
  };
 
@@ -61,7 +68,7 @@ class etaInterpolationBase : public slsInterpolation {
 
 
   virtual void resetFlatField() {
-    for (int ibx=0; ibx<nbeta*nbeta; ibx++) {
+    for (int ibx=0; ibx<nbetaX*nbetaY; ibx++) {
       heta[ibx]=0;
       hhx[ibx]=0;
       hhy[ibx]=0;
@@ -70,13 +77,16 @@ class etaInterpolationBase : public slsInterpolation {
 
   };
     
-  int *setEta(int *h, int nb=-1, double emin=1, double emax=0)
+  int *setEta(int *h, int nb=-1, int nby=-1, double emin=1, double emax=0)
   {  
     if (h) {
       if (heta) delete [] heta;
       heta=h;
-      nbeta=nb;
+      nbetaX=nb;
-      if (nb<=0) nbeta=nSubPixels*10;
+      nbetaY=nby;
+      if (nbetaX<=0) nbetaX=nSubPixelsX*10;
+      if (nbetaY<=0) nbetaY=nSubPixelsY*10;
+      
       etamin=emin;
       etamax=emax;
       if (etamin>=etamax) {
@@ -85,22 +95,24 @@ class etaInterpolationBase : public slsInterpolation {
       }
       rangeMin=etamin;
       rangeMax=etamax;
-      etastep=(etamax-etamin)/nbeta;
+      etastepX=(etamax-etamin)/nbetaX;
+      etastepY=(etamax-etamin)/nbetaY;
     }
     return heta;
   };
   
-   int *setFlatField(int *h, int nb=-1, double emin=1, double emax=0)
+   int *setFlatField(int *h, int nb=-1, int nby=-1, double emin=1, double emax=0)
   {  
-    return setEta(h, nb, emin, emax);
+    return setEta(h, nb, nby, emin, emax);
   };
 
 
 
   int *getFlatField(){return setEta(NULL);};
   
-  int *getFlatField(int &nb, double &emin, double &emax){
+  int *getFlatField(int &nb, int &nby, double &emin, double &emax){
-    nb=nbeta; 
+    nb=nbetaX; 
+    nby=nbetaY; 
     emin=etamin; 
     emax=etamax; 
     return getFlatField();
@@ -109,13 +121,13 @@ class etaInterpolationBase : public slsInterpolation {
   
   void *writeFlatField(const char * imgname) {
     float *gm=NULL;
-    gm=new float[nbeta*nbeta];
+    gm=new float[nbetaX*nbetaY];
-    for (int ix=0; ix<nbeta; ix++) {
+    for (int ix=0; ix<nbetaX; ix++) {
-      for (int iy=0; iy<nbeta; iy++) {
+      for (int iy=0; iy<nbetaY; iy++) {
-	gm[iy*nbeta+ix]=heta[iy*nbeta+ix];
+	gm[iy*nbetaX+ix]=heta[iy*nbetaX+ix];
       }
     } 
-    WriteToTiff(gm, imgname, nbeta, nbeta);   
+    WriteToTiff(gm, imgname, nbetaX, nbetaY);   
     delete [] gm;
     return NULL; 
   };
@@ -129,16 +141,18 @@ class etaInterpolationBase : public slsInterpolation {
       etamax=2;
     }
     
-    etastep=(etamax-etamin)/nbeta;
+    etastepX=(etamax-etamin)/nbetaX;
+    etastepY=(etamax-etamin)/nbetaY;
     uint32 nnx;
     uint32 nny;
     float *gm=ReadFromTiff(imgname, nnx, nny);
-    if (nnx!=nny) {
+    /* if (nnx!=nny) { */
-      cout << "different number of bins in x " << nnx << "  and y " << nny<< " !"<< endl;
+    /*   cout << "different number of bins in x " << nnx << "  and y " << nny<< " !"<< endl; */
-      cout << "Aborting read"<< endl;
+    /*   cout << "Aborting read"<< endl; */
-      return 0;
+    /*   return 0; */
-    }
+    /* } */
-    nbeta=nnx;
+    nbetaX=nnx;
+    nbetaY=nny;
     if (gm) {
       if (heta) {
 	delete [] heta;
@@ -146,13 +160,13 @@ class etaInterpolationBase : public slsInterpolation {
 	delete [] hhy;
       }
       
-      heta=new int[nbeta*nbeta];
+      heta=new int[nbetaX*nbetaY];
-      hhx=new float[nbeta*nbeta];
+      hhx=new float[nbetaX*nbetaY];
-      hhy=new float[nbeta*nbeta];
+      hhy=new float[nbetaX*nbetaY];
       
-      for (int ix=0; ix<nbeta; ix++) {
+      for (int ix=0; ix<nbetaX; ix++) {
-	for (int iy=0; iy<nbeta; iy++) {
+	for (int iy=0; iy<nbetaY; iy++) {
-	  heta[iy*nbeta+ix]=gm[iy*nbeta+ix];
+	  heta[iy*nbetaX+ix]=gm[iy*nbetaX+ix];
 	}
       }
       delete [] gm;
@@ -178,10 +192,10 @@ float *gethhx()
     };
   virtual int addToFlatField(double etax, double etay){
     int ex,ey; 
-    ex=(etax-etamin)/etastep;
+    ex=(etax-etamin)/etastepX;
-    ey=(etay-etamin)/etastep;
+    ey=(etay-etamin)/etastepY;
-    if (ey<nbeta && ex<nbeta && ex>=0 && ey>=0)
+    if (ey<nbetaY && ex<nbetaX && ex>=0 && ey>=0)
-      heta[ey*nbeta+ex]++; 
+      heta[ey*nbetaX+ex]++; 
     return 0;    
   };
   
@@ -195,80 +209,80 @@ float *gethhx()
    
    float tot_eta=0;
 
-  float *etah=new float[nbeta*nbeta];
+  float *etah=new float[nbetaX*nbetaY];
-  int etabins=nbeta;
+  // int etabins=nbeta;
   int ibb=0;
 
-  for (int ii=0; ii<etabins*etabins; ii++) {
+  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
    
       etah[ii]=heta[ii];
       tot_eta+=heta[ii];
   }
   sprintf(tit,"/scratch/eta_%d.tiff",ind);
-  WriteToTiff(etah, tit, etabins, etabins);
+  WriteToTiff(etah, tit, nbetaX, nbetaY);
 
 
-  for (int ii=0; ii<etabins*etabins; ii++) {
+  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
-    ibb=(hhx[ii]*nSubPixels);
+    ibb=(hhx[ii]*nSubPixelsX);
     etah[ii]=ibb;
   }
   sprintf(tit,"/scratch/eta_hhx_%d.tiff",ind);
-  WriteToTiff(etah, tit, etabins, etabins);
+  WriteToTiff(etah, tit, nbetaX, nbetaY);
 	  
-  for (int ii=0; ii<etabins*etabins; ii++) {
+  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
-    ibb=hhy[ii]*nSubPixels;
+    ibb=hhy[ii]*nSubPixelsY;
     etah[ii]=ibb;
   }
   sprintf(tit,"/scratch/eta_hhy_%d.tiff",ind);
-  WriteToTiff(etah, tit, etabins, etabins);
+  WriteToTiff(etah, tit, nbetaX, nbetaY);
 	  
   
-  float *ftest=new float[nSubPixels*nSubPixels];
+  float *ftest=new float[nSubPixelsX*nSubPixelsY];
 
-  for (int ib=0; ib<nSubPixels*nSubPixels; ib++) ftest[ib]=0;
+  for (int ib=0; ib<nSubPixelsX*nSubPixelsY; ib++) ftest[ib]=0;
   
 
   //int ibx=0, iby=0;
   
-  for (int ii=0; ii<nbeta*nbeta; ii++) {
+  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
     
-    ibx=nSubPixels*hhx[ii];
+    ibx=nSubPixelsX*hhx[ii];
-    iby=nSubPixels*hhy[ii];
+    iby=nSubPixelsY*hhy[ii];
     if (ibx<0) ibx=0;
     if (iby<0) iby=0;
-    if (ibx>=nSubPixels) ibx=nSubPixels-1;
+    if (ibx>=nSubPixelsX) ibx=nSubPixelsX-1;
-    if (iby>=nSubPixels) iby=nSubPixels-1;
+    if (iby>=nSubPixelsY) iby=nSubPixelsY-1;
     
 
-    if (ibx>=0 && ibx<nSubPixels && iby>=0 && iby<nSubPixels) {
+    if (ibx>=0 && ibx<nSubPixelsX && iby>=0 && iby<nSubPixelsY) {
       //
       // if (ibx>0 && iby>0) cout << ibx << " " << iby << " " << ii << endl;
-      ftest[ibx+iby*nSubPixels]+=heta[ii];
+      ftest[ibx+iby*nSubPixelsX]+=heta[ii];
     } else
       cout << "Bad interpolation "<< ii << " " << ibx << " " << iby<< endl; 
     
   }
 
   sprintf(tit,"/scratch/ftest_%d.tiff",ind);
-  WriteToTiff(ftest, tit, nSubPixels, nSubPixels);
+  WriteToTiff(ftest, tit, nSubPixelsX, nSubPixelsY);
 
   //int ibx=0, iby=0;
-  tot_eta/=nSubPixels*nSubPixels;
+  tot_eta/=nSubPixelsX*nSubPixelsY;
   int nbad=0;
-  for (int ii=0; ii<etabins*etabins; ii++) {
+  for (int ii=0; ii<nbetaX*nbetaY; ii++) {
-    ibx=nSubPixels*hhx[ii];
+    ibx=nSubPixelsX*hhx[ii];
-    iby=nSubPixels*hhy[ii];
+    iby=nSubPixelsY*hhy[ii];
-    if (ftest[ibx+iby*nSubPixels]<tot_eta*0.5) {
+    if (ftest[ibx+iby*nSubPixelsX]<tot_eta*0.5) {
       etah[ii]=1;
       nbad++;
-    } else if(ftest[ibx+iby*nSubPixels]>tot_eta*2.){
+    } else if(ftest[ibx+iby*nSubPixelsX]>tot_eta*2.){
       etah[ii]=2;
       nbad++;
     } else
       etah[ii]=0;
   }
   sprintf(tit,"/scratch/eta_bad_%d.tiff",ind);
-  WriteToTiff(etah, tit, etabins, etabins);
+  WriteToTiff(etah, tit, nbetaX, nbetaY);
   // cout << "Index: " << ind << "\t Bad bins: "<< nbad << endl;
   //int ibx=0, iby=0;
 
@@ -286,46 +300,44 @@ float *gethhx()
     double diff=0, d;
     //double bsize=1./nSubPixels;
     int nbad=0;
-    double p_tot_x[nSubPixels], p_tot_y[nSubPixels], p_tot[nSubPixels*nSubPixels];
+    double p_tot_x[nSubPixelsX], p_tot_y[nSubPixelsY], p_tot[nSubPixelsX*nSubPixelsY];
-    double maxdiff=0, mindiff=avg*nSubPixels*nSubPixels;
+    double maxdiff=0, mindiff=avg*nSubPixelsX*nSubPixelsY;
    
     int ipx, ipy;
-    for (ipy=0; ipy<nSubPixels; ipy++) {
+    for (ipy=0; ipy<nSubPixelsY; ipy++) {
-      for (ipx=0; ipx<nSubPixels; ipx++) {
+      for (ipx=0; ipx<nSubPixelsX; ipx++) {
-	p_tot[ipx+ipy*nSubPixels]=0;
+	p_tot[ipx+ipy*nSubPixelsX]=0;
       }
       p_tot_y[ipy]=0;
       p_tot_x[ipy]=0;
     }
    
-    for (int ibx=0; ibx<nbeta; ibx++) {
+    for (int ibx=0; ibx<nbetaX; ibx++) {
-      for (int iby=0; iby<nbeta; iby++) {
+      for (int iby=0; iby<nbetaY; iby++) {
-	ipx=hx[ibx+iby*nbeta]*nSubPixels;
+	ipx=hx[ibx+iby*nbetaX]*nSubPixelsX;
 	if (ipx<0) ipx=0;
-	if (ipx>=nSubPixels) ipx=nSubPixels-1;
+	if (ipx>=nSubPixelsX) ipx=nSubPixelsX-1;
 	
-	ipy=hy[ibx+iby*nbeta]*nSubPixels;
+	ipy=hy[ibx+iby*nbetaX]*nSubPixelsY;
 	if (ipy<0) ipy=0;
-	if (ipy>=nSubPixels) ipy=nSubPixels-1;
+	if (ipy>=nSubPixelsY) ipy=nSubPixelsY-1;
-	
-	p_tot[ipx+ipy*nSubPixels]+=heta[ibx+iby*nbeta];
-	p_tot_y[ipy]+=heta[ibx+iby*nbeta];
-	p_tot_x[ipx]+=heta[ibx+iby*nbeta];
-	
 	
+	p_tot[ipx+ipy*nSubPixelsX]+=heta[ibx+iby*nbetaX];
+	p_tot_y[ipy]+=heta[ibx+iby*nbetaX];
+	p_tot_x[ipx]+=heta[ibx+iby*nbetaX];
       }
     }
     
     
     //  cout << endl << endl;
-    for (ipy=0; ipy<nSubPixels; ipy++) { 
+    for (ipy=0; ipy<nSubPixelsY; ipy++) { 
      cout.width(5);
      //flat_y[ipy]=p_tot_y[ipy];//avg/nSubPixels;
-      for (ipx=0; ipx<nSubPixels; ipx++) {
+      for (ipx=0; ipx<nSubPixelsX; ipx++) {
 
 	//	flat_x[ipx]=p_tot_x[ipx];///avg/nSubPixels;
-	flat[ipx+nSubPixels*ipy]=p_tot[ipx+nSubPixels*ipy];///avg;
+	flat[ipx+nSubPixelsX*ipy]=p_tot[ipx+nSubPixelsX*ipy];///avg;
-	d=p_tot[ipx+nSubPixels*ipy]-avg;
+	d=p_tot[ipx+nSubPixelsX*ipy]-avg;
 	if (d<0) d*=-1.;
 	if (d>5*sqrt(avg) )
 	  nbad++;
@@ -354,8 +366,8 @@ float *gethhx()
   float *hhx;
   float *hhy;
   int *heta;
-  int nbeta;
+  int nbetaX, nbetaY;
-  double etamin, etamax, etastep;
+  double etamin, etamax, etastepX, etastepY;
   double rangeMin, rangeMax;
 
 

slsDetectorCalibration/interpolations/etaInterpolationPosXY.h

@@ -9,7 +9,7 @@
 
 class etaInterpolationPosXY : public virtual etaInterpolationBase{
  public:
- etaInterpolationPosXY(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny,ns, nb, emin,emax){
+ etaInterpolationPosXY(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax){
     //  cout << "epxy " << nb << " " << emin << " " << emax << endl; cout << nbeta << " " << etamin << " " << etamax << endl; 
   };
 
@@ -24,14 +24,6 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
   virtual void prepareInterpolation(int &ok)
   {
    ok=1;  
-#ifdef MYROOT1   
-   if (hhx) delete hhx;
-   if (hhy) delete hhy;
-
-   hhx=new TH2D("hhx","hhx",heta->GetNbinsX(),heta->GetXaxis()->GetXmin(),heta->GetXaxis()->GetXmax(), heta->GetNbinsY(),heta->GetYaxis()->GetXmin(),heta->GetYaxis()->GetXmax()); 
-   hhy=new TH2D("hhy","hhy",heta->GetNbinsX(),heta->GetXaxis()->GetXmin(),heta->GetXaxis()->GetXmax(), heta->GetNbinsY(),heta->GetYaxis()->GetXmin(),heta->GetYaxis()->GetXmax()); 
-   
-#endif
 
 
    ///*Eta Distribution Rebinning*///
@@ -40,106 +32,128 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
    double tot_eta=0;
    double tot_eta_x=0;
    double tot_eta_y=0;
-   for (int ip=0; ip<nbeta*nbeta; ip++)
+   for (int ip=0; ip<nbetaX*nbetaY; ip++)
      tot_eta+=heta[ip];
    cout << "total eta entries is :"<< tot_eta << endl;   
    if (tot_eta<=0) {ok=0; return;};
 
 
-   double hx[nbeta]; //profile x
+   double hx[nbetaX]; //profile x
-   double hy[nbeta]; //profile y
+   double hy[nbetaY]; //profile y
-   double hix[nbeta]; //integral of projection x
+   double hix[nbetaX]; //integral of projection x
-   double hiy[nbeta]; //integral of projection y
+   double hiy[nbetaY]; //integral of projection y
    //  int ii=0;
-   double etax;//, etay;
+   double etax, etay;
-   for (int ib=0; ib<nbeta; ib++) {
+   for (int ib=0; ib<nbetaX; ib++) {
 
-     tot_eta_x=0;
-     tot_eta_y=0;
    
-     for (int iby=0; iby<nbeta; iby++) {
+     //tot_eta_y=0;
-       etax=etamin+iby*etastep;
+
+     for (int iby=0; iby<nbetaY; iby++) {
+       etay=etamin+iby*etastepY;
        //cout << etax << endl;
-       if (etax>=0 && etax<=1)
+     
-	 hx[iby]=heta[iby+ib*nbeta];
-       else {
-	 hx[iby]=0;
-       }
        // tot_eta_x+=hx[iby];
-       if (etax>=0 && etax<=1)
+       if (etay>=0 && etay<=1)
-	 hy[iby]=heta[ib+iby*nbeta];
+	 hy[iby]=heta[ib+iby*nbetaX];
        else
 	 hy[iby]=0;
        // tot_eta_y+=hy[iby];
      }
 
-     hix[0]=hx[0];
+   
      hiy[0]=hy[0];
 
-     for (int iby=1; iby<nbeta; iby++) {
+     for (int iby=1; iby<nbetaY; iby++) {
-       hix[iby]=hix[iby-1]+hx[iby];
        hiy[iby]=hiy[iby-1]+hy[iby];
      }
 
-     // ii=0;
+     tot_eta_y=hiy[nbetaY-1]+1;
-     tot_eta_x=hix[nbeta-1]+1;
-     tot_eta_y=hiy[nbeta-1]+1;
      
-     for (int ibx=0; ibx<nbeta; ibx++) {
+     for (int iby=0; iby<nbetaY; iby++) {
-       if (tot_eta_x<=0) {
-	 hhx[ibx+ib*nbeta]=-1;
-	 //ii=(ibx)/nbeta;
-       } else //if (hix[ibx]>(ii+1)*tot_eta_x*bsize) 
-	 { 
-	   //if (hix[ibx]>tot_eta_x*(ii+1)/nSubPixels) ii++;
-	   hhx[ibx+ib*nbeta]=hix[ibx]/tot_eta_x;
-	 }
-     }
-     /* if (ii!=(nSubPixels-1)) */
-     /*   cout << ib << " x " <<  tot_eta_x << " " << (ii+1)*tot_eta_x*bsize << " " << ii << " " << hix[nbeta-1]<< endl; */
-     
-     //ii=0;
-     
-     for (int ibx=0; ibx<nbeta; ibx++) {
        if (tot_eta_y<=0) {
-	 hhy[ib+ibx*nbeta]=-1;
+	 hhy[ib+iby*nbetaX]=-1;
 	 //ii=(ibx*nSubPixels)/nbeta;
        } else {   
 	 //if (hiy[ibx]>tot_eta_y*(ii+1)/nSubPixels) ii++;
-	 hhy[ib+ibx*nbeta]=hiy[ibx]/tot_eta_y;
+	 hhy[ib+iby*nbetaX]=hiy[iby]/tot_eta_y;
        }
      }
    }
 
 
+
+   for (int ib=0; ib<nbetaY; ib++) {
+
+     for (int ibx=0; ibx<nbetaX; ibx++) {
+       etax=etamin+ibx*etastepX;
+       //cout << etax << endl;
+       if (etax>=0 && etax<=1)
+	 hx[ibx]=heta[ibx+ib*nbetaX];
+       else {
+	 hx[ibx]=0;
+       }
+     }
+     hix[0]=hx[0];
+       
+     for (int ibx=1; ibx<nbetaX; ibx++) {
+       hix[ibx]=hix[ibx-1]+hx[ibx];
+     }
+
+  
+     tot_eta_x=hix[nbetaX-1]+1;
+     
+     for (int ibx=0; ibx<nbetaX; ibx++) {
+       if (tot_eta_x<=0) {
+	 hhx[ibx+ib*nbetaX]=-1;
+       } 
+       else { 
+	 hhx[ibx+ib*nbetaX]=hix[ibx]/tot_eta_x;
+       }
+     }
+     
+
+     
+     for (int ibx=0; ibx<nbetaX; ibx++) {
+       if (tot_eta_x<=0) {
+	 hhx[ibx+ib*nbetaX]=-1;
+       } else	 { 
+	 //if (hix[ibx]>tot_eta_x*(ii+1)/nSubPixels) ii++;
+	 hhx[ibx+ib*nbetaX]=hix[ibx]/tot_eta_x;
+       }
+     }
+     
+   }
+
+     
    int ibx, iby, ib; 
    
    iby=0;
-   while (hhx[iby*nbeta+nbeta/2]<0) iby++;
+   while (hhx[iby*nbetaY+nbetaY/2]<0) iby++;
    for (ib=0; ib<iby;ib++) {
-     for (ibx=0; ibx<nbeta;ibx++)
+     for (ibx=0; ibx<nbetaX;ibx++)
-       hhx[ibx+nbeta*ib]=hhx[ibx+nbeta*iby];
+       hhx[ibx+nbetaX*ib]=hhx[ibx+nbetaX*iby];
    }
-   iby=nbeta-1;
+   iby=nbetaY-1;
    
-   while (hhx[iby*nbeta+nbeta/2]<0) iby--;
+   while (hhx[iby*nbetaY+nbetaY/2]<0) iby--;
-   for (ib=iby+1; ib<nbeta;ib++) {
+   for (ib=iby+1; ib<nbetaY;ib++) {
-     for (ibx=0; ibx<nbeta;ibx++)
+     for (ibx=0; ibx<nbetaX;ibx++)
-       hhx[ibx+nbeta*ib]=hhx[ibx+nbeta*iby];
+       hhx[ibx+nbetaX*ib]=hhx[ibx+nbetaX*iby];
    }
    
    iby=0;
-   while (hhy[nbeta/2*nbeta+iby]<0) iby++;
+   while (hhy[nbetaX/2*nbetaX+iby]<0) iby++;
    for (ib=0; ib<iby;ib++) {
-     for (ibx=0; ibx<nbeta;ibx++)
+     for (ibx=0; ibx<nbetaY;ibx++)
-       hhy[ib+nbeta*ibx]=hhy[iby+nbeta*ibx];
+       hhy[ib+nbetaX*ibx]=hhy[iby+nbetaX*ibx];
    }
-   iby=nbeta-1;
+   iby=nbetaX-1;
    
-   while (hhy[nbeta/2*nbeta+iby]<0) iby--;
+   while (hhy[nbetaX/2*nbetaX+iby]<0) iby--;
-   for (ib=iby+1; ib<nbeta;ib++) {
+   for (ib=iby+1; ib<nbetaX;ib++) {
-     for (ibx=0; ibx<nbeta;ibx++)
+     for (ibx=0; ibx<nbetaY;ibx++)
-       hhy[ib+nbeta*ibx]=hhy[iby+nbeta*ibx];
+       hhy[ib+nbetaX*ibx]=hhy[iby+nbetaX*ibx];
    }
 
 
@@ -156,9 +170,16 @@ class etaInterpolationPosXY : public virtual etaInterpolationBase{
 
 };
 
+
+
+
+
+
+
+
 class eta2InterpolationPosXY : public virtual eta2InterpolationBase, public virtual etaInterpolationPosXY {
  public:
- eta2InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny,ns, nb, emin,emax),eta2InterpolationBase(nx,ny,ns, nb, emin,emax),etaInterpolationPosXY(nx,ny,ns, nb, emin,emax){
+ eta2InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax),eta2InterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax),etaInterpolationPosXY(nx,ny, ns, nsy, nb, nby, emin, emax){
     //  cout << "e2pxy " << nb << " " << emin << " " << emax << endl; 
   };
  
@@ -172,8 +193,8 @@ class eta2InterpolationPosXY : public virtual eta2InterpolationBase, public virt
 
 class eta3InterpolationPosXY : public virtual eta3InterpolationBase, public virtual etaInterpolationPosXY {
  public:
- eta3InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nb=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny,ns, nb, emin,emax),eta3InterpolationBase(nx,ny,ns, nb, emin,emax), etaInterpolationPosXY(nx,ny,ns, nb, emin,emax){
+ eta3InterpolationPosXY(int nx=400, int ny=400, int ns=25, int nsy=25, int nb=-1, int nby=-1, double emin=1, double emax=0) : etaInterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax),eta3InterpolationBase(nx,ny, ns, nsy, nb, nby, emin, emax), etaInterpolationPosXY(nx,ny, ns, nsy, nb, nby, emin, emax){
-      cout << "e3pxy " << nbeta << " " << etamin << " " << etamax << " " << nSubPixels<< endl;  
+    //   cout << "e3pxy " << nbeta << " " << etamin << " " << etamax << " " << nSubPixels<< endl;  
   };
 
  eta3InterpolationPosXY(eta3InterpolationPosXY *orig): etaInterpolationBase(orig), etaInterpolationPosXY(orig)  {};

slsDetectorCalibration/interpolations/slsInterpolation.h

@@ -29,19 +29,21 @@ class slsInterpolation
 {
 
  public:
- slsInterpolation(int nx=400, int ny=400, int ns=25) :nPixelsX(nx), nPixelsY(ny),  nSubPixels(ns), id(0) {
+ slsInterpolation(int nx=400, int ny=400, int ns=25, int nsy=-1) :nPixelsX(nx), nPixelsY(ny),  nSubPixelsX(ns), nSubPixelsY(nsy),id(0) {
    
- hint=new int[ns*nx*ns*ny];
+    if (nSubPixelsY<=0) nSubPixelsY=nSubPixelsX;
+    hint=new int[nSubPixelsX*nx*nSubPixelsY*ny];
 
 };
   
  slsInterpolation(slsInterpolation *orig){
    nPixelsX=orig->nPixelsX;
    nPixelsY=orig->nPixelsY;
-   nSubPixels=orig->nSubPixels;
+   nSubPixelsX=orig->nSubPixelsX;
+   nSubPixelsY=orig->nSubPixelsY;
    
-   hint=new int[nSubPixels*nPixelsX*nSubPixels*nPixelsY];
+   hint=new int[nSubPixelsX*nPixelsX*nSubPixelsY*nPixelsY];
-   memcpy(hint, orig->hint,nSubPixels*nPixelsX*nSubPixels*nPixelsY*sizeof(int));
+   memcpy(hint, orig->hint,nSubPixelsX*nPixelsX*nSubPixelsY*nPixelsY*sizeof(int));
  
  };
 
@@ -51,23 +53,37 @@ class slsInterpolation
    return new slsInterpolation(this);
    }*/
 
-  int getNSubPixels() {return nSubPixels;};
+  int getNSubPixelsX() {return nSubPixelsX;};
+  int getNSubPixelsY() {return nSubPixelsY;};
+  int getNSubPixels() {if (nSubPixelsX==nSubPixelsY) return nSubPixelsX; else return 0;};
+  void getNSubPixels(int &nsx, int &nsy) {nsx=nSubPixelsX; nsy=nsx=nSubPixelsY;}
 
+  void setNSubPixels(int ns, int nsy=-1)   {
    
-  int setNSubPixels(int ns)   {
-    if (ns>0 && ns!=nSubPixels) {
       delete [] hint;
-      nSubPixels=ns;
+      nSubPixelsX=ns;
-      hint=new int[nSubPixels*nPixelsX*nSubPixels*nPixelsY];
+      if (nsy>0)  nSubPixelsY=nsy;
-    }
+      else nSubPixelsY=ns;
-    return nSubPixels;
+      
+      hint=new int[nSubPixelsX*nPixelsX*nSubPixelsY*nPixelsY];
+      
+      //return nSubPixels;
   }
 
-  int getImageSize(int &nnx, int &nny, int &ns) {
+  
-    nnx=nSubPixels*nPixelsX;
+
-    nny=nSubPixels*nPixelsY;
+
-    ns=nSubPixels;
+  int getImageSize(int &nnx, int &nny, int &nsx, int &nsy) {
-    return nSubPixels*nSubPixels*nPixelsX*nPixelsY;
+    nnx=nSubPixelsX*nPixelsX;
+    nny=nSubPixelsY*nPixelsY;
+    nsx=nSubPixelsX;
+    nsy=nSubPixelsY;
+    return nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY;
+  };
+  
+
+  int getImageSize() {
+    return nSubPixelsX*nSubPixelsY*nPixelsX*nPixelsY;
   };
   
   
@@ -92,14 +108,14 @@ class slsInterpolation
     //cout << "!" <<endl;
     float *gm=NULL;
     int *dummy=getInterpolatedImage();
-    gm=new float[ nSubPixels*  nSubPixels* nPixelsX*nPixelsY];
+    gm=new float[ nSubPixelsX*  nSubPixelsY* nPixelsX*nPixelsY];
     if (gm) {
-      for (int ix=0; ix<nPixelsX*nSubPixels; ix++) {
+      for (int ix=0; ix<nPixelsX*nSubPixelsX; ix++) {
-	for (int iy=0; iy<nPixelsY*nSubPixels; iy++) {
+	for (int iy=0; iy<nPixelsY*nSubPixelsY; iy++) {
-	  gm[iy*nPixelsX*nSubPixels+ix]=dummy[iy*nPixelsX*nSubPixels+ix];
+	  gm[iy*nPixelsX*nSubPixelsX+ix]=dummy[iy*nPixelsX*nSubPixelsX+ix];
 	}
       }
-      WriteToTiff(gm, imgname,nSubPixels* nPixelsX ,nSubPixels* nPixelsY); 
+      WriteToTiff(gm, imgname,nSubPixelsY* nPixelsX ,nSubPixelsY* nPixelsY); 
       delete [] gm;
     } else cout << "Could not allocate float image " << endl;
     return NULL;    
@@ -120,9 +136,9 @@ class slsInterpolation
   virtual void clearInterpolatedImage() {
 
 
-      for (int ix=0; ix<nPixelsX*nSubPixels; ix++) {
+      for (int ix=0; ix<nPixelsX*nSubPixelsX; ix++) {
-	for (int iy=0; iy<nPixelsY*nSubPixels; iy++) {
+	for (int iy=0; iy<nPixelsY*nSubPixelsY; iy++) {
-	  hint[iy*nPixelsX*nSubPixels+ix]=0;
+	  hint[iy*nPixelsX*nSubPixelsX+ix]=0;
 	}
       }
 
@@ -133,11 +149,11 @@ class slsInterpolation
 
 
   virtual int *addToImage(double int_x, double int_y){ 
-    int iy=((double)nSubPixels)*int_y; 
+    int iy=((double)nSubPixelsY)*int_y; 
-    int ix=((double)nSubPixels)*int_x; 
+    int ix=((double)nSubPixelsX)*int_x; 
-     if (ix>=0 && ix<(nPixelsX*nSubPixels) && iy<(nSubPixels*nPixelsY) && iy>=0 ){
+     if (ix>=0 && ix<(nPixelsX*nSubPixelsX) && iy<(nSubPixelsY*nPixelsY) && iy>=0 ){
        // cout << int_x << " " << int_y << " " << "  " << ix << " " << iy << " " << ix+iy*nPixelsX*nSubPixels << " " << hint[ix+iy*nPixelsX*nSubPixels];
-       (*(hint+ix+iy*nPixelsX*nSubPixels))+=1; 
+       (*(hint+ix+iy*nPixelsX*nSubPixelsX))+=1; 
        // cout << " " << hint[ix+iy*nPixelsX*nSubPixels] << endl;
      }// else
       // cout << "bad! "<< int_x << " " << int_y << " " << "  " << ix << " " << iy << " " << ix+iy*nPixelsX*nSubPixels << endl;
@@ -180,11 +196,12 @@ class slsInterpolation
     /* cluster[2]=cl+6; */
     
     sum=0;
+    int xoff=0, yoff=0;
+#ifndef WRITE_QUAD 
     double sumBL=0;
     double sumTL=0;
     double sumBR=0;
     double sumTR=0;
-    int xoff=0, yoff=0;
     for (int ix=0; ix<3; ix++) {
       for (int iy=0; iy<3; iy++) {
 	sum+=cl[ix+3*iy];
@@ -204,34 +221,95 @@ class slsInterpolation
 
     
     if(sumTL  >= totquad){
-      /* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; */
+/* #ifdef WRITE_QUAD */
-      /* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; */
+/*       /\* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; *\/ */
-      
+/*       /\* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; *\/ */
+/*       if (sumTL  ==sum) { */
+/* #endif */
       corner = TOP_LEFT;
       totquad=sumTL;
       xoff=0;
       yoff=1;
+/* #ifdef WRITE_QUAD */
+/*       } */
+/* #endif */
     } 
 
     if(sumBR  >= totquad){
       /* sDum[0][0] = cluster[0][1]; sDum[1][0] = cluster[1][1]; */
       /* sDum[0][1] = cluster[0][2]; sDum[1][1] = cluster[1][2]; */
       
+/* #ifdef WRITE_QUAD */
+/*       /\* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; *\/ */
+/*       /\* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; *\/ */
+/*       if (sumBR   ==sum) { */
+/* #endif */
+      corner = BOTTOM_RIGHT;
       xoff=1;
       yoff=0;
-      corner = BOTTOM_RIGHT;
       totquad=sumBR;
+/* #ifdef WRITE_QUAD */
+/*       } */
+/* #endif */
     }
     
     if(sumTR  >= totquad){
+/* #ifdef WRITE_QUAD */
+/*       /\* sDum[0][0] = cluster[1][0]; sDum[1][0] = cluster[2][0]; *\/ */
+/*       /\* sDum[0][1] = cluster[1][1]; sDum[1][1] = cluster[2][1]; *\/ */
+/*       if (sumTR ==sum) { */
+/* #endif */
       xoff=1;
       yoff=1;
       /* sDum[0][0] = cluster[1][1]; sDum[1][0] = cluster[2][1]; */
       /* sDum[0][1] = cluster[1][2]; sDum[1][1] = cluster[2][2]; */
       corner = TOP_RIGHT;
       totquad=sumTR;
+/* #ifdef WRITE_QUAD */
+/*       } */
+/* #endif */
     }
  
+#endif    
+#ifdef WRITE_QUAD    
+   
+    double sumB=0;
+    double sumT=0;
+    double sumR=0;
+    double sumL=0;
+
+    for (int ix=0; ix<3; ix++) {
+      for (int iy=0; iy<3; iy++) {
+	sum+=cl[ix+3*iy];
+	if (ix<1 ) sumL+=cl[ix+iy*3];
+	if (ix>1) sumR+=cl[ix+iy*3];
+	if (iy<1) sumB=cl[ix+iy*3];
+	if (iy>1) sumT+=cl[ix+iy*3];
+      }
+    } 
+    
+    totquad=sum;
+    if ( sumT==0 && sumR==0) {
+        corner = BOTTOM_LEFT;
+	xoff=0;
+	yoff=0;
+    } else if ( sumB==0 && sumR==0 ) {
+        corner = TOP_LEFT;
+      xoff=0;
+      yoff=1;
+    } else if ( sumT==0 && sumL==0) {
+      corner = BOTTOM_RIGHT;
+      xoff=1;
+      yoff=0;
+    } else if ( sumB==0 && sumL==0) {
+      xoff=1;
+      yoff=1;
+      corner = TOP_RIGHT;
+    } else
+      printf("** bad 2x2 cluster!\n");
+
+#endif
+
 
     for (int ix=0; ix<2; ix++) {
       for (int iy=0; iy<2; iy++) {
@@ -495,7 +573,7 @@ class slsInterpolation
 
  protected:
   int nPixelsX, nPixelsY;
-  int nSubPixels;
+  int nSubPixelsX, nSubPixelsY;
   int id;
   int *hint;
 };

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
+LDFLAG= -L/usr/lib64/ -lpthread -lm  -lstdc++  -lzmq -pthread -lrt -ltiff   -O3  -std=c++11 -Wall -L../../build/bin/ -lSlsSupport
 #-L../../bin -lhdf5  -L.
 
 #DESTDIR?=../bin
 
 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/moench03Interpolation.cpp

@@ -16,7 +16,8 @@
 
 //#include "etaInterpolationPosXY.h"
 #include "noInterpolation.h"
-#include "etaInterpolationCleverAdaptiveBins.h"
+#include "etaInterpolationPosXY.h"
+//#include "etaInterpolationCleverAdaptiveBins.h"
 //#include "etaInterpolationRandomBins.h"
 using namespace std;
 #define NC 400

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

@@ -1,13 +1,18 @@
-#define WRITE_QUAD
+//#define WRITE_QUAD
 #define DEVELOPER
-
+#undef CORR
 #define C_GHOST 0.0004
 
 #define CM_ROWS 20
 
 #include "sls_detector_defs.h"
 #include "ZmqSocket.h"
+#ifndef RECT
 #include "moench03T1ZmqDataNew.h"
+#endif
+#ifdef RECT
+#include "moench03T1ZmqDataNewRect.h"
+#endif
 #include "moench03GhostSummation.h"
 #include "moench03CommonMode.h"
 #include <vector> 
@@ -31,12 +36,12 @@
 #include "ansi.h"
 #include <iostream>
 
-//#include <chrono>
+#include <chrono>
 #include <ctime> // time_t
 #include <cstdio>
 
 using namespace std;
-//using namespace std::chrono;
+using namespace std::chrono;
 
 //#define SLS_DETECTOR_JSON_HEADER_VERSION 0x2
 
@@ -49,10 +54,11 @@ int main(int argc, char *argv[]) {
  */
   FILE *of=NULL;
   int fifosize=5000;
-  int etabins=1000;//nsubpix*2*100;
+  int etabins=1000, etabinsy=1000;//nsubpix*2*100;
   double etamin=-1, etamax=2;
-  int nSubPixels=2;
+  int nSubPixelsX=2;
   //	int emin, emax;
+  int nSubPixelsY=2;
 	// help
   if (argc < 3 ) {
     cprintf(RED, "Help: ./trial [receive socket ip] [receive starting port number] [send_socket ip] [send starting port number] [nthreads] [nsubpix] [gainmap]  [etafile]\n");
@@ -71,9 +77,12 @@ int main(int argc, char *argv[]) {
 
   int ok;
 
-  // high_resolution_clock::time_point t1;
+  high_resolution_clock::time_point t1;
-  // high_resolution_clock::time_point t2 ;
+  high_resolution_clock::time_point t2 ;
-  time_t begin,end,finished;
+    std::chrono::steady_clock::time_point begin,end,finished;
+      //time_t begin,end,finished;
+  int rms=0;
+  
 
 
   if (argc > 4) {
@@ -93,10 +102,14 @@ int main(int argc, char *argv[]) {
     nthreads=atoi(argv[5]);
 
   cout << "Number of threads is: " << nthreads << endl;
-  if (argc>6)
+  if (argc>6) {
-    nSubPixels=atoi(argv[6]);
+    nSubPixelsX=atoi(argv[6]);
-  cout << "Number of subpixels is: " << nSubPixels << endl;
+    nSubPixelsY=nSubPixelsX;
-  
+#ifdef RECT
+    nSubPixelsX=2;
+#endif
+  }
+  cout << "Number of subpixels is: " << nSubPixelsX << " " <<  nSubPixelsY << endl;
 
   char *gainfname=NULL;
   if (argc>7) {
@@ -116,7 +129,7 @@ int main(int argc, char *argv[]) {
   int npx, npy;
   det->getDetectorSize(npx, npy);
 
-
+  int send_something=0;
 
 
   int maxSize = npx*npy*2;//32*2*8192;//5000;//atoi(argv[3]);
@@ -129,8 +142,12 @@ int main(int argc, char *argv[]) {
 
   int ncol_cm=CM_ROWS;
   double xt_ghost=C_GHOST;
-  moench03CommonMode *cm=new moench03CommonMode(ncol_cm);
+  moench03CommonMode *cm=NULL;
-  moench03GhostSummation *gs=new moench03GhostSummation(det, xt_ghost);
+  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,14 +175,14 @@ 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, 1000, 100, -1, -1, gainmap, gs);
 
     multiThreadedCountingDetector *mt=new multiThreadedCountingDetector(filter,nthreads,fifosize);
 
     // multiThreadedAnalogDetector *mt=new multiThreadedAnalogDetector(filter,nthreads,fifosize);
 #endif
 #ifdef INTERP
-  eta2InterpolationPosXY *interp=new eta2InterpolationPosXY(npx, npy, nSubPixels, etabins, etamin, etamax);
+    eta2InterpolationPosXY *interp=new eta2InterpolationPosXY(npx, npy, nSubPixelsX,nSubPixelsY, etabins,  etabinsy, etamin, etamax);
 
   if (etafname) interp->readFlatField(etafname);
 
@@ -260,7 +277,17 @@ int main(int argc, char *argv[]) {
 	// header variables
 	uint64_t acqIndex = -1;
 	uint64_t frameIndex = -1;
-	//uint32_t subFrameIndex = -1;
+#ifdef MOENCH_BRANCH
+ 	uint32_t subFrameIndex = -1;
+	int* flippedData = 0;
+#endif
+	
+	uint64_t subframes=0;
+	//uint64_t  isubframe=0;
+	uint64_t  insubframe=0;
+	double subnorm=1;
+	uint64_t  f0=-1, nsubframes=0, nnsubframe=0;
+
 	uint64_t fileindex = -1;
 	string filename = "";
 	//	char* image = new char[size];
@@ -270,10 +297,10 @@ int main(int argc, char *argv[]) {
 	int iframe=0;
 	char ofname[10000];
 		    
-	char fname[10000];
+	string fname;
 	//	int length;
-	int *detimage;
+	int *detimage=NULL;
-	int nnx, nny,nns;
+	int nnx, nny,nnsx, nnsy;
 	//uint32_t imageSize = 0, nPixelsX = 0, nPixelsY = 0, 
 	//uint32_t  dynamicRange = 0;
 	// infinite loop
@@ -289,11 +316,11 @@ int main(int argc, char *argv[]) {
 	//int16_t *dout;//=new int16_t [nnx*nny];
 	uint32_t dr = 32;
 	int32_t *dout=NULL;//=new int32_t [nnx*nny];
+	float *doutf=NULL;//=new int32_t [nnx*nny];
 	uint16_t roundRNumber = 0;
 	uint8_t detType = 0;
 	uint8_t version = 0;
-	//	int* flippedData = 0;
+	string additionalJsonHeader="" ;
-	char* additionalJsonHeader = 0;
 
 	int32_t threshold=0;
 	
@@ -311,7 +338,7 @@ int main(int argc, char *argv[]) {
 	frameMode fMode=eFrame;
 	double *ped;
 
-	filter->getImageSize(nnx, nny,nns);
+	filter->getImageSize(nnx, nny,nnsx, nnsy);
 
 	
 
@@ -334,10 +361,13 @@ int main(int argc, char *argv[]) {
 
 #endif
 	    //	  if (!zmqsocket->ReceiveHeader(0, acqIndex, frameIndex, subframeIndex, filename, fileindex)) {
-	      //  cprintf(RED, "Got Dummy\n");
+	       cprintf(RED, "Got Dummy\n");
 	      //   t1=high_resolution_clock::now();
-	      time(&end);
+	       //time(&end);
+	       //cout << "Measurement lasted " << difftime(end,begin) << endl;
 
+	       end = std::chrono::steady_clock::now();
+	       cout << "Measurement lasted " << (end-begin).count()*0.000001 << " ms" << endl;
 
 	    while (mt->isBusy()) {;}//wait until all data are processed from the queues
 	    
@@ -352,22 +382,60 @@ int main(int argc, char *argv[]) {
 	      cprintf(RED, "Sent Dummy\n");
 	    }
 	    } else {
+	      send_something=0;
 	      if (fMode==ePedestal) {
-	      sprintf(ofname,"%s_%ld_ped.tiff",fname,fileindex);
+		sprintf(ofname,"%s_%ld_ped.tiff",fname.c_str(),fileindex);
 		mt->writePedestal(ofname);
 		cout << "Writing pedestal to " << ofname << endl;
+		if (rms){
+		  sprintf(ofname,"%s_%ld_var.tiff",fname.c_str(),fileindex);
+		  mt->writePedestalRMS(ofname);
+		  
+		} 
+		send_something=1;
 	      }
 #ifdef INTERP
 	      else if  (fMode==eFlat) {
 		mt->prepareInterpolation(ok);
-	      sprintf(ofname,"%s_%ld_eta.tiff",fname,fileindex);
+		sprintf(ofname,"%s_%ld_eta.tiff",fname.c_str(),fileindex);
 		mt->writeFlatField(ofname);
 		cout << "Writing eta to " << ofname << endl;
+		send_something=1;
 	      }
 #endif
 	      else {
-	      sprintf(ofname,"%s_%ld.tiff",fname,fileindex);
+		if (subframes>0 ) { 
+		  if (insubframe>0) {
+		    sprintf(ofname,"%s_sf%ld_%ld.tiff",fname.c_str(),nnsubframe,fileindex);
+		    //		  mt->writeImage(ofname);
+		    doutf= new float[nnx*nny];
+		    if (subframes>0 && insubframe!=subframes && insubframe>0)
+		      subnorm=((double)subframes)/((double)insubframe);
+		    else
+		      subnorm=1.;
+		    for (int ix=0; ix<nnx*nny; ix++) {
+		    doutf[ix]=detimage[ix]*subnorm;
+		    if (doutf[ix]<0) doutf[ix]=0;
+		    }
+	    
+		    cout << "Writing image to " << ofname << endl;
+		    
+		    WriteToTiff(doutf,ofname ,nnx, nny); 
+		    
+		    if (doutf)
+		      delete [] doutf;
+		    doutf=NULL;
+		    
+		    nsubframes++;
+		    insubframe=0;
+		    send_something=1;
+		  }
+		} else {
+		  sprintf(ofname,"%s_%ld.tiff",fname.c_str(),fileindex);
 		  mt->writeImage(ofname);
+		  send_something=1;
+		}
+		
 		cout << "Writing image to " << ofname << endl;
 	      }
 	      //  cout << nns*nnx*nny*nns*dr/8 << " " << length << endl;
@@ -376,11 +444,13 @@ int main(int argc, char *argv[]) {
 	      
 	    if (fMode==ePedestal) {   
 	      cprintf(MAGENTA,"Get pedestal!\n");
-	      nns=1;
+	      nnsx=1;
+	      nnsy=1;
+	      
 	      nnx=npx;
 	      nny=npy;
 	      //dout= new int16_t[nnx*nny*nns*nns];
-	      dout= new int32_t[nnx*nny*nns*nns];
+	      dout= new int32_t[nnx*nny*nnsx*nnsy];
 	      // cout << "get pedestal " << endl;
 	      ped=mt->getPedestal();
 	      // cout << "got pedestal " << endl;
@@ -406,15 +476,19 @@ int main(int argc, char *argv[]) {
 	     }
 #endif
 	    else {
-	      detimage=mt->getImage(nnx,nny,nns);
+	      detimage=mt->getImage(nnx,nny,nnsx, nnsy);
 	      cprintf(MAGENTA,"Get image!\n");
-	      cout << nnx << " " << nny << " " << nns << endl;
+	      cout << nnx << " " << nny << " " << nnsx << " " << nnsy << endl;
 	      // nns=1;
 	      // nnx=npx;
 	      // nny=npy;
 	      // nnx=nnx*nns;
 	      //nny=nny*nns;
 	      dout= new int32_t[nnx*nny];
+	      if (subframes>0 && insubframe!=subframes && insubframe>0)
+		subnorm=((double)subframes)/((double)insubframe);
+	      else
+		subnorm=1.;
 	      for (int ix=0; ix<nnx*nny; ix++) {
 		// for (int iy=0; iy<nny*nns; iy++) {
 		 //  for (int isx=0; isx<nns; isx++) {
@@ -426,69 +500,22 @@ int main(int argc, char *argv[]) {
 		    
 		//   }
 		// }
-		  dout[ix]=detimage[ix];
+		  dout[ix]=detimage[ix]*subnorm;
 		  if (dout[ix]<0) dout[ix]=0;
 		  //   cout << ix << " " << dout[ix] << endl;
 		  // }
 	      }
 	    }
+	    //if ((insubframe>0 && subframes>0) || (subframes<=0) ){
 
+	    if(send_something) {
 	   
-	    //// int SendHeaderData ( int index, bool dummy, uint32_t jsonversion, uint32_t dynamicrange = 0, uint64_t fileIndex = 0,
+ 	    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);   
-	      // 		uint32_t ndetx = 0, uint32_t ndety = 0, uint32_t npixelsx = 0, uint32_t npixelsy = 0, uint32_t imageSize = 0,
-	      // 		uint64_t acqIndex = 0, uint64_t fIndex = 0, const 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 gapPixelsEnable = 0, int flippedDataX = 0,
-	      // 		char* additionalJsonHeader = 0) {
-
-
-
-	    //  cout << "Sending image size " << nnx << " " << nny << endl;
-
-#ifndef DEVELOPER
-#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);
-#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
-	      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);
-	     */
-#endif		
-	       
 			
 	      
 	      zmqsocket2->SendData((char*)dout,nnx*nny*dr/8);
 	      cprintf(GREEN, "Sent Data\n");
+	    }
 	    
 	    zmqsocket2->SendHeaderData(0, true, SLS_DETECTOR_JSON_HEADER_VERSION);
 	    cprintf(RED, "Sent Dummy\n");
@@ -502,14 +529,16 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 	    mt->clearImage();
 	    
 	    newFrame=1;
-	    //t2 = high_resolution_clock::now();
 	    
-	      time(&finished);
-	      //   auto meas_duration = duration_cast<microseconds>( t2 - t0 ).count();
-	      //   auto real_duration = duration_cast<microseconds>( t2 - t1 ).count();
 	    
-	    cout << "Measurement lasted " << difftime(end,begin) << endl;
+	    //time(&finished);
-	    cout << "Processing lasted " << difftime(finished,begin) << endl;
+	    //cout << "Processing lasted " << difftime(finished,begin) << endl;
+	    
+	       finished = std::chrono::steady_clock::now();
+	       cout << "Processing lasted " << (finished-begin).count()*0.000001 << " ms" << endl;
+#ifdef OPTIMIZE
+	    return 0;
+#endif
 	    continue; //continue to not get out
 
 
@@ -517,7 +546,8 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 
 #ifdef NEWZMQ
 	    if (newFrame) {
-	      time(&begin);
+    begin = std::chrono::steady_clock::now();
+    //time(&begin);
 	      // t0 = high_resolution_clock::now();
 	      //cout <<"new frame" << endl;
 
@@ -543,8 +573,8 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 
 	      //dataSize=size;
 
-	      strcpy(fname,filename.c_str());
+	      //strcpy(fname,filename.c_str());
-
+	      fname=filename;
 	      // cprintf(BLUE, "Header Info:\n"
 	      // 	      "size: %u\n"
 	      // 	      "multisize: %u\n"
@@ -577,6 +607,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: ");
@@ -591,6 +622,12 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 		    // 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;
+		    //isPedestal=1;
+		    rms=1;
 		  }
 #ifdef INTERP 
 		  else if (frameMode_s == "flatfield") {
@@ -729,6 +766,21 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 	      // 	mt->setNSubPixels(nSubPixels);
 	      // }
 	      
+	      // threshold=0;
+	      cprintf(MAGENTA, "Subframes: ");
+	      subframes=0;
+	      //isubframe=0;
+	      insubframe=0;
+	      subnorm=1;
+	      f0=0;
+	      nnsubframe=0;
+	      if (doc.HasMember("subframes")) {	
+		if (doc["subframes"].IsInt()) {
+		  subframes=doc["subframes"].GetInt();
+		}
+	      }	
+	      cprintf(MAGENTA, "%ld\n", subframes);
+
 	      
 	      newFrame=0;
 	      /* zmqsocket->CloseHeaderMessage();*/
@@ -754,33 +806,97 @@ int ZmqSocket::SendHeaderData(int 0, bool false, uint32_t SLS_DETECTOR_JSON_HEAD
 	  }
 
 	  
+
 	  // cout << "data" << endl;
 	  // get data
 	  // acqIndex = doc["acqIndex"].GetUint64();
+
 	  frameIndex       = doc["fIndex"].GetUint64();
+
 	  // subFrameIndex    = doc["expLength"].GetUint();
 
 	  //  bunchId=doc["bunchId"].GetUint();
 	  //  timestamp=doc["timestamp"].GetUint();
 	  packetNumber=doc["packetNumber"].GetUint();
 	  // cout << acqIndex << " " << frameIndex << " " << subFrameIndex << " "<< bunchId << " " << timestamp << " " << packetNumber << endl;
+	  //cprintf(GREEN, "frame\n");
 	  if (packetNumber>=40) {
 	    //*((int*)buff)=frameIndex;
+	    if (insubframe==0) f0=frameIndex;
 	    memcpy(buff,&frameIndex,sizeof(int));
 	    //length = 
 	    zmqsocket->ReceiveData(0, buff+sizeof(int), size);
 	    mt->pushData(buff);
 	    mt->nextThread();
 	    mt->popFree(buff);
+	    insubframe++;
+	    nsubframes=frameIndex+1-f0;
 	  } else {
 	    cprintf(RED, "Incomplete frame: received only %d packet\n", packetNumber);
 	    //length = 
 	    zmqsocket->ReceiveData(0, dummybuff, size);
+	  }
+	  
+
+
+
+	  if (subframes>0 && insubframe>=subframes && fMode==eFrame) {
+	    while (mt->isBusy()) {;}//wait until all data are processed from the queues
+	    detimage=mt->getImage(nnx,nny,nnsx, nnsy);
+	    cprintf(MAGENTA,"Get image!\n");
+	    dout= new int32_t[nnx*nny];
+	    doutf= new float[nnx*nny];
+	    if (subframes>0 && insubframe!=subframes && insubframe>0)
+	      subnorm=((double)subframes)/((double)insubframe);
+	    else
+	      subnorm=1.;
+	    for (int ix=0; ix<nnx*nny; ix++) {
+	      dout[ix]=detimage[ix]*subnorm;
+	      if (dout[ix]<0) dout[ix]=0;
+	      doutf[ix]=dout[ix];
+	    }
+	    sprintf(ofname,"%s_sf%ld_%ld.tiff",fname.c_str(),nnsubframe,fileindex);
+	    
+	    cout << "Writing image to " << ofname << endl;
+
+	    WriteToTiff(doutf,ofname ,nnx, nny); 
+	    nsubframes++;
+	    insubframe=0;
+	    nnsubframe++;
+
+
+	    
+ 	    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);
+
+	    zmqsocket2->SendData((char*)dout,nnx*nny*dr/8);
+	    cprintf(GREEN, "Sent subdata\n");
+		
+
+	    if (dout)
+	      delete [] dout;
+	    dout=NULL;
+
+	    if (doutf)
+	      delete [] doutf;
+	    doutf=NULL;
+	    
+	    mt->clearImage();
 	    
 	  }
 
 		 
 
+
+
+
+
+
+	
+	      
+
+
+	  
+	  
 	  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>
@@ -95,7 +95,7 @@ public:
   virtual int *getImage() {
     return det->getImage();
   }
-  virtual int getImageSize(int &nnx, int &nny, int &ns) {return det->getImageSize(nnx, nny, ns);};
+  virtual int getImageSize(int &nnx, int &nny, int &ns, int &nsy) {return det->getImageSize(nnx, nny, ns, nsy);};
   virtual int getDetectorSize(int &nnx, int &nny) {return det->getDetectorSize(nnx, nny);};
 
   virtual ~threadedAnalogDetector() {StopThread();  delete fifoFree; delete fifoData;}
@@ -123,7 +123,7 @@ public:
      return fifoFree->pop(ptr);
    }
 
-   virtual int isBusy() {return busy;}
+   virtual int isBusy() {if (fifoData->isEmpty() && busy==0) return 0; else return 1;}
    
    //protected:
    /** Implement this method in your subclass with the code you want your thread to run. */
@@ -221,10 +221,10 @@ FILE *getFilePointer(){return det->getFilePointer();};
    }
 
 
-   virtual int setNSubPixels(int ns)  { 
+  virtual int setNSubPixels(int ns, int nsy)  { 
      slsInterpolation *interp=(det)->getInterpolation();
-     if (interp)  return interp->setNSubPixels(ns);
+     if (interp)  interp->setNSubPixels(ns, nsy);
-     else return 1;};
+     return 1;};
 
 
    virtual slsInterpolation *setInterpolation(slsInterpolation *f){
@@ -249,7 +249,7 @@ protected:
    }
 
    void * processData() {
-     busy=1;
+     //  busy=1;
      while (!stop) {
        if (fifoData->isEmpty()) {
 	 busy=0;
@@ -259,6 +259,7 @@ protected:
 	 fifoData->pop(data); //blocking!
 	 det->processData(data);
 	 fifoFree->push(data); 
+	 //busy=0;
        }
      }
      return NULL;
@@ -313,13 +314,13 @@ public:
    
   virtual void newDataSet(){for (int i=0; i<nThreads; i++) dets[i]->newDataSet();};
   
-  virtual int *getImage(int &nnx, int &nny, int &ns) {
+  virtual int *getImage(int &nnx, int &nny, int &ns, int &nsy) {
     int *img;
     // int nnx, nny, ns; 
     // int nnx, nny, ns;
-    int nn=dets[0]->getImageSize(nnx, nny,ns);
+    int nn=dets[0]->getImageSize(nnx, nny,ns, nsy);
     if (image) {
-      delete image;
+      delete [] image;
       image=NULL;
     }
     image=new int[nn];
@@ -362,10 +363,10 @@ public:
 /*        dets[ii]->writeImage(tit); */
 /*      } */
 /* #endif */
-     int nnx, nny, ns;
+    int nnx, nny, ns, nsy;
-     getImage(nnx, nny, ns);
+    getImage(nnx, nny, ns,nsy);
      //int nnx, nny, ns;
-     int nn=dets[0]->getImageSize(nnx, nny, ns);
+    int nn=dets[0]->getImageSize(nnx, nny, ns, nsy);
      float *gm=new float[nn];
      if (gm) {
        for (int ix=0; ix<nn; ix++) {
@@ -462,6 +463,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 +543,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;

slsDetectorCalibration/multiThreadedInterpolatingDetector.h

@@ -46,7 +46,7 @@ public:
   };
   
 
-   virtual int setNSubPixels(int ns)  { return (dets[0])->setNSubPixels(ns);};
+   /* virtual int setNSubPixels(int ns)  { return (dets[0])->setNSubPixels(ns);}; */
 
    virtual void resetFlatField() {(dets[0])->resetFlatField();};
    
@@ -69,13 +69,13 @@ public:
 
 
 
-  virtual int *getImage(int &nnx, int &nny, int &ns) {
+   virtual int *getImage(int &nnx, int &nny, int &nsx, int &nsy) {
-    if (getInterpolation()==NULL) return multiThreadedAnalogDetector::getImage(nnx,nny,ns);
+     if (getInterpolation()==NULL) return multiThreadedAnalogDetector::getImage(nnx,nny,nsx, nsy);
     //if one interpolates, the whole image is stored in detector 0;
     int *img;
     // int nnx, nny, ns; 
     // int nnx, nny, ns;
-    int nn=dets[0]->getImageSize(nnx, nny,ns);
+    int nn=dets[0]->getImageSize(nnx, nny,nsx, nsy);
     if (image) {
       delete image;
       image=NULL;

slsDetectorCalibration/pedestalSubtraction.h

@@ -10,7 +10,7 @@ class pedestalSubtraction  {
       \param nn number of samples to calculate the moving average (defaults to 1000)
   */
   pedestalSubtraction (int nn=1000) : stat(nn) {};
-    
+  /* void setPointers(double *me, double *va) {mean=me; var=va; stat.setPointers(mean, var);}; */
     /** virtual destructorr 
      */
     virtual ~pedestalSubtraction() {};

slsDetectorCalibration/singlePhotonDetector.h

@@ -51,14 +51,13 @@ public analogDetector<uint16_t> {
 
   */
 
-
  singlePhotonDetector(slsDetectorData<uint16_t> *d,
 		      int csize=3,
 		      double nsigma=5,
 		      int sign=1,
 		      commonModeSubtraction *cm=NULL,
 		      int nped=1000,
-		      int nd=100, int nnx=-1, int nny=-1, double *gm=NULL, ghostSummation<uint16_t> *gs=NULL) : analogDetector<uint16_t>(d, sign, cm, nped, nnx, nny, gm, gs),   nDark(nd), eventMask(NULL),nSigma (nsigma), eMin(-1), eMax(-1), clusterSize(csize), clusterSizeY(csize), clusters(NULL),   quad(UNDEFINED_QUADRANT), tot(0), quadTot(0)  {
+		      int nd=100, int nnx=-1, int nny=-1, double *gm=NULL, ghostSummation<uint16_t> *gs=NULL) : analogDetector<uint16_t>(d, sign, cm, nped, nnx, nny, gm, gs),   nDark(nd), eventMask(NULL),nSigma (nsigma), eMin(-1), eMax(-1), clusterSize(csize), clusterSizeY(csize), c2(1),c3(1), clusters(NULL),   quad(UNDEFINED_QUADRANT), tot(0), quadTot(0)  {
     
     
     
@@ -66,13 +65,18 @@ public analogDetector<uint16_t> {
     fm=new pthread_mutex_t ;
 
     eventMask=new eventType*[ny];
+    //  val=new double*[ny];
     for (int i=0; i<ny; i++) {
       eventMask[i]=new eventType[nx];
+      // val[i]=new double[nx];
     }
     
     if (ny==1)
       clusterSizeY=1;
 
+  
+    c2=sqrt((clusterSizeY+1)/2* (clusterSize+1)/2);
+    c3=sqrt(clusterSizeY*clusterSize);
     // cluster=new single_photon_hit(clusterSize,clusterSizeY);
     clusters=new single_photon_hit[nx*ny];
    
@@ -100,8 +104,10 @@ public analogDetector<uint16_t> {
     myFile=orig->myFile;
     
     eventMask=new eventType*[ny];
+    // val=new double*[ny];
     for (int i=0; i<ny; i++) {
       eventMask[i]=new eventType[nx];
+      // val[i]=new double[nx];
     }
     eMin=orig->eMin;
     eMax=orig->eMax;
@@ -111,6 +117,10 @@ public analogDetector<uint16_t> {
     clusterSize=orig->clusterSize;
     clusterSizeY=orig->clusterSizeY;
     // cluster=new single_photon_hit(clusterSize,clusterSizeY);
+
+    c2=sqrt((clusterSizeY+1)/2* (clusterSize+1)/2);
+    c3=sqrt(clusterSizeY*clusterSize);
+
     clusters=new single_photon_hit[nx*ny];
 
     // cluster=clusters;
@@ -124,6 +134,8 @@ public analogDetector<uint16_t> {
     gmap=orig->gmap;
     nphTot=0;
     nphFrame=0;
+    nphTot=0;
+    nphFrame=0;
     
   }
   
@@ -196,7 +208,6 @@ public analogDetector<uint16_t> {
       int nn=0;
       double max=0, tl=0, tr=0, bl=0,br=0, v;
       double rms=0;
-      
       int cm=0;
       if (cmSub) cm=1;
 
@@ -218,8 +229,8 @@ public analogDetector<uint16_t> {
 	    cout << "add to common mode?"<< endl;
 	    addToCommonMode(data);
 	  }
-	    for (int iy=ymin; iy<ymax; iy++) {
+	    for (iy=ymin; iy<ymax; ++iy) {
-	  for (int ix=xmin; ix<xmax; ix++) {
+	  for (ix=xmin; ix<xmax; ++ix) {
 	      if (det->isGood(ix,iy)) {
 		val=subtractPedestal(data,ix,iy, cm);
 		
@@ -236,8 +247,8 @@ public analogDetector<uint16_t> {
 	    }
 	  }
 	  
-	  for (int iy=ymin; iy<ymax; iy++) {
+	  for (iy=ymin; iy<ymax; ++iy) {
-	for (int ix=xmin; ix<xmax; ix++) {
+	for (ix=xmin; ix<xmax; ++ix) {
 	    
 	    if (det->isGood(ix,iy)) {
 	      eventMask[iy][ix]=PEDESTAL;
@@ -346,15 +357,20 @@ int *getClusters(char *data,  int *ph=NULL) {
 
  
   int nph=0;
-  double val[ny][nx];
+  // const int cy=(clusterSizeY+1)/2;
-  int cy=(clusterSizeY+1)/2;
+  //const int cs=(clusterSize+1)/2;
-  int cs=(clusterSize+1)/2;
-  //int ir, ic;
 
+  //int ir, ic;
+  eventType ee;
   double max=0, tl=0, tr=0, bl=0,br=0, *v;
   int cm=0;
   int good=1;
-  if (cmSub) cm=1;
+  int ir, ic;
+  // double quadTot;
+  //quadrant quad;
+  double rms;
+  //if (cmSub) cm=1;
+      double val[ny][nx];
   if (ph==NULL)
     ph=image;
   
@@ -366,13 +382,15 @@ int *getClusters(char *data,  int *ph=NULL) {
 
 
   
-  if (cm)
+  if (cmSub) {
     addToCommonMode(data);
+    cm=1;
+  }
 
+  for (iy=ymin; iy<ymax; ++iy) {
+    for (ix=xmin; ix<xmax; ++ix) {
+      if (det->isGood(ix,iy)==0) continue; 
 
-    for (int iy=ymin; iy<ymax; iy++) {
-  for (int ix=xmin; ix<xmax; ix++) {
-      if (det->isGood(ix,iy)) {
 	max=0;
 	tl=0;
 	tr=0;
@@ -384,20 +402,19 @@ int *getClusters(char *data,  int *ph=NULL) {
 	
       
 	
-	eventMask[iy][ix]=PEDESTAL;
+	//eventMask[iy][ix]
+	  ee=PEDESTAL;
 	
 	
-	(clusters+nph)->rms=getPedestalRMS(ix,iy);
+	  rms=getPedestalRMS(ix,iy);
 	// cluster=clusters+nph;
 	
-      
+	  // cout << ix << " " << iy << endl;
-	for (int ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
+	for (ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
-	  for (int ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
+	  for (ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
 	    
 	    if ((iy+ir)>=iy && (iy+ir)<ny && (ix+ic)>=ix && (ix+ic)<nx) {
 	      val[iy+ir][ix+ic]=subtractPedestal(data,ix+ic,iy+ir, cm);
-	    }
-	    
 	      v=&(val[iy+ir][ix+ic]);
 	      tot+=*v;
 	      if (ir<=0 && ic<=0)
@@ -412,44 +429,68 @@ int *getClusters(char *data,  int *ph=NULL) {
 		max=*v;
 	      }
 	   
-	    
-	    if (ir==0 && ic==0) {
-	      if (*v<-nSigma*(clusters+nph)->rms)
-		eventMask[iy][ix]=NEGATIVE_PEDESTAL;
-	      else if (*v>nSigma*(clusters+nph)->rms)
-		eventMask[iy][ix]=PHOTON;
 	    }
 	    
+	    
 	  }
 	}
-	if (eventMask[iy][ix]==PHOTON && val[iy][ix]<max) 
+	/* if (ix==50 && iy==50) */
+	/*   cout << id << " " << ix << " " << iy << " " << det->getValue(data,ix,iy)<< " "  << val[iy][ix] << " " << getPedestal(ix,iy) << " " << rms << endl;  */
+	if (val[iy][ix]<-nSigma*rms){
+	  ee=NEGATIVE_PEDESTAL;
 	  continue;    
-	
+	} 
-	if (bl>=br && bl>=tl && bl>=tr) {
+	if (max>nSigma*rms){
-	  (clusters+nph)->quad=BOTTOM_LEFT;
+	  //	  cout << "ph1 " << max << " " << nSigma*rms << endl;
-	  (clusters+nph)->quadTot=bl;
+	  ee=PHOTON;
-	} else if (br>=bl && br>=tl && br>=tr) {
+	  if (val[iy][ix]<max)
-	  (clusters+nph)->quad=BOTTOM_RIGHT;
+	    continue;
-	(clusters+nph)->quadTot=br;
+	}
-	} else if (tl>=br && tl>=bl && tl>=tr) {
+	else if (tot>c3*nSigma*rms) {
-	  (clusters+nph)->quad=TOP_LEFT;
+	  //	  cout << "ph3 " << tot << " " << c3*nSigma*rms << endl;
-	  (clusters+nph)->quadTot=tl;
+	  ee=PHOTON;
-	} else if   (tr>=bl && tr>=tl && tr>=br) {
+	}
-	  (clusters+nph)->quad=TOP_RIGHT;
+#ifndef WRITE_QUAD
-	  (clusters+nph)->quadTot=tr;
+	else {
+#endif
+	    quad=BOTTOM_RIGHT;
+	    quadTot=br;
+	    if (bl>=quadTot) {
+	      quad=BOTTOM_LEFT;
+	      quadTot=bl;
+	    }
+	    if (tl>=quadTot) {
+	      quad=TOP_LEFT;
+	      quadTot=tl;
+	    }
+	    if (tr>=quadTot) {
+	      quad=TOP_RIGHT;
+	      quadTot=tr;
 	    }
 	    
-	if (max>nSigma*(clusters+nph)->rms || tot>sqrt(clusterSizeY*clusterSize)*nSigma*(clusters+nph)->rms || ((clusters+nph)->quadTot)>sqrt(cy*cs)*nSigma*(clusters+nph)->rms) {
+	    if (quadTot>c2*nSigma*rms) {
-	  if (val[iy][ix]>=max) {
+	      //   cout << "ph2 " << quadTot << " " << c2*nSigma*rms << endl;
-	  eventMask[iy][ix]=PHOTON_MAX;
+	      ee=PHOTON;
+	    }
+	  
+#ifndef WRITE_QUAD
+	}
+#endif
+	if (ee==PHOTON && val[iy][ix]==max) {
+	  ee=PHOTON_MAX;
+	  // cout << "**" <<id<< " " << iframe << " "  << nDark << " "   << ix << " " << iy << " " << rms << " " << max << " " << quadTot << " " << tot << endl;
       	  (clusters+nph)->tot=tot;
       	  (clusters+nph)->x=ix;
       	  (clusters+nph)->y=iy;
+      	  (clusters+nph)->quad=quad;
+      	  (clusters+nph)->quadTot=quadTot;
+      	  //(clusters+nph)->rms=rms;
       	  //	  (clusters+nph)->iframe=det->getFrameNumber(data);
       	  // cout << det->getFrameNumber(data) << " " << (clusters+nph)->iframe << endl;
-	  (clusters+nph)->ped=getPedestal(ix,iy,0);
+      	  //  (clusters+nph)->ped=getPedestal(ix,iy,0);
-	  for (int ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
+	  for (ir=-(clusterSizeY/2); ir<(clusterSizeY/2)+1; ir++) {
-	    for (int ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
+	    for (ic=-(clusterSize/2); ic<(clusterSize/2)+1; ic++) {
+	      if ((iy+ir)>=iy && (iy+ir)<ny && (ix+ic)>=ix && (ix+ic)<nx) 
 		(clusters+nph)->set_data(val[iy+ir][ix+ic],ic,ir);
 	    }
       }
@@ -462,19 +503,19 @@ int *getClusters(char *data,  int *ph=NULL) {
       }
       
       
-	  } else {
+	} else if (ee==PEDESTAL) {
-	    eventMask[iy][ix]=PHOTON;
-	  }
-	} else if (eventMask[iy][ix]==PEDESTAL) {
 	  addToPedestal(data,ix,iy,cm);
+	} /*else {
+	    eventMask[iy][ix]=PHOTON;
+	    }*/
+	//eventMask[iy][ix]=ee;
   }
 }
-    }
+  
-  }
   nphFrame=nph;
   nphTot+=nph;
   //cout << nphFrame << endl;
-  //  cout <<"**********************************"<< det->getFrameNumber(data) << " " << nphFrame << endl;
+  //cout <<id << " **********************************"<< iframe << " " << det->getFrameNumber(data) << " " << nphFrame << endl;
   writeClusters(det->getFrameNumber(data));
   return  image;
   
@@ -561,13 +602,20 @@ int *getClusters(char *data,  int *ph=NULL) {
 */
 
     static void writeClusters(FILE *f, single_photon_hit *cl, int nph, int fn=0){
-  
+      if (nph>0) {
-/* #ifndef OLDFORMAT   */
+#ifndef OLDFORMAT   
-/*       if (fwrite((void*)&fn, 1,  sizeof(int), f))  */
+	if (fwrite((void*)&fn, 1,  sizeof(int), f))  
-/* 	if (fwrite((void*)&nph, 1,  sizeof(int), f))  */
+	  if (fwrite((void*)&nph, 1,  sizeof(int), f))  
-/* #endif    */
+#endif    
 	    for (int i=0; i<nph; i++) (cl+i)->write(f);
+      }
     };
+      
+
+
+
+
+
  void writeClusters(FILE *f, int fn=0){
    writeClusters(f,clusters,nphFrame, fn);
   //for (int i=0; i<nphFrame; i++) 
@@ -623,6 +671,7 @@ int *getClusters(char *data,  int *ph=NULL) {
     double eMin, eMax;
     int clusterSize; /**< cluster size in the x direction */
     int clusterSizeY; /**< cluster size in the y direction i.e. 1 for strips, clusterSize for pixels */
+    double c2, c3;
     //  single_photon_hit *cluster; /**< single photon hit data structure */
     single_photon_hit *clusters; /**< single photon hit data structure */
     quadrant quad; /**< quadrant where the photon is located */
@@ -631,6 +680,7 @@ int *getClusters(char *data,  int *ph=NULL) {
     int nphTot;
     int nphFrame;
 
+    //    double **val;
     pthread_mutex_t *fm;
 
     };

slsDetectorCalibration/single_photon_hit.h

@@ -39,13 +39,13 @@ class single_photon_hit {
     //fwrite((void*)this, 1, 3*sizeof(int)+4*sizeof(double)+sizeof(quad), myFile); 
     
     // if (fwrite((void*)this, 1, sizeof(int)+2*sizeof(int16_t), myFile))
-    //#ifdef OLDFORMAT 
+#ifdef OLDFORMAT 
     if (fwrite((void*)&iframe, 1,  sizeof(int), myFile)) {};
-      //#endif  
+#endif  
 #ifndef WRITE_QUAD
       //printf("no quad ");
-    if (fwrite((void*)&x, 2,  sizeof(int16_t), myFile)) 
+    //if (fwrite((void*)&x, 2,  sizeof(int16_t), myFile)) 
-      return fwrite((void*)data, 1, dx*dy*sizeof(int), myFile);
+      return fwrite((void*)&x, 1, dx*dy*sizeof(int)+2*sizeof(int16_t), myFile);
 #endif 
 #ifdef WRITE_QUAD
     // printf("quad ");
@@ -104,9 +104,9 @@ class single_photon_hit {
   size_t read(FILE *myFile) {
     //fread((void*)this, 1,  3*sizeof(int)+4*sizeof(double)+sizeof(quad), myFile); 
     
-    //#ifdef OLDFORMAT 
+#ifdef OLDFORMAT 
     if (fread((void*)&iframe, 1,  sizeof(int), myFile))  {}
-      //#endif   
+#endif   
 #ifndef WRITE_QUAD
       // printf( "no quad \n");
     if (fread((void*)&x, 2,  sizeof(int16_t), myFile))  
@@ -246,8 +246,6 @@ class single_photon_hit {
   int *get_cluster() {return data;};
 
   int	iframe; 	        /**< frame number */
-  int16_t 	x; 			/**< x-coordinate of the center of hit */
-  int16_t	y; 			/**< x-coordinate of the center of hit */
   double	rms; 		/**< noise of central pixel l -- at some point it can be removed*/
   double 	ped; 		/**< pedestal of the central pixel -- at some point it can be removed*/
    double tot; /**< sum of the 3x3 cluster */
@@ -255,6 +253,8 @@ class single_photon_hit {
    double quadTot; /**< sum of the maximum 2x2cluster */ 
   int dx;	                /**< size of data cluster in x */
   int dy;                 /**< size of data cluster in y */ 
+  int16_t 	x; 			/**< x-coordinate of the center of hit */
+  int16_t	y; 			/**< x-coordinate of the center of hit */ 
   int *data;		        /**< pointer to data */
 };
 

slsDetectorGui/CMakeLists.txt

@@ -1,10 +1,13 @@
 set(CMAKE_AUTOMOC ON)
 
+find_package(PNG REQUIRED)
+find_package(ZLIB REQUIRED)
+
 set(SOURCES
-    slsDetectorPlotting/src/SlsQt1DPlot.cxx
+    slsDetectorPlotting/src/SlsQt1DPlot.cpp
-    slsDetectorPlotting/src/SlsQt1DZoomer.cxx
+    slsDetectorPlotting/src/SlsQt1DZoomer.cpp
-    slsDetectorPlotting/src/SlsQt2DHist.cxx
+    slsDetectorPlotting/src/SlsQt2DHist.cpp
-    slsDetectorPlotting/src/SlsQt2DPlot.cxx
+    slsDetectorPlotting/src/SlsQt2DPlot.cpp
     src/qDetectorMain.cpp
     src/qDrawPlot.cpp
     src/qCloneWidget.cpp
@@ -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
 )
@@ -100,10 +103,10 @@ set_target_properties(slsDetectorGui PROPERTIES
 )
 
 install(TARGETS slsDetectorGui
-    EXPORT "${TARGETS_EXPORT_NAME}"
+    # EXPORT "${TARGETS_EXPORT_NAME}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    # LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    # ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    # PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 

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">
@@ -55,6 +55,149 @@
      </widget>
     </item>
     <item row="1" column="0">
+     <widget class="QLabel" name="lblCompleteImage">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>40</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="palette">
+       <palette>
+        <active>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>0</red>
+            <green>150</green>
+            <blue>110</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </active>
+        <inactive>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>0</red>
+            <green>150</green>
+            <blue>110</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </inactive>
+        <disabled>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>139</red>
+            <green>142</green>
+            <blue>142</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </disabled>
+       </palette>
+      </property>
+      <property name="text">
+       <string>Complete Image</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QLabel" name="lblInCompleteImage">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>40</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="palette">
+       <palette>
+        <active>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>255</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </active>
+        <inactive>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>255</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </inactive>
+        <disabled>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>139</red>
+            <green>142</green>
+            <blue>142</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </disabled>
+       </palette>
+      </property>
+      <property name="text">
+       <string>Missing Packets</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <spacer name="horizontalSpacer_3">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>117</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="2" column="0" colspan="3">
      <widget class="QWidget" name="widgetStatistics" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -240,8 +383,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>500</width>
+     <width>376</width>
-     <height>28</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSave">