more tests

.clang-format

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

.clang-tidy

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,42 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us improve 
-title: New Bug Report
-labels: action - Bug, priority - Unclassified, status - Pending
-template: bug_report.md
----
-<!-- Preview changes before submitting -->
-<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
-<!-- This is a comment, the syntax is a bit different from c++ or bash -->
-
-##### *Distribution: 
-<!-- RHEL7, RHEL6, Fedora, etc -->
-
-
-##### *Detector type: 
-<!-- If applicable, Eiger, Jungfrau, Mythen3, Gotthard2, Gotthard, Moench, ChipTestBoard -->
-
-##### *Software Package Version: 
-<!-- developer, 4.2.0, 4.1.1, etc -->
-
-##### Priority:
-<!-- Super Low, Low, Medium, High, Super High -->
-
-##### *Describe the bug
-<!--  A clear and concise description of what the bug is -->
-
-##### Expected behavior
-<!--  A clear and concise description of what you expected to happen. -->
-
-##### To Reproduce
-<!--  Steps to reproduce the behavior: -->
-<!--  1. Go to '...' -->
-<!--  2. Click on '....' -->
-<!--  3. Scroll down to '....' -->
-<!--  4. See error -->
-
-##### Screenshots
-<!--  If applicable, add screenshots to help explain your problem. -->
-
-##### Additional context
-<!--  Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/change_request.md

@@ -1,28 +0,0 @@
----
-name: Change Request
-about: Suggest a change to an existing feature
-title: New Change Request
-labels: action - Change, priority - Unclassified, status - Pending
-template: change_request.md
----
-<!-- Preview changes before submitting -->
-<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
-<!-- This is a comment, the syntax is a bit different from c++ or bash -->
-
-##### *Detector type: 
-<!-- If applicable, Eiger, Jungfrau, Mythen3, Gotthard2, Gotthard, Moench, ChipTestBoard -->
-
-##### *Software Package Version: 
-<!-- developer, 4.2.0, 4.1.1, etc -->
-
-##### Priority:
-<!-- Super Low, Low, Medium, High, Super High -->
-
-##### *State the change request:
-<!--  A clear and concise description of what the change is to an existing feature -->
-
-##### Is your change request related to a problem. Please describe:
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-##### Additional context:
-<!--  Add any other context about the feature here -->

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,34 +0,0 @@
----
-name: Feature Request
-about: Suggest a feature, documentation or submit a question
-title: New Feature Request
-labels: action - Enhancement, priority - Unclassified, status - Pending
-template: feature_request.md
----
-<!-- Preview changes before submitting -->
-<!-- Please fill out everything with an *, as this report will be discarded otherwise -->
-<!-- This is a comment, the syntax is a bit different from c++ or bash -->
-
-##### *Detector type: 
-<!-- If applicable, Eiger, Jungfrau, Mythen3, Gotthard2, Gotthard, Moench, ChipTestBoard -->
-
-##### *Software Package Version: 
-<!-- developer, 4.2.0, 4.1.1, etc -->
-
-##### Priority:
-<!-- Super Low, Low, Medium, High, Super High -->
-
-##### *State the feature:
-<!--  A clear and concise description of what the feature is -->
-
-##### Is your feature request related to a problem. Please describe:
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-##### Describe the solution you'd like:
-<!-- A clear and concise description of what you want to happen -->
-
-##### Describe alternatives you've considered:
-<!-- A clear and concise description of any alternative solutions or features you've considered -->
-
-##### Additional context:
-<!--  Add any other context about the feature here -->

.travis.yml

@@ -4,6 +4,12 @@ language: cpp
 
 os: linux
 
+# env: 
+#   matrix: 
+#      - CONDA_PY="3.7"
+
+
+
 dist: bionic
 
 install:
@@ -31,8 +37,7 @@ script:
 
 deploy:
   provider: script
-  script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -v --show-traceback -t $CONDA_TOKEN upload --force {} \;
+  script: find $HOME/miniconda/envs/testenv/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
   on:
-    branch: developer
-    tags: true
+    branch: udp
 

CMakeLists.txt

@@ -2,7 +2,7 @@ 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,26 +44,6 @@ option(SLS_USE_PYTHON "Python bindings" OFF)
 option(SLS_USE_CTBGUI "ctb GUI" OFF)
 option(SLS_BUILD_DOCS "docs" OFF)
 option(SLS_BUILD_EXAMPLES "examples" OFF)
-option(SLS_TUNE_LOCAL "tune to local machine" OFF)
-option(SLS_DEVEL_HEADERS "install headers for devel" OFF)
-option(SLS_USE_MOENCH "compile zmq and post processing for Moench" OFF)
-
-# set(ClangFormat_BIN_NAME clang-format)
-set(ClangFormat_EXCLUDE_PATTERNS    "build/" 
-                                    "libs/" 
-                                    "slsDetectorCalibration/" 
-                                    "ctbGui/" 
-                                    "manual/"
-                                    "python/"
-                                    "sample/"
-                                    ${CMAKE_BINARY_DIR})
-find_package(ClangFormat)
-
-#Enable LTO if available
-check_ipo_supported(RESULT SLS_LTO_AVAILABLE)
-message(STATUS "SLS_LTO_AVAILABLE:" ${SLS_LTO_AVAILABLE})
-
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -87,7 +67,6 @@ target_compile_options(slsProjectWarnings INTERFACE
                                             -Wformat=2
                                             -Wredundant-decls
                                             # -Wconversion
-                                            -Wvla
                                             -Wdouble-promotion
                                             -Werror=return-type
 
@@ -132,11 +111,6 @@ 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
@@ -175,12 +149,20 @@ if (SLS_USE_TEXTCLIENT)
     add_subdirectory(slsDetectorSoftware)
 endif (SLS_USE_TEXTCLIENT)
 
+
 if (SLS_USE_RECEIVER)
+    if (SLS_USE_HDF5)
+        find_package(HDF5 1.10 COMPONENTS CXX REQUIRED)
+    endif (SLS_USE_HDF5)
     add_subdirectory(slsReceiverSoftware) 
 endif (SLS_USE_RECEIVER)
 
 if (SLS_USE_GUI)   
-    add_subdirectory(slsDetectorGui)
+    find_package(Qt4 REQUIRED)
+    find_package(Qwt 6 REQUIRED)
+    if (QT4_FOUND AND QWT_FOUND)
+        add_subdirectory(slsDetectorGui)
+    endif()
 endif (SLS_USE_GUI)
 
 if (SLS_USE_SIMULATOR)
@@ -214,15 +196,12 @@ if(SLS_BUILD_DOCS)
 endif(SLS_BUILD_DOCS)
 
 
-if(SLS_USE_MOENCH)
-    add_subdirectory(slsDetectorCalibration/moenchExecutables)
-endif(SLS_USE_MOENCH)
 
 if(SLS_MASTER_PROJECT)
     # Set install dir CMake packages
-    set(CMAKE_INSTALL_DIR "share/cmake/${PROJECT_NAME}")
+    set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/sls)
     # Set the list of exported targets
-    set(PROJECT_LIBRARIES slsSupportShared slsDetectorShared slsReceiverShared)
+    set(PROJECT_LIBRARIES slsSupportLib slsDetectorShared slsReceiverShared)
     # Generate and install package config file and version
     include(cmake/package_config.cmake)
 endif()

README.md

@@ -1,92 +1,91 @@
-### Note
-
-Please do not update to any xxxx.xx.xx.dev0 tags. They are not releases, but tags for internal usage.
-Use only releases with tags such as x.x.x or x.x.x-rcx.
-
 ### Documentation
-Detailed documentation on the latest release of 5.0.0 can be found in the [software wiki](https://slsdetectorgroup.github.io/devdoc/index.html) and on the [official site](https://www.psi.ch/en/detectors/software).
+Detailed documentation can be found on the [official site.](https://www.psi.ch/detectors/users-support)
 
 ### Binaries
-Binaries for the slsDetectorPackage are available through conda. 
-```
-#Add conda channels
-conda config --add channels conda-forge
-conda config --add channels slsdetectorgroup
-conda config --set channel_priority strict
-
-conda install slsdetlib   #only shared lib and command line
-conda install slsdet      #python bindings (includes slsdetlib)
-conda install slsdetgui   #gui (includes qt4)
-
-#Install specific version
-conda install slsdet=2020.03.02.dev0 #developer version from 3 March 2020
-
-```
+Documentation to obtain the binaries via the conda package is available for [lib](https://github.com/slsdetectorgroup/sls_detector_lib) and [gui](https://github.com/slsdetectorgroup/sls_detector_gui)
 
 ### Source code
-One can also obtain the source code from this repository and compile.
+One can also obtain the source code from this repository and compile while realizing the setup dependencies as required.
 ```
 git clone https://github.com/slsdetectorgroup/slsDetectorPackage.git
 
 ```
-#### Dependencies 
-
-Refer [this page](https://slsdetectorgroup.github.io/devdoc/dependencies.html)  for dependencies.
+#### Setup dependencies 
+* Gui Client <br>
+Requirements: Qt 4.8 and Qwt 6.0
+```
+    export QTDIR=/usr/local/Trolltech/
+    export QWTDIR=/usr/local/qwt-6.0.1/
+```
+If either of them does not exist, the GUI client will not be built.
 
+* Advanced user Calibration wizards<br>
+Requirements: ROOT
+```
+    export ROOTSYS=/usr/local/root-5.34
+```
 
 #### Compilation 
 
-Compiling can be done in two ways. Either with the convenience script
-cmk.sh or directly with cmake for more control.
+Compiling can be done in two ways.
 
 **1. Compile using script cmk.sh**<br>
 
-These are mainly aimed at those not familiar with using ccmake and cmake. 
-```
-    The binaries are generated in slsDetectorPackage/build/bin directory.
+After compiling, the libraries and executables will be found in `slsDetectorPackage/build/bin` directory<br>
 
-    Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5 directory>] [-l Install directory] [-k <CMake command>] [-j <Number of threads>]
-    -[no option]: only make
-    -c: Clean
-    -b: Builds/Rebuilds CMake files normal mode
-    -p: Builds/Rebuilds Python API
-    -h: Builds/Rebuilds Cmake files with HDF5 package
-    -d: HDF5 Custom Directory
-    -k: CMake command
-    -l: Install directory
-    -t: Build/Rebuilds only text client
-    -r: Build/Rebuilds only receiver
-    -g: Build/Rebuilds only gui
-    -s: Simulator
-    -u: Chip Test Gui
-    -j: Number of threads to compile through
-    -e: Debug mode
-    -i: Builds tests
-    -m: Manuals
-    -n: Manuals without compiling doxygen (only rst)
-    -z: Moench zmq processor
-    
-    # get all options
-    ./cmk.sh -?
-
-    # new build  and compile in parallel:
-    ./cmk.sh -bj5
-```
+Usage: [-c] [-b] [-h] [-d HDF5 directory] [-j]<br>
+ * -[no option]: only make<br>
+ * -c: Clean<br>
+ * -b: Builds/Rebuilds CMake files normal mode<br>
+ * -h: Builds/Rebuilds Cmake files with HDF5 package<br>
+ * -d: HDF5 Custom Directory<br>
+ * -t: Build/Rebuilds only text client<br>
+ * -r: Build/Rebuilds only receiver<br>
+ * -g: Build/Rebuilds only gui<br>
+ * -j: Number of threads to compile through<br>
+ * -e: Debug mode
  
+Basic Option:
+./cmk.sh -b
+ 
+For only make:
+./cmk.sh
+
+For make clean;make:
+./cmk.sh -c
+
+For using hdf5 without custom dir /blabla:
+./cmk.sh -h -d /blabla
+
+For rebuilding cmake without hdf5 
+./cmk.sh -b
+
+For using multiple cores to compile faster:
+./cmk.sh -j9<br>
+
+
+For rebuilding only certain sections<br>
+./cmk.sh -tg #only text client and gui<br>
+./cmk.sh -r #only receiver<br>
+
+
 **2. Compile without script**<br>
-Use cmake to create out-of-source builds, by creating a build folder parallel to source directory. This would create a debug build with address sanitizers.
+Use cmake to create out-of-source builds, by creating a build folder parallel to source directory.
 ```
-    $ mkdir build
-    $ cd build
-    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON
-    $ make -j12 #or whatever number of threads wanted
+    $ cd ..
+    $ mkdir slsDetectorPackage-build
+    $ cd slsDetectorPackage-build
+    $ cmake ../slsDetectorPackage  -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=OFF 
+    $ make
 ```
 
-To install binaries using CMake
+Use the following as an example to compile statically and using specific hdf5 folder
 ```
-    git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
-    mkdir build && cd build
-    cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
-    make -j12 #or whatever number of cores you are using to build
-    make install
+    $ HDF5_ROOT=/opt/hdf5v1.10.0 cmake ../slsDetectorPackage -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_HDF5=ON
+ ```  
+After compiling, the libraries and executables will be found at `bin` directory
+```
+    $ ls bin/
+    gui_client  libSlsDetector.a  libSlsDetector.so  libSlsReceiver.a  libSlsReceiver.so
+    sls_detector_acquire  sls_detector_get  slsDetectorGui  sls_detector_help  sls_detector_put  slsReceiver slsMultiReceiver
 ```

RELEASE.txt

@@ -1,390 +1,2 @@
-SLS Detector Package 5.0.0 released on 18.11.2020 (Major Release)
-=================================================================
-
-    CONTENTS
-    --------
-    1.	Topics Concerning
-    2.  New Features
-    3.  Resolved Issues
-    4.  Known Issues
-    5.  Firmware Requirements
-    6.  Download, Documentation & Support
-
-
-
-1. Topics Concerning
-====================
-
-    - Compilation requirements
-    - Manuals
-    - Client API complete change
-    - Exceptions
-    - Scan mode (dacs and trimbit)
-    - Timing commands
-    - Enum list (daclist, dacvalues, settingslist, drlist etc.)
-    - Command line (return code)
-    - Command line (dac)
-    - UDP configuration change
-    - Gappixels
-    - Detector Simulators
-    - (Jungfrau server) settings and default dacs
-    - (Servers) Shared Memory
-    - (Jungfrau) two interfaces
-    - (Eiger, Jungfrau server) starting frame number
-    - (Eiger server) Server Config File
-    - (Eiger server) Partial Readout
-    - (Eiger server) Removed Features
-    - (Eiger server) Deactivation
-    - Zmq interface (ZmqSocket.h)
-    - slsReceiver (Metadata)
-    - slsReceiver (Shared Memory)
-    - slsReceiver (UDP IP)
-    - (Eiger Custom Receiver) Header packet
-    - Gui (zmq high water mark)
-    - (Eiger Server) Blocked server
-    - (Eiger Firmware) Extra 8 byte Packets
- 
-
-
-2. New Features
-===============
-
-    Client
-    ------
-    1.  Compilation requirements
-        They are very different now and can be accessed at
-            https://slsdetectorgroup.github.io/devdoc/dependencies.html
-        Gui not included in default cmk.sh script. Must be explicitly asked for.
-
-    2.  Manuals 
-        They can be compiled in the package. 
-            https://slsdetectorgroup.github.io/devdoc/installation.html#build-this-documentation
-        Or refer to the documentation provided in 
-            https://slsdetectorgroup.github.io/devdoc/index.html
-
-    3.  API
-        Changed to Detector class. 
-        C++: Detector.h
-            Documentation:
-                https://slsdetectorgroup.github.io/devdoc/detector.html
-            Examples to use the Detector class:
-                https://github.com/slsdetectorgroup/api-examples
-
-        Python API Documentation: 
-            https://slsdetectorgroup.github.io/devdoc/pydetector.html
-
-        Command line:
-            Many commands have become deprecated. They will still execute, 
-            but give a warning.
-            Documentation:
-                https://slsdetectorgroup.github.io/devdoc/commandline.html
-            Help on a command:
-                sls_detector_help [command], or
-                sls_detector_get -h [command]
-    
-    4.  Exceptions
-        They are thrown instead of providing error codes.
-            sls_detector_exceptions.h
-        Make sure you catch all exceptions in custom gui and handle them or 
-        inform the user.
-        Exceptions thrown in callbacks are also handled.
-            - An exception in startAcquisitionCallBack will need to be handled in 
-            startReceiver or acquire()
-            - An exception in acquisitionFinishedCallBack will need to be handled in
-            stopReceiver or acquire()
-            - An exception in rawDataReadyCallBack or rawDataModifyReadyCallBack
-            will only print and skip image to free it in memory. If address is
-            incorrect after callback, expect undefined behavior.
-
-    5.  Scan mode
-        One can do scans for dacs or trimbits. Trimbits are only for Eiger or 
-        Mythen3. Enable scan mode and then acquire using blocking or non blocking
-        method. Command: scan.
-
-    6.  Timing Commands
-        In command line, all timing commands (eg. peiod) can now specify unit. 
-            eg 100ms 10us, 1s, 100ns
-        In C++ API, one must use chrono library.
-            eg. std::chrono::duration<double, std::milli> t1{232.57};
-                det.setExptime(std::chrono::duration_cast<std::chrono::nanoseconds>(t1));
-        In Python API, one must use timedelta library. 
-            eg. d.exptime = dt.timedelta(seconds = 1.2)
-
-    7.  Enum list (daclist)
-        Command line and API now has features to get the list of enums/commands
-        for dacs, settings, dynamic range, timing modes and temperatures for 
-        the detector in shared memory. 
-            eg. daclist, settingslist, drlist, timinglist, templist
-        Command line also has commands to get their values.
-            eg. dacvalues, tempvalues
-        Python has commands to get their values (detector specific class).
-            eg. d.temp, d.dacs
-
-    8.  Command Line (return code)
-        Return code of the client command line applications now return 0 for 
-        success and 1 for failure.
-        
-    9.  Command Line (Dac)
-        All dac commands have been converted to a single "dac" command with 
-        the previous dac commands as arguments.
-            eg. sls_detector_get vcmp_ll
-            is now
-            sls_detector_get dac vcmp_ll
-    
-    10. UDP Configuration
-        Once all the udp details are set in the detector, the detector's
-        destination is then configured automatically. If the detector is not 
-        configured, it will  fail when acquiring. If any of these parameters
-        are also changed, then this is configured again. Hence, configuremac 
-        command has been removed. Instead, there are commands such as
-        udp_validate (to validate if it has been configured) and
-        udp_reconfigure (to reconfigure).
-
-    11. Gap Pixels
-        Gap pixels are now only available in client call back or gui (not in 
-        receiver anymore). It can be enabled for Eiger and Jungfrau and 
-        includes inter chip and inter module gap pixels.
-
-    Detector Servers
-    ----------------
-
-    1.  Detector Simulators 
-        Or virtual detector servers for every detector have been provided. 
-        They are compiled along with the client by enabling its option. 
-        They should also send fake data (increasing pixel/channel value).  
-
-    2.  (Jungfrau) settings
-        Settings command do not implicitly set default dacs from now on.
-        One can use the command 'defaultdacs' to set them explicitly.
-
-    3.  Shared Memory
-        Almost all the detector parameters removed from shared memory.
-        Therefore, they are all fetched directly from detector.
-
-    4.  (Jungfrau) Two 10G data interfaces
-        Only Jungfrau PCBs with version 2.0 can run at full speed using both
-        the 10G UDP interfaces to stream out data. This is available from 
-        the current firmware and software. To enable two interfaces, one has 
-        to enable two interfaces using "numinterfaces" to 2 and set corresponding
-        udp_dstip2, udp_dstport2 etc. One can also decide to select which of 
-        the two interfaces to use, when using only 1 interface.
-
-    5.  (Eiger, Jungfrau) Next Frame number
-        Both now have running frame numbers that is only reset at boot up
-        and increments continuously through acquisitions. One is able to 
-        set the next frame number now. Command: nextframenumber.
-
-    6.  (Eiger) Server Config file (config_eiger.txt)
-        A config file on the detector can take in 2 parameters "master" 
-        and "top" being set to 1 or 0 to enable or disable the same.
-        When server is started without this file, it is set to hardware
-        settings.
-
-    7.  (Eiger) Partial readout
-        It is possible for partial readouts, where you specify the number
-        of pixel rows to read out. Not all values are allowed. The current
-        slsReceiver does not complain about missing packets, but only puts 
-        this partial image into the complete image (padding the rest). One
-        can cut out required subimage using callbacks, but this feature
-        is probably more useful for custom receivers. Command: readnlines.
-
-    8.  (Eiger) Removed Features
-        storeinram, safe speed and ability to set settings via the settings 
-        command has been removed.
-
-    9.  (Eiger) Deactivation
-        The detector is deactivated by default upon boot up and activated only 
-        upon setting hostname in the client. This is to ensure if the 
-        network of a board or a board is broken and one cannot connect
-        to this board, then it is deactivated by default upon reboot. 
-        Therefore, one can use other half modules of the detector.
-
-    Receiver
-    --------
-
-    1.  Zmq
-        The static library and the zmq.h is no longer provided with package.
-        One must install ZeroMQ version 4.
-        ZmqSocket.h API has changed, especially in parsing receiving JSON header.
-        One must pick up needed parameters  from exposed struct zmqHeader in 
-        ZmqSocket.h.
-
-    2.  Metadata
-        Detector dependant metadata has been added to the master files.
-
-    3.  Shared Memory
-        Almost all receiver parameters have been removed from client shared memory.
-        Therefore the receiver process needs to be alive to access any receiver
-        parameter as they are now fetched directly from the receiver.
-
-    4.  UDP IP
-        Since all the parameters are fetched from receiver or detector directly 
-        (not shared memory), the udp desintation ip (previously rx_udpip) is safer 
-        to be specified before setting rx_hostname. Setting it before has the
-        advantage that the detector is updated first before the receiver is
-        requested for the udp mac. This helps when changing pc and the receiver
-        cannot find the udp ip to get the udp mac.
-
-    5.  (Eiger) Header packet
-        The header packets of Eiger are not sent in this firmware version. So, 
-        custom receivers should handle accordingly.
-
-    Gui
-    ---
-    
-    1.  Zmq high water mark
-        When opening the Gui, the zmq send and receiver high water mark is set to 2
-        instead of default (1000 for zmq library version 4). This is to ensure
-        fast and large detectors can still see latest data on the gui at the cost of
-        losing images in between.
-        When using a different processor or client data call back to handle zmq data, 
-        please ensure this is set back to default to get every zmq packet. Setting it to 
-        -1 sets it to library defaults.
-
-    
-    
-
-3. Resolved Issues
-==================
-
-    Detector Server
-    ---------------
-
-    1.  (Eiger) Blocked Server
-        Very rarely, Eiger control or stop server would block and would require a restart
-        of server. This is due to both servers accessing the same link to get to FEB
-        registers. Locking has been implemented in server shared memory to resolve.
-
-
-
-4. Known Issues
-===============
-
-    1.  (Eiger) Extra 8 byte Packets
-        When stopping detector acquisition while acquiring for more than 128 frames,
-        the next acquisition sends out first an 8 byte packet. This is discarded
-        by the slsReceiver/slsMultiReceiver. Please handle this in custom receivers.
-
-
-
-5. Firmware Requirements
-========================
-        
-        Eiger
-        =====  
-        Compatible version : 08.09.2020 (v27)
-        
-        Jungfrau
-        ========       
-        Compatible version : 24.07.2020 (v1.1, PCB v1.0) 
-                           : 21.07.2020 (v2.1, PCB v2.0)
-
-        Gotthard
-        ========   
-        Compatible version : 08.02.2018 (50um and 25um Master)
-                           : 09.02.2018 (25 um Slave) 
-
-        Mythen3
-        =======
-        Compatible version : 25.09.2020 (development)
-
-        Gotthard2
-        =========
-        Compatible version : 25.09.2020 (development)
-
-        Moench
-        ======
-        Compatible version : 05.10.2020 (v1.0)
-
-        Ctb
-        ===
-        Compatible version : 05.10.2020 (v1.0)
-
-        Detector Upgrade
-        ================
-
-        The following can be upgraded remotely:
-        Eiger      via bit files
-        Jungfrau   via command <.pof>
-        Mythen3    via command <.rbf>
-        Gotthard2  via command <.rbf> 
-        Moench     via command <.pof>
-        Ctb        via command <.pof>
-
-        The following cannot be upgraded remotely:
-        Gotthard   
-
-        Instructions available at
-            https://slsdetectorgroup.github.io/devdoc/firmware.html
-        and
-            https://slsdetectorgroup.github.io/devdoc/serverupgrade.html
-
-    
-6. Download, Documentation & Support
-====================================
-
-    Download
-    --------
-    
-    The Source Code:
-         https://github.com/slsdetectorgroup/slsDetectorPackage
-            
-    Documentation
-    -------------
-    
-    Installation:
-        https://slsdetectorgroup.github.io/devdoc/installation.html#
-        
-    Firmware Upgrade:
-        https://slsdetectorgroup.github.io/devdoc/firmware.html
-
-    Detector Server upgrade:
-        https://slsdetectorgroup.github.io/devdoc/serverupgrade.html
-
-    Detector Simulators:
-        https://slsdetectorgroup.github.io/devdoc/virtualserver.html
-
-    Consuming slsDetectorPackage:
-        https://slsdetectorgroup.github.io/devdoc/consuming.html
-        
-    API Examples:
-        https://github.com/slsdetectorgroup/api-examples
-
-    Command Line Documentation:
-        https://slsdetectorgroup.github.io/devdoc/commandline.html
-
-    Quick Start Guide:
-        https://slsdetectorgroup.github.io/devdoc/quick_start_guide.html
-        
-    C++ API Documentation:
-        https://slsdetectorgroup.github.io/devdoc/detector.html
-       
-    C++ API Example:
-        https://slsdetectorgroup.github.io/devdoc/examples.html#
-        
-    Python API Documentation:
-        https://slsdetectorgroup.github.io/devdoc/pygettingstarted.html
-
-    Python API Example:
-        https://slsdetectorgroup.github.io/devdoc/pyexamples.html
-
-    Receivers (including custom receiver):
-        https://slsdetectorgroup.github.io/devdoc/receivers.html
-        https://slsdetectorgroup.github.io/devdoc/slsreceiver.html
-
-    TroubleShooting:
-        https://slsdetectorgroup.github.io/devdoc/troubleshooting.html
-        
-    Further Documentation:
-        https://www.psi.ch/en/detectors/documentation
-        
-    Info on Releases:
-        https://www.psi.ch/en/detectors/software
-
-
-    Support
-    -------
-
-        dhanya.thattil@psi.ch
-        erik.frojdh@psi.ch
-
+Draft
+- dr 4, 8, 16 in eiger -> speed 0, 32 stays same (speed 1)

cmake/FindClangFormat.cmake

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

cmake/FindSphinx.cmake

@@ -1,6 +1,6 @@
 #Look for an executable called sphinx-build
 find_program(SPHINX_EXECUTABLE
-             NAMES sphinx-build sphinx-build-3.6
+             NAMES sphinx-build
              DOC "Path to sphinx-build executable")
  
 include(FindPackageHandleStandardArgs)

cmake/clang-format.cmake

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

cmake/package_config.cmake

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

cmk.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
-CMAKE="cmake3"
 BUILDDIR="build"
-INSTALLDIR=""
 HDF5DIR="/opt/hdf5v1.10.0"
 HDF5=0
 COMPILERTHREADS=0
@@ -13,9 +11,6 @@ PYTHON=0
 TESTS=0
 SIMULATOR=0
 CTBGUI=0
-MANUALS=0
-MANUALS_ONLY_RST=0
-MOENCHZMQ=0
 
 
 CLEAN=0
@@ -24,15 +19,13 @@ CMAKE_PRE=""
 CMAKE_POST=""
 
 usage() { echo -e "
-Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5 directory>] [-l Install directory] [-k <CMake command>] [-j <Number of threads>]
+Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [-h] [-d <HDF5 directory>] [-j] <Number of threads>
  -[no option]: only make
  -c: Clean
  -b: Builds/Rebuilds CMake files normal mode
  -p: Builds/Rebuilds Python API
  -h: Builds/Rebuilds Cmake files with HDF5 package
  -d: HDF5 Custom Directory
- -k: CMake command
- -l: Install directory
  -t: Build/Rebuilds only text client
  -r: Build/Rebuilds only receiver
  -g: Build/Rebuilds only gui
@@ -41,9 +34,6 @@ Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5
  -j: Number of threads to compile through
  -e: Debug mode
  -i: Builds tests
- -m: Manuals
- -n: Manuals without compiling doxygen (only rst)
- -z: Moench zmq processor
 
 Rebuild when you switch to a new build and compile in parallel:
 ./cmk.sh -bj5
@@ -79,7 +69,7 @@ For rebuilding only certain sections
  
  " ; exit 1; }
 
-while getopts ":bpchd:k:l:j:trgeisumnz" opt ; do
+while getopts ":bpchd:j:trgeisu" opt ; do
 	case $opt in
 	b) 
 		echo "Building of CMake files Required"
@@ -103,14 +93,6 @@ while getopts ":bpchd:k:l:j:trgeisumnz" opt ; do
 		echo "New HDF5 directory: $OPTARG" 
 		HDF5DIR=$OPTARG
 		;;
-	l)
-		echo "CMake install directory: $OPTARG"
-		INSTALLDIR="$OPTARG"
-		;;
-	k)
-		echo "CMake command: $OPTARG"
-		CMAKE="$OPTARG"
-		;;
 	j) 
 		echo "Number of compiler threads: $OPTARG" 
 		COMPILERTHREADS=$OPTARG
@@ -142,18 +124,6 @@ while getopts ":bpchd:k:l:j:trgeisumnz" opt ; do
 		echo "Compiling Options: Simulator" 
 		SIMULATOR=1
 		;; 
-	m)	
-		echo "Compiling Manuals"
-		MANUALS=1
-		;;
-	n)	
-		echo "Compiling Manuals (Only RST)"
-		MANUALS_ONLY_RST=1
-		;;
-	z)	
-		echo "Compiling Moench Zmq Processor"
-		MOENCHZMQ=1
-		;;
 	u)
 		echo "Compiling Options: Chip Test Gui"
 		CTBGUI=1
@@ -217,8 +187,8 @@ fi
 
 #Debug
 if [ $DEBUG -eq 1 ]; then
-#	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
-	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
+	CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug "
+# CMAKE_POST+=" -DCMAKE_BUILD_TYPE=Debug -DSLS_USE_SANITIZER=ON "
 	echo "Debug Option enabled"
 fi 
 
@@ -228,18 +198,6 @@ 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 
-
-#Moench zmq processor
-if [ $MOENCHZMQ -eq 1 ]; then
-	CMAKE_POST+=" -DSLS_USE_MOENCH=ON "
-	echo "Moench Zmq Processor Option enabled"
-fi 
-
 #Chip Test Gui
 if [ $CTBGUI -eq 1 ]; then
 	CMAKE_POST+=" -DSLS_USE_CTBGUI=ON "
@@ -264,15 +222,7 @@ else
 fi
 
 
-#install
-if [ -n "$INSTALLDIR" ]; then
-	CMAKE_POST+=" -DCMAKE_INSTALL_PREFIX=$INSTALLDIR"
-	CMAKE_POST+=" -DCMAKE_FIND_ROOT_PATH=$INSTALLDIR"
-fi
-
-
 #enter build dir
-#pushd $BUILDDIR;
 cd $BUILDDIR;
 echo "in "$PWD
 
@@ -281,7 +231,7 @@ echo "in "$PWD
 #cmake
 if [ $REBUILD -eq 1 ]; then
 	rm -f CMakeCache.txt
-	BUILDCOMMAND="$CMAKE_PRE $CMAKE $CMAKE_POST .."
+	BUILDCOMMAND="$CMAKE_PRE cmake3 $CMAKE_POST .."
 	echo $BUILDCOMMAND
 	eval $BUILDCOMMAND
 fi
@@ -294,45 +244,15 @@ fi
 
 #make
 if [ $COMPILERTHREADS -gt 0 ]; then
-	if [ $MANUALS -eq 0 ] && [ $MANUALS_ONLY_RST -eq 0 ]; then
-		BUILDCOMMAND="make -j$COMPILERTHREADS"
-		echo $BUILDCOMMAND
-		eval $BUILDCOMMAND
-	else
-		if [ $MANUALS -eq 1 ]; then
-			BUILDCOMMAND="make docs -j$COMPILERTHREADS"
-			echo $BUILDCOMMAND
-			eval $BUILDCOMMAND
-		else
-			BUILDCOMMAND="make rst -j$COMPILERTHREADS"
-			echo $BUILDCOMMAND
-			eval $BUILDCOMMAND		
-		fi
-	fi 
+	BUILDCOMMAND="make -j$COMPILERTHREADS"
+	echo $BUILDCOMMAND
+	eval $BUILDCOMMAND
 else
-	if [ $MANUALS -eq 0 ] && [ $MANUALS_ONLY_RST -eq 0 ]; then
-		echo "make"
-		make
-	else
-		if [ $MANUALS -eq 1 ]; then
-			echo "make docs"
-			make docs
-		else
-			echo "make rst"
-			make rst
-		fi
-	fi 
-fi
-
-
-#install
-if [ -n "$INSTALLDIR" ]; then
-	make install
-#	popd
-#	$CMAKE --build $BUILDDIR --target install
+	make
 fi
 
 
 
 
 
+

conda-recepie/conda_build_config.yaml

@@ -2,7 +2,6 @@ python:
     - 3.6
     - 3.7
     - 3.8
-    - 3.9
     
 numpy: 
     - 1.17

conda-recepie/copy_lib.sh

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

conda-recepie/meta.yaml

@@ -1,13 +1,13 @@
 
 package:
   name: sls_detector_software
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+  version: "udp"
 
 source:
   - path: ..
 
 build:
-  number: 0
+  number: 1
   binary_relocation: True
   rpaths:
     - lib/
@@ -33,12 +33,10 @@ requirements:
     - {{ cdt('libselinux') }}            # [linux]
     - {{ cdt('libxdamage') }}            # [linux]
     - {{ cdt('libxxf86vm') }}            # [linux]
-    - expat
 
   host:
     - libstdcxx-ng
     - libgcc-ng
-    - zeromq
     - xorg-libx11
     - xorg-libice
     - xorg-libxext
@@ -46,10 +44,8 @@ requirements:
     - xorg-libxau
     - xorg-libxrender
     - xorg-libxfixes
-    - expat
 
   run:
-    - zeromq
     - libstdcxx-ng
     - libgcc-ng 
 
@@ -98,4 +94,3 @@ outputs:
         - {{ pin_subpackage('slsdetlib', exact=True) }}
         - qwt 6.*
         - qt 4.8.*
-        - expat

ctbGui/CMakeLists.txt

@@ -59,13 +59,14 @@ set( HEADERS
 #set(ROOT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
 # ROOT dictionary generation 
-include("${ROOT_DIR}/RootMacros.cmake")
+include("${ROOT_DIR}/modules/RootNewMacros.cmake")
 root_generate_dictionary(ctbDict ${HEADERS} LINKDEF ctbLinkDef.h)
 add_library(ctbRootLib SHARED ctbDict.cxx)
 target_include_directories(ctbRootLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(ctbRootLib PUBLIC 
     ROOT::Core 
     slsDetectorShared
+    slsSupportLib
     ${ROOT_LIBRARIES} 
     ${ROOT_EXE_LINKER_FLAGS}
 )
@@ -77,6 +78,7 @@ set_target_properties(
 
 target_link_libraries(ctbGui PUBLIC 
     slsDetectorShared
+    slsSupportLib
     ctbRootLib
     ${TIFF_LIBRARIES}
 )

ctbGui/ctbAcquisition.cpp

@@ -16,7 +16,6 @@
 #include <TColor.h>
 #include <TTimer.h>
 #include <TH2F.h>
-#include <TSystem.h>
 
 
 #include <stdio.h>
@@ -26,14 +25,13 @@
 
 #include "ctbAcquisition.h"
 #include "ctbDefs.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
+#include "Detector.h"
+#include "sls_detector_defs.h"
 #include "ctbMain.h"
 #include "moench03CtbData.h" 
-//#include "moench03TCtbData.h" 
-//#include "moench03T1CtbData.h" 
+#include "moench03TCtbData.h" 
+#include "moench03T1CtbData.h" 
 #include "moench03CommonMode.h" 
-#include "moench03T1ZmqDataNew.h" 
 #include "moench02CtbData.h" 
 //#include "jungfrau10ModuleData.h" 
 #include "moenchCommonMode.h" 
@@ -44,10 +42,7 @@
 #include "moench04CtbZmqData.h"
 #include "moench04CtbZmq10GbData.h"
 #include "deserializer.h"
-#include "sls/detectorData.h"
-#include "imageZmq16bit.h"
-#include "imageZmq32bit.h"
-
+#include "detectorData.h"
 
 using namespace std;
 
@@ -237,10 +232,7 @@ hframe=new TGHorizontalFrame(this, 800,50);
   cbDetType->AddEntry("MOENCH02", MOENCH02);
   cbDetType->AddEntry("MOENCH04", MOENCH04);
   // cbDetType->AddEntry("JUNGFRAU1.0", 2);
-  cbDetType->AddEntry("MOENCH03",MOENCH03);
-  cbDetType->AddEntry("IMAGE32BIT",IMAGE32B);
-  cbDetType->AddEntry("IMAGE16BIT",IMAGE16B);
-
+  //cbDetType->AddEntry("MOENCH03 T", iiii++);
   //cbDetType->AddEntry("MOENCH03", iiii++);
   // cbDetType->AddEntry("MYTHEN3 0.1", MYTHEN301);
   // cbDetType->AddEntry("ADCSAR2", ADCSAR2);
@@ -279,7 +271,7 @@ hframe=new TGHorizontalFrame(this, 800,50);
 
 
 
-  //  cout << "off "<< endl;
+    cout << "off "<< endl;
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -298,8 +290,8 @@ hframe=new TGHorizontalFrame(this, 800,50);
                                                TGNumberFormat::kNEANonNegative, 
 			     TGNumberFormat::kNELLimitMinMax,0,16535);
    hframe->AddFrame(eSerOff,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   eSerOff->MapWindow();
-   eSerOff->SetNumber(0);
+   eSerOff->MapWindow();;
+   eSerOff->SetNumber(5);
    e= eSerOff->TGNumberEntry::GetNumberEntry();
    eSerOff->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeSerialOffset(Long_t)");
    e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeSerialOffset()");
@@ -345,53 +337,6 @@ hframe=new TGHorizontalFrame(this, 800,50);
    
 
 
-  hframe=new TGHorizontalFrame(this, 800,50);
-  AddFrame(hframe,new TGLayoutHints(kLHintsTop | kLHintsExpandX , 10,10,10,10));
-  hframe->MapWindow();
-    
- 
-
-  label=new TGLabel(hframe,"Image Pixels");
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-  label->MapWindow();
-  label->SetTextJustify(kTextLeft);
-
-
-  label=new TGLabel(hframe,"X: ");
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-  label->MapWindow();
-  label->SetTextJustify(kTextRight);
-
-
-  ePixX=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-			     TGNumberFormat::kNELLimitMinMax,0,16535);
-   hframe->AddFrame(ePixX,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   ePixX->MapWindow();
-   ePixX->SetNumber(400);
-   e= ePixX->TGNumberEntry::GetNumberEntry();
-   ePixX->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
-   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
-
-
-
-  label=new TGLabel(hframe,"Y: ");
-  hframe->AddFrame(label,new TGLayoutHints(kLHintsTop | kLHintsLeft| kLHintsExpandX, 5, 5, 5, 5));
-  label->MapWindow();
-  label->SetTextJustify(kTextRight);
-
-
-  ePixY=new TGNumberEntry(hframe, 0, 9,999, TGNumberFormat::kNESInteger,
-                                               TGNumberFormat::kNEANonNegative, 
-			     TGNumberFormat::kNELLimitMinMax,0,16535);
-   hframe->AddFrame(ePixY,new TGLayoutHints(kLHintsTop |  kLHintsExpandX, 1, 1, 1, 1));
-   ePixY->MapWindow();
-   ePixY->SetNumber(400);
-   e= ePixY->TGNumberEntry::GetNumberEntry();
-   ePixY->Connect("ValueSet(Long_t)","ctbAcquisition",this,"ChangeImagePixels(Long_t)");
-   e->Connect("ReturnPressed()","ctbAcquisition",this,"ChangeImagePixels()");
-
-
 
 
   hframe=new TGHorizontalFrame(this, 800,50);
@@ -664,10 +609,8 @@ hframe=new TGHorizontalFrame(this, 800,50);
   cout <<"Registering data callback" << endl;
   try {
     myDet->registerDataCallback(&dataCallback, (void*)this);
-  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition") 
-      try {
-	myDet->setRxZmqDataStream(true); 
-      } CATCH_DISPLAY ("Could not get set RxZmqDataStream.", "ctbAcquisition::ctbAcquisition") 
+  } CATCH_DISPLAY ("Could not get register call back.", "ctbAcquisition::ctbAcquisition")
+
   cout <<"Done" << endl;
   
     //  mgAdcs=new TMultiGraph();
@@ -889,7 +832,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
 
   //  cout <<"global plot is " << globalPlot << endl;
   // cout << "*******************************************" <<endl;
-   cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " nx:" << data->nx << " ny: " << data->ny << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
+  // cout <<"------Plot: "<<  index << " prog:" << data->progressIndex << " npoints:" << data->npoints << " npy: " << data->npy << " " << data->fileName << " bytes: " << data->databytes << " dr:"<< data->dynamicRange << " fi: " << data ->fileIndex <<  endl;
   if (globalPlot || cbGetPedestal->IsOn()) {
     //#ifdef TESTADC
     //  cout <<"------"<<  index << " " << ip << " " << data->npoints << endl;
@@ -916,11 +859,6 @@ 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;
@@ -985,8 +923,7 @@ sample1 (dbit0 + dbit1 +...)if (cmd == "rx_dbitlist") {
       for (int y=0; y<ny; y++) {
 	ped=0;
 	aval=dataStructure->getValue(data->data,x,y);
-	//aval=dataStructure->getChannel(data->data,x,y);
-	cout << x << " " <<y << " "<< aval << endl;
+      
 	if (cbGetPedestal->IsOn()) {
 	  if (photonFinder) {
 	    photonFinder->addToPedestal(aval,x,y);
@@ -1157,20 +1094,8 @@ void ctbAcquisition::Draw(){
 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") 
+    dbitPlot=0;
   } 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++)
@@ -1275,9 +1200,6 @@ void ctbAcquisition::changeDetector(){
    eNumCount->SetState(kFALSE);
   eDynRange->SetState(kFALSE);
   eSerOff->SetState(kFALSE);
-  ePixX->SetState(kFALSE);
-  ePixY->SetState(kFALSE);
-    
   deserializer=0;
   if (rb2D->IsOn() ) {//|| rbScan->IsOn()
     switch  (cbDetType->GetSelected()) {
@@ -1288,6 +1210,7 @@ void ctbAcquisition::changeDetector(){
       // commonMode=new moench03CommonMode();
       break;
      case MOENCH04:
+
       try {
         auto retval = myDet->getTenGiga().tsquash("Different values");
         if (retval) {
@@ -1300,54 +1223,6 @@ 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;
@@ -1411,7 +1286,6 @@ void ctbAcquisition::changeDetector(){
 	photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode 
 	//photonFinder=new singlePhotonDetector(dataStructure,csize,nsigma,1,cm); //sign is positive - should correct with ADC mask, no common mode
 	dataStructure->getDetectorSize(nx,ny);
-	
       }
       if (deserializer) {
 	ny=1;
@@ -1637,23 +1511,20 @@ void ctbAcquisition::update() {
 
    if (dataStructure) {
      cout << cbDetType->GetSelected()<< endl;
-    // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
-    //   cout << "settings deserialiation parameters for MYTHEN" << endl;
-    //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-    //   eSerOff->SetNumber( ms->setSerialOffset(-1));
-    //   eDynRange->SetNumber( ms->setDynamicRange(-1));
-    //   eNumCount->SetNumber( ms->setNumberOfCounters(-1));
-    // }
+    if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
+      cout << "settings deserialiation parameters for MYTHEN" << endl;
+      mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+      eSerOff->SetNumber( ms->setSerialOffset(-1));
+      eDynRange->SetNumber( ms->setDynamicRange(-1));
+      eNumCount->SetNumber( ms->setNumberOfCounters(-1));
+    }
     
    }
 
-  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 {
+    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")
@@ -1739,13 +1610,9 @@ 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")
-  }
+    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"));
@@ -1982,18 +1849,14 @@ void ctbAcquisition::setDbitEnable(Int_t reg){
 void ctbAcquisition::updateChans() {
 
   // dbit list
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+  try { 
+    auto retval = myDet->getRxDbitList().tsquash("Different values");
     dbitlist.clear();
-  } else {
-    try {
-      auto retval = myDet->getRxDbitList().tsquash("Different values");
-      dbitlist.clear();
-      if (!retval.empty()) {
-        for (const auto &value : retval) 
-          dbitlist.push_back(value);
-      }
-    } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbAcquisition::updateChans")
-  }
+    if (!retval.empty()) {
+      for (const auto &value : retval) 
+        dbitlist.push_back(value);
+    }
+  } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbAcquisition::updateChans")
 
   // adc mask
   try { 
@@ -2114,22 +1977,20 @@ void ctbAcquisition::ChangeNumberOfChannels(Long_t a){
 
 
 void ctbAcquisition::ChangeSerialOffset(){
-  changeDetector();
   // if (dataStructure) {
 
-  //    cout << cbDetType->GetSelected()<< endl;
-  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
-  //     cout << "settings offsets for MYTHEN" << endl;
-  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-  //     ms->setSerialOffset(eSerOff->GetIntNumber());
+  //   //  cout << cbDetType->GetSelected()<< endl;
+  //   // if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302 ){
+  //   //   cout << "settings offsets for MYTHEN" << endl;
+  //   //   mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
+  //   //   ms->setSerialOffset(eSerOff->GetIntNumber());
       
-  //   }
+  //   // }
   // }
 };
 
 
 void ctbAcquisition::ChangeDynamicRange(){
-  changeDetector();
   // if (dataStructure) {
 
   //    cout << cbDetType->GetSelected()<< endl;
@@ -2143,7 +2004,6 @@ void ctbAcquisition::ChangeDynamicRange(){
 };
 
 void ctbAcquisition::ChangeNumberOfChannels(){
-  changeDetector();
   // if (dataStructure) {
   //    cout << cbDetType->GetSelected()<< endl;
   //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
@@ -2157,24 +2017,6 @@ void ctbAcquisition::ChangeNumberOfChannels(){
     changePlot();
 };
 
-void ctbAcquisition::ChangeImagePixels(Long_t a){
-  ChangeImagePixels();
-};
-
-void ctbAcquisition::ChangeImagePixels(){
-  changeDetector();
-  // if (dataStructure) {
-  //    cout << cbDetType->GetSelected()<< endl;
-  //   if (cbDetType->GetSelected()==MYTHEN301 || cbDetType->GetSelected()==MYTHEN302){
-  //     cout << "settings number of channels for MYTHEN" << endl;
-  //     mythen3_01_jctbData* ms=(mythen3_01_jctbData*)dataStructure;
-  //     ms->setNumberOfCounters(eNumCount->GetIntNumber());
-      
-  //   }
-  // }
-  // if (deserializer)
-  //  changePlot();
-};
 
 
 void ctbAcquisition::ChangeHistoLimitsPedSub(Long_t a){

ctbGui/ctbAcquisition.h

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

ctbGui/ctbAdcs.cpp

@@ -25,7 +25,7 @@
 
 #include "ctbAdcs.h"
 #include "ctbDefs.h"
-#include "sls/Detector.h"
+#include "Detector.h"
 
 using namespace std;
 

ctbGui/ctbDacs.cpp

@@ -10,8 +10,8 @@
 
 #include "ctbDacs.h"
 #include "ctbDefs.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
+#include "Detector.h"
+#include "sls_detector_defs.h"
 
 using namespace std;
 
@@ -108,26 +108,15 @@ 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 {
-    int sid = id;
-    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-      sid = getMoenchDacId();
-    }
-    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
+    myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(id), dacsEntry->GetIntNumber(), dacsUnit->IsOn()); 
   } CATCH_DISPLAY ("Could not set dac " + to_string(id) + ".", "ctbDac::setValue")
 
   getValue();
@@ -139,11 +128,7 @@ void ctbDac::setOn(Bool_t b) {
     setValue();
   } else {
     try {
-      int sid = id;
-      if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-	sid = getMoenchDacId();
-      }
-      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(sid), -100, false);
+      myDet->setDAC(static_cast<slsDetectorDefs::dacIndex>(id), -100, false);
     } CATCH_DISPLAY ("Could not power off dac " + to_string(id) + ".", "ctbDac::setOn")
   }
   getValue();
@@ -151,11 +136,7 @@ void ctbDac::setOn(Bool_t b) {
 
 int ctbDac::getValue() { 
   try {
-    int sid = id;
-    if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
-      sid = getMoenchDacId();
-    }
-    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(sid), dacsUnit->IsOn()).tsquash("Different values"); 
+    int val = myDet->getDAC(static_cast<slsDetectorDefs::dacIndex>(id), 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,6 +54,8 @@ int getMoenchDacId();
 class ctbDacs : public TGGroupFrame {
 private:
   
+
+
    ctbDac *dacs[NDACS+2];
 
    sls::Detector* myDet;

ctbGui/ctbDefs.h

@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <chrono>
 
-//#include "sls/sls_detector_exceptions.h"
-//#include "sls/ansi.h"
+//#include "sls_detector_exceptions.h"
+//#include "ansi.h"
 #define RED    	 	"\x1b[31m"
 #define RESET   	"\x1b[0m"
 #define BOLD    	"\x1b[1m"
@@ -71,14 +71,14 @@ class ctbDefs {
                     std::string exceptionMessage,
                     std::string source) {
         // because sls_detector_exceptions cannot be included
-      if (exceptionMessage.find("hared memory") != std::string::npos) {
+        if (exceptionMessage.find("hared memory")) {
             throw;
         }
-      if (exceptionMessage.find("annot connect") != std::string::npos) {
+        if (exceptionMessage.find("annot connect")) {
             throw;
         }
         cprintf(RED, "Warning (%s): %s [Caught Exception: %s]\n", source.c_str(), message.c_str(), exceptionMessage.c_str());
         //return Message(qDefs::WARNING, message + std::string("\nCaught exception:\n") + exceptionMessage, source);
     }; 
 
-};
+};

ctbGui/ctbGui.cpp

@@ -9,8 +9,8 @@
 #include <fstream>
 #include <string>
 
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
+#include "Detector.h"
+#include "sls_detector_defs.h"
 //#include "sls_receiver_defs.h"
 #include "ctbMain.h"
 #include "ctbDefs.h"

ctbGui/ctbMain.cpp

@@ -34,7 +34,7 @@
 #include <fstream>
 #include <string>
 
-#include "sls/Detector.h"
+#include "Detector.h"
 #include "ctbDefs.h"
 #include "ctbMain.h"
 #include "ctbDacs.h"
@@ -259,10 +259,8 @@ ctbMain::ctbMain(const TGWindow *p, sls::Detector *det)
 
    cout << "connect mtab" << endl;
 
-  try{  
-   setReadoutMode(pat->getReadoutMode());  
-  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
-
+   
+   setReadoutMode(pat->getReadoutMode());
    setADCEnable(adcs->setEnable());
    setAnalogSamples(pat->getAnalogSamples());
    setDigitalSamples(pat->getDigitalSamples());

ctbGui/ctbPattern.cpp

@@ -25,7 +25,7 @@
 
 #include "ctbPattern.h"
 #include "ctbDefs.h"
-#include "sls/Detector.h"
+#include "Detector.h"
 #include <chrono>
 using namespace std;
 
@@ -1035,42 +1035,33 @@ void ctbPattern::readoutModeChanged(int flags) {
 
 }
 
-int ctbPattern::getReadoutMode() {  
- int retval=slsDetectorDefs::ANALOG_ONLY;
-    
- if (myDet->getDetectorType().squash() == slsDetectorDefs::CHIPTESTBOARD) {
-   try{
-     retval = myDet->getReadoutMode().tsquash("Different values");
-   } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
-      
-   switch(retval) {
-   case slsDetectorDefs::ANALOG_AND_DIGITAL:
-     cout << "analog and digital" << endl;
-     cbAnalog->SetOn(kTRUE);
-     cbDigital->SetOn(kTRUE);
-     break;
-   case slsDetectorDefs::DIGITAL_ONLY:
-     cout << "digital only" << endl;
-     cbAnalog->SetOn(kFALSE);
-     cbDigital->SetOn(kTRUE);
-     break;
-   case slsDetectorDefs::ANALOG_ONLY:
-     cout << "analog only" << endl;
-     cbAnalog->SetOn(kTRUE);
-     cbDigital->SetOn(kFALSE);    
-     break;
-   default:
-     throw("unknown readout flag");
-   }
- } else {
-   cbAnalog->SetOn(kTRUE);
-   cbDigital->SetOn(kFALSE);    
- }
-    
+int ctbPattern::getReadoutMode() {
+  try{
+    auto retval = myDet->getReadoutMode().tsquash("Different values");
+    switch(retval) {
+      case slsDetectorDefs::ANALOG_AND_DIGITAL:
+        cout << "analog and digital" << endl;
+        cbAnalog->SetOn(kTRUE);
+        cbDigital->SetOn(kTRUE);
+        break;
+      case slsDetectorDefs::DIGITAL_ONLY:
+        cout << "digital only" << endl;
+        cbAnalog->SetOn(kFALSE);
+        cbDigital->SetOn(kTRUE);
+        break;
+      case slsDetectorDefs::ANALOG_ONLY:
+        cout << "analog only" << endl;
+        cbAnalog->SetOn(kTRUE);
+        cbDigital->SetOn(kFALSE);    
+        break;
+      default:
+        throw("unknown readout flag");
+    }
     Emit("readoutModeChanged(int)",static_cast<int>(retval));
     return retval;
- 
- 
+  } CATCH_DISPLAY ("Could not get readout flags", "ctbPattern::getReadoutMode")
+
+  return -1;
 }
 
 int ctbPattern::getAnalogSamples() {
@@ -1084,17 +1075,13 @@ int ctbPattern::getAnalogSamples() {
   return -1;
 }
    
-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();
- 
+int ctbPattern::getDigitalSamples() {
+  try{
+    auto retval = myDet->getNumberOfDigitalSamples().tsquash("Different values");
+    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/ctbPowers.cpp

@@ -13,8 +13,8 @@
 #include "ctbDefs.h"
 #include "ctbDacs.h"
 #include "ctbPowers.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
+#include "Detector.h"
+#include "sls_detector_defs.h"
 
 using namespace std;
 

ctbGui/ctbSignals.cpp

@@ -35,7 +35,7 @@
 
 #include "ctbSignals.h"
 #include "ctbDefs.h"
-#include "sls/Detector.h"
+#include "Detector.h"
 
 using namespace std;
 
@@ -374,43 +374,33 @@ void ctbSignals::update() {
 
   } CATCH_DISPLAY ("Could not get patternIOcontrol.", "ctbSignals::update")
 
-  if (myDet->getDetectorType().squash() == slsDetectorDefs::MOENCH) {
+  try {
+
+    auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
     // enable all
-    for (int is=0; is<64; is++) {
-      signals[is]->setDbitList(1);
-    } 
-    eDbitOffset->SetNumber(0);
-  } 
-  
-  // ctb
-  else {
-    try {
-
-      auto dbitlist = myDet->getRxDbitList().tsquash("Different values");
-      // enable all
-      if (dbitlist.empty()) {
-        for (int is=0; is<64; is++) {
-          signals[is]->setDbitList(1);
-        } 
+    if (dbitlist.empty()) {
+      for (int is=0; is<64; is++) {
+        signals[is]->setDbitList(1);
+      } 
+    }
+    else {
+      // disable all
+      for (int is=0; is<64; is++) {
+        signals[is]->setDbitList(0);
       }
-      else {
-        // disable all
-        for (int is=0; is<64; is++) {
-          signals[is]->setDbitList(0);
-        }
-        // enable selected
-        for (const auto &value : dbitlist)  {
-          signals[value]->setDbitList(1);
-        }
+      // enable selected
+      for (const auto &value : dbitlist)  {
+        signals[value]->setDbitList(1);
       }
+    }
 
-    } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbSignals::update")
+  } CATCH_DISPLAY ("Could not get receiver dbit list.", "ctbSignals::update")
+
+  try {
+    auto val = myDet->getRxDbitOffset().tsquash("Different values");
+    eDbitOffset->SetNumber(val);
+  } CATCH_DISPLAY ("Could not get receiver dbit offset.", "ctbSignals::update")
 
-    try {
-      auto val = myDet->getRxDbitOffset().tsquash("Different values");
-      eDbitOffset->SetNumber(val);
-    } CATCH_DISPLAY ("Could not get receiver dbit offset.", "ctbSignals::update")
-  }
 }
 
 

ctbGui/ctbSlowAdcs.cpp

@@ -10,8 +10,8 @@
 
 #include "ctbSlowAdcs.h"
 #include "ctbDefs.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
+#include "Detector.h"
+#include "sls_detector_defs.h"
 
 using namespace std;
 

ctbGui/patternGenerator/generate.sh

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

docs/CMakeLists.txt

@@ -1,98 +1,69 @@
-find_package(Doxygen REQUIRED)
-find_package(Sphinx REQUIRED)
+find_package(Doxygen)
+find_package(Sphinx)
 
 
+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? 
+    target_include_directories(gendoc PRIVATE ${PROJECT_SOURCE_DIR}/slsDetectorSoftware/src)
+    target_link_libraries(gendoc PRIVATE
+      slsDetectorShared
+    )
+    set_target_properties(gendoc PROPERTIES 
+      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+    )
 
+    
+    
 
-# Utility to generate command line documentation
-add_executable(gendoc src/gendoc.cpp)
-# This is a bit hacky, but better than exposing stuff? 
-target_include_directories(gendoc PRIVATE ${PROJECT_SOURCE_DIR}/slsDetectorSoftware/src)
-target_link_libraries(gendoc PRIVATE
-  slsDetectorShared
-)
-set_target_properties(gendoc PROPERTIES 
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-)
+    #Doxygen
+    set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
+    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
 
+    #Sphinx
+    set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+    set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR})
 
+    set(SPHINX_SOURCE_FILES
+      src/commandline.rst
+      src/container_utils.rst
+      src/dependencies.rst
+      src/detector.rst
+      src/index.rst
+      src/installation.rst
+      src/pydetector.rst
+      src/pyenums.rst
+      src/pyexamples.rst
+      src/receiver.rst
+      src/result.rst
+      src/type_traits.rst
+      src/ToString.rst
+      
+    )
 
+    foreach(filename ${SPHINX_SOURCE_FILES})
+      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename} 
+                    "${SPHINX_BUILD}/${filename}")
+    endforeach(filename ${SPHINX_SOURCE_FILES})
 
-#Doxygen
-set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
-set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
+        "${SPHINX_BUILD}/conf.py"
+        @ONLY)
 
-#Sphinx
-set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR})
-
-set(SPHINX_SOURCE_FILES
-  src/commandline.rst
-  src/container_utils.rst
-  src/consuming.rst
-  src/dependencies.rst
-  src/detector.rst
-  src/index.rst
-  src/installation.rst
-  src/pydetector.rst
-  src/pyenums.rst
-  src/pyexamples.rst
-  src/servers.rst
-  src/receiver_api.rst
-  src/result.rst
-  src/type_traits.rst
-  src/ToString.rst
-  src/examples.rst
-  src/pygettingstarted.rst
-  src/firmware.rst
-  src/serverupgrade.rst
-  src/virtualserver.rst
-  src/serverdefaults.rst
-  src/quick_start_guide.rst
-  src/troubleshooting.rst
-  src/receivers.rst
-  src/slsreceiver.rst
-)
-
-foreach(filename ${SPHINX_SOURCE_FILES})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename} 
-              "${SPHINX_BUILD}/${filename}")
-endforeach(filename ${SPHINX_SOURCE_FILES})
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
-  "${SPHINX_BUILD}/conf.py"
-  @ONLY)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/gen_server_doc.py.in"
-  "${SPHINX_BUILD}/gen_server_doc.py"
-  @ONLY)
-
-  configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/static/extra.css"
-  "${SPHINX_BUILD}/static/css/extra.css"
-  @ONLY)
-
-add_custom_target(server_rst python gen_server_doc.py)  
-
-add_custom_target(docs
-              gendoc
-              COMMAND python gen_server_doc.py
-              COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-              COMMAND ${SPHINX_EXECUTABLE} -a -b html
-              -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
-              -c "${SPHINX_BUILD}"
-              ${SPHINX_BUILD}/src 
-              ${SPHINX_BUILD}/html
-              COMMENT "Generating documentation with Sphinx")
-
-add_custom_target(rst
-              COMMAND ${SPHINX_EXECUTABLE} -a -b html
-              -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
-              -c "${SPHINX_BUILD}"
-              ${SPHINX_BUILD}/src 
-              ${SPHINX_BUILD}/html
-              COMMENT "Generating documentation with Sphinx")
+    add_custom_target(docs
+                    gendoc
+                    COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+                    COMMAND ${SPHINX_EXECUTABLE} -a -b html
+                    -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
+                    -c "${SPHINX_BUILD}"
+                    ${SPHINX_BUILD}/src 
+                    ${SPHINX_BUILD}/html
+                    COMMENT "Generating documentation with Sphinx")
 
+else (DOXYGEN_FOUND AND SPHINX_FOUND)
+  message("Doxygen and Sphinx are needed to build documentation")
+endif (DOXYGEN_FOUND AND SPHINX_FOUND)

docs/conf.py.in

@@ -21,7 +21,7 @@ print(sys.path)
 # -- Project information -----------------------------------------------------
 
 project = 'slsDetectorPackage'
-copyright = '2020, PSD Detector Group'
+copyright = '2019, PSD Detector Group'
 author = 'PSD Detector Group'
 version = '@PROJECT_VERSION@'
 
@@ -59,8 +59,4 @@ html_theme = "sphinx_rtd_theme"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['static']
-
-
-def setup(app):
-    app.add_stylesheet('css/extra.css')  # may also be an URL
+#html_static_path = ['_static']

docs/gen_server_doc.py.in

@@ -1,86 +0,0 @@
-import os 
-import re
-from pathlib import Path
-def remove_comments(text):
-    def replacer(match):
-        s = match.group(0)
-        if s.startswith('/'):
-            return " " # note: a space and not an empty string
-        else:
-            return s
-    pattern = re.compile(
-        r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',
-        re.DOTALL | re.MULTILINE
-    )
-    return re.sub(pattern, replacer, text)
-
-
-# @CMAKE_CURRENT_BINARY_DIR@
-
-print('\n\n\n\n SERVER CSV')
-
-src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
-detectors = ['Mythen3', 'Gotthard2', 'Eiger', 
-            'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
-
-
-for det in detectors:
-    print(det)
-    in_fname = src/f'{det.lower()}DetectorServer/slsDetectorServer_defs.h'
-    #print(f'Reading: {in_fname}')
-    with open(in_fname) as f:
-        lines = f.read().replace('\\\n', '')
-        lines = lines.splitlines(keepends = True)
-
-    lines = [l.strip('#define').strip(' ') for l in lines if l.startswith('#define')]
-    output = []
-    signals = []
-    fields = ['Name,', 'Value', 'Comment']
-    excluded = ['DAC_NAMES', 'DEFAULT_DAC_VALS', 'CLK_NAMES', 'ONCHIP_DAC_NAMES']
-    header = f'{fields[0]:35}{fields[1]:35}\n'
-    output.append(header)
-    signals.append(header)
-    dac_names = []
-    dac_values = []
-    for line in lines:
-        name, *parts = line.split()
-        arg = ' '.join(parts)
-        value, *comments = arg.split('//') 
-        value = value.strip('() ')
-        # value = value.replace(', ', ' ')
-        value = value.replace('\"', '')
-        if name not in excluded:
-            name += ','
-            if name.startswith('SIGNAL_'):
-                signals.append(f'{name:35}{value}\n')
-            else:
-                output.append(f'{name:35}\"{value}\"\n')
-        elif name == 'DAC_NAMES':
-            dac_names = [v.strip(', ') for v in value.split()]
-            dac_names = [n+',' for n in dac_names]
-        elif name == 'DEFAULT_DAC_VALS':
-            dac_values = remove_comments(value).strip('{}; ')
-            dac_values = dac_values.replace(',', '').split()
-            dac_values = [v.strip('') for v in dac_values]
-
-    print(f"dac_names: {len(dac_names)}, dac_values={len(dac_values)}")
-    if len(dac_values) == 0:
-        dac_values = ['N/A']*len(dac_names)
-
-    
-
-    rstpath = Path('@CMAKE_SOURCE_DIR@')/'docs/src/'
-
-    out_fname = Path.cwd()/f'src/{det.lower()}.csv'
-    out_dac_fname = Path.cwd()/f'src/{det.lower()}-dacs.csv'
-    #print(f'Writing: {out_fname}')
-    with open(out_fname, 'w') as f:
-        f.writelines(output)
-
-    output = [f'{n:35}{v}\n' for n,v in zip(dac_names, dac_values)]
-    output.insert(0, header)
-
-    with open(out_dac_fname, 'w') as f:
-        f.writelines(output)
-
-print('END\n\n\n\n')

docs/src/commandline.rst

@@ -4,44 +4,13 @@ Command line interface
 Usage
 -------------
 
-Commands can be used either with sls_detector_get or sls_detector_put
+Commands can be uses either with sls_detector_get or sls_detector_put
 
 .. code-block::
 
     sls_detector_get vrf
 
-Help
---------
-
-.. code-block::
-
-    # get list of commands
-    sls_detector_get list
-
-    # search for a particular command using a word
-    sls_detector_get list | grep adc
-
-    # get help for a particular command
-    sls_detector_get -h fpath
-    sls_detector_help fpath
-  
-
 Commands
 -----------
 
 .. include:: ../commands.rst
-
-
-Depreciated commands
-------------------------
-
-.. note ::
-	All the dac commands are preceded with the **dac** command. Use command **daclist** to get correct list of dac command arguments for current detector.
-
-.. csv-table:: Depreciated commands
-   :file: ../depreciated.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-
-

docs/src/consuming.rst

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

docs/src/dependencies.rst

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

docs/src/examples.rst

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

docs/src/firmware.rst

@@ -1,511 +0,0 @@
-Firmware Upgrade
-=================
-
-
-
-Eiger
--------------
-
-Download 
-^^^^^^^^^^^^^
-- `bcp script <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/eiger/bcp>`__
-
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- bit files
-    .. list-table:: 
-       :widths: 25 10 30 25 10
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - v5.0.0-rcx
-         - 
-         - 08.09.2020
-         - `v27 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/eiger/v27/>`__
-         - 
-       * - v4.0.0 - v4.2.0
-         - 
-         - 30.07.2019
-         - `v24 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/eiger/v24/>`__
-         - 
-       * - v3.1.0 - v3.1.5
-         - 
-         - 17.08.2017
-         - `v20 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/eiger/v20/>`__
-         -
-
-
-Upgrade
-^^^^^^^^
-#. Tftp must be already installed on your pc to use the bcp script.
-
-#. Kill the on-board servers and copy new servers to the board. 
-
-    .. code-block:: bash
-
-        # Option 1: from detector console
-        # kill old server
-        ssh root@bebxxx
-        killall eigerDetectorServer
-
-        # copy new server
-        cd executables
-        scp user@pc:/path/eigerDetectorServerxxx .
-        chmod 777 eigerDetectorServerxxx
-        ln -sf eigerDetectorServerxxx eigerDetectorServer
-        sync
-
-        # Options 2: from client console for multiple modules
-        for i in bebxxx bebyyy;
-        do ssh root@$i killall eigerDetectorServer;
-        scp eigerDetectorServerxxx root@$i:~/executables/eigerDetectorServer;
-        ssh root@$i sync; done
-
-
-    * This is crucial when registers between firmwares change. Failure to do so will result in linux on boards to crash and boards can't be pinged anymore.
-
-#. Bring the board into programmable mode using either of the 2 ways. Both methods result in only the central LED blinking.
-    
-    * **Manual:**
-    
-        Do a hard reset for each half module on back panel boards, between the LEDs, closer to each of the 1G ethernet connectors. Push until all LEDs start to blink.
-    
-    * Software:  
-        .. code-block:: bash
-
-            ssh root@bebxxx
-            cd executables
-            ./boot_recovery
-
-#. Start a terminal for each half module and run the following to see progress.
-
-    .. code-block:: bash
-    
-    	nc -p 3000 -u bebxxx 3000
-        # Press enter twice to see prompt with board name.
-        > bebxxx
-        # After each bcp command, wait for this terminal to print "Success".
-
-
-#. In another terminal, run the following to update firmware. Please update bit files with great caution as it could make your board inaccessible, if done incorrectly.
-
-    .. code-block:: bash
-    
-        #update back end fpga
-        bcp download.bit bebxxx:/fw0
-
-        #update front left fpga
-        bcp download.bit bebxxx:/febl
-
-        #update front right fpga
-        bcp download.bit bebxxx:/febr
-
-        #update kernel (only if required by the SLS Detector Group)
-        bcp download.bit bebxxx:/kernel
-
-#. Reboot the detector.
-
-Jungfrau
--------------
-
-Download 
-^^^^^^^^^^^^^
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- pof files
-    .. list-table:: 
-       :widths: 25 10 30 25 10
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - v5.0.0-rcx
-         - 2.0
-         - 21.07.2020
-         - `v2.1 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/jungfrau/v2_1/jungfrau_v2_1.pof>`__
-         - 
-       * - v5.0.0-rcx
-         - 1.0
-         - 24.07.2020
-         - `v1.1 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/jungfrau/v1_1/jungfrau_v1_1.pof>`__
-         - 
-       * - v4.0.1 - v4.2.0
-         - 1.0
-         - 06.12.2018
-         - `v0.7 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/jungfrau/v0_7/jungfrau_v0_7.pof>`__
-         - 
-       * - v3.1.0 - v3.1.5
-         - 1.0
-         - 13.11.2017
-         - `v0.6 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/jungfrau/v0_6/jungfrau_v0_6.pof>`__
-         -
-
-
-
-Upgrade (from v4.x.x)
-^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-#. Tftp must be installed on pc.
-
-#. Update client package to the latest (5.0.0-rc1).
-
-#. Disable server respawning or kill old server
-    .. code-block:: bash
-
-        # Option 1: if respawning enabled
-        telnet bchipxxx
-        # edit /etc/inittab
-        # comment out line #ttyS0::respawn:/jungfrauDetectorServervxxx
-        reboot
-        # ensure servers did not start up after reboot
-        telnet bchipxxx
-        ps
-
-        #  Option 2: if respawning already disabled
-        telnet bchipxxx
-        killall jungfrauDetectorServerv*
-
-#. Copy new server and start in update mode
-    .. code-block:: bash
-
-        tftp pcxxx -r jungfrauDetectorServervxxx -g
-        chmod 777 jungfrauDetectorServervxxx
-        ./jungfrauDetectorServervxxx -u
-
-#. Program fpga from the client console
-    .. code-block:: bash
-
-        sls_detector_get free
-        # Crucial that the next command executes without any errors
-        sls_detector_put hostname bchipxxx
-        sls_detector_put programfpga xxx.pof
-
-#. After programming, kill 'update server' using Ctrl + C in server console.
-
-#. Enable server respawning if needed
-    .. code-block:: bash
-
-        telnet bchipxxx
-        # edit /etc/inittab
-        # uncomment out line #ttyS0::respawn:/jungfrauDetectorServervxxx
-        # ensure the line has the new server name
-        reboot
-        # ensure both servers are running using ps
-        jungfrauDetectorServervxxx
-        jungfrauDetectorServervxxx --stop-server 1953
-
-
-Upgrade (from v5.0.0-rcx)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # removes old server from respawn, sets up new server to respawn
-        # and reboots
-        sls_detector_put update jungfrauDetectorServervxxx pcxxx xx.pof
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.pof
-
-
-
-Gotthard
----------
-
-Download 
-^^^^^^^^^^^^^
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- pof files
-    .. list-table:: 
-       :widths: 15 15 15 15 5
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - All versions
-         - 50um
-         - 08.02.2018
-         - `50um <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/gotthard_I/50um/gotthard_I_50um.pof>`__
-         - 
-       * - All versions
-         - 25um (master)
-         - 08.02.2018
-         - `25um (master) <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/gotthard_I/25um/master/gotthard_I_25um_master.pof>`__
-         - 
-       * - All versions
-         - 25um (slave)
-         - 09.02.2018
-         - `25um (slave) <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/gotthard_I/25um/slave/gotthard_I_25um_slave.pof>`__
-         - 
-
-.. _firmware upgrade using blaster for blackfin:
-
-Upgrade
-^^^^^^^^
-.. warning ::
-    | Gotthard firmware cannot be upgraded remotely and requires the use of USB-Blaster.
-    | It is generally updated by the SLS Detector group.
-
-#. Download `Altera Quartus software or Quartus programmer <https://fpgasoftware.intel.com/20.1/?edition=standard&platform=linux&product=qprogrammer#tabs-4>`__.
-   
-
-#. Start Quartus programmer, click on Hardware Setup. In the "Currently selected hardware" window, select USB-Blaster.
-
-#. In the Mode combo box, select "Active Serial Programming".
-
-#. Plug the end of your USB-Blaster with the adaptor provided to the connector 'AS config' on the Gotthard board.
-
-#. Click on 'Add file'. Select programming (pof) file provided by the SLS Detector group.
-
-#. Check "Program/Configure" and "Verify". Push the start button. Wait until the programming process is finished.
-
-#. In case of error messages, check the polarity of cable (that pin1 corresponds) and that the correct programming connector is selected.
-
-#. Reboot the detector.
-
-
-Mythen3
--------
-
-.. note :: 
-
-  As it is still in developement, the rbf files must be picked up from the SLS Detector Group.
-
-Download 
-^^^^^^^^^^^^^
-
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- rbf files
-    .. list-table:: 
-       :widths: 25 10 30 25 10
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - v5.0.0-rcx
-         - 
-         - 25.09.2020
-         - 
-         - development
-
-
-Upgrade (from v5.0.0-rcx)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # and reboots (new server not respawned currently)
-        sls_detector_put update mythen3DetectorServervxxx pcxxx xxx.rbf
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.rbf
-
-
-
-Gotthard2
--------------
-
-.. note :: 
-
-  As it is still in developement, the rbf files must be picked up from the SLS Detector Group.
-
-Download 
-^^^^^^^^^^^^^
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- rbf files
-    .. list-table:: 
-       :widths: 25 10 30 25 10
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - v5.0.0-rcx
-         - 
-         - 25.09.2020
-         - 
-         - development
-
-Upgrade (from v5.0.0-rcx)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # and reboots (new server not respawned currently)
-        sls_detector_put update gotthard2DetectorServervxxx pcxxx xxx.rbf
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.rbf
-
-
-
-Moench
--------
-
-Download 
-^^^^^^^^^^^^^
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- pof files
-    .. list-table:: 
-       :widths: 25 10 30 25 10
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - v5.0.0-rcx
-         - EPCQ128
-         - 05.10.2020
-         - `v1.0 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/moench/EPCQ128/v1_0/moench_v1_0_201005.pof>`__
-         - 
-       * - v5.0.0-rcx
-         - EPCS128
-         - 05.10.2020
-         - `v1.0 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/moench/EPCS128/v1_0/moench_v1_0_201005.pof>`__
-         - 
-
-Upgrade (from v5.0.0-rcx)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # removes old server from respawn, sets up new server to respawn
-        # and reboots
-        sls_detector_put update moenchDetectorServervxxx pcxxx xx.pof
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.pof
-
-Ctb
-----
-
-Download 
-^^^^^^^^^^^^^
-- detector server corresponding to package in slsDetectorPackage/serverBin
-
-- pof files
-    .. list-table:: 
-       :widths: 25 10 30 25 10
-       :header-rows: 1
-
-       * - Software
-         - Hardware
-         - Firmware Date
-         - Firmware Link
-         - Comments
-       * - v5.0.0-rcx
-         - EPCQ128
-         - 05.10.2020
-         - `v1.0 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/ctb/EPCQ128/v1_0/ctb_v1_0_201005.pof>`__
-         - 
-       * - v5.0.0-rcx
-         - EPCS128
-         - 05.10.2020
-         - `v1.0 <https://github.com/slsdetectorgroup/slsDetectorFirmware/blob/master/binaries/ctb/EPCS128/v1_0/ctb_v1_0_201005.pof>`__
-         - 
-
-Upgrade (from v5.0.0-rcx)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Check :ref:`firmware troubleshooting <blackfin firmware troubleshooting>` if you run into issues while programming firmware.
-
-#. Program from console
-    .. code-block:: bash
-
-        # copies server from tftp folder of pc, programs fpga,
-        # removes old server from respawn, sets up new server to respawn
-        # and reboots
-        sls_detector_put update ctbDetectorServervxxx pcxxx xx.pof
-
-        # Or only program firmware
-        sls_detector_put programfpga xxx.pof
-
-
-.. _blackfin firmware troubleshooting:
-
-Firmware Troubleshooting with blackfin
-----------------------------------------
-
-#. v4.x.x client after programming will most likely reboot the blackfin processor, regardless of error.
-
-#. v5.x.x-rcx client after programming will not reboot the blackfin processor, if error occurred.
-
-#. If a reboot occured with an incomplete firmware in flash, the blackfin will most likely not find the mtd3 drive. To see if this drive exists:
-  .. code-block:: bash
-    
-    # connect to the board
-    telnet bchipxxx
-
-    # view of mtd3 existing
-    root:/> more /proc/mtd
-    dev:    size   erasesize  name
-    mtd0: 00040000 00020000 "bootloader(nor)"
-    mtd1: 00100000 00020000 "linux kernel(nor)"
-    mtd2: 002c0000 00020000 "file system(nor)"
-    mtd3: 01000000 00010000 "bitfile(spi)"
-
-4. If one can see the mtd3 drive, one can already try to flash again using the **programfpga** command (without rebooting blackfin or detector). 
-
-#. If one can't list it, read the next section to try to get the blackfin to list it.
-
-How to get back mtd3 drive remotely
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-This might take a few reruns (maybe even 10) until the mtd drive is accessed by the blackfin upon linux startup.
-
-  .. code-block:: bash
-    
-    # step 1: connect to the board
-    telnet bchipxxx
-
-    # step 2: check if mtd3 drive listed
-    more /proc/mtd
-
-    # step 3: tell fpga not to touch flash and reboot
-    echo 9 > /sys/class/gpio/export; 
-    echo out > /sys/class/gpio/gpio9/direction; 
-    echo 0 > /sys/class/gpio/gpio9/value;
-    reboot
-
-    # step 4: repeat steps 1 - 3 until you see the mtd3 drive
-
-
-Last Resort using USB Blaster
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If none of these steps work, the last resort might be physically upgrading the firmware using a USB blaster, which also requires opening up the detector. Instructions for all the blackfin detectors are the same as the one for :ref:`gotthard firmware upgrade <firmware upgrade using blaster for blackfin>`.

docs/src/gendoc.cpp

@@ -1,7 +1,7 @@
-/**
- * Utility program to generate input files for the command line
+/** 
+ * Utility program to generate input files for the command line 
  * documentation. Uses the string returned from sls_detector_help cmd
- *
+ * 
  */
 #include <fstream>
 #include <iostream>
@@ -9,9 +9,10 @@
 #include <string>
 #include <vector>
 
+
 #include "CmdProxy.h"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
+#include "Detector.h"
+#include "sls_detector_defs.h"
 
 std::string replace_all(const std::string &src, const std::string &from,
                         const std::string &to) {
@@ -48,14 +49,8 @@ int main() {
         auto tmp = os.str().erase(0, cmd.size());
         auto usage = tmp.substr(0, tmp.find_first_of('\n'));
         tmp.erase(0, usage.size());
-        auto help = replace_all(tmp, "\n\t", "\n\t\t| ");
+        auto help = replace_all(tmp, "\n\t", "\n\t\t");
         fs << '\t' << cmd << usage << help << "\n";
     }
 
-    std::ofstream fs2("depreciated.csv");
-    fs2 << "Old, New\n";
-    auto cmds = proxy.GetDepreciatedCommands();
-    for (auto it : cmds) {
-        fs2 << it.first << ", " << it.second << '\n';
-    }
-}
+}

docs/src/index.rst

@@ -6,18 +6,12 @@
 Welcome to slsDetectorPackage's documentation!
 ==============================================
 
-.. note :: 
-
-    This is the documentation for the latest development version of slsDetectorPackage
-    For documentation on current and previous releases visit the official page: https://www.psi.ch/en/detectors/documentation
-
 .. toctree::
     :maxdepth: 1
     :caption: Installation:
 
     installation
     dependencies
-    consuming
    
 .. toctree::
     :caption: C++ API
@@ -25,14 +19,12 @@ Welcome to slsDetectorPackage's documentation!
 
     detector
     result
-    receiver_api
-    examples
+    receiver
 
 .. toctree::
     :caption: Python API
     :maxdepth: 2
 
-    pygettingstarted
     pydetector
     pyenums
     pyexamples
@@ -42,7 +34,6 @@ Welcome to slsDetectorPackage's documentation!
     :maxdepth: 2
 
     commandline  
-    quick_start_guide
 
 .. toctree::
     :caption: Developer
@@ -51,34 +42,6 @@ Welcome to slsDetectorPackage's documentation!
     type_traits
     ToString
 
-.. toctree::
-    :caption: Firmware
-    :maxdepth: 2
-
-    firmware 
-
-.. toctree::
-    :caption: Detector Server
-    :maxdepth: 2
-
-    servers
-    serverupgrade
-    virtualserver
-    serverdefaults
-
-.. toctree::
-    :caption: Receiver
-    :maxdepth: 2
-
-    receivers
-    slsreceiver
-
-.. toctree::
-    :caption: Troubleshooting
-
-    troubleshooting
-
-
 .. Indices and tables
 .. ==================
 

docs/src/installation.rst

@@ -1,154 +1,5 @@
 
-
-
-.. note :: 
-
-    The default branch of our git repository is developer. It contains the 
-    latest development version. It is expected to compile and work but 
-    features might be added or tweaked. In some cases the API might also change
-    without being communicated. If absolute stability of the API is needed please
-    use one of the release versions. 
-
-.. warning ::
-    
-    Before building from source make sure that you have the 
-    :doc:`dependencies <../dependencies>` installed. If installing using conda, conda will 
-    manage the dependencies.
-    
-
-.. _Installation:
-
 Installation
 ==============================================
 
-.. _build from source using cmake:
-
-Build from source using CMake
----------------------------------
-
-Note that on some systems, for example RH7,  cmake v3+ is available under the cmake3 alias.
-It is also required to clone with the option --recursive to get the git submodules used
-in the package. 
-
-
-.. code-block:: bash
-
-    git clone --recursive https://github.com/slsdetectorgroup/slsDetectorPackage.git
-    mkdir build && cd build
-    cmake ../slsDetectorPackage -DCMAKE_INSTALL_PREFIX=/your/install/path
-    make -j12 #or whatever number of cores you are using to build
-    make install
-
-The easiest way to configure options is to use the ccmake utility. 
-
-.. code-block:: bash
-
-    #from the build directory
-    ccmake .
-
-
-Build using cmk.sh script
--------------------------
-These are mainly aimed at those not familiar with using ccmake and cmake.
-
-.. code-block:: bash
-
-    The binaries are generated in slsDetectorPackage/build/bin directory.
-
-    Usage: $0 [-c] [-b] [-p] [e] [t] [r] [g] [s] [u] [i] [m] [n] [-h] [z] [-d <HDF5 directory>] [-l Install directory] [-k <CMake command>] [-j <Number of threads>]
-    -[no option]: only make
-    -c: Clean
-    -b: Builds/Rebuilds CMake files normal mode
-    -p: Builds/Rebuilds Python API
-    -h: Builds/Rebuilds Cmake files with HDF5 package
-    -d: HDF5 Custom Directory
-    -k: CMake command
-    -l: Install directory
-    -t: Build/Rebuilds only text client
-    -r: Build/Rebuilds only receiver
-    -g: Build/Rebuilds only gui
-    -s: Simulator
-    -u: Chip Test Gui
-    -j: Number of threads to compile through
-    -e: Debug mode
-    -i: Builds tests
-    -m: Manuals
-    -n: Manuals without compiling doxygen (only rst)
-    -z: Moench zmq processor
-    
-    # get all options
-    ./cmk.sh -?
-
-    # new build  and compile in parallel:
-    ./cmk.sh -bj5
-
-
-Install binaries using conda
---------------------------------
-
-Conda is not only useful to manage python environments but can also
-be used as a user space package manager. 
-
-We have three different packages available:
-
- * **slsdetlib**, shared libraries and command line utilities 
- * **slsdetgui**, GUI
- * **slsdet**, Python bindings
-
-
-.. code-block:: bash
-
-    #Add channels for dependencies and our library
-    conda config --add channels conda-forge
-    conda config --add channels slsdetectorgroup
-    conda config --set channel_priority strict
-
-    #cerate an environment with our library, then activate
-    #replace 2020.07.20.dev0 with the required tag
-    conda create -n myenv slsdetlib=2020.07.23.dev0
-    conda activate myenv
-
-    #ready to use
-    sls_detector_get exptime
-    etc ...
-
-
-.. code-block:: bash
-
-    #List available versions
-    conda search slsdet
-
-
-Build from source on old distributions
------------------------------------------
-
-If your linux distribution doesn't come with a C++11 compiler (gcc>4.8) then 
-it's possible to install a newer gcc using conda and build the slsDetectorPackage
-using this compiler
-
-.. code-block:: bash
-
-    #Create an environment with the dependencies
-    conda create -n myenv gxx_linux-64 cmake zmq
-    conda activate myenv
-    cmake ../slsDetectorPackage -DCMAKE_PREFIX_PATH=$CONDA_PREFIX
-    make -j12
-
-
-Build this documentation
--------------------------------
-
-The documentation for the slsDetectorPackage is build using a combination 
-of Doxygen, Sphinx and Breathe. The easiest way to install the dependencies
-is to use conda 
-
-.. code-block:: bash
-
-    conda create -n myenv python sphinx sphinx_rtd_theme
-
-Then enable the option SLS_BUILD_DOCS to create the targets
-
-.. code-block:: bash
-
-    make docs # generate API docs and build Sphinx RST
-    make rst # rst only, saves time in case the API did not change
+get the source etc.

docs/src/pydetector.rst

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

docs/src/pyenums.rst

@@ -4,74 +4,9 @@ Enums
 These enums are defined in slsDetectorDefs in the C++ package and 
 exposed to Python through pybind11.
 
-
-::  
-
-    # Most settings are represented as enums that can be 
-    # explicitly imported
-
-    from slsdet import Detector, fileFormat
-    d = Detector()
-    d.fformat = fileFormat.BINARY
-
-    # Altough not recommended for convenience all enums 
-    # and some other things can be impored using *
-
-    from slsdet import *
-    d.speed = speedLevel.FULL_SPEED 
-
-    # To list the available enums, use dir()
-
-    import slsdet.enums
-    for enum in dir(slsdet.enums):
-        # filter out special memebers
-        if not enum.startswith('_'):
-            print(enum)
-
-
-.. py:currentmodule:: slsdet
+.. py:currentmodule:: sls_detector
 
 .. autoclass:: runStatus
+    :members:  
     :undoc-members:
-
-.. autoclass:: detectorType
-    :undoc-members:
-
-.. autoclass:: frameDiscardPolicy
-    :undoc-members:
-
-.. autoclass:: fileFormat
-    :undoc-members:
-
-.. autoclass:: dimension
-    :undoc-members:
-
-.. autoclass:: externalSignalFlag
-    :undoc-members:
-
-.. autoclass:: timingMode
-    :undoc-members:
-
-.. autoclass:: dacIndex
-    :undoc-members:
-
-.. autoclass:: detectorSettings
-    :undoc-members:
-
-.. autoclass:: clockIndex
-    :undoc-members:
-
-.. autoclass:: speedLevel
-    :undoc-members:
-
-.. autoclass:: readoutMode
-    :undoc-members:
-
-.. autoclass:: masterFlags
-    :undoc-members:
-
-.. autoclass:: burstMode
-    :undoc-members:
-
-.. autoclass:: timingSourceType
-    :undoc-members:
+    :show-inheritance:

docs/src/pyexamples.rst

@@ -1,73 +1,7 @@
 Examples
 ================
 
-Some short examples on how to use slsdet. If something is missing don't hesitate to
-open an issue in our our  `github repo
-<https://github.com/slsdetectorgroup/slsDetectorPackage>`_. 
-
-
-------------------------------------
-Setting exposure time 
-------------------------------------
-
-Setting and reading back exposure time can be done either using a Python datetime.timedelta
-or by setting the time in seconds. 
-
-::
-
-    # Set exposure time to 1.2 seconds
-    >>> d.exptime = 1.2
-
-    # Setting exposure time using timedelta
-    import datetime as dt
-    >>> d.exptime = dt.timedelta(seconds = 1.2)
-
-    # With timedelta any arbitrary combination of units can be used
-    >>> t = dt.timedelta(microseconds = 100, seconds = 5.3, minutes = .3)
-
-    # To set exposure time for individual detector one have to resort
-    # to the C++ style API.
-    # Sets exposure time to 1.2 seconds for module 0, 6 and 12
-    >>> d.setExptime(1.2, [0, 6, 12]) 
-    >>> d.setExptime(dt.timedelta(seconds = 1.2), [0, 6, 12]) 
-
-
-
-------------------------------------
-Converting numbers to hex
-------------------------------------
-
-Python support entering numbers in  format by using the 0x prefix. However, when reading 
-back you will get a normal integer. This can then be converted to a hex string representation
-using the built in hex() function. 
-
-.. code-block :: python
-
-    from slsdet import Detector
-    >>> d = Detector()
-    >>> d.patwait0 = 0xaa
-    >>> d.patwait0
-    170
-
-    # Convert to  string
-    >>> hex(d.patwait0)
-    '0xaa'
-
-For multiple values one can use a list comprehension to loop over the values. 
-
-.. code-block :: python
-
-    >>> values = [1,2,3,4,5]
-    >>> [(v) for v in values]
-    ['0x1', '0x2', '0x3', '0x4', '0x5']
-
-    # or to a single string by passing the list to .join
-    >>> ', '.join([hex(v) for v in values])
-    '0x1, 0x2, 0x3, 0x4, 0x5'
-
-
-
-    
+Some short hints on how to use the detector
 
 ------------------------
 Simple threshold scan
@@ -140,39 +74,37 @@ But lets start looking at the at the manual way:
 ::
 
     import time
-    from slsdet import Detector, runStatus
+    from sls_detector import Eiger
+    d = Eiger()
 
+    n = 10
+    t = 1
 
-    n_frames = 10
-    t_exp = 1
+    d.exposure_time = t
+    d.n_frames = n
+    d.reset_frames_caught()
 
-    # Set exposure time and number of frames
-    d = Detector()
-    d.exptime = t_exp
-    d.frames = n_frames
-
-    # Start the measurement
+    #Start the measurement
     t0 = time.time()
-    d.startDetector()
-    d.startReceiver()
+    d.start_receiver()
+    d.start_detector()
 
-    # Wait for the detector to be ready or do other important stuff
-    time.sleep(t_exp * n_frames)
+    #Wait for the detector to be ready or do other important stuff
+    time.sleep(t*n)
 
-    # check if the detector is ready otherwise wait a bit longer
-    while d.status != runStatus.IDLE:
+    #check if the detector is ready otherwise wait a bit longer
+    while d.status != 'idle':
         time.sleep(0.1)
 
-    # Stop the receiver after we got the frames
-    # Detector is already idle so we don't need to stop it
-    d.stopReceiver()
-
-    lost = d.rx_framescaught - n_frames
-    print(
-        f"{n_frames} frames of {t_exp}s took {time.time()-t0:{.3}}s with {lost} frames lost "
-    )
+    #Stop the receiver after we got the frames
+    #Detector is already idle so we don't need to stop it
+    d.stop_receiver()
 
+    lost = d.frames_caught - n
+    print(f'{n} frames of {t}s took {time.time()-t0:{.3}}s with {lost} frames lost ')
 
+    #Reset to not interfere with a potential next measurement
+    d.reset_frames_caught()
 
 Instead launching d.acq() from a different process is a bit easier since the control of receiver and detector
 is handled in the acq call. However, you need to join the process used otherwise a lot of zombie processes would
@@ -182,104 +114,30 @@ hang around until the main process exits.
 
     import time
     from multiprocessing import Process
-    from slsdet import Detector, runStatus
+    from sls_detector import Eiger
 
+    def acquire():
+        """
+        Create a new Eiger object that still referes to the same actual detector
+        and same shared memory. Then launch acq.
+        """
+        detector = Eiger()
+        detector.acq()
 
-    d = Detector()
+    #This is the detector we use throughout the session
+    d = Eiger()
 
-    #Create a separate process to run acquire in
-    p = Process(target=d.acquire)
+    #Process to run acquire
+    p = Process(target=acquire)
 
     #Start the thread and short sleep to allow the acq to start
     p.start()
     time.sleep(0.01)
 
     #Do some other work
-    while d.status != runStatus.IDLE:
-        print("Working")
+    while d.busy is True:
+        print(d.busy)
         time.sleep(0.1)
 
     #Join the process
-    p.join()
-
-
-------------------------------
-Setting and getting times
-------------------------------
-
-::
-
-    import datetime as dt
-    from slsdet import Detector
-    from slsdet.utils import element_if_equal
-
-    d = Detector()
-
-    # The simplest way is to set the exposure time in 
-    # seconds by using the exptime property
-    # This sets the exposure time for all modules
-    d.exptime = 0.5
-
-    # exptime also accepts a python datetime.timedelta
-    # which can be used to set the time in almost any unit
-    t = dt.timedelta(milliseconds = 2.3)
-    d.exptime = t
-
-    # or combination of units
-    t = dt.timedelta(minutes = 3, seconds = 1.23)
-    d.exptime = t
-
-    # exptime however always returns the time in seconds
-    >>> d.exptime
-    181.23 
-
-    # To get back the exposure time for each module 
-    # it's possible to use getExptime, this also returns
-    # the values as datetime.timedelta
-
-    >>> d.getExptime()
-    [datetime.timedelta(seconds=181, microseconds=230000), datetime.timedelta(seconds=181, microseconds=230000)]
-
-    # In case the values are the same it's possible to use the
-    # element_if_equal function to reduce the values to a single 
-    # value
-
-    >>> t = d.getExptime()
-    >>> element_if_equal(t)
-    datetime.timedelta(seconds=1)
-
---------------
-Reading dacs
---------------
-
-::
-
-    from slsdet import Detector, Eiger, dacIndex
-
-    #using the specialized class
-    e = Eiger()
-    >>> e.dacs
-    ========== DACS =========
-    vsvp      :    0    0
-    vtrim     : 2480 2480
-    vrpreamp  : 3300 3300
-    vrshaper  : 1400 1400
-    vsvn      : 4000 4000
-    vtgstv    : 2556 2556
-    vcmp_ll   : 1000 1000
-    vcmp_lr   : 1000 1000
-    vcal      :    0    0
-    vcmp_rl   : 1000 1000
-    rxb_rb    : 1100 1100
-    rxb_lb    : 1100 1100
-    vcmp_rr   : 1000 1000
-    vcp       : 1000 1000
-    vcn       : 2000 2000
-    vishaper  : 1550 1550
-    iodelay   :  650  650
-
-    # or using the general class and the list
-    d = Detector()
-    for dac in d.daclist:
-        r = d.getDAC(dac, False)
-        print(f'{dac.name:10s} {r}')
+    p.join()

docs/src/pygettingstarted.rst

@@ -1,228 +0,0 @@
-Getting Started 
-==================
-
-
---------------------
-Which Python?  
---------------------
-
-We require at lest Python 3.6 and strongly recommended that you don't use the system
-Python installation. The examples in this documentation uses `conda
-<https://docs.conda.io/en/latest/miniconda.html>`_ since it provides good support
-also for non Python packages but there are also other alternatives like, pyenv. 
-
-Using something like conda also allows you to quickly switch beteen different Python 
-environments. 
-
-.. warning ::
-
-    If you use conda avoid also installing packages with pip. 
-
----------------------
-PYTHONPATH 
----------------------
-
-If you install slsdet using conda everything is set up and you can
-directly start using the Python bindings. However, if you build 
-from source you need to tell Python where to find slsdet. This
-is be done by adding your build/bin directory to PYTHONPATH. 
-
-.. code-block:: bash
-
-    export PYTHONPATH = /path/to/your/build/bin:$PYTHONPATH
-
-.. note ::
-
-    Don't forget to compile with the option SLS_USE_PYTHON=ON to enable
-    the Python bindings or if you use the cmk.sh script -p.
-
---------------------------------------
-Which detector class should I use? 
---------------------------------------
-
-We provide a generic class called Detector and detector specific 
-versions like, Eiger, Jungfrau etc. The most or all functionality 
-is there in the base class except the convenient access to dacs
-and temperatures. 
-
-:: 
-
-    from slsdet import Detector, Eiger
-
-    d = Detector()
-    e = Eiger()
-
-    # Both classes can be used to control an Eiger detector
-    d.exptime = 0.5
-    e.period = 1
-
-    # But Eiger gives a simpler interface to the dacs
-    >>> e.dacs
-    ========== DACS =========
-    vsvp           :    0
-    vtrim          : 2480
-    vrpreamp       : 3300
-    vrshaper       : 1400
-    vsvn           : 4000
-    vtgstv         : 2556
-    vcmp_ll        : 1000
-    vcmp_lr        : 1000
-    vcal           :    0
-    vcmp_rl        : 1000
-    rxb_rb         : 1100
-    rxb_lb         : 1100
-    vcmp_rr        : 1000
-    vcp            : 1000
-    vcn            : 2000
-    vishaper       : 1550
-    iodelay        :  650
-
-
-.. note ::
-
-    Depending on user feedback we might move some detector specific
-    functionality to the specialized classes.
-
-
-----------------------------------
-Hey, there seems to be two APIs?
-----------------------------------
-
-To make the Python API approachable, both if you come from the command line 
-or are using the C++ API, we provide two interfaces to the detector. 
-One is property based and tries to stay as close to the command line syntax
-as is possible, and the other one directly maps the C++ API found in Detector.h.
-There is also an underlying design reason for the two APIs since we auto 
-generate the bindings to the C++ code using a mix of pybind11 and clang-tools. 
-The property based API covers most of the functionality but in some cases 
-you have to reach for the C++ like interface. 
-
-
-::  
-
-    d = Detector()
-
-    # C++ like API 
-    d.setExptime(0.1)
-
-    # or a bit more pythonic
-    d.exptime = 0.1
-
-The c++ style API offers more control over access to individual modules
-in a large detector.
-
-:: 
-
-    # Set exposure time for module 1, 5 and 7
-    d.setExptime(0.1, [1,5,7])
-
---------------------
-Finding functions 
---------------------
-
-To find out which properties and methods that a Python object have you
-can use dir()
-
-::
-
-    >>> from slsdet import Detector
-    >>> d = Detector()
-    >>> dir(d)
-    ['__class__', '__delattr__', '__dict__', '__dir__', '__doc__', 
-    '__eq__', '__format__', '__ge__', '__getattribute__', '__gt__', 
-    '__hash__', '__init__', '__init_subclass__', '__le__', '__len__', 
-    '__lt__', '__module__', '__ne__', '__new__', '__reduce__', 
-    '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', 
-    '__str__', '__subclasshook__', '_adc_register', '_frozen', 
-    '_register', 'acquire', 'adcclk', 'adcphase', 'adcpipeline', 
-    'adcreg', 'asamples', 'auto_comp_disable', 'clearAcquiringFlag', 
-    'clearBit', 'clearROI', 'client_version', 'config', 'copyDetectorServer', 
-    'counters', 'daclist', 'dacvalues', 'dbitclk', 'dbitphase' ...
-
-Since the list for Detector is rather long it's an good idea to filter it. 
-The following example gives you properties and methods containing time in 
-their name.
-
-:: 
-
-    >>> [item for item in dir(d) if 'time' in item]
-    ['exptime', 'getExptime', 'getExptimeForAllGates', 'getExptimeLeft', 
-    'getSubExptime', 'patwaittime0', 'patwaittime1', 'patwaittime2', 
-    'setExptime', 'setSubExptime', 'subdeadtime', 'subexptime']
-
-The above method works on any Python object but for convenience we also 
-included two functions to find names. View prints the names one per line
-while find returns a list of names. 
-
-::
-
-    from slsdet.lookup import view, find
-
-    >>> view('exptime')
-    exptime
-    getExptime
-    getExptimeForAllGates
-    getExptimeLeft
-    getSubExptime
-    setExptime
-    setSubExptime
-    subexptime
-
-    >>> find('exptime')
-    ['exptime', 'getExptime', 'getExptimeForAllGates', 'getExptimeLeft', 
-    'getSubExptime', 'setExptime', 'setSubExptime', 'subexptime']
-
-
-------------------------------------
-Finding out what the function does
-------------------------------------
-
-To access the documentation of a function directly from the Python prompt use help(). 
-
-.. code-block :: python
-
-    >>> help(Detector.period)
-    Help on property:
-
-        Period between frames, accepts either a value in seconds or datetime.timedelta
-
-        Note
-        -----
-        :getter: always returns in seconds. To get in datetime.delta, use getPeriod
-
-        Examples
-        -----------
-        >>> d.period = 1.05
-        >>> d.period = datetime.timedelta(minutes = 3, seconds = 1.23)
-        >>> d.period
-        181.23
-        >>> d.getPeriod()
-        [datetime.timedelta(seconds=181, microseconds=230000)]
-
-
-----------------------
-Where are the ENUMs?
-----------------------
-
-To set some of the detector settings like file format you have
-to pass in an enum. 
-
-:: 
-
-    >>> d.setFileFormat(fileFormat.BINARY)
-    
-The enums can be found in slsdet.enums 
-
-::
-
-    import slsdet
-    >>> [e for e in dir(slsdet.enums) if not e.startswith('_')]
-    ['burstMode', 'clockIndex', 'dacIndex', 
-    'detectorSettings', 'detectorType', 'dimension', 'externalSignalFlag', 
-    'fileFormat', 'frameDiscardPolicy', 'masterFlags', 
-    'readoutMode', 'runStatus', 'speedLevel', 'timingMode', 
-    'timingSourceType']
-
-    # Even though importing using * is not recommended one could
-    # get all the enums like this: 
-    >>> from slsdet.enums import *

docs/src/quick_start_guide.rst

@@ -1,140 +0,0 @@
-Quick Start Guide
-=================
-
-Detector
---------
-Start up detector (with cooling if required). Ensure both control server and stop server is running on-board.
-
-Or use a detector simulator to test. Click :ref:`here<Virtual Detector Servers>` for further instructions.
-
-Receiver
---------
-
-| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
-
-For a Single Module
-    .. code-block:: bash  
-
-        # default port 1954
-        slsReceiver
-
-        # custom port 2012
-        slsReceiver -t2012
-
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 0 
-
-
-Client
-------
-
-Refer :ref:`Sample Config file` to create config file.
-
-.. code-block:: bash  
-
-    # load config file
-    sls_detector_put config /path/sample.config
-
-    # set number of frames
-    sls_detector_put frames 5
-
-    # acquire
-    sls_detector_acquire
-
-
-.. _Sample Config file:
-
-Sample Config file
-^^^^^^^^^^^^^^^^^^
-There are sample config files for each detector in slsDetectorPackage/examples folder.
-
-For a Single Module
-    .. code-block:: bash  
-
-        # connects to module
-        hostname bchipxxx
-
-        # connects to receiver at default port
-        rx_hostname mpc1922
-        # or to connect to specific port
-        # rx_hostname mpc1922:2012
-
-        # sets destination udp ports (not needed, default is 50001)
-        udp_dstport 50012
-
-        # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-For a Single Module with custom Receiver (not slsReceiver)
-    .. code-block:: bash  
-
-        # connects to module
-        hostname bchipxxx
-
-        # sets destination udp ports (not needed, default is 50001)
-        udp_dstport 50012
-
-        # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
-
-        # destination udp ip 
-        udp_dstip 192.168.1.100
-
-        # source udp mac 
-        udp_srcmac aa:bb:cc:dd:ee:ff
-        
-        # destination udp mac 
-        udp_dstmac 3c:ab:98:bf:50:60
-
-        # set file path
-        fpath /tmp
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # connects to mulitple modules
-        hostname bchipxxx+bchipyyy+
-
-        # connects to receivers at ports 2012 and 2014
-        rx_hostname mpc1922:2012+mpc1922:2013+
-
-        # sets differernt destination udp ports
-        0:udp_dstport 50012
-        1:udp_dstport 50014
-
-        # source udp ips must be same subnet at destintaion udp ips
-        0:udp_srcip 192.168.1.112
-        1:udp_srcip 192.168.1.114
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-Gui
-----
-
-Compile with SLS_USE_GUI=ON in cmake or -g option in cmk.sh script. One can also just use the conda binary. Refer :ref:`installation instructions<Installation>`.
-
-.. code-block:: bash  
-
-    slsDetectorGui
-
-
-.. note ::
-    | The streaming high water mark (commmand: rx_zmqhwm) and the receiving high water mark (command: zmqhwm) is by default the lib zmq's default (currently 1000).
-    | At Gui startup, these values are set to 2. Hence, for very fast detectors, many frames will be dropped to be able to view the latest in the gui.
-    | One can still change this setting in the gui in the Plot tab (ZMQ Streaming), from the command line or API.
-    | Both hwm's can be set to a -1 to use the lib's default.
-    | Since the dummy end of acquisition packet streamed from receiver might also be lost, receiver restreams until gui acknowledges.

docs/src/receiver.rst

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

docs/src/receivers.rst

@@ -1,71 +0,0 @@
-Receivers
-=================
-
-Receiver processes can be run on same or different machines as the client, receives the data from the detector (via UDP packets).
-When using the slsReceiver/ slsMultiReceiver, they can be further configured by the client control software (via TCP/IP) to set file name, file path, progress of acquisition etc.
-
-Detector UDP Header
----------------------
-
-| The UDP data format for the packets consist of a common header for all detectors, followed by the data for that one packet.
-
-**The SLS Detector Header**
-
-.. table:: <-------------------------------- 8 bytes -------------------------------->
-    :align: center
-    :widths: 30,30,30,30
-
-    +--------------------------------------------------------------------+
-    |frameNumber                                                         |
-    +---------------------------------+----------------------------------+
-    |expLength                        |packetNumber                      |
-    +---------------------------------+----------------------------------+
-    |bunchId                                                             |
-    +--------------------------------------------------------------------+
-    |timestamp                                                           |
-    +----------------+----------------+----------------+-----------------+
-    |modId           |row             |column          |reserved         |
-    +----------------+----------------+----------------+--------+--------+
-    |debug                            |roundRNumber    |detType |version |
-    +---------------------------------+----------------+--------+--------+
-
-UDP configuration in Config file
-----------------------------------
-
-#. UDP source port is hardcoded in detector server, starting at 32410.
-#. **udp_dstport** : UDP destination port number. Port in receiver pc to listen to packets from the detector.
-#. **udp_dstip** : IP address of UDP destination interface. IP address of interface in receiver pc to listen to packets from detector. If **auto** is used (only when using slsReceiver/ slsMultiReceiver), the IP of **rx_hostname** is picked up.
-#. **udp_dstmac** : Mac address of UDP destination interface. MAC address of interface in receiver pc to list to packets from detector. Only required when using custom receiver, else slsReceiver/slsMultiReceiver picks it up from **udp_dstip**.
-#. **udp_srcip** : IP address of UDP source interface. IP address of detector UDP interface to send packets from. Do not use for Eiger 1Gb interface (uses its hardware IP). For others, must be in the same subnet as **udp_dstip**.
-#. **udp_srcmac** : MAC address of UDP source interface. MAC address of detector UDP interface to send packets from. Do not use for Eiger (uses hardware mac). For others, it is not necessary, but can help for switch and debugging to put unique values for each module.
- 
-
-Custom Receiver
-----------------
-
-| When using  custom receiver with our package, ensure that **udp_dstmac** is also configured in the config file. This parameter is not required when using slsReceiver.
-
-| Cannot use "auto" for **udp_dstip**.
-
-| Also ensure that there are no **rx_** commands in the config file. These commands are for configuring the slsReceiver.
-
-Example of a custom receiver config file
-
-* The main difference is the lack of **rx_** commands or file commands (eg. fwrite, fpath) and the udp_dstmac is required in config file.
-
-.. code-block:: bash
-
-    # detector hostname
-    hostname bchip052
-
-    # udp destination port (receiver)
-    udp_dstport 50004
-
-    # udp destination ip (receiver)
-    udp_dstip 10.0.1.100
-
-    # udp source ip (same subnet as udp_dstip)
-    udp_srcip 10.0.1.184
-
-    # udp destination mac
-    udp_dstmac 22:47:d5:48:ad:ef

docs/src/serverdefaults.rst

@@ -1,106 +0,0 @@
-Default Values
-==============================================
-
-Mythen3
--------------
-
-.. csv-table:: Default values
-   :file: mythen3.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Mythen3 DACS
-   :file: mythen3-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Gotthard2
--------------
-
-.. csv-table:: Default values
-   :file: gotthard2.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Gotthard 2 DACS
-   :file: gotthard2-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Moench
--------------
-
-.. csv-table:: Default values
-   :file: moench.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Moench DACS
-   :file: moench-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Ctb
--------------
-
-.. csv-table:: Default values
-   :file: ctb.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Eiger
--------------
-
-.. csv-table:: Default values
-   :file: eiger.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Eiger DACS
-   :file: eiger-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Jungfrau
--------------
-
-.. csv-table:: Default values
-   :file: jungfrau.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Jungfrau DACS
-   :file: jungfrau-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-Gotthard
--------------
-
-.. csv-table:: Default values
-   :file: gotthard.csv
-   :widths: 35, 35
-   :header-rows: 1
-
-DACS
-^^^^^^^^^^^^^
-
-.. csv-table:: Gotthard DACS
-   :file: gotthard-dacs.csv
-   :widths: 35, 35
-   :header-rows: 1

docs/src/servers.rst

@@ -1,36 +0,0 @@
-Detector Servers
-=================
-
-Location
----------
-   slsDetectorPackage/serverBin/ folder in every release.
-
-
-.. _Detector Server Arguments:
-
-Arguments
----------
-
-   .. code-block:: bash  
-
-      Possible arguments are:
-      -v, --version            : Software version
-      -p, --port <port>        : TCP communication port with client. 
-      -g, --nomodule           : [Mythen3][Gotthard2] Generic or No Module mode. 
-                                 Skips detector type checks.
-      -f, --phaseshift <value> : [Gotthard] only. Sets phase shift. 
-      -d, --devel              : Developer mode. Skips firmware checks. 
-      -u, --update             : Update mode. Skips firmware checks and initial detector setup. 
-      -s, --stopserver         : Stop server. Do not use as it is created by control server 
-
-
-Basics
-------------
-
-Detector Servers include:
-   * Control server [default port: 1952]
-      * Almost all client communication.
-   * Stop server [default port: 1953]
-      *  Client requests for detector status, stop acquisition, temperature, advanced read/write registers.
-
-When using a blocking acquire command (sls_detector_acquire or Detector::acquire), the control server is blocked until end of acquisition. However, stop server commands could be used in parallel.

docs/src/serverupgrade.rst

@@ -1,114 +0,0 @@
-Detector Server Upgrade
-=======================
-
-
-
-Eiger
--------------
-
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-
-#. Kill old server and copy new server
-    .. code-block:: bash
-
-        # Option 1: from detector console
-        # kill old server
-        ssh root@bebxxx
-        killall eigerDetectorServer
-
-        # copy new server
-        cd executables
-        scp user@pc:/path/eigerDetectorServerxxx .
-        chmod 777 eigerDetectorServerxxx
-        ln -sf eigerDetectorServerxxx eigerDetectorServer
-        sync
-
-        # Options 2: from client console for multiple modules
-        for i in bebxxx bebyyy;
-        do ssh root@$i killall eigerDetectorServer;
-        scp eigerDetectorServerxxx root@$i:~/executables/eigerDetectorServer;
-        ssh root@$i sync; done
-
-
-#. Reboot the detector.
-
-
-Jungfrau
--------------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver jungfrauDetectorServerxxx pcxxx
-
-
-Gotthard
----------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver gotthardDetectorServerxxx pcxxx
-
-
-
-Mythen3
--------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder and reboots (does not respawn)
-        sls_detector_put copydetectorserver mythen3DetectorServerxxx pcxxx
-
-
-Gotthard2
-----------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder and reboots (does not respawn)
-        sls_detector_put copydetectorserver gotthard2DetectorServerxxx pcxxx
-
-
-Moench
-------
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver moenchDetectorServerxxx pcxxx
-
-
-Ctb
----
-
-**Location:** slsDetectorPackage/serverBin/ folder for every release.
-
-#. Install tftp and copy detector server binary to tftp folder
-#. Program from console (only from 5.0.0-rcx)
-    .. code-block:: bash
-
-        # copies new server from pc tftp folder, respawns and reboots
-        sls_detector_put copydetectorserver ctbDetectorServerxxx pcxxx

docs/src/slsreceiver.rst

@@ -1,170 +0,0 @@
-slsReceiver/ slsMultiReceiver
-================================
-
-| One has to start the slsReceiver before loading config file or using any receiver commands (prefix: **rx_** )
-
-For a Single Module
-    .. code-block:: bash  
-
-        # default port 1954
-        slsReceiver
-
-        # custom port 2012
-        slsReceiver -t2012
-
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # each receiver (for each module) requires a unique tcp port (if all on same machine)
-
-        # using slsReceiver in multiple consoles
-        slsReceiver
-        slsReceiver -t1955
-
-        # slsMultiReceiver [starting port] [number of receivers]
-        slsMultiReceiver 2012 2
-
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 1
-
-
-Client Commands 
------------------
-
-| One can remove **udp_dstmac** from the config file, as the slsReceiver fetches this from the **udp_ip**.
-
-| One can use "auto" for **udp_dstip** if one wants to use default ip of **rx_hostname**.
-
-| The first command to the receiver (**rx_** commands) should be **rx_hostname**. The following are the different ways to establish contact.
-
-    .. code-block:: bash  
-
-        # default receiver tcp port (1954)
-        rx_hostname xxx
-
-        # custom receiver port
-        rx_hostname xxx:1957
-
-        # custom receiver port
-        rx_tcpport 1954
-        rx_hostname xxx
-
-        # multi modules with custom ports
-        rx_hostname xxx:1955+xxx:1956+
-
-        # multi modules with custom ports on same rxr pc
-        0:rx_tcpport 1954
-        1:rx_tcpport 1955
-        2:rx_tcpport 1956
-        rx_hostname xxx
-
-        # multi modules with custom ports on different rxr pc
-        0:rx_tcpport 1954
-        0:rx_hostname xxx
-        1:rx_tcpport 1955
-        1:rx_hostname yyy
-
-
-| Example commands:
-
-    .. code-block:: bash 
-
-        # to get a list of receiver commands (these dont include file commands)
-        sls_detector_get list | grep rx_
-
-        # some file commands are:
-        fwrite
-        foverwrite
-        findex
-        fpath
-        fname
-        fmaster
-        fformat
-
-        # to get help on a single commands
-        sls_detector_get -h rx_framescaught
-
-
-File format
---------------
-
-* The file name format is [fpath]/[fname]_dx_fy_[findex].raw, where x is module index and y is file index. **fname** is file name prefix and by default "run". **fpath** is '/' by default.
-
-* Each acquisition will have an increasing acquisition index or findex (if file write enabled). This can be retrieved by using **findex** command. 
-
-* Each acquisition can have multiple files (the file index number **y**), with **rx_framesperfile** being the maximum number of frames per file. The default varies for each detector type.
-
-* Some file name examples:
-
-    .. code-block:: bash
-
-        # first file
-        path-to-file/run_d0_f0_0.raw
-
-        # second file after reaching max frames in first file
-        path-to-file/run_d0_f1_0.raw
-        
-        # second acquisition, first file
-        path-to-file/run_d0_f0_1.raw
-
-* Each acquisition will create a master file that can be enabled/disabled using **fmaster**. This should have parameters relevant to the acquisition.
-
-* SLS Receiver Header consist of SLS Detector Header + 64 bytes of bitmask, altogether 112 bytes. The packetNumber in the sls detector header part, will be updated to number of packets caught by receiver for that frame. Furthermore, the bit mask will specify which packets have been received.
-
-**Binary file format**
-
-* This is the default file format. 
-
-* Each data file will consist of frames, each consisting of slsReceiver Header followed by data for 1 frame.
-
-* Master file is of ASCII format and will also include the format of the slsReceiver Header.
-
-
-**HDF5 file formats**
-
-#. Compile the package with HDF5 option enabled
-
-    #. Using cmk script: ./cmk.sh -hj9 -d [path of hdf5 dir]
-
-    #. Enable using cmake **-DCMAKE_INSTALL_PREFIX=/path/to/hdf/installation** and **-DSLS_USE_HDF5=ON**
-
-#. Start Receiver process
-
-#. Load config file
-
-#. Set file format from client or in config file
-    .. code-block:: bash
-
-        sls_detector_put fformat hdf5
-
-
-| For multiple, modules, a virtual file linking all the modules is created. Both the data files and virtual files are linked in the master file.
-
-
-Performance 
--------------
-
-Please refer to Receiver PC Tuning options and slsReceiver Tuning under `Troubleshooting <https://slsdetectorgroup.github.io/devdoc/troubleshooting.html>`_.
-
-
-Using Callbacks
-----------------
-
-One can get a callback in the receiver for each frame to:
-    * manipulate the data that will be written to file, or
-    * disable file writing in slsReceiver and take care of the data for each call back
-
-When handling callbacks, the control should be returned as soon as possible, to prevent packet loss from fifo being full.
-
-**Example**
-    * `main cpp file <https://github.com/slsdetectorgroup/api-examples/blob/master/e4-receiver_callbacks.cpp>`_ 
-    * `cmake file <https://github.com/slsdetectorgroup/api-examples/blob/master/CMakeLists.txt>`_. 
-    * how to install the slsDetectorPackage is provided :ref:`here <build from source using cmake>`.
-    * compile the example **e4-rxr** by:
-
-        .. code-block:: bash
-
-            cmake ../path/to/your/source -DCMAKE_PREFIX_PATH=/path/to/sls/install
-            make
-            

docs/src/troubleshooting.rst

@@ -1,299 +0,0 @@
-Troubleshooting
-=================
-
-If something is missing, don't hesitate to
-open an issue at our  `github repo issues
-<https://github.com/slsdetectorgroup/slsDetectorPackage/issues>`_. 
-
-Common
-------
-
-Missing Packets
-^^^^^^^^^^^^^^^
-Possible causes could be the following:
-
-#. Receiver PC is not tuned for socket buffer size and input packet queue.
-    * Refer to :ref:`Increase rmem_default, rmem_max and max_backlog<Receiver PC Tuning>`
-
-#. Wiring
-    * Faulty wiring or connecting cable to incorrect interface.
-
-#. Link up and speed
-    * Check to see if there is a blue LED on board to signal that the link is up. Check ethtool and find if Link Deteced:Yes and Speed is acceptable (>10k).
-
-#. Detector is not acquiring (Not Eiger)
-    * Take an acquisition with many images and using the following steps instead of acquire:
-        .. code-block:: bash
-
-            sls_detector_put status start
-            # keep executing this command to see if the number of frames left keeps decreasing,
-            # which means the detector is acquiring.
-            sls_detector_get framesl 
-
-    .. note ::
-    
-        If you are using multiple modules, the previous command can return -1 because each module will return different values. Then, check for a single module instead: sls_detector_get 0:framesl
-
-#. Data cable plugged into the wrong interface on board (Jungfrau)
-    * Please ensure that the data cable is plugged into the rightmost interface. The middle one is disabled for PCB v1.0 and must be selected via command for PCB v2.0.
-
-#. Detector is not sending data
-    * Check the board to see if the green LED is blinking next to the data cable, which means that the detector is sending data.
-
-#. Firewall or security feature
-    * A firewall or some security feature could be blocking the reception of data.
-
-#. Ethernet interface not configured properly
-    * Ensure that the interfaces used are configured properly with the right mask and ip. Eg. use ifconfig and route commands to verify.
-
-#. Ethernet interface not configured for Jumbo frames (10Gb)
-    * Ensure that the interfaces used in receiver pc have MTU 9000 (jumbo frames) enabled.
-
-#. Detector IP (Not Eiger)
-    * Ensure it is valid and does not end if 0 or 255. Also ensure that the detector ip is in the same subnet as rx_udpip and the masking in the interface configuration ensures this rule.
-
-#. Tcpdump or wireshark
-    * Use one of these to confirm that you receive packets (with the right filtering ie. source and destination ports, ip).
-
-#. Check SFP modules
-    * Check if the SFP modules on both sides of the fiber are of same type.
-
-#. Pinging the subnet (receiving only a few number of packets each time)
-    * If a switch is used between a receiver pc and detector instead of plugging the cables directly, one might have to ping any ip in the subnet of the Ethernet interface constantly so that it does not forget the ip during operation.
-    * Eg. if rx_udpip is 10.2.3.100, then ping constantly 10.2.3.xxx, where xxx is any ip other than 100.
-
-
-
-.. _Receiver PC Tuning:
-
-Receiver PC Tuning Options
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-#. Increase maximum receive socket buffer size and socket input packet queue. 
-    * Temporarily (until shut down)
-        .. code-block:: bash
-            
-            # check size
-            sysctl -a | grep rmem
-            sysctl -a | grep backlog
-
-            # set max and default (use 1Gb for Jungfrau and 100Mb for others)
-            sysctl net.core.rmem_max=$((100*1024*1024)) 
-            sysctl net.core.rmem_default=$((100*1024*1024))
-            sysctl net.core.netdev_max_backlog=250000
-
-
-    * Permanently
-            .. code-block:: bash
-
-                # edit /etc/sysctl.conf file
-                # set max and default (use 1Gb for Jungfrau and 100Mb for others)
-                net.core.rmem_max = 104857600
-                net.core.rmem_default= 104857600
-                net.core.netdev_max_backlog = 250000
-
-                # save file and run the following
-                sysctl -p
-
-    .. note ::
-        This is the most basic setting, which is sometimes more than enough.
-
-#. For 10Gb,
-    * MTU must be set up to 9000 for jumbo frames on detector, switch and server NIC
-    
-    * Set up static MAC address tables with separated VLANs
-
-#. Write to memory if not a large disk and pc not fast enough.
-    .. code-block:: bash
-
-        mount -t tmpfs none /ramdisk_folder
-        # or
-        mount -t tmpfs none /mnt/ramdisk -o size=10G
-        # check how many GB memory you can allocate, to avoid swapping otherwise    
-
-
-#. Modify ethtool settings. 
-    * rx ring parameters
-        .. code-block:: bash
-
-            # check 
-            ethtool -g xth1
-
-            # set to max value in your pc settings
-            ethtool -G xth1 rx 4096 
-
-    * coalesce settings (might not always work)
-        .. code-block:: bash
-
-            # check 
-            ethtool -c xth1
-
-            # set to max value in your pc settings
-            ethtool -C xth1 rx-usecs 100 
-
-    * pause parameters
-        .. code-block:: bash
-
-            # check 
-            ethtool -a xth1
-
-            # set to max value in your pc settings
-            ethtool -A xth1 rx on
- 
-    .. note ::
-
-        | xth1 is example interface name. 
-        | These settings are lost at pc reboot.
-
-#. Give user speicific user scheduling privileges.
-    .. code-block:: bash
-
-        # edit /etc/security/limits.conf
-        # add following line or similar depending on your distribution
-        username rtprio 99
-
-    .. note ::
-
-        This is also set if slsReceiver is run as root user.
-        
-        
-#. Disable power saving in CPU frequency 
-    .. code-block:: bash
-
-        # or similar command depending on your distribution
-        cpupower frequency-info
-        cpupower frequency-set -g performance
-
-        # or
-        cpufreq-info
-        for i in ‘seq 0 7‘; do cpufreq-set -c $i -g performance; done
-
-
-slsReceiver Tuning
-^^^^^^^^^^^^^^^^^^
-
-#. Starting receiver as root to have scheduling privileges.
-
-#. For 10g, enable flow control
-    .. code-block:: bash
-
-        sls_detector_put flowcontrol10g 1
-
-#. Increase slsReceiver fifo depth between listening and processing threads.
-    .. code-block:: bash
-
-        sls_detector_get rx_fifodepth
-        # sets number of frames in fifo to 5000
-        sls_detector_put rx_fifodepth 5000
-
-#. Increase number of frames per file to reduce time taken to open and close files.
-    .. code-block:: bash
-
-        sls_detector_get rx_framesperfile
-        sls_detector_put rx_framesperfile 20000
-        # writes all frames into a single file
-        sls_detector_put rx_framesperfile 0
-
-
-Shared memory error
-^^^^^^^^^^^^^^^^^^^
-| For errors due to access or size, delete shared memory files nd try again.
-
-To list all shared memory files of sls detector package.
-    .. code-block:: bash
-        
-        ll /dev/shm/slsDetectorPackage*
-        -rw-------. 1 l_d l_d  136 Oct  1 11:42 /dev/shm/slsDetectorPackage_multi_0
-        -rw-------. 1 l_d l_d 3476 Oct  1 11:42 /dev/shm/slsDetectorPackage_multi_0_sls_0
-        -rw-------. 1 l_d l_d 3476 Oct  1 11:42 /dev/shm/slsDetectorPackage_multi_0_sls_1
-
-Cannot connect to detector
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Ensure both control and stop servers are running on the detector.
-    .. code-block:: bash
-
-        ps -ef | grep jungfrauDetectorServer*
-
-Cannot connect to receiver
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Start receiver before running a client command that needs to communicate with receiver.
-
-Receiver: cannot bind socket
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#. slsReceiver or slsMultiReceiver is already open somewhere.
-    * Kill it and restart it.
-
-#. Tcp port is in use by another application.
-    * Start Receiver with a different tcp port and adjust it config file
-        .. code-block:: bash
-
-            # restart receiver with different port
-            slsReceiver -t1980
-
-            # adjust in config file
-            rx_hostname pcxxxx:1980
-
-.. _common troubleshooting multi module data:
-
-Cannot get multi module data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Possible causes could be the following:
-
-#. Network
-    * If you have a direct connection, check to see if the network cables are connected correctly to corresponding interfaces on the PC side. Check also the network configuration and that the detectors and receivers are in the corresponding subnet.
-
-#. Power Supply
-    * Check power supply current limit.
-    * For Jungfrau, refer to :ref:`Jungfrau Power Supply Troubleshooting<Jungfrau Troubleshooting Power Supply>`.
-
-
-
-Gotthard
-----------
-
-
-Missing first frame or next frame after a delay
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Connect the data link from the Module directly to receiver pc or to a private network.
-
-
-Jungfrau
----------
-
-Temperature event occured
-^^^^^^^^^^^^^^^^^^^^^^^^^
-This will occur only if:
-* temp_threshold (threshold temperature) has been set to a value
-* temp_control (temperature control) set to 1
-* and the temperature overshooted the threshold temperature.
-
-**Consequence**
-* sls_detector_get temp_event will give 1 # temperature event occured
-* the chip will be powered off
-
-**Solution**
-* Even after fixing the cooling, any subsequent powerchip command will fail unless the temperature event has been cleared.
-
-* Clear the temperature event
-    .. code-block:: bash
-        
-        # gives the current chip power status (zero currently as chip powered off)
-        sls_detector_get powerchip 
-
-        # clear temperature event
-        sls_detector_put temp_event 0
-
-        # power on the chip
-        sls_detector_put powerchip 1 
-
-
-.. _Jungfrau Troubleshooting Power Supply:
-
-Cannot get multi module data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Check :ref:`Common Multi Module Troubleshooting<common troubleshooting multi module data>`
-#. Power Supply
-    * Comment out this line in the config file: powerchip 1
-    * Powering on the chip increases the power consumption by a considerable amount. If commenting out this line aids in getting data (strange data due to powered off chip), then it could be the power supply current limit. Fix it (possibly to 8A current limit) and uncomment the powerchip line back in config file.
-

docs/src/virtualserver.rst

@@ -1,149 +0,0 @@
-.. _Virtual Detector Servers:
-Detector Simulators
-===================
-
-Compilation
------------
-
-* Using CMake, turn on the option 
-    .. code-block:: bash  
-        
-        SLS_USE_SIMULATOR=ON
-
-* Using cmk.sh script,
-     .. code-block:: bash  
-        
-        ./cmk.sh -bsj9 #option s is for simulator
-
-
-Binaries
-^^^^^^^^
-    .. code-block:: bash  
-
-        eigerDetectorServerMaster_virtual
-        eigerDetectorServerSlaveTop_virtual
-        eigerDetectorServerSlaveBottom_virtual
-        jungfrauDetectorServer_virtual
-        gotthardDetectorServer_virtual
-        gotthard2DetectorServer_virtual
-        mythen3DetectorServer_virtual
-        moenchDetectorServer_virtual
-        ctbDetectorServer_virtual
-
-
-Arguments
----------
-
-The arguments are the same as the :ref:`normal server arguments<Detector Server Arguments>`.
-
-When using multiple modules, use different ports for each virtual server.
-    .. code-block:: bash  
-
-        # will start control server at port 1912 and stop server at port 1913
-        jungfrauDetectorServer --port 1912 &
-
-        # will start second control server at port 1914 and stop server at port 1915
-        jungfrauDetectorServer --port 1914 &
-
-
-Client
-------
-
-.. code-block:: bash  
-
-    # hostname should include the port (if not default)
-    sls_detector_put hostname localhost:1912+localhost:1914+
-
-    # or use virtual command, instead of hostname
-    # connects to 2 servers at localhost 
-    # (control servers: 1912, 1914; stop servers: 1913, 1915)
-    sls_detector_put virtual 2 1912 
-
-Use the same in the config file.
-Detector API has a method 'isVirtualDetectorServer' to check if on-board detector server is virtual.
-
-
-Sample Config file
-^^^^^^^^^^^^^^^^^^
-There are sample config files for each detector in slsDetectorPackage/examples folder.
-
-For a Single Module
-    .. code-block:: bash  
-
-        # connects to control port 1912
-        hostname localhost:1912+
-
-        # connects to receiver at ports 2012
-        rx_hostname mpc1922:2012+
-
-        # sets destination udp ports (not needed, default is 50001)
-        udp_dstport 50012
-
-        # source udp ips must be same subnet at destintaion udp ips
-        udp_srcip 192.168.1.112
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # connects to control ports 1912, 1914 and stop ports 1913, 1915
-        virtual 2 1912
-        # or hostname localhost:1912+localhost:1914+
-
-        # connects to receivers at ports 2012 and 2014
-        rx_hostname mpc1922:2012+mpc1922:2013+
-
-        # sets differernt destination udp ports
-        0:udp_dstport 50012
-        1:udp_dstport 50014
-
-        # source udp ips must be same subnet at destintaion udp ips
-        0:udp_srcip 192.168.1.112
-        1:udp_srcip 192.168.1.114
-
-        # destination udp ip picked up from rx_hostname (if auto)
-        udp_dstip auto
-
-        # set file path
-        fpath /tmp
-
-Receivers
-----------
-Same as if you would use an actual detector
-
-For a Single Module
-    .. code-block:: bash  
-
-        slsReceiver -t2012
-
-
-For Multiple Modules
-    .. code-block:: bash  
-
-        # slsMultiReceiver [starting port] [number of receivers] [print each frame header for debugging]
-        slsMultiReceiver 2012 2 0 
-
-Gui
-----
-| Same as if you would use an actual detector.
-| Compile with SLS_USE_GUI=ON in cmake or -g option in cmk.sh script.
-
-.. code-block:: bash  
-
-    slsDetectorGui
-
-Limitations
------------
-
-#. Data coming out of virtual server is fake. Value at each pixel/ channel is incremented by 1.
-
-#. A stop will stop the virtual acquisition only at the start of every new frame.
-
-#. Triggers are counted as number of virtual frames. trigger command to send a software trigger (Mythen3 & Eiger) is not implemented in virtual server.
-
-#. firmware version and serial number will give 0.

docs/static/extra.css

@@ -1,4 +0,0 @@
-/* override table no-wrap */
-.wy-table-responsive table td, .wy-table-responsive table th {
-    white-space: normal;
-}

examples/eiger_10Gb.config

@@ -1,37 +1,33 @@
-# detetctor geometry, long side of the module first
-detsize 1024 512 
-
-# detector hostname for controls
+detsizechan 1024 512 
+#detetctor geometry, long side of the module first
 hostname beb059+beb058+ 
+#1Gb detector hostname for controls
 
-# 1Gb receiver pc hostname with tcp port to configure receiver
-rx_hostname x12sa-vcons:1991+x12sa-vcons:1992
+0:rx_tcpport 1991 
+#tcpport for the first halfmodule                 
+0:rx_udpport 50011 
+#udp port first quadrant, first halfmodule       
+0:rx_udpport2 50012 
+#udp port second quadrant, first halfmodule       
+0:rx_udpip 10.0.30.210 
+#udp IP of the receiver over 10Gb              
+0:detectorip 10.0.30.100 
+#first half module 10 Gb IP 
 
-# udp port first quadrant, first halfmodule         
-0:udp_dstport 50011 
+1:rx_tcpport 1992 
+#tcpport for the second halfmodule                  
+1:rx_udpport 50013 
+#udp port first quadrant, second halfmodule     
+1:rx_udpport2 50014 
+#udp port second quadrant, second halfmodule  
+1:rx_udpip 10.0.40.210  
+#udp IP of the receiver over 10Gb, 
+#can be the same or different from 0:rx_udpip                                   
+1:detectorip 10.0.40.101 
+#second half module 10 Gb IP 
 
-# udp port second quadrant, first halfmodule       
-0:udp_dstport2 50012 
+rx_hostname x12sa-vcons 
+#1Gb receiver pc hostname
 
-# udp IP of the receiver over 10Gb              
-0:udp_dstip 10.0.30.210 
-
-# first half module 10 Gb IP (same subnet as 0:udp_dstip)
-0:udp_srcip 10.0.30.100 
-
-# udp port first quadrant, second halfmodule       
-1:udp_dstport 50013 
-
-# udp port second quadrant, second halfmodule  
-1:udp_dstport2 50014 
-    
-# udp IP of the receiver over 10Gb, 
-1:udp_dstip 10.0.40.210  
-
-# second half module 10 Gb IP 
-# can be the same or different from 0:rx_udpip 
-# butsame subnet as 1:udp_dstip                              
-1:udp_srcip 10.0.40.101 
-
-# output directory
-fpath /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+threaded 1

examples/eiger_1Gb.config

@@ -1,21 +1,24 @@
-# detetctor geometry, long side of the module first
-detsize 1024 512 
-
-# detector hostname for controls
+detsizechan 1024 512 
+#detetctor geometry, long side of the module first
 hostname beb059+beb058+ 
+#1Gb detector hostname for controls
 
-# 1Gb receiver pc hostname with tcp port to configure receiver
-rx_hostname x12sa-vcons:1991+x12sa-vcons:1992
-
-# udp port first quadrant, first halfmodule         
-0:udp_dstport 50011 
+0:rx_tcpport 1991 
+#tcpport for the first halfmodule                 
+0:rx_udpport 50011 
+#udp port first quadrant, first halfmodule         
+0:rx_udpport2 50012 
 #udp port second quadrant, first halfmodule       
-0:udp_dstport2 50012 
 
-# udp port first quadrant, second halfmodule       
-1:udp_dstport 50013 
-# udp port second quadrant, second halfmodule  
-1:udp_dstport2 50014 
+1:rx_tcpport 1992 
+#tcpport for the second halfmodule               
+1:rx_udpport 50013 
+#udp port first quadrant, second halfmodule       
+1:rx_udpport2 50014 
+#udp port second quadrant, second halfmodule  
     
-# output directory
-fpath /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+rx_hostname x12sa-vcons 
+#1Gb receiver pc hostname
+
+outdir /sls/X12SA/data/x12saop/Data10/Eiger0.5M
+threaded 1

examples/gotthard.config

@@ -1,12 +1,27 @@
-# detector hostname
 hostname bchip007
 
-# receiver pc hostname of 1Gb IP of the machine
-rx_hostname my_receiver_hostname
-
-# output directory
-fpath  /bigRAID/datadir_gotthard/rec_test_data
-
-# high voltage
-highvoltage 120
+#0:port 1952
+#0:stopport 1953
+#0:rx_tcpport 1956 must also have this in receiver config file
+0:angdir 1.000000
+0:moveflag 0.000000
+0:extsig:0 off
+#0:detectorip 129.129.202.9
+0:detectormac 00:aa:bb:cc:dd:ee
+0:rx_udpport 50004
+0:rx_udpip 129.129.202.98
+0:rx_hostname pc6898
+0:outdir /bigRAID/datadir_gotthard/rec_test_data
+0:vhighvoltage 120
+master -1
+sync none
+outdir /bigRAID/datadir_gotthard/rec_test_data
+headerbefore none
+headerafter none
+headerbeforepar none
+headerafterpar none
+badchannels none
+angconv none
+globaloff 0.000000
+binsize 0.001000
 

examples/gotthard2_veto_file.txt

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

examples/gotthard2_veto_photon.txt

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

examples/gotthard_II.config

@@ -1,34 +0,0 @@
-# detector hostname
-hostname strip3
-
-# receiver pc hostname with tcp port
-rx_hostname pc12365:1982
-
-# udp source ip
-udp_srcip 10.1.1.184
-
-# udp destination ip (receiver interface ip)
-udp_dstip 10.1.1.107
-
-# only needed for debugging veto signals
-# udp destination port must be different from udp_dstport (default of 50001)
-udp_dstport2 50084
-udp_srcip2 10.1.1.185
-udp_dstip2 10.1.1.107
-
-# output directory
-fpath  /tmp
-
-# disable file writing
-fwrite 0
-
-# to enable 2nd interface for veto debugging
-numinterfaces 2
-
-# enable veto data streaming
-veto 1
-
-# Sampling pipeline 1 clk
-reg 0x120 0x00000010
-clkphase 1 135 deg
-

examples/gotthard_setup.det

@@ -0,0 +1,32 @@
+fname run
+index 0
+dr 16
+settings veryhighgain
+threshold 0
+exptime 0.000002990
+period 0.000024984
+delay 0.999999968
+gates 1
+frames 300000.000000000
+triggers 1.000000000
+timing auto
+fineoff 0.000000
+startscript none
+startscriptpar none
+stopscript none
+stopscriptpar none
+scriptbefore none
+scriptbeforepar none
+scriptafter none
+scriptafterpar none
+scan0script none
+scan0par none
+scan0prec 0
+scan0steps 0 
+scan1script none
+scan1par none
+scan1prec 0
+scan1steps 0 
+ratecorr 0.000000
+flatfield none
+badchannels none

examples/gotthard_two.config

@@ -1,17 +1,17 @@
-# detector hostname
+detsizechan 2560 1
+
 hostname bchip074+bchip075+
 
-# receiver pc hostname of 1Gb IP of the machine (with tcpport)
-rx_hostname my_receiver_hostname+my_receiver_hostname:1955
 
-# default udp destination port 50001
-1:udp_dstport 50002
+0:extsig:0 trigger_in_rising_edge
+0:rx_tcpport 1954
+0:rx_udpport 50001
+0:vhighvoltage 0
 
-# output directory
-fpath  /tmp
-
-extsig 0 trigger_in_rising_edge
-highvoltage 0
+1:extsig:0 trigger_in_rising_edge
+1:rx_tcpport 1955
+1:rx_udpport 50002
+1:vhighvoltage 0
 
 ##############################################################################
 #########
@@ -19,27 +19,39 @@ highvoltage 0
 #########
 ##############################################################################
 
-## receiver pc hostname of 1Gb IP of the machine
-#rx_zmqip my_receiver_hostname 
-## client/gui or softIOc pc hostname
-#zmqip my_client_hostname 
-
-## rxr zmq streaming out port
+# #replace my_receiver_hostname with the hostname of IP of the machine where the receiver runs
+#0:rx_zmqip my_receiver_hostname 
 #0:rx_zmqport 30003
-## client zmq listening port
+# #replace my_client_hostname with the hostname of IP of the machine where the client/GUI or softIOC runs
+#0:zmqip my_client_hostname 
 #0:zmqport  40003
-## rxr zmq streaming out port
-#1:rx_zmqport 30004
-## client zmq listening port
-#1:zmqport  40004
 
-## stream out every frame via zmq
-#rx_zmqfreq 1
-## enable zmq streaming
-#rx_zmqstream 1
+# #replace my_receiver_hostname with the hostname of IP of the machine where the receiver runs
+#1:rx_zmqip my_receiver_hostname 
+#1:rx_zmqport 30004
+# #replace my_client_hostname with the hostname of IP of the machine where the client/GUI or softIOC runs
+#1:zmqip  my_client_hostname 
+#1:zmqport  40004
 
 ##############################################################################
 #########
 ######### until here
 #########
 ##############################################################################
+
+
+r_readfreq 1
+rx_datastream 1
+
+#replace my_receiver_hostname with the hostname of 1Gb IP of the machine where the receiver runs
+rx_hostname my_receiver_hostname
+rx_datastream 1
+outdir /tmp/
+
+
+settings veryhighgain
+exptime 0.000005
+period 0.0001
+
+vhighvoltage 90
+

examples/jungfrau.config

@@ -1,38 +1,16 @@
-# detector hostname
-hostname bchip052
+hostname localhost
 
-# 1Gb receiver pc hostname (default tcpport: 1954)
-rx_hostname pcmoench01
+0:rx_udpport 50004
+0:rx_udpip 172.24.8.84
+0:detectorip 172.24.8.254
+rx_hostname localhost
 
-# udp destination port (receiver)
-udp_dstport 50004
+#powerchip 1
+#vhighvoltage 200
 
-# udp destination ip (receiver)
-udp_dstip 10.0.1.100
+#extsig:0 trigger_in_rising_edge
+#timing trigger
 
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 10.0.1.184
+outdir /tmp/slsdetector
 
-# PCBv2.0 (using 2 interfaces, top)
-udp_dstport2 50005
-udp_dstip2 10.0.2.100 
-udp_srcip2 10.0.2.184
-# enable two interfaces
-numinterfaces 2
-# select inner interface(effective only when numinterfaces is 1)
-#selinterface 1
 
-# power on chip
-powerchip 1
-
-# high voltage
-highvoltage 200
-
-# timing to trigger
-timing trigger
-
-# output file directory
-fpath /external_pool/jungfrau_data/softwaretest
-
-# disable file writing
-fwrite 0

examples/jungfrau_custom_receiver.config

@@ -1,39 +0,0 @@
-# detector hostname
-hostname bchip052
-
-# do not use any rx_ or "file" (eg. fwrite, fpath) commands, which go to slsReceiver/slsMultiReceiver
-
-# udp destination port (receiver)
-udp_dstport 50004
-
-# udp destination ip (receiver)
-udp_dstip 10.0.1.100
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 10.0.1.184
-
-# udp destination mac
-udp_dstmac 22:47:d5:48:ad:ef
-
-
-# PCBv2.0 (using 2 interfaces, top)
-udp_dstport2 50005
-udp_dstip2 10.0.2.100 
-udp_srcip2 10.0.2.184
-udp_dstmac2 22:47:d5:48:ad:ff
-
-
-# enable two interfaces
-numinterfaces 2
-# select inner interface(effective only when numinterfaces is 1)
-#selinterface 1
-
-# power on chip
-powerchip 1
-
-# high voltage
-highvoltage 200
-
-# timing to trigger
-timing trigger
-

examples/jungfrau_two.config

@@ -1,49 +1,26 @@
-# detector geometry x, y
-detsize 1024 1024
-
-# detector hostname
+detsizechan 1024 1024
 hostname bchip048+bchip052+
 
-# 1Gb receiver pc hostname  (default tcpport: 1954)
-rx_hostname pcmoench01+pcmoench01:1955
+0:rx_udpport 50004
+0:rx_udpip 10.1.1.100
+0:rx_udpmac F4:52:14:2F:32:00
+0:detectorip 10.1.1.10
+0:detectormac 00:aa:bb:cc:dd:33
 
+1:rx_tcpport 1955
+1:rx_udpport 50005
+1:rx_udpip 10.1.1.100
+1:rx_udpmac F4:52:14:2F:32:00
+1:detectorip 10.1.1.11
+1:detectormac 00:aa:bb:cc:dd:33
 
+rx_hostname pcmoench01
 
-# udp configurations for 1st module
-# udp destination port (receiver)
-0:udp_dstport 50004
-
-# udp destination ip (receiver)
-0:udp_dstip 10.1.1.100
-
-# udp source ip (same subnet as 0:udp_dstip)
-0:udp_srcip 10.1.1.10
-
-
-
-# udp configurations for 2nd module
-# udp destination port (receiver)
-1:udp_dstport 50005
-
-# udp destination ip (receiver)
-1:udp_dstip 10.1.1.100
-
-# udp source ip (same subnet as 1:udp_dstip)
-1:udp_srcip 10.1.1.11
-
-
-
-# power on chip
 powerchip 1
+vhighvoltage 200
+#extsig:0 trigger_in_rising_edge
+#timing trigger
 
-# high voltage
-highvoltage 200
+outdir /external_pool/jungfrau_data/softwaretest
 
-# timing to trigger
-timing trigger
 
-# output file directory
-fpath /external_pool/jungfrau_data/softwaretest
-
-# disable file writing
-fwrite 0

examples/measurement_setup.det

@@ -1,32 +0,0 @@
-# file name prefix
-fname measurement1
-
-# file acquisition index
-findex 3000
-
-# dynamic range (only for Mythen3 and Eiger)
-dr 32
-
-# settings 
-settings veryhighgain
-
-# exposure time
-exptime 100us
-
-# period
-period 2ms
-
-# frames per trigger
-frames 30000
-
-# timing mode
-timing trigger
-
-# triggers
-triggers 10
-
-# delay after trigger
-delay 1ms
-
-
-

examples/moench01_T1_lab.config

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

examples/moench03_T1.config

@@ -1,62 +0,0 @@
-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
-
-#############################################
-### 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_zmqstream 1
-
-
-
-frames 100000
-period 0.0006
-
-#############################################
-### edit with directory you want to write to
-############################################
-fpath /mnt/moench_data/scratch/
-
-fwrite 0
-
-rx_jsonpara frameMode frame
-rx_jsonpara detectorMode counting
-rx_discardpolicy discardpartial
-
-
-adcpipeline 15
-
-powerchip 1
-highvoltage 90
-
-#adcreg 0x14 0x40
-
-

examples/two_gotthard.config

@@ -0,0 +1,55 @@
+#####Any line with a # is not read######
+
+detsizechan 2560 1
+
+hostname bchip007+bchip009+
+
+#0:hostname bchip007
+#0:port 1952
+#0:stopport 1953
+#0:rx_tcpport 1956 
+0:angdir 1.000000
+0:moveflag 0.000000
+0:ffdir /home/l_msdetect
+0:extsig:0 off
+
+0:detectorip 10.1.1.2
+#0:detectormac 00:aa:bb:cc:dd:ee
+#0:rx_udpport 50001
+0:rx_udpip 10.1.1.1
+0:rx_hostname 129.129.202.134 
+0:outdir /data/speedt
+0:vhighvoltage 120
+
+
+#1:hostname bchip009
+#1:port 1952
+#1:stopport 1953
+1:rx_tcpport 1957
+1:angdir 1.000000
+1:moveflag 0.000000
+1:ffdir /home/l_msdetect
+1:extsig:0 off
+
+1:detectorip 10.1.2.2
+#1:detectormac 00:aa:bb:cc:dd:ee
+1:rx_udpport 50004
+1:rx_udpip 10.1.2.1
+1:rx_hostname 129.129.202.134 
+1:outdir /data/speedt
+1:vhighvoltage 120
+
+
+master -1
+sync none
+outdir /data/speedt
+ffdir /home/l_msdetect
+headerbefore none
+headerafter none
+headerbeforepar none
+headerafterpar none
+badchannels none
+angconv none
+globaloff 0.000000
+binsize 0.001000
+

examples/virtual_ctb_moench.config

@@ -1,477 +0,0 @@
-# detector hostname
-hostname localhost:1910
-
-# receiver hostname
-rx_hostname mpc1922:2010
-
-# udp destination ports
-udp_dstport 50010
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-
-# default clocks
-runclk 40
-adcclk 20
-dbitclk 40
-
-
-# patterns
-patword 0x0000 0x0000000000000000
-patword 0x0001 0x0000000000000000
-patword 0x0002 0x0008000900080000
-patword 0x0003 0x0008000900080000
-patword 0x0004 0x0008000900080000
-patword 0x0005 0x0008000900080000
-patword 0x0006 0x0008000900080000
-patword 0x0007 0x0008000900080000
-patword 0x0008 0x0008000900080000
-patword 0x0009 0x0008000900080000
-patword 0x000a 0x0008000900080000
-patword 0x000b 0x0008000900080000
-patword 0x000c 0x0008000900080000
-patword 0x000d 0x0008000900080000
-patword 0x000e 0x0008000900080000
-patword 0x000f 0x0008000900080000
-patword 0x0010 0x0008000900080000
-patword 0x0011 0x0008000900080000
-patword 0x0012 0x0008000900080000
-patword 0x0013 0x0008000900080000
-patword 0x0014 0x0008000900080000
-patword 0x0015 0x0008000900080000
-patword 0x0016 0x0008400900080020
-patword 0x0017 0x0008400900080020
-patword 0x0018 0x0008599f0418503a
-patword 0x0019 0x0008599f0418503a
-patword 0x001a 0x0108599f0418503a
-patword 0x001b 0x0108599f0418503a
-patword 0x001c 0x0108599f0418503a
-patword 0x001d 0x0108599f0418503a
-patword 0x001e 0x0108599f0418503a
-patword 0x001f 0x0108599f0418503a
-patword 0x0020 0x0108599f0418503a
-patword 0x0021 0x0108599f0418503a
-patword 0x0022 0x0108599f0418503a
-patword 0x0023 0x0108599f0418503a
-patword 0x0024 0x0108599f0418503a
-patword 0x0025 0x0108599f0418503a
-patword 0x0026 0x0108599f0418503a
-patword 0x0027 0x0108599f0418503a
-patword 0x0028 0x0108599f0418503a
-patword 0x0029 0x0108599f0418503a
-patword 0x002a 0x0108599f0418503a
-patword 0x002b 0x0108599f0418503a
-patword 0x002c 0x0108599f0418503a
-patword 0x002d 0x0108599f0418503a
-patword 0x002e 0x0108599f0418503a
-patword 0x002f 0x0108599f0418503a
-patword 0x0030 0x0108599f0418503a
-patword 0x0031 0x0108599f0418503a
-patword 0x0032 0x0108599f0418503a
-patword 0x0033 0x0108599f0418503a
-patword 0x0034 0x0108599f0418503a
-patword 0x0035 0x0108599f0418503a
-patword 0x0036 0x0108599f0418503a
-patword 0x0037 0x0108599f0418503a
-patword 0x0038 0x0108599f0418503a
-patword 0x0039 0x0108599f0418503a
-patword 0x003a 0x0108599f0418503a
-patword 0x003b 0x0108599f0418503a
-patword 0x003c 0x0108599f0418503a
-patword 0x003d 0x0108599f0418503a
-patword 0x003e 0x0108599f0418503a
-patword 0x003f 0x0108599f0418503a
-patword 0x0040 0x0108599f0418503a
-patword 0x0041 0x0108599f0418503a
-patword 0x0042 0x0108599f0418503a
-patword 0x0043 0x0108599f0418503a
-patword 0x0044 0x0108599f0418503a
-patword 0x0045 0x0108599f0418503a
-patword 0x0046 0x0108599f0418503a
-patword 0x0047 0x0108599f0418503a
-patword 0x0048 0x0108599f0418503a
-patword 0x0049 0x0108599f0418503a
-patword 0x004a 0x0108599f0418503a
-patword 0x004b 0x0108599f0418503a
-patword 0x004c 0x0108599f0418503a
-patword 0x004d 0x0108599f0418503a
-patword 0x004e 0x0108599f0418503a
-patword 0x004f 0x0108599f0418503a
-patword 0x0050 0x0108599f0418503a
-patword 0x0051 0x0108599f0418503a
-patword 0x0052 0x0108599f0418503a
-patword 0x0053 0x0108599f0418503a
-patword 0x0054 0x0108599f0418503a
-patword 0x0055 0x0108599f0418503a
-patword 0x0056 0x0108599f0418503a
-patword 0x0057 0x0108599f0418503a
-patword 0x0058 0x0108599f0418503a
-patword 0x0059 0x0108599f0418503a
-patword 0x005a 0x0108599f0418503a
-patword 0x005b 0x0108599f0418503a
-patword 0x005c 0x0108599f0418503a
-patword 0x005d 0x0108599f0418503a
-patword 0x005e 0x0108599f0418503a
-patword 0x005f 0x0108599f0418503a
-patword 0x0060 0x0108599f0418503a
-patword 0x0061 0x0108599f0418503a
-patword 0x0062 0x0108599f0418503a
-patword 0x0063 0x0108599f0418503a
-patword 0x0064 0x0108599f0418503a
-patword 0x0065 0x0108599f0418503a
-patword 0x0066 0x0108599f0418503a
-patword 0x0067 0x0108599f0418503a
-patword 0x0068 0x0108599f0418503a
-patword 0x0069 0x0108599f0418503a
-patword 0x006a 0x0108599f0418503a
-patword 0x006b 0x0108599f0418503a
-patword 0x006c 0x0108599f0418503a
-patword 0x006d 0x0108599f0418503a
-patword 0x006e 0x0108599f0418503a
-patword 0x006f 0x0108599f0418503a
-patword 0x0070 0x0108599f0418503a
-patword 0x0071 0x0108599f0418503a
-patword 0x0072 0x0108599f0418503a
-patword 0x0073 0x0108599f0418503a
-patword 0x0074 0x0108599f0418503a
-patword 0x0075 0x0108599f0418503a
-patword 0x0076 0x0108599f0418503a
-patword 0x0077 0x0108599f0418503a
-patword 0x0078 0x0108599f0418503a
-patword 0x0079 0x0108599f0418503a
-patword 0x007a 0x0108599f0418503a
-patword 0x007b 0x0108599f0418503a
-patword 0x007c 0x0108599f0418503a
-patword 0x007d 0x0108599f0418503a
-patword 0x007e 0x010859960418503a
-patword 0x007f 0x010859960418503a
-patword 0x0080 0x010859960418503a
-patword 0x0081 0x010859960418503a
-patword 0x0082 0x010859960418503a
-patword 0x0083 0x010859960418503a
-patword 0x0084 0x010859960418503a
-patword 0x0085 0x010859960418503a
-patword 0x0086 0x010859960418503a
-patword 0x0087 0x010859960418503a
-patword 0x0088 0x010859960418503a
-patword 0x0089 0x010859960418503a
-patword 0x008a 0x010859960418503a
-patword 0x008b 0x010859960418503a
-patword 0x008c 0x010859960418503a
-patword 0x008d 0x010859960418503a
-patword 0x008e 0x010859960418503a
-patword 0x008f 0x010859960418503a
-patword 0x0090 0x010859960418503a
-patword 0x0091 0x010859960418503a
-patword 0x0092 0x010819960418501a
-patword 0x0093 0x010819960418501a
-patword 0x0094 0x010819960418501a
-patword 0x0095 0x010819960418501a
-patword 0x0096 0x030819960418501a
-patword 0x0097 0x030819960418501a
-patword 0x0098 0x030819960418501a
-patword 0x0099 0x030819960418501a
-patword 0x009a 0x030819960418501a
-patword 0x009b 0x030819960418501a
-patword 0x009c 0x030819960418501a
-patword 0x009d 0x030819960418501a
-patword 0x009e 0x030819960418501a
-patword 0x009f 0x030819960418501a
-patword 0x00a0 0x030819960418501a
-patword 0x00a1 0x030819960418501a
-patword 0x00a2 0x030819960418501a
-patword 0x00a3 0x030819960418501a
-patword 0x00a4 0x030819960418501a
-patword 0x00a5 0x030819960418501a
-patword 0x00a6 0x030819960418501a
-patword 0x00a7 0x030819960418501a
-patword 0x00a8 0x030819960418501a
-patword 0x00a9 0x030819960418501a
-patword 0x00aa 0x030819960418501a
-patword 0x00ab 0x030819960418501a
-patword 0x00ac 0x030819960008501a
-patword 0x00ad 0x030819960008501a
-patword 0x00ae 0x030819960008501a
-patword 0x00af 0x030819960008501a
-patword 0x00b0 0x030819960008501a
-patword 0x00b1 0x030819960008501a
-patword 0x00b2 0x030819960008501a
-patword 0x00b3 0x030819960008501a
-patword 0x00b4 0x030819960008501a
-patword 0x00b5 0x030819960008501a
-patword 0x00b6 0x030819960008501a
-patword 0x00b7 0x030819960008501a
-patword 0x00b8 0x030819960008501a
-patword 0x00b9 0x030819960008501a
-patword 0x00ba 0x030819960008501a
-patword 0x00bb 0x030819960008501a
-patword 0x00bc 0x030819960008501a
-patword 0x00bd 0x030819960008501a
-patword 0x00be 0x030819960008501a
-patword 0x00bf 0x030819960008501a
-patword 0x00c0 0x0308199f0008501a
-patword 0x00c1 0x0308199f0008501a
-patword 0x00c2 0x0308199f0008501a
-patword 0x00c3 0x0308199f0008501a
-patword 0x00c4 0x0308199f0008501a
-patword 0x00c5 0x0308199f0008501a
-patword 0x00c6 0x0308199f0008501a
-patword 0x00c7 0x0308199f0008501a
-patword 0x00c8 0x0308199f0008501a
-patword 0x00c9 0x0308199f0008501a
-patword 0x00ca 0x0308199f0008501a
-patword 0x00cb 0x0308199f0008501a
-patword 0x00cc 0x0308199f0008501a
-patword 0x00cd 0x0308199f0008501a
-patword 0x00ce 0x0308199f0008501a
-patword 0x00cf 0x0308199f0008501a
-patword 0x00d0 0x0308199f0008501a
-patword 0x00d1 0x0308199f0008501a
-patword 0x00d2 0x0308199f0008501a
-patword 0x00d3 0x0308199f0008501a
-patword 0x00d4 0x0308599f0008503a
-patword 0x00d5 0x0308599f0008503a
-patword 0x00d6 0x030c599f000850ba
-patword 0x00d7 0x030c599f000850ba
-patword 0x00d8 0x030c599f000850ba
-patword 0x00d9 0x030c599f000850ba
-patword 0x00da 0x030c599f000850ba
-patword 0x00db 0x030c599f000850ba
-patword 0x00dc 0x030c599f000850ba
-patword 0x00dd 0x030c599f000850ba
-patword 0x00de 0x030c599f000850ba
-patword 0x00df 0x030c599f000850ba
-patword 0x00e0 0x030c599f000850ba
-patword 0x00e1 0x030c599f000850ba
-patword 0x00e2 0x030c599f000850ba
-patword 0x00e3 0x030c599f000850ba
-patword 0x00e4 0x030c599f000850ba
-patword 0x00e5 0x030c599f000850ba
-patword 0x00e6 0x030c599f000850ba
-patword 0x00e7 0x030c599f000850ba
-patword 0x00e8 0x030c599f000850ba
-patword 0x00e9 0x030c599f000850ba
-patword 0x00ea 0x030c799f010858ba
-patword 0x00eb 0x030c799f010858ba
-patword 0x00ec 0x030c599f000850ba
-patword 0x00ed 0x030c599f000850ba
-patword 0x00ee 0x030c599f000850ba
-patword 0x00ef 0x030c599f000850ba
-patword 0x00f0 0x030c599f000850ba
-patword 0x00f1 0x030c599f000850ba
-patword 0x00f2 0x030c599f000850ba
-patword 0x00f3 0x030c599f000850ba
-patword 0x00f4 0x030c599f000850ba
-patword 0x00f5 0x030c599f000850ba
-patword 0x00f6 0x030c599f000850ba
-patword 0x00f7 0x030c599f000850ba
-patword 0x00f8 0x030c599f000850ba
-patword 0x00f9 0x030c599f000850ba
-patword 0x00fa 0x030c599f000850ba
-patword 0x00fb 0x030c599f000850ba
-patword 0x00fc 0x030c599f000850ba
-patword 0x00fd 0x030c599f000850ba
-patword 0x00fe 0x030c599f000850ba
-patword 0x00ff 0x030c599f000850ba
-patword 0x0100 0x030c599f000850ba
-patword 0x0101 0x030c599f000850ba
-patword 0x0102 0x030c599f400850ba
-patword 0x0103 0x030c599f400850ba
-patword 0x0104 0x030c599f600850ba
-patword 0x0105 0x030c599f400850ba
-patword 0x0106 0x030c599f400850ba
-patword 0x0107 0x030c599f400850ba
-patword 0x0108 0x870c599f682e50ba
-patword 0x0109 0x870c599f482850ba
-patword 0x010a 0x870c599f000e50ba
-patword 0x010b 0x870c599f000850ba
-patword 0x010c 0x870c599f000e50ba
-patword 0x010d 0x870c599f000850ba
-patword 0x010e 0x870c599f000e50ba
-patword 0x010f 0x870c599f000850ba
-patword 0x0110 0x870c599f000e50ba
-patword 0x0111 0x870c599f000850ba
-patword 0x0112 0x870c599f000e50ba
-patword 0x0113 0x870c599f000850ba
-patword 0x0114 0x870c599f000e50ba
-patword 0x0115 0x870c599f000850ba
-patword 0x0116 0x870c599f000e50ba
-patword 0x0117 0x870c599f000850ba
-patword 0x0118 0x870c599f000e50ba
-patword 0x0119 0x870c599f000850ba
-patword 0x011a 0x870c599f000e50ba
-patword 0x011b 0x870c599f000850ba
-patword 0x011c 0x870c599f000e50ba
-patword 0x011d 0x870c599f000850ba
-patword 0x011e 0x870c599f000e50ba
-patword 0x011f 0x870c599f000850ba
-patword 0x0120 0x870c599f000e50ba
-patword 0x0121 0x870c599f000850ba
-patword 0x0122 0x870c599f200e50ba
-patword 0x0123 0x870c599f000850ba
-patword 0x0124 0x870c599f000e50ba
-patword 0x0125 0x870c599f000850ba
-patword 0x0126 0x870c599f000e50ba
-patword 0x0127 0x870c599f000850ba
-patword 0x0128 0x870c599f000e50ba
-patword 0x0129 0x870c599f000850ba
-patword 0x012a 0x870c599f000e50ba
-patword 0x012b 0x870c599f000850ba
-patword 0x012c 0x870c599f000e50ba
-patword 0x012d 0x870c599f000850ba
-patword 0x012e 0x870c599f000e50ba
-patword 0x012f 0x870c599f000850ba
-patword 0x0130 0x870c599f000e50ba
-patword 0x0131 0x870c599f000850ba
-patword 0x0132 0x870c599f000e50ba
-patword 0x0133 0x870c599f000850ba
-patword 0x0134 0x870c599f000e50ba
-patword 0x0135 0x870c599f000850ba
-patword 0x0136 0x870c599f000e50ba
-patword 0x0137 0x870c599f000850ba
-patword 0x0138 0x870c599f000e50ba
-patword 0x0139 0x870c599f000850ba
-patword 0x013a 0x870c599f282e50ba
-patword 0x013b 0x870c599f082850ba
-patword 0x013c 0x870c599f000e50ba
-patword 0x013d 0x870c599f000850ba
-patword 0x013e 0x870c599f000e50ba
-patword 0x013f 0x870c599f000850ba
-patword 0x0140 0x870c599f000e50ba
-patword 0x0141 0x870c599f000850ba
-patword 0x0142 0x870c599f000e50ba
-patword 0x0143 0x870c599f000850ba
-patword 0x0144 0x870c599f000e50ba
-patword 0x0145 0x870c599f000850ba
-patword 0x0146 0x870c599f000e50ba
-patword 0x0147 0x870c599f000850ba
-patword 0x0148 0x870c599f000e50ba
-patword 0x0149 0x870c599f000850ba
-patword 0x014a 0x870c599f000e50ba
-patword 0x014b 0x870c599f000850ba
-patword 0x014c 0x870c599f000e50ba
-patword 0x014d 0x870c599f000850ba
-patword 0x014e 0x870c599f000e50ba
-patword 0x014f 0x870c599f000850ba
-patword 0x0150 0x870c599f000e50ba
-patword 0x0151 0x870c599f000850ba
-patword 0x0152 0x870c599f000e50ba
-patword 0x0153 0x870c599f000850ba
-patword 0x0154 0x870c599f200e50ba
-patword 0x0155 0x870c599f000850ba
-patword 0x0156 0x870c599f000e50ba
-patword 0x0157 0x870c599f000850ba
-patword 0x0158 0x870c599f000e50ba
-patword 0x0159 0x870c599f000850ba
-patword 0x015a 0x870c599f000e50ba
-patword 0x015b 0x870c599f000850ba
-patword 0x015c 0x870c599f000e50ba
-patword 0x015d 0x870c599f000850ba
-patword 0x015e 0x870c599f000e50ba
-patword 0x015f 0x870c599f000850ba
-patword 0x0160 0x870c599f000e50ba
-patword 0x0161 0x870c599f000850ba
-patword 0x0162 0x870c599f000e50ba
-patword 0x0163 0x870c599f000850ba
-patword 0x0164 0x870c599f000e50ba
-patword 0x0165 0x870c599f000850ba
-patword 0x0166 0x870c599f000e50ba
-patword 0x0167 0x870c599f000850ba
-patword 0x0168 0x870c599f000e50ba
-patword 0x0169 0x870c599f000850ba
-patword 0x016a 0x870c599f000e50ba
-patword 0x016b 0x870c599f000850ba
-patword 0x016c 0x070c599f000850ba
-patword 0x016d 0x070c599f000850ba
-patword 0x016e 0x000c599f000850ba
-patword 0x016f 0x000c599f000850ba
-patword 0x0170 0x0008599f200e503a
-patword 0x0171 0x0008599f0008503a
-patword 0x0172 0x0008599f200e503a
-patword 0x0173 0x0008599f0008503a
-patword 0x0174 0x0008599f0008503a
-patword 0x0175 0x0008599f0008503a
-patword 0x0176 0x0008599f0008503a
-patword 0x0177 0x0008599f0008503a
-patword 0x0178 0x0008599f0008503a
-patword 0x0179 0x0008599f0008503a
-patword 0x017a 0x0008599f0008503a
-patword 0x017b 0x0008599f0008503a
-patword 0x017c 0x0008599f0008503a
-patword 0x017d 0x0008599f0008503a
-patword 0x017e 0x0008599f0008503a
-patword 0x017f 0x0008599f0008503a
-patword 0x0180 0x0008599f0008503a
-patword 0x0181 0x0008599f0008503a
-patword 0x0182 0x0008599f0008503a
-patword 0x0183 0x0008599f0008503a
-patword 0x0184 0x0008599f0008503a
-patword 0x0185 0x0008599f0008503a
-patword 0x0186 0x0008599f0008503a
-patword 0x0187 0x0008599f0008503a
-patword 0x0188 0x0008599f0008503a
-patword 0x0189 0x0008599f0008503a
-patword 0x018a 0x0008599f0008503a
-patword 0x018b 0x0008599f0008503a
-patword 0x018c 0x0008599f0008503a
-patword 0x018d 0x0008599f0008503a
-patioctrl 0x8f0effff6dbffdbf
-patlimits 0x0000 0x018c
-patloop0 0x013a 0x016b
-patnloop0 0x199
-patloop1 0x0400 0x0400
-patnloop1 0
-patloop2 0x0400 0x0400
-patnloop2 0
-patwait0 0x00aa
-patwaittime0 10000
-patwait1 0x0400
-patwaittime1 0
-patwait2 0x0400
-patwaittime2 0
-
-# dacs
-dac 6 800
-dac 0 1300
-dac 4 1428
-dac 1 1000
-dac 7 900
-dac 3 680
-dac 2 1400
-dac 5 1200
-
-
-adcinvert 4a342593
-
-# analog samples
-asamples 5000
-
-# digital samples
-dsamples 0
-
-# adc phase
-adcphase 30 deg
-
-# adc pipeline
-adcpipeline 14
-
-# analog readout
-romode analog
-
-# frames
-frames 1
-
-# period
-period 1ms
-
-

examples/virtual_eiger_1_half_module.config

@@ -1,22 +0,0 @@
-# detector hostname
-hostname localhost:1900
-
-# receiver hostname
-rx_hostname mpc1922:2000
-
-# udp destination ports
-udp_dstport 50000
-udp_dstport2 50001
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-#imagetest 1
-
-

examples/virtual_eiger_2_half_modules.config

@@ -1,23 +0,0 @@
-# detector hostname
-hostname localhost:1900+localhost:1902+
-
-# receiver hostname
-rx_hostname mpc1922:2000+mpc1922:2001+
-
-# udp destination ports
-0:udp_dstport 50000
-0:udp_dstport2 50001
-1:udp_dstport 50002
-1:udp_dstport2 50003
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-#imagetest 1
-

examples/virtual_gotthard.config

@@ -1,23 +0,0 @@
-# detector hostname
-hostname localhost:1904
-
-# receiver hostname
-rx_hostname mpc1922:2004
-
-# udp destination ports
-udp_dstport 50004
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-
-

examples/virtual_gotthard2.config

@@ -1,37 +0,0 @@
-# detector hostname
-hostname localhost:1914
-
-# receiver hostname
-rx_hostname mpc1922:2014
-
-# udp destination ports
-udp_dstport 50014
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-# enable 2nd interface for veto debugging
-# udp destination port for veto
-udp_dstport2 50015
-# udp destination ip (from rx_hostname)
-udp_dstip2 auto
-# udp source ip (same subnet as udp_dstip)
-udp_srcip2 192.168.1.100
-
-# to enable 2nd interface for veto debugging
-numinterfaces 2
-
-# enable veto data streaming
-veto 1
-
-
-

examples/virtual_jungfrau.config

@@ -1,32 +0,0 @@
-# detector hostname
-hostname localhost:1906
-
-# receiver hostname
-rx_hostname mpc1922:2006
-
-# udp destination ports
-udp_dstport 50006
-udp_dstport2 50007
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-udp_dstip2 auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-udp_srcip2 192.168.1.100
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-#imagetest 1
-#frames 1
-
-# enable two interfaces
-numinterfaces 2
-
-# select inner interface(effective only when numinterfaces is 1)
-#selinterface 1

examples/virtual_jungfrau_4.config

@@ -1,47 +0,0 @@
-# detector geometry
-detsize 2048 1024
-
-# detector hostname
-virtual 4 1952
-
-# receiver hostname and tcpports
-0:rx_tcpport 1970
-1:rx_tcpport 1971
-2:rx_tcpport 1972
-3:rx_tcpport 1973
-rx_hostname mpc1922
-
-# udp destination ports
-0:udp_dstport2 50001
-0:udp_dstport2 50002
-1:udp_dstport 50003
-1:udp_dstport2 50004
-2:udp_dstport 50005
-2:udp_dstport2 50006
-3:udp_dstport 50007
-3:udp_dstport2 50008
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-udp_dstip2 auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-udp_srcip2 192.168.1.100
-
-# transmission delay frame
-0:txndelay_frame 0
-1:txndelay_frame 1
-2:txndelay_frame 2
-3:txndelay_frame 3
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-#imagetest 1
-#frames 1
-
-

examples/virtual_moench.config

@@ -1,21 +0,0 @@
-# detector hostname
-hostname localhost:1908
-
-# receiver hostname
-rx_hostname mpc1922:2008
-
-# udp destination ports
-udp_dstport 50008
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-

examples/virtual_mythen3.config

@@ -1,24 +0,0 @@
-# detector hostname
-hostname localhost:1912
-
-# receiver hostname
-rx_hostname mpc1922:2012
-
-# udp destination ports
-udp_dstport 50012
-
-# udp destination ip from rx_hostname
-udp_dstip auto
-
-# udp source ip (same subnet as udp_dstip)
-udp_srcip 192.168.1.100
-
-# output file directory
-fpath /tmp
-
-# disable file writing
-fwrite 0
-
-# load ascii pattern file
-#pattern ../pat.txt
-

integrationTests/test-eigerIntegration.cpp

@@ -1,6 +1,6 @@
-#include "DetectorImpl.h"
 #include "catch.hpp"
-#include "sls/string_utils.h"
+#include "DetectorImpl.h"
+#include "string_utils.h"
 #include "tests/globals.h"
 #include <iostream>
 

integrationTests/test-integrationDectector.cpp

@@ -1,14 +1,14 @@
 
 #include "catch.hpp"
 
+#include "ClientSocket.h"
+#include "logger.h"
 #include "DetectorImpl.h"
-#include "Module.h"
-#include "sls/ClientSocket.h"
-#include "sls/logger.h"
-#include "sls/sls_detector_defs.h"
+#include "slsDetector.h"
+#include "sls_detector_defs.h"
 
-#include "sls/Timer.h"
-#include "sls/sls_detector_funcs.h"
+#include "Timer.h"
+#include "sls_detector_funcs.h"
 #include <iostream>
 #include <vector>
 #define VERBOSE
@@ -23,10 +23,10 @@
 // extern dt type;
 
 TEST_CASE("Single detector no receiver", "[.integration][.single]") {
-    auto t = Module::getTypeFromDetector(test::hostname);
+    auto t = slsDetector::getTypeFromDetector(test::hostname);
     CHECK(t == test::type);
 
-    Module d(t);
+    slsDetector d(t);
     CHECK(d.getDetectorTypeAsEnum() == t);
     CHECK(d.getDetectorTypeAsString() == test::detector_type);
 
@@ -51,7 +51,7 @@ TEST_CASE("Set control port then create a new object with this control port",
     int new_cport = 1993;
     int new_sport = 2000;
     {
-        Module d(test::type);
+        slsDetector d(test::type);
         d.setHostname(test::hostname);
         CHECK(d.getControlPort() == old_cport);
         d.setControlPort(new_cport);
@@ -60,7 +60,7 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
     {
-        Module d(test::type);
+        slsDetector d(test::type);
         d.setHostname(test::hostname);
         d.setControlPort(new_cport);
         d.setStopPort(new_sport);
@@ -73,23 +73,24 @@ TEST_CASE("Set control port then create a new object with this control port",
         d.freeSharedMemory();
     }
 
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.getStopPort() == DEFAULT_PORTNO + 1);
     d.freeSharedMemory();
 }
 
+
 TEST_CASE("single EIGER detector no receiver basic set and get",
           "[.integration][eiger]") {
     // TODO! this test should take command line arguments for config
     SingleDetectorConfig c;
 
     // Read type by connecting to the detector
-    auto type = Module::getTypeFromDetector(c.hostname);
+    auto type = slsDetector::getTypeFromDetector(c.hostname);
     CHECK(type == c.type_enum);
 
-    // Create Module of said type and set hostname and detector online
-    Module d(type);
+    // Create slsDetector of said type and set hostname and detector online
+    slsDetector d(type);
     CHECK(d.getDetectorTypeAsEnum() == type);
     CHECK(d.getDetectorTypeAsString() == c.type_string);
 
@@ -129,8 +130,10 @@ TEST_CASE("single EIGER detector no receiver basic set and get",
     d.freeSharedMemory();
 }
 
+
+
 TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
 
     // Check that detector server is unlocked then lock
@@ -151,12 +154,13 @@ TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") {
     d.freeSharedMemory();
 }
 
-TEST_CASE("Set settings", "[.integration][.single]") {
-    Module d(test::type);
+TEST_CASE("Set settings", "[.integration][.single]"){
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
     CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD);
 }
 
+
 TEST_CASE("Timer functions", "[.integration][cli]") {
     // FRAME_NUMBER, /**< number of real time frames: total number of
     // acquisitions is number or frames*number of triggers */ ACQUISITION_TIME,
@@ -181,7 +185,7 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
     // MEASURED_SUBPERIOD,	/**< measured subperiod */
     // MAX_TIMERS
 
-    Module d(test::type);
+    slsDetector d(test::type);
     d.setHostname(test::hostname);
 
     // Number of frames
@@ -200,7 +204,8 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
     if (test::type != dt::EIGER) {
         auto delay = 10000;
         d.setDelayAfterTrigger(delay);
-        CHECK(d.getDelayAfterTrigger() == delay);
+        CHECK(d.getDelayAfterTrigger() ==
+              delay);
     }
 
     auto triggers = 2;
@@ -213,15 +218,16 @@ TEST_CASE("Timer functions", "[.integration][cli]") {
         CHECK(d.getSubExptime() == subtime);
     }
     // for (int i =0; i!=frames; ++i)
-    d.startAndReadAll();
+        d.startAndReadAll();
 
     d.freeSharedMemory();
+
 }
 
 // TEST_CASE("Aquire", "[.integration][eiger]"){
 //     SingleDetectorConfig c;
-//     auto type = Module::getTypeFromDetector(c.hostname);
-//     Module d(type);
+//     auto type = slsDetector::getTypeFromDetector(c.hostname);
+//     slsDetector d(type);
 //     d.setHostname(c.hostname);
 
 //     auto period = 1000000000;
@@ -376,8 +382,8 @@ TEST_CASE("Chiptestboard Loading Patterns", "[.ctbintegration]") {
     }
 }
 
-TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert",
-          "[.ctbintegration][dbit]") {
+
+TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert", "[.ctbintegration][dbit]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
@@ -397,27 +403,27 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert",
 
     // dbit list
 
-    std::vector<int> list = m.getReceiverDbitList();
+    std::vector <int> list = m.getReceiverDbitList();
     list.clear();
     for (int i = 0; i < 10; ++i)
         list.push_back(i);
     m.setReceiverDbitList(list);
-
+    
     CHECK(m.getReceiverDbitList().size() == 10);
 
     list.push_back(64);
     CHECK_THROWS_AS(m.setReceiverDbitList(list), sls::RuntimeError);
-    CHECK_THROWS_WITH(m.setReceiverDbitList(list),
-                      Catch::Matchers::Contains("be between 0 and 63"));
+    CHECK_THROWS_WITH(m.setReceiverDbitList(list), 
+        Catch::Matchers::Contains("be between 0 and 63"));
 
     list.clear();
     for (int i = 0; i < 65; ++i)
         list.push_back(i);
     CHECK(list.size() == 65);
-    CHECK_THROWS_WITH(m.setReceiverDbitList(list),
-                      Catch::Matchers::Contains("be greater than 64"));
+    CHECK_THROWS_WITH(m.setReceiverDbitList(list),  
+        Catch::Matchers::Contains("be greater than 64"));
 
-    list.clear();
+    list.clear(); 
     m.setReceiverDbitList(list);
     CHECK(m.getReceiverDbitList().empty());
 
@@ -435,8 +441,8 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert",
     m.setExternalSamplingSource(62);
     CHECK(m.getExternalSamplingSource() == 62);
     CHECK_THROWS_WITH(m.setExternalSamplingSource(64),
-                      Catch::Matchers::Contains("be 0-63"));
-    CHECK(m.getExternalSamplingSource() == 62);
+         Catch::Matchers::Contains("be 0-63"));
+    CHECK(m.getExternalSamplingSource() == 62); 
     m.setExternalSampling(1);
     CHECK(m.getExternalSampling() == 1);
     m.setExternalSampling(0);
@@ -444,29 +450,26 @@ TEST_CASE("Chiptestboard Dbit offset, list, sampling, advinvert",
     m.setExternalSampling(1);
     CHECK(m.getExternalSampling() == 1);
     CHECK(m.readRegister(0x7b) == 0x1003E);
+    
 }
 
-TEST_CASE("Eiger or Jungfrau nextframenumber",
-          "[.eigerintegration][.jungfrauintegration][nextframenumber]") {
+TEST_CASE("Eiger or Jungfrau startingfnum", "[.eigerintegration][.jungfrauintegration][startingfnum]") {
     SingleDetectorConfig c;
 
     // pick up multi detector from shm id 0
     DetectorImpl m(0);
 
     // ensure ctb detector type, hostname and online
-    REQUIRE(
-        ((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) ||
-         (m.getDetectorTypeAsEnum() ==
-          slsDetectorDefs::detectorType::JUNGFRAU)));
+    REQUIRE(((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) || (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::JUNGFRAU)));
     REQUIRE(m.getHostname() == c.hostname);
 
-    CHECK(m.setNumberOfFrames(1) == 1);
+     CHECK(m.setNumberOfFrames(1) == 1);
 
     // starting fnum
     uint64_t val = 8;
 
-    m.setNextFrameNumber(val);
-    CHECK(m.getNextFrameNumber() == val);
+    m.setStartingFrameNumber(val);
+    CHECK(m.getStartingFrameNumber() == val);
     CHECK(m.acquire() == slsDetectorDefs::OK);
     CHECK(m.getReceiverCurrentFrameIndex() == val);
 
@@ -474,18 +477,18 @@ TEST_CASE("Eiger or Jungfrau nextframenumber",
     CHECK(m.acquire() == slsDetectorDefs::OK);
     CHECK(m.getReceiverCurrentFrameIndex() == val);
 
-    CHECK_THROWS_AS(m.setNextFrameNumber(0), sls::RuntimeError);
+    CHECK_THROWS_AS(m.setStartingFrameNumber(0), sls::RuntimeError);
 
     if (m.getDetectorTypeAsString() == "Eiger") {
         val = 281474976710655;
     } else if (m.getDetectorTypeAsString() == "Jungfrau") {
         val = 18446744073709551615;
     }
-    m.setNextFrameNumber(val);
-    CHECK(m.getNextFrameNumber() == val);
+    m.setStartingFrameNumber(val);
+    CHECK(m.getStartingFrameNumber() == val);
     CHECK(m.acquire() == slsDetectorDefs::OK);
     CHECK(m.getReceiverCurrentFrameIndex() == val);
-    CHECK(m.getNextFrameNumber() == (val + 1));
+    CHECK(m.getStartingFrameNumber() == (val + 1));
 }
 
 TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
@@ -495,8 +498,7 @@ TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
     DetectorImpl m(0);
 
     // ensure detector type, hostname
-    REQUIRE(
-        (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER));
+    REQUIRE((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER));
     REQUIRE(m.getHostname() == c.hostname);
 
     m.setDynamicRange(16);
@@ -505,7 +507,7 @@ TEST_CASE("Eiger readnlines", "[.eigerintegration][readnlines]") {
     CHECK(m.getReadNLines() == 256);
     m.setReadNLines(1);
     CHECK(m.getReadNLines() == 1);
-
+        
     m.setDynamicRange(8);
     m.setReadNLines(256);
     CHECK(m.getReadNLines() == 256);

integrationTests/test-integrationMulti.cpp

@@ -1,6 +1,6 @@
-#include "DetectorImpl.h"
 #include "catch.hpp"
-#include "sls/string_utils.h"
+#include "DetectorImpl.h"
+#include "string_utils.h"
 #include "tests/globals.h"
 #include <iostream>
 
@@ -24,6 +24,8 @@ TEST_CASE("Initialize a multi detector", "[.integration][.multi]") {
     d.freeSharedMemory();
 }
 
+
+
 TEST_CASE("Set and read timers", "[.integration][.multi]") {
 
     DetectorImpl d(0, true, true);
@@ -55,6 +57,7 @@ TEST_CASE("Set and read timers", "[.integration][.multi]") {
     // PROGRESS, /**< fraction of measurement elapsed - only get! */
     // MEASUREMENTS_NUMBER,
 
+
     // FRAMES_FROM_START,
     // FRAMES_FROM_START_PG,
     // SAMPLES,
@@ -75,6 +78,7 @@ TEST_CASE("Set and read timers", "[.integration][.multi]") {
         CHECK(d.setSubFrameExposureDeadTime(-1) == Approx(subframe_deadtime));
     }
 
+    
     if (test::type == dt::EIGER) {
         // 32bit is needed for subframe exposure
         d.setDynamicRange(32);

manual/Makefile

@@ -0,0 +1,51 @@
+DESTDIR?=docs
+
+
+#manual-api manual-calwiz manual-client manual-gui manual-main
+
+
+
+MAINDIRS= manual-main manual-api  manual-calwiz manual-client manual-gui
+#manual-calwiz manual-calwiz manual-gui manual-client manual-api
+CLEANDIRS=$(MAINDIRS:manual-%=clean-%)
+PDFDIRS=$(MAINDIRS:manual-%=pdf-%)
+HTMLDIRS=$(MAINDIRS:manual-%=html-%)
+ALLDIRS=$(MAINDIRS:manual-%=all-%)
+
+
+all: $(ALLDIRS)
+#	$(shell test -d $(DESTDIR)/pdf && rm -fr $(DESTDIR)/pdf)
+#	mv pdf $(DESTDIR)
+#	$(shell test -d $(DESTDIR)/html && rm -fr $(DESTDIR)/html)
+#	mv html $(DESTDIR)
+	
+pdf: $(PDFDIRS)
+#	$(shell test -d $(DESTDIR)/pdf && rm -fr $(DESTDIR)/pdf)
+#	mv pdf $(DESTDIR)
+
+html: $(HTMLDIRS)
+#	$(shell test -d $(DESTDIR)/html && rm -fr $(DESTDIR)/html)
+#	mv html $(DESTDIR)
+
+clean: $(CLEANDIRS)
+	rm -fr $(DESTDIR)/pdf
+	rm -fr $(DESTDIR)/html	
+
+all-%:
+	echo 
+	cd  $(@:all-%=manual-%) && make all
+
+pdf-%:
+	cd  $(@:pdf-%=manual-%) && make pdf
+
+html-%:
+	cd  $(@:html-%=manual-%) && make html
+
+clean-%: 
+	cd  $(@:clean-%=manual-%) && make clean	
+
+
+#<23><>$(@D)<29><>    The directory part of the file name of the target, with the trailing slash removed. If the value of <20><>$@<40><> is dir/foo.o then <20><>$(@D)<29><> is dir. This value is . if <20><>$@<40><> does not contain a slash.
+#<23><>$(@F)<29><>    The file-within-directory part of the file name of the target. If the value of <20><>$@<40><> is dir/foo.o then <20><>$(@F)<29><> is foo.o. <20><>$(@F)<29><> is equivalent to <20><>$(notdir $@)<29><>.
+
+

manual/index.html

@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+
+<!--Converted with LaTeX2HTML 2002-2-1 (1.71)
+original version by:  Nikos Drakos, CBLU, University of Leeds
+* revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
+* with significant contributions from:
+  Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
+<HTML>
+<HEAD>
+<TITLE>SLS Detector Software Documentation</TITLE>
+<META NAME="description" CONTENT="SLS Detector Software Documentation">
+<META NAME="keywords" CONTENT="SLS Detectors">
+<META NAME="resource-type" CONTENT="document">
+<META NAME="distribution" CONTENT="global">
+
+<LINK REL="next" HREF="node1.html">
+</HEAD>
+
+<BODY >
+<P>
+
+<H1 ALIGN="CENTER">SLS Detector Software Documentation</H1>
+<DIV>
+</DIV>
+<BR><HR>
+<!--Table of Child-Links-->
+<A NAME="CHILD_LINKS"></A>
+
+<UL> 
+
+<LI><A HREF="slsDetectors-FAQ/index.html">SLS Detectors Frequently Asked Questions</A>  <BR>
+Documents with general remarks about the detectors and the software that all users should read.
+<A HREF="../pdf/slsDetectors-FAQ.pdf">*pdf*</A>    <BR>
+ <BR>
+<LI><A HREF="slsDetectorInstall/index.html">Installation</A> <BR>
+Documentation for the installation of the SLS Detectors software library
+<A HREF="../pdf/slsDetectorInstall.pdf">*pdf*</A> <BR>
+ <BR>
+<LI><A HREF="slsDetectorClientHowTo/index.html">Command Line Interface</A>  <BR>
+Reference documentation for the command line interface sls_detector_put, sls_detector_get, sls_detector_acquire, sls_detector_help 
+<A HREF="../pdf/slsDetectorClientHowTo.pdf">*pdf*</A>  <BR>
+ <BR>
+<LI><A HREF="slsDetectorGuiHowTo/index.html">Graphical Users Interface</A>  <BR>
+Reference documentation for the GUI
+<A HREF="../pdf/slsDetectorGuiHowTo.pdf">*pdf*</A>  <BR>
+ <BR>
+<LI><A HREF="calibrationWizardsHowTo/index.html">Calibration Wizards</A> 
+<UL> 
+<LI> Energy calibration <A HREF="../pdf/energyCalibrationHowTo.pdf">*pdf*</A> 
+<LI> Angular calibration <A HREF="../pdf/angularCalibrationHowTo.pdf">*pdf*</A>     
+</UL>
+ <BR>
+
+<LI><A HREF="slsDetectorUsersDocs/index.html">Application Program Interface</A>  <BR>
+Doxygen documentation for using the slsDetectorUsers class
+<A HREF="../pdf/slsDetectorUsersDocs.pdf">*pdf*</A>  <BR>
+   <BR>        
+</UL>
+
+<BR><HR>
+<ADDRESS>
+Anna Bergamaschi
+</ADDRESS>
+</BODY>
+</HTML>

manual/manual-api/CMakeLists.txt

@@ -0,0 +1,32 @@
+set(SOURCES
+    mainReceiver.cpp
+)
+
+include_directories(
+    ../../slsSupportLib/include
+    ../../slsReceiverSoftware/include
+    ../../build/bin 
+    ../../slsdetectorSoftware/slsDetector 
+)
+
+add_executable(slsMultiReceiver
+    ${SOURCES}
+)
+
+target_link_libraries(slsMultiReceiver
+    slsReceiverShared
+    pthread
+    ${ZeroMQ_LIBRARIES}
+    rt
+)
+
+if (HDF5_FOUND)
+    target_link_libraries(slsMultiReceiver ${HDF5_LIBRARIES})
+endif ()
+
+
+set_target_properties(slsMultiReceiver PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+install(TARGETS slsMultiReceiver DESTINATION bin)

manual/manual-api/Makefile

@@ -0,0 +1,62 @@
+PKGDIR		=	../..
+LIBDIR		=   $(PKGDIR)/bin
+INCLUDES	=   -I . -I$(PKGDIR)/slsSupportLib/include -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector  -I$(PKGDIR)/slsReceiversoftware/include
+SRC_DET		= 	mainClient.cpp 	
+SRC_REC		=   mainReceiver.cpp
+ZMQLIBDIR	= 	$(PKGDIR)/slsSupportLib/include
+LDFLAG_DET 	=	-I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq
+LDFLAG_REC 	=	-I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq
+DESTDIR		?=	../docs
+
+HDF5 		?=	no
+HDF5_DIR 	?=	/opt/hdf5v1.10.0
+
+ifeq ($(HDF5),yes)
+	LDFLAG_REC += -L$(HDF5_DIR)/lib  -Wl,-rpath=$(HDF5_DIR)/lib -lhdf5 -lhdf5_cpp -lsz -lz -DHDF5C 
+endif
+
+all: docs detUser slsMultiReceiver 
+#all: docs
+
+docs: createdocs docspdf docshtml removedocs
+
+createdocs: slsDetectorUsers.doxy mainClient.cpp mainReceiver.cpp
+	doxygen slsDetectorUsers.doxy	
+
+docspdf: 
+	cd slsDetectorUsersDocs/latex && make 
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	$(shell test -d $(DESTDIR)/pdf || mkdir -p $(DESTDIR)/pdf)
+	mv slsDetectorUsersDocs/latex/refman.pdf $(DESTDIR)/pdf/slsDetectorUsersDocs.pdf
+
+docshtml: 
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	$(shell test -d $(DESTDIR)/html || mkdir -p $(DESTDIR)/html)
+	$(shell test -d $(DESTDIR)/html/slsDetectorUsersDocs && rm -r $(DESTDIR)/html/slsDetectorUsersDocs)
+	mv slsDetectorUsersDocs/html $(DESTDIR)/html/slsDetectorUsersDocs
+	
+removedocs:
+	rm -rf 	slsDetectorUsersDocs;
+	
+detUser:$(SRC_DET)
+	echo "creating client"
+	mkdir -p bin
+	g++ -o bin/detUser $(SRC_DET) $(INCLUDES) $(LDFLAG_DET) -lm -lstdc++
+
+slsMultiReceiver:$(SRC_REC)
+	echo "creating receiver"
+	echo $LDFLAG_REC
+	mkdir -p bin
+	g++ -o bin/slsMultiReceiver $(SRC_REC) $(INCLUDES) $(LDFLAG_REC) -lm -lstdc++
+	cp bin/slsMultiReceiver $(LIBDIR)
+	
+clean:
+	echo "cleaning for manual-api"
+	rm -rf bin/detUser bin/slsMultiReceiver bin/detReceiver slsDetectorUsersDocs
+	rm -rf slsDetectorUsersDocs
+	rm -rf $(DESTDIR)/html/slsDetectorUsersDocs
+	rm -rf $(DESTDIR)/pdf/slsDetectorUsersDocs.pdf
+	rm -rf $(LIBDIR)/slsMultiReceiver
+	
+
+

manual/manual-api/mainClient.cpp

@@ -0,0 +1,106 @@
+/**
+\file mainClient.cpp
+
+This file is an example of how to implement the slsDetectorUsers class 
+You can compile it linking it to the slsDetector library
+
+g++ mainClient.cpp -L lib -lSlsDetector -L/usr/lib64/ -L lib2 -lzmq  -pthread -lrt -lm -lstdc++
+
+where,
+
+lib is the location of libSlsDetector.so
+
+lib2 is the location of the libzmq.a.
+[ libzmq.a is required only when using data call backs and enabling data streaming from receiver to client.
+It is linked in manual/manual-api from slsReceiverSoftware/include ]
+
+ */
+
+#include "slsDetectorUsers.h"
+#include "detectorData.h"
+#include <iostream>
+#include <cstdlib>
+
+/**
+ * Data Call back function defined
+ * @param pData pointer to data structure received from the call back
+ * @param iframe frame number of data passed
+ * @param isubframe sub frame number of data passed ( only valid for EIGER in 32 bit mode)
+ * @param pArg pointer to object
+ * \returns integer that is currently ignored
+ */
+int dataCallback(detectorData *pData, int iframe, int isubframe, void *pArg)
+{
+	std::cout  	<< " DataCallback:"
+				<< "\n nx           : " << pData->npoints
+				<< "\n ny           : " << pData->npy
+				<< "\n Frame number : " << iframe << std::endl;
+}
+
+
+/**
+ * Example of a main program using the slsDetectorUsers class
+ *
+ * - Arguments are optional
+ * 		- argv[1] : Configuration File
+ * 		- argv[2] : Measurement Setup File
+ * 		- argv[3] : Detector Id (default is zero)
+ */
+int main(int argc,  char **argv) {
+	/** - if specified, set ID from argv[3] */
+	int id=0;
+	if (argc>=4)
+		id=atoi(argv[3]);
+
+
+	/** - slsDetectorUsers Object is instantiated with appropriate ID */
+	int ret = 1;
+	slsDetectorUsers *pDetector = new slsDetectorUsers (ret, id);
+	if (ret == 1) {
+		std::cout << "Error: Could not instantiate slsDetectorUsers" << std::endl;
+		return EXIT_FAILURE;
+	}
+
+
+	/** - if specified, load configuration file (necessary at least the first time it is called to properly configure advanced settings in the shared memory) */
+	if (argc>=2){
+		pDetector->readConfigurationFile(argv[1]);
+		std::cout << "Detector configured" << std::endl;
+	}
+
+	/** - set detector in shared memory online (in case no config file was used) */
+	pDetector->setOnline(1);
+
+	/** - set receiver in shared memory online (in case no config file was used) */
+	pDetector->setReceiverOnline(1);
+
+	/** - registering data callback */
+	pDetector->registerDataCallback(&dataCallback, NULL);
+
+
+	/** - ensuring detector status is idle before starting acquisition. exiting if not idle */
+	int status = pDetector->getDetectorStatus();
+	if (status  !=  0){
+		std::cout << "Detector not ready: " << slsDetectorUsers::runStatusType(status) << std::endl;
+		return 1;
+	}
+
+	/** - if provided, load detector settings */
+	if (argc>=3){
+		pDetector->retrieveDetectorSetup(argv[2]);
+		std::cout << "Detector measurement set-up done" << std::endl;
+	}
+
+
+	/** - start measurement */
+	pDetector->startMeasurement();
+	std::cout << "measurement finished" << std::endl;
+
+	/** - returning when acquisition is finished or data are avilable */
+
+	/** - delete slsDetectorUsers object */
+	delete pDetector;
+
+	return 0;
+}
+

manual/manual-api/mainReceiver.cpp

@@ -0,0 +1,306 @@
+/**
+ \file mainReceiver.cpp
+
+This file is an example of how to implement the slsReceiverUsers class
+You can compile it linking it to the slsReceiver library
+
+g++ mainReceiver.cpp -L lib -lSlsReceiver -L/usr/lib64/ -L lib2 -lzmq  -pthread -lrt -lm -lstdc++
+
+where,
+
+lib is the location of lSlsReceiver.so
+
+lib2 is the location of the libzmq.a.
+[ libzmq.a is required only when using data call backs and enabling data streaming from receiver to client.
+It is linked in manual/manual-api from slsReceiverSoftware/include ]
+
+ */
+
+#include "sls_detector_defs.h"
+#include "slsReceiverUsers.h"
+
+#include <csignal>	//SIGINT
+#include <cstdlib>		//system
+#include <cstring>
+#include <iostream>
+//#include "utilities.h"
+//#include "logger.h"
+#include <cerrno>
+#include <string>
+#include <sys/types.h>	//wait
+#include <sys/wait.h>	//wait
+#include <syscall.h>	//tid
+#include <unistd.h> 	//usleep
+using namespace std;
+
+
+/** Define Colors to print data call back in different colors for different recievers */
+#define PRINT_IN_COLOR(c,f, ...) 	printf ("\033[%dm" f RESET, 30 + c+1, ##__VA_ARGS__)
+
+
+/** Variable is true to continue running, set to false upon interrupt */
+bool keeprunning;
+
+/**
+ * Control+C Interrupt Handler
+ * Sets the variable keeprunning to false, to let all the processes know to exit properly
+ */
+void sigInterruptHandler(int p){
+	keeprunning = false;
+}
+
+/**
+ * prints usage of this example program
+ */
+void printHelp() {
+	cprintf(RESET, "Usage:\n"
+			"./slsMultiReceiver(detReceiver) [start_tcp_port] [num_receivers] [1 for call back, 0 for none]\n\n");
+	exit(EXIT_FAILURE);
+}
+
+/**
+ * Start Acquisition Call back
+ * slsReceiver writes data if file write enabled.
+ * Users get data to write using call back if registerCallBackRawDataReady is registered.
+ * @param filepath file path
+ * @param filename file name
+ * @param fileindex file index
+ * @param datasize data size in bytes
+ * @param p pointer to object
+ * \returns ignored
+ */
+int StartAcq(char* filepath, char* filename, uint64_t fileindex, uint32_t datasize, void*p){
+	cprintf(BLUE, "#### StartAcq:  filepath:%s  filename:%s fileindex:%llu  datasize:%u ####\n",
+			filepath, filename, (long long unsigned int)fileindex, datasize);
+
+	cprintf(BLUE, "--StartAcq: returning 0\n");
+	return 0;
+}
+
+/**
+ * Acquisition Finished Call back
+ * @param frames Number of frames caught
+ * @param p pointer to object
+ */
+void AcquisitionFinished(uint64_t frames, void*p){
+	cprintf(BLUE, "#### AcquisitionFinished: frames:%llu ####\n",(long long unsigned int)frames);
+}
+
+
+/**
+ * Get Receiver Data Call back
+ * Prints in different colors(for each receiver process) the different headers for each image call back.
+ * @param metadata sls_receiver_header metadata
+ * @param datapointer pointer to data
+ * @param datasize data size in bytes.
+ * @param p pointer to object
+ */
+void GetData(char* metadata, char* datapointer, uint32_t datasize, void* p){
+	slsDetectorDefs::sls_receiver_header* header = (slsDetectorDefs::sls_receiver_header*)metadata;
+	slsDetectorDefs::sls_detector_header detectorHeader = header->detHeader;
+
+	PRINT_IN_COLOR (detectorHeader.modId?detectorHeader.modId:detectorHeader.row,
+			"#### %d GetData: ####\n"
+			"frameNumber: %lu\t\texpLength: %u\t\tpacketNumber: %u\t\tbunchId: %lu"
+			"\t\ttimestamp: %lu\t\tmodId: %u\t\t"
+			"row: %u\t\tcolumn: %u\t\treserved: %u\t\tdebug: %u"
+			"\t\troundRNumber: %u\t\tdetType: %u\t\tversion: %u"
+			//"\t\tpacketsMask:%s"
+			"\t\tfirstbytedata: 0x%x\t\tdatsize: %u\n\n",
+			detectorHeader.row, (long unsigned int)detectorHeader.frameNumber,
+			detectorHeader.expLength, detectorHeader.packetNumber, (long unsigned int)detectorHeader.bunchId,
+			(long unsigned int)detectorHeader.timestamp, detectorHeader.modId,
+			detectorHeader.row, detectorHeader.column, detectorHeader.reserved,
+			detectorHeader.debug, detectorHeader.roundRNumber,
+			detectorHeader.detType, detectorHeader.version,
+			//header->packetsMask.to_string().c_str(),
+            ((uint8_t)(*((uint8_t*)(datapointer)))), datasize);
+}
+
+
+
+/**
+ * Get Receiver Data Call back (modified)
+ * Prints in different colors(for each receiver process) the different headers for each image call back.
+ * @param metadata sls_receiver_header metadata
+ * @param datapointer pointer to data
+ * @param datasize data size in bytes.
+ * @param revDatasize new data size in bytes after the callback.
+ * This will be the size written/streamed. (only smaller value is allowed).
+ * @param p pointer to object
+ */
+void GetData(char* metadata, char* datapointer, uint32_t &revDatasize, void* p){
+	slsDetectorDefs::sls_receiver_header* header = (slsDetectorDefs::sls_receiver_header*)metadata;
+	slsDetectorDefs::sls_detector_header detectorHeader = header->detHeader;
+
+	PRINT_IN_COLOR (detectorHeader.modId?detectorHeader.modId:detectorHeader.row,
+			"#### %d GetData: ####\n"
+			"frameNumber: %llu\t\texpLength: %u\t\tpacketNumber: %u\t\tbunchId: %llu"
+			"\t\ttimestamp: %llu\t\tmodId: %u\t\t"
+			"row: %u\t\tcolumn: %u\t\treserved: %u\t\tdebug: %u"
+			"\t\troundRNumber: %u\t\tdetType: %u\t\tversion: %u"
+			//"\t\tpacketsMask:%s"
+			"\t\tfirstbytedata: 0x%x\t\tdatsize: %u\n\n",
+			detectorHeader.row, (long long unsigned int)detectorHeader.frameNumber,
+			detectorHeader.expLength, detectorHeader.packetNumber, (long long unsigned int)detectorHeader.bunchId,
+			(long long unsigned int)detectorHeader.timestamp, detectorHeader.modId,
+			detectorHeader.row, detectorHeader.column, detectorHeader.reserved,
+			detectorHeader.debug, detectorHeader.roundRNumber,
+			detectorHeader.detType, detectorHeader.version,
+			//header->packetsMask.to_string().c_str(),
+			((uint8_t)(*((uint8_t*)(datapointer)))), revDatasize);
+
+	// if data is modified, eg ROI and size is reduced
+	revDatasize = 26000;
+}
+
+
+
+
+/**
+ * Example of main program using the slsReceiverUsers class
+ *
+ * - Defines in file for:
+ *  	- Default Number of receivers is 1
+ *  	- Default Start TCP port is 1954
+ */
+int main(int argc, char *argv[]) {
+
+	/**	- set default values */
+	int numReceivers = 1;
+	int startTCPPort = 1954;
+	int withCallback = 0;
+	keeprunning = true;
+
+	/**	- get number of receivers and start tcp port from command line arguments */
+	if ( (argc != 4) || (!sscanf(argv[1],"%d", &startTCPPort)) || (!sscanf(argv[2],"%d", &numReceivers)) || (!sscanf(argv[3],"%d", &withCallback)) )
+		printHelp();
+	cprintf(BLUE,"Parent Process Created [ Tid: %ld ]\n", (long)syscall(SYS_gettid));
+	cprintf(RESET, "Number of Receivers: %d\n", numReceivers);
+	cprintf(RESET, "Start TCP Port: %d\n", startTCPPort);
+	cprintf(RESET, "Callback Enable: %d\n", withCallback);
+
+
+
+	/** - Catch signal SIGINT to close files and call destructors properly */
+	struct sigaction sa;
+	sa.sa_flags=0;							// no flags
+	sa.sa_handler=sigInterruptHandler;		// handler function
+	sigemptyset(&sa.sa_mask);				// dont block additional signals during invocation of handler
+	if (sigaction(SIGINT, &sa, nullptr) == -1) {
+		cprintf(RED, "Could not set handler function for SIGINT\n");
+	}
+
+	/** - Ignore SIG_PIPE, prevents global signal handler, handle locally,
+	   instead of a server crashing due to client crash when writing, it just gives error */
+	struct sigaction asa;
+	asa.sa_flags=0;							// no flags
+	asa.sa_handler=SIG_IGN;					// handler function
+	sigemptyset(&asa.sa_mask);				// dont block additional signals during invocation of handler
+	if (sigaction(SIGPIPE, &asa, nullptr) == -1) {
+		cprintf(RED, "Could not set handler function for SIGPIPE\n");
+	}
+
+
+	/** - loop over number of receivers */
+	for (int i = 0; i < numReceivers; ++i) {
+
+		/**	- fork process to create child process */
+		pid_t pid = fork();
+
+		/**	- if fork failed, raise SIGINT and properly destroy all child processes */
+		if (pid < 0) {
+			cprintf(RED,"fork() failed. Killing all the receiver objects\n");
+			raise(SIGINT);
+		}
+
+			/**	- if child process */
+		else if (pid == 0) {
+			cprintf(BLUE,"Child process %d [ Tid: %ld ]\n", i, (long)syscall(SYS_gettid));
+
+			char temp[10];
+			sprintf(temp,"%d",startTCPPort + i);
+			char* args[] = {(char*)"ignored", (char*)"--rx_tcpport", temp};
+			int ret = slsDetectorDefs::OK;
+			/**	-  create slsReceiverUsers object with appropriate arguments */
+			slsReceiverUsers *receiver = new slsReceiverUsers(3, args, ret);
+			if(ret==slsDetectorDefs::FAIL){
+				delete receiver;
+				exit(EXIT_FAILURE);
+			}
+
+
+			/**	- register callbacks. remember to set file write enable to 0 (using the client)
+		  if we should not write files and you will write data using the callbacks */
+			if (withCallback) {
+
+				/** - Call back for start acquisition */
+				cprintf(BLUE, "Registering 	StartAcq()\n");
+				receiver->registerCallBackStartAcquisition(StartAcq, nullptr);
+
+				/** - Call back for acquisition finished */
+				cprintf(BLUE, "Registering 	AcquisitionFinished()\n");
+				receiver->registerCallBackAcquisitionFinished(AcquisitionFinished, nullptr);
+
+				/* 	- Call back for raw data */
+				cprintf(BLUE, "Registering     GetData() \n");
+				if (withCallback == 1) receiver->registerCallBackRawDataReady(GetData,nullptr);
+				else if (withCallback == 2) receiver->registerCallBackRawDataModifyReady(GetData,nullptr);
+			}
+
+
+
+			/**	- start tcp server thread */
+			if (receiver->start() == slsDetectorDefs::FAIL){
+				delete receiver;
+				cprintf(BLUE,"Exiting Child Process [ Tid: %ld ]\n", (long)syscall(SYS_gettid));
+				exit(EXIT_FAILURE);
+			}
+
+			/**	- as long as keeprunning is true (changes with Ctrl+C) */
+			while(keeprunning)
+				pause();
+			/**	- interrupt caught, delete slsReceiverUsers object and exit */
+			delete receiver;
+			cprintf(BLUE,"Exiting Child Process [ Tid: %ld ]\n", (long)syscall(SYS_gettid));
+			exit(EXIT_SUCCESS);
+			break;
+		}
+	}
+
+	/** - Parent process ignores SIGINT (exits only when all child process exits) */
+	sa.sa_flags=0;							// no flags
+	sa.sa_handler=SIG_IGN;					// handler function
+	sigemptyset(&sa.sa_mask);				// dont block additional signals during invocation of handler
+	if (sigaction(SIGINT, &sa, nullptr) == -1) {
+		cprintf(RED, "Could not set handler function for SIGINT\n");
+	}
+
+
+	/** - Print Ready and Instructions how to exit */
+	cout << "Ready ... " << endl;
+	cprintf(RESET, "\n[ Press \'Ctrl+c\' to exit ]\n");
+
+	/** - Parent process waits for all child processes to exit */
+	for(;;) {
+		pid_t childPid = waitpid (-1, nullptr, 0);
+
+		// no child closed
+		if (childPid == -1) {
+			if (errno == ECHILD) {
+				cprintf(GREEN,"All Child Processes have been closed\n");
+				break;
+			} else {
+				cprintf(RED, "Unexpected error from waitpid(): (%s)\n",strerror(errno));
+				break;
+			}
+		}
+
+		//child closed
+		cprintf(BLUE,"Exiting Child Process [ Tid: %ld ]\n", (long int) childPid);
+	}
+
+	cout << "Goodbye!" << endl;
+	return 0;
+}
+

manual/manual-api/slsDetectorUsers.doxy

@@ -0,0 +1,91 @@
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+INTERNAL_DOCS = NO
+
+SHOW_INCLUDE_FILES = YES
+
+SHOW_FILES = YES
+
+SHOW_NAMESPACES = NO
+
+COMPACT_LATEX = YES
+
+PAPER_TYPE = a4
+
+PDF_HYPERLINKS = YES
+
+USE_PDFLATEX = YES
+
+LATEX_HIDE_INDICES = YES
+
+SOURCE_BROWSER	= YES
+
+PREDEFINED           = __cplusplus
+ 
+INPUT            = 		../../slsDetectorSoftware/slsDetector/slsDetectorUsers.h		\
+					 	../../slDetectorSoftware/slsDetectorAnalysis/detectorData.h 	\
+					 	../../slsReceiverSoftware/include/slsReceiverUsers.h 			\
+					 	mainClient.cpp 													\
+					 	mainReceiver.cpp
+
+OUTPUT_DIRECTORY = slsDetectorUsersDocs

manual/manual-calwiz/Makefile

@@ -0,0 +1,56 @@
+DESTDIR?=../docs
+
+
+#manual-api manual-calwiz manual-client manual-gui manual-main
+
+TEX=latex
+
+MAINTEXS= angularCalibrationHowTo.tex energyCalibrationHowTo.tex 
+
+TEXS=ancCal.tex enCal.tex installation.tex 
+
+DVIS = $(MAINTEXS:.tex=.dvi)
+PSS = $(MAINTEXS:.tex=.ps)
+PDFS = $(MAINTEXS:.tex=.pdf)
+HTMLS = $(MAINTEXS:%.tex=%)
+
+
+all: pdf html
+	echo $(PWD)
+	echo $(PDFS)
+	echo $(HTMLS)
+
+
+pdf: $(PDFS)
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	$(shell test -d $(DESTDIR)/pdf || mkdir -p $(DESTDIR)/pdf)
+	mv $(PDFS) $(DESTDIR)/pdf	
+
+html: $(HTMLS)
+
+$(HTMLS): $(TEXS) $(MAINTEXS)
+	$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
+	$(shell test -d $(DESTDIR)/html || mkdir -p $(DESTDIR)/html)                     
+	$(shell test -d $(DESTDIR)/html/$@ && rm -r $(DESTDIR)/html/$@)
+	latex $@.tex
+	latex2html -split 4 $@.tex
+	mv $@ $(DESTDIR)/html
+
+%.dvi : %.tex $(TEXS)
+	latex $<
+	latex $<
+
+%.ps : %.dvi
+	dvips -o $@  $< 
+
+
+%.pdf : %.ps
+	ps2pdf  $<  $@
+
+
+clean:
+	rm -rf *.aux *.log *.toc *.out $(DVIS) $(PSS) $(PDFS) $(HTMLS)
+	rm -rf $(DESTDIR)/html/angularCalibrationHowTo
+	rm -rf $(DESTDIR)/html/energyCalibrationHowTo
+	rm -rf $(DESTDIR)/pdf/angularCalibrationHowTo.pdf
+	rm -rf $(DESTDIR)/pdf/energyCalibrationHowTo.pdf

manual/manual-calwiz/ancCal.tex

@@ -0,0 +1,171 @@
+
+In order to convert from strip number to 2$\theta$-angle, an accurate angular calibration of the detector must be performed (for details see the paper Bergamaschi, A. et al. (2010). J. Synchrotron Rad. 17, 653-668). \\
+
+For this purpose, a series of patterns of a powder standard with symmetric peaks (e.g. silicon) must acquired while shifting the detector by an angular step of the order of about 2\% of the module size. During the measurement, a strong intensity peak (e.g. Si(111)) should pass through the field of view of every module such that it can be used as a reference angular position to perform the calibration of the modules position.\\
+
+In a first step, the   peak is fitted with a Gaussian in order to determine its position $C_{peak}$ in channel number for each of the acquired patterns.\\
+In a second step, for each module $i$, the encoder position  $\Theta_e$  is fitted as a function of the peak position  $C_{peak}$  according to:
+\begin{equation}\label{eq:angcal}
+\Theta_e=\Theta_o^i-\arctan\Big(\frac{p \cdot (C_{peak}-C_{center}^i)}{R^i}\Big),
+\end{equation} 
+where the parameters $\Theta_o^i$ is the angular offset with respect to the diffractometer zero position, $C_{center}^{i}$ is the central channel  and $R^i$ is the distance of the module $i$ from the diffractometer center while $p=50~\mu m$ is the strip pitch of the detector. \\
+Finally, the global offset of the detector system is precisely determined by refining a silicon pattern at a well-defined energy (i.e., knowing the position of the peak).
+
+The same function of equation~\ref{eq:angcal}, with the parameters obtained from the calibration, is used in order to convert from channel number to 2$\theta$-angle.
+
+The parallax at the borders of the modules due to the thickness of the silicon sensor is a function of the X-ray energy (higher energy X-rays are absorbed deeper inside the sensor) and is of the order of 0.2~mdeg at 12~keV and 0.5~mdeg at 30~keV. \\
+The differences in pixel size due to the different portion of solid angle covered by the strips on the border of the modules and  the higher efficiency due to the longer path of the X-rays in the sensor are removed by the flat field correction. This also normalizes additional differences in pixel size between channels which are also present because of mismatches in the strip sensor fabrication and in fluctuations of the channels threshold level.
+ 
+Patterns acquired at different detector positions are generally merged together  in order to fill the gaps between the modules and correct possibly bad functioning channels. In this procedure the data from different positions which are closer than 4~mdeg (the average pixel size) are averaged and the new position is set to the mean of the positions of the original points.
+
+
+The position and width of the peaks results from a fit over several detector channels. Geometrical distortions might disturb this determination mainly because of errors in the angular calibration, fluctuations in the encoder position, variations between channels and parallax effects.\\
+The resolution in locating the peak center and determining its width and integrated intensity has been estimated by acquiring several patterns of a LaB$_6$ sample in a 300~$\mu$m capillary with the detector shifted in 5~mdeg steps between 30.4 and 36.5 degrees. The 16~peaks acquired have been fitted with a Gaussian function plus background and the fluctuations on the fitted parameters have been calculated. The resulting average resolutions are  0.63$\pm$0.06~mdeg for the peak center and 0.22$\pm$0.05~mdeg for the peak Full-Width at Half-Maximum (FWHM) for an average peak FWHM of 27.0$\pm$2.5~mdeg. \\
+These results show that  the angular calibration allows a resolution in determining the peaks position and width which is appropriate for structural determination.
+
+\section{Data acquisition}
+
+The angular calibration consists in acquiring a set of diffraction patterns of a well known powder standard (e.g. Silicon) at different encoder positions.  In order to facilitate the procedure, the sample should not emit fluorescent light and should present relatively symmetric peaks. \\
+During the measurement, a strong intensity peak (e.g. Si(111)) should pass through the field of view of every module such that it can be used as a reference angular position to perform the calibration of the modules position. In general the highest peak will be used for the calibration, but this is not necessary in case there would be e.g. geometrical limitations for shifting the detector. \\ \textbf{Do not forget to properly position the beam stopper if the detector is scanned in front of the direct beam.}\\
+The detector should be shifted of an angular step of the order of about 2\% of the module size, such that about 50 patterns can contribute to the fitting of the 3 parameters necessary for the angular calibration.\\
+ 
+All the angular calibration procedure should be acquired using a trimmed detector with the threshold set at half of the X-ray energy (Assuming no fluorescent element in the standard). A flat field should also be acquired in order to precisely correct the data, while the X-ray intensity should be kept lower than about 100~kHz per strip in order to avoid the need for rate corrections.
+
+A rough angular conversion file starting from a previous calibration or from the geometric characteristics of the mechanics is an advantage. The angular conversion file should contain a line for each module of the detector with its module number $i$, center  $C_{center}^{i}$ and error, conversion radius $p/R^i$ and error, offset $\Theta_o^i$ and error:
+\begin{verbatim}
+module 0 center 639.5 +- 0 conversion 6.56E-05 +- 0 offset 0 +- 0
+\end{verbatim}
+Also the \textit{global offset} value of the beamline should be approximately known i.e. the angular position of channel 0 of module 0 when the motor is set at 0. \\
+All the documentation assumes that the detector is oriented in the same direction as the encoder position i.e. large channel number at higher angles (both per module and absolute). If this is not the case, the \textit{angular direction} should be set to -1. 
+
+\subsection{Software}
+
+For the acquisition ot the data you need to install the slsDetector software package (please refere to separate documentation). The use of the GUI is optional and all operations can be performed also using the text client.\\
+
+Please make sure that you have edited the \\
+\textit{slsDetectorSoftware/usersFunctions/angleFunction.h} \\
+in order to match the angular conversion for your geometry and \\
+\textit{slsDetectorSoftware/usersFunctions/usersFunctions.cpp} \\
+in order to be able to move the detector and read out its position by using the slsDetector software.
+
+In the following the command to acquire a dataset for the angular calibration with an exposure time of 1~s, and position shift 
+\begin{verbatim}
+#setup angular calibration log mode
+> sls_detector_put angcallog 1 
+#set exposure time to 1s
+> sls_detector_put exptime 1. 
+#setup threshold scan
+> sls_detector_put scan0script position 
+#setup the precision for the scan variable in the file name
+> sls_detector_put scan0prec 2 
+#set scan range between 20deg and -60deg, step of -0.1deg
+# (at 12.4 keV the Si(111) peak is at approx 19deg
+> sls_detector_put scan0range 20 -60 -0.1 
+#acquire the data
+> sls_detector_acquire
+#unset angular calibration log mode
+> sls_detector_put angcallog 0
+\end{verbatim}
+
+With the GUI you can obtain the same results by clicking on the \textit{Angular calibration} log button in the advanced tab (see figure~\ref{fig:guiangcallog}) and setting up the motor position scan in the Actions tab (see figure~\ref{fig:guiposscan}). The exposure time should also be set in the measurement tab.
+
+
+
+Additional to the data files, the acquisition will produce a .angcal file containing an header and, for each step of the acquisition, the exect value of the motor position and the file name. \\
+In case you forgot to enable the angcallog flag in the software, you can produce the file with the syntax as follows, assuming that you know the exact values of your encoder for each frame:
+\begin{verbatim}
+type Mythen
+maxmod 32
+nmod 32
+angconv /scratch/angcal20120422/ang.off
+globaloff 5.088
+fineoff 0.0
+angdir 1
+ffdir /scratch/angcal20120422/
+flatfield flatfield_E12keV_T6keV_0.raw
+badchannels /scratch/cal/bad.chans
+19.99998 angcal_S20.00_0
+19.90001 angcal_S19.90_0
+19.79999 angcal_S19.80_0
+19.70002 angcal_S19.70_0
+......
+\end{verbatim}
+
+
+
+\begin{figure}
+\caption{Acquisition GUI window to enable the angular calibration log.} \label{fig:guiangcallog}
+\includegraphics[width=\textwidth]{enable_angcal.eps}
+\end{figure} 
+
+\begin{figure}
+\caption{Acquisition GUI window to setup the motor position scan.} \label{fig:guiposscan}
+\includegraphics[width=\textwidth]{position_scan.eps}
+\end{figure} 
+\newpage
+
+\section{Data analysis}
+
+The data analysis consists in fitting with a gaussian the selected peak of the powder pattern for each position in order to determine its position is channel number as a function of the encoder position. \\
+In a second step, for each module, the channel vs. encoder curve is fitted in order to extrapolate the three parameters necessary for the angular conversion and the result is written to file
+
+\subsection{Software}
+
+The software used for the angular calibration data analysis is based on root (see http://root.cern.ch).\\
+This can be downloaded as binary or installed from sources. The version of the software should not play an important role, but up to now everything has been implemented and tested using version 5.20.
+
+To start the data analysis simply launch:
+\begin{verbatim}
+> ./angularCalibrationWizard 
+\end{verbatim}
+
+\begin{figure}
+\caption{Overview of the nagular calibration dataset.} \label{fig:setangcal}
+\includegraphics[width=\textwidth]{setupAngcal.eps}
+\end{figure} 
+
+To setup the angular calibration dataset, the .angcal file should be selected (or digited) and the load button should be pressed to confirm. The parameters of the angular calibration are then read to the file and the data loaded for a quick overview (see figure~\ref{fig:setangcal}).\\
+The software assumes that the data files (.raw) and the .encal file are in the same directory.\\
+A 2D color plot will show a rebinned overview of the dataset. The peak to be fitted should be visible as a high intensity diagonal line passing through all the channels.
+
+
+\begin{figure}
+\caption{Preview of the fitting of the Si(111) peak for one of the detector positions.} \label{fig:peakfit}
+\includegraphics[width=\textwidth]{peakFit.eps}
+\end{figure} 
+
+For a more detailed view of the data, one can select an angular calibration step from the combo box, select the plot mode (raw data or processed data as a function of channel number, processed angular converted data, flat field data, or again an overview of the whole dataset). \\
+By (right) clicking close to the axis you are able to zoom in/out, set the scale to logarithmic etc.\\
+
+If the bad channel list, angular conversion file or flat field file are changed compared to the acquisition, they can be reloaded by editing the correspondent text entries and pressing enter.
+
+In particular, the angular converted data should be checked in order to view the position of the selected peak. In this case, the plot will be zoomed to the angular region slected in the minimum and maximum angle entries. By pressing fit, the fit of the peak in the selected angular range will be shown (see figure~\ref{fig:peakfit}).  It is useful to check that it works properly in several positions such that then the sequential fitting on all steps can give good results.
+
+To automatically fit all positions simply press \textit{Proceed to Modules Calibration} and wait until all steps are fitted. This can take sometime, depending on the number of steps.
+
+
+\begin{figure}
+\caption{Window for fitting the angular calibration parameters of a module.} \label{fig:anglefit}
+\includegraphics[width=\textwidth]{angleFit.eps}
+\end{figure} 
+
+
+
+
+
+In the module calibration window (see figure~\ref{fig:anglefit}), you will be able to fit the channel number to encoder position curve to estimate the three angular calibration parameters for each module.\\
+The entries show the angular calibration parameters used for approximate angular conversion in the previous step of the calibration. These can be edited and will be used as start parameters for the fit.
+By clicking on the check box next to the parameters, the selected parameter will be set and fixed during the fit. Often the center is used as a fix parameter.\\
+It is possible to navigate between modules by using the Previous and Next module buttons. To refit the current module (e.g. after changing one of the parameters) simply re-click on the module number.
+
+After fitting all modules you can click on the \textit{Write Angular Calibration} button, select the file name to write to and save the calibration angulat calibration data. Please note that the offset of module 0 will always be 0 and the other values will be rescaled to its value. Therefore the global offset of the steup will always need to be specified for a proper angular conversion unless the home of the encoder will not be redifined.
+
+\section{Setup calibration files}
+
+To use the generated angular calibration files, using the text client:
+\begin{verbatim}
+sls_detector_put angconv /scratch/ang_new.off 
+\end{verbatim}
+while for the GUI the file name should be specified in the configuration file (works also for the text client).
+\end{document}
+