Merge branch 'fix_v3.1.1_issues' into 'master'

Fix v3.1.1 issues

Closes #4, #9, #12, and #13

See merge request !4

.gitlab-ci.yml

+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+stages:
+  - build
+  - deploy
+
+.build-conda: &build-conda
+  stage: build
+  artifacts:
+    paths:
+      - dist/
+  tags:
+    - conda
+
+build-linux:
+  <<: *build-conda
+  script:
+    - conda build ./conda/camera --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
+  tags:
+    - linux
+
+build-noarch:
+  <<: *build-conda
+  script:
+    - conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
+
+deploy-devel:
+  stage: deploy
+  environment:
+    name: devel/$CI_COMMIT_REF_NAME
+    url: http://bcu-ci.esrf.fr/devel
+  dependencies:
+    - build-linux
+    - build-noarch
+  script:
+    - cp -Rf dist/* /conda-devel/
+    - conda index /conda-devel/
+  tags:
+    - conda
+    - linux
+  only:
+    - branches
+  except:
+    - stable
+  when: manual
+
+deploy-stable:
+  stage: deploy
+  environment:
+    name: production
+    url: http://bcu-ci.esrf.fr/stable
+  dependencies:
+    - build-linux
+    - build-noarch
+  script:
+    - cp -Rf dist/* /conda/
+    - conda index /conda/
+  tags:
+    - conda
+    - linux
+  only:
+    - tags
+    - stable

CMakeLists.txt

@@ -5,71 +5,208 @@
 #  European Synchrotron Radiation Facility
 #  BP 220, Grenoble 38043
 #  FRANCE
-# 
+#
 #  Contact: lima@esrf.fr
-# 
+#
 #  This is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
-# 
+#
 #  This software is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ############################################################################
+
+cmake_minimum_required(VERSION 3.1)
+
+project(slsdetector)
+
 set(NAME slsdetector)
 
-set(SLS_DETECTOR_DIR slsDetectorPackage)
+# Include additional modules that are used inconditionnaly
+include(GNUInstallDirs)
+include(GenerateExportHeader)
+
+# If conda build, always set lib dir to 'lib'
+if(NOT LIMA_ENABLE_NUMA)
+  message(FATAL_ERROR
+          "slsdetector requires NUMA control in Lima: set LIMA_ENABLE_NUMA ON")
+endif()
+
+# If conda build, always set lib dir to 'lib'
+if($ENV{CONDA_BUILD})
+  set(CMAKE_INSTALL_LIBDIR "lib")
+endif()
+
+# Set lower / upper case project names
+string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER)
+string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
+
+# Set targets export name (used by lima and dependencies)
+set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWER}-targets")
+#set(namespace "${PROJECT_NAME}::")
+
+# Check if project is being used directly or via add_subdirectory
+set(CAMERA_MASTER_PROJECT OFF)
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(CAMERA_MASTER_PROJECT ON)
+endif()
+
+if (CAMERA_MASTER_PROJECT)
+  find_package(Lima REQUIRED)
+endif()
+
+# CMake additional macros
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
+
+# Set version
+include(project_version)
+
+# Enable python binding code compilation using sip generator
+if (CAMERA_MASTER_PROJECT)
+  option(LIMA_ENABLE_PYTHON "compile python binding code?" OFF)
+endif()
+
+if (LIMA_ENABLE_PYTHON)
+  # Find python interpreter and libs
+  find_package(PythonInterp)
+  find_package(PythonLibs)
+  if(${PYTHONINTERP_FOUND})
+    # python site-packages folder
+    execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
+      OUTPUT_VARIABLE _PYTHON_SITE_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+
+  set(PYTHON_SITE_PACKAGES_DIR ${_PYTHON_SITE_PACKAGES_DIR} CACHE PATH "where should python modules be installed?")
+
+  find_package(SIP REQUIRED)
+  include(SIPMacros)
+  if(WIN32)
+    set(SIP_TAGS WIN32_PLATFORM)
+  elseif(UNIX)
+    set(SIP_TAGS POSIX_PLATFORM)
+  endif(WIN32)
+  set(SIP_EXTRA_OPTIONS -e -g)
+
+  find_package(NumPy REQUIRED)
+endif()
+
+# Additional packages
+find_package(Numa REQUIRED)
+
+# slsDetectorPackage
+set(SLS_DETECTOR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/slsDetectorPackage)
 set(SLS_DETECTOR_SW ${SLS_DETECTOR_DIR}/slsDetectorSoftware)
 set(SLS_DETECTOR_RECV ${SLS_DETECTOR_DIR}/slsReceiverSoftware)
 
 option (USE_TEXTCLIENT "Text Client" ON)
 option (USE_RECEIVER "Receiver" ON)
-option (USE_GUI "GUI" ON)
+option (USE_GUI "GUI" OFF)
 
 add_subdirectory(${SLS_DETECTOR_DIR})
 
-set(${NAME}_srcs src/SlsDetectorDefs.cpp
-		 src/SlsDetectorArgs.cpp
-		 src/SlsDetectorCPUAffinity.cpp
-		 src/SlsDetectorModel.cpp
-		 src/SlsDetectorReceiver.cpp
-		 src/SlsDetectorCamera.cpp
-		 src/SlsDetectorEiger.cpp
-		 src/SlsDetectorInterface.cpp)
-
-add_library(lima${NAME} SHARED ${${NAME}_srcs})
-
-target_include_directories(lima${NAME} PUBLIC 
-			   include
-			   ${SLS_DETECTOR_SW}/include
-			   ${SLS_DETECTOR_SW}/commonFiles
-			   ${SLS_DETECTOR_SW}/slsDetector
-			   ${SLS_DETECTOR_SW}/multiSlsDetector
-			   ${SLS_DETECTOR_SW}/slsDetectorServer
-			   ${SLS_DETECTOR_SW}/slsDetectorAnalysis
-			   ${SLS_DETECTOR_SW}/slsReceiverInterface
-			   ${SLS_DETECTOR_RECV}/include)
-
-target_link_libraries(lima${NAME}
-		      limacore
-		      slsDetectorShared slsReceiverShared zmq)
-
-limatools_set_library_soversion(lima${NAME} VERSION)
-install(TARGETS lima${NAME} LIBRARY DESTINATION lib)
+file(GLOB_RECURSE SLSDETECTOR_INCS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
+
+add_library(slsdetector SHARED
+  src/SlsDetectorDefs.cpp
+  src/SlsDetectorArgs.cpp
+  src/SlsDetectorCPUAffinity.cpp
+  src/SlsDetectorModel.cpp
+  src/SlsDetectorReceiver.cpp
+  src/SlsDetectorCamera.cpp
+  src/SlsDetectorEiger.cpp
+  src/SlsDetectorInterface.cpp
+  ${SLSDETECTOR_INCS}
+)
+
+# Generate export macros
+generate_export_header(slsdetector)
+
+# Set version and output name
+set_target_properties(slsdetector PROPERTIES
+  OUTPUT_NAME "lima${PROJECT_NAME_LOWER}"
+  VERSION "${PROJECT_VERSION}"
+  SOVERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
+
+# Add dependencies
+target_include_directories(slsdetector
+    PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/include>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/commonFiles>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/slsDetector>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/multiSlsDetector>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/slsDetectorServer>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/slsDetectorAnalysis>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_SW}/slsReceiverInterface>"
+    PUBLIC "$<BUILD_INTERFACE:${SLS_DETECTOR_RECV}/include>"
+    PUBLIC "$<BUILD_INTERFACE:${NUMA_INCLUDE_DIR}>"
+    PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"           # For export header
+    PUBLIC "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
 
+message("NUMA_LIBRARY=" ${NUMA_LIBRARY})
+
+target_link_libraries(slsdetector
+  PUBLIC limacore
+  PUBLIC slsDetectorShared slsReceiverShared zmq
+  PUBLIC ${NUMA_LIBRARY}
+)
+
+# Binding code for python
 if(LIMA_ENABLE_PYTHON)
-    limatools_run_sip_for_camera(${NAME})
-    install(FILES python/__init__.py DESTINATION 
-            ${PYTHON_SITE_PACKAGES_DIR}/Lima/SlsDetector)
+  include(LimaTools)
+  limatools_run_sip_for_camera(slsdetector)
 endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+# Generate and install package config file and version
+if(CAMERA_MASTER_PROJECT)
+  set (PROJECT_LIBRARIES slsdetector)
+  set(SIP_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/sip/lima)
+  set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/lima)
+  include(package_config)
+endif()
+
+## Installation
+
+install(
+  TARGETS slsdetector
+  EXPORT "${TARGETS_EXPORT_NAME}"
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}   # import library
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}   # .so files are libraries
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}   # .dll files are binaries
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}  # this does not actually install anything (but used by downstream projects)
+)
+
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+  COMPONENT devel
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  FILES_MATCHING PATTERN "*.h"
+)
+
+install(
+  FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/project_version.h
+    ${PROJECT_BINARY_DIR}/slsdetector_export.h
+  COMPONENT devel
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+if(LIMA_ENABLE_PYTHON)
+  install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/
+    DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/SlsDetector"
+  )
+endif()
 
-if(LIMA_ENABLE_TESTS)
-	add_subdirectory(test/)
+## Tests
+if(CAMERA_ENABLE_TESTS)
+    enable_testing()
+    #add_subdirectory(test)
 endif()

VERSION

-1.7.0

cmake/FindNuma.cmake

+# Module for locating libnuma
+#
+# Read-only variables:
+#   NUMA_FOUND
+#     Indicates that the library has been found.
+#
+#   NUMA_INCLUDE_DIR
+#     Points to the libnuma include directory.
+#
+#   NUMA_LIBRARY_DIR
+#     Points to the directory that contains the libraries.
+#     The content of this variable can be passed to link_directories.
+#
+#   NUMA_LIBRARY
+#     Points to the libnuma that can be passed to target_link_libararies.
+#
+# Copyright (c) 2015 Steve Borho
+
+include(FindPackageHandleStandardArgs)
+
+find_path(NUMA_ROOT_DIR
+  NAMES include/numa.h
+  PATHS ENV NUMA_ROOT
+  DOC "NUMA root directory")
+
+find_path(NUMA_INCLUDE_DIR
+  NAMES numa.h
+  HINTS ${NUMA_ROOT_DIR}
+  PATH_SUFFIXES include
+  DOC "NUMA include directory")
+
+find_library(NUMA_LIBRARY
+  NAMES numa
+  HINTS ${NUMA_ROOT_DIR}
+  DOC "NUMA library")
+
+if (NUMA_LIBRARY)
+    get_filename_component(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH)
+endif()
+
+mark_as_advanced(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY)
+
+find_package_handle_standard_args(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY)

cmake/project-config.cmake.in

+# Config file for @PROJECT_NAME_LOWER@
+#
+# It defines the following variables:
+#
+# @PROJECT_NAME_UPPER@_INCLUDE_DIRS     - include directory
+# @PROJECT_NAME_UPPER@_LIBRARIES        - all dynamic libraries
+# @PROJECT_NAME_UPPER@_STATIC_LIBRARIES - all static libraries
+
+@PACKAGE_INIT@
+
+# Add dependencies here
+include(CMakeFindDependencyMacro)
+find_dependency(Lima)
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")
+
+check_required_components(@PROJECT_NAME_LOWER@)

conda/camera/bld.bat

+cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DCAMERA_ENABLE_PYTHON=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
+IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+cmake --build build --config Release --target install
+IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%

conda/camera/build.sh

+#!/bin/bash
+cmake -Bbuild -H. -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_NUMA=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
+cmake --build build --target install

conda/camera/conda_build_config.yaml

+blas_impl:
+  - mkl                        # [x86_64]
+c_compiler:
+  - vs2017                     # [win]
+cxx_compiler:
+  - vs2017                     # [win]
+python:
+  - 2.7                        # [linux]
+  - 3.6
+  - 3.7
+# This differs from target_platform in that it determines what subdir the compiler
+#    will target, not what subdir the compiler package will be itself.
+#    For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
+#    code on win-64 miniconda.
+cross_compiler_target_platform:
+  - win-64                     # [win]
+target_platform:
+  - win-64                     # [win]
+vc:
+  - 14
+zip_keys:
+  -                             # [win]
+    - vc                        # [win]
+    - c_compiler                # [win]
+    - cxx_compiler              # [win]

conda/camera/meta.yaml

+{% set version = GIT_DESCRIBE_TAG[1:] %}
+
+package:
+  name: lima-camera-slsdetector
+  version: {{ version }}
+
+source:
+  path: ../..
+
+build:
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+
+requirements:
+  host:
+    - python {{ python }}
+    - numpy
+    - sip 4.19.8              # For compatibility with pyqt 5.9.2
+    - lima-core
+    - libnuma
+    - libpng
+  build:
+    - git
+    - cmake
+    - {{ compiler('cxx') }}
+  run:
+    - python {{ python }}
+    - sip >=4.19.4, <=4.19.8  # For compatibility with pyqt 5.9.2
+    - libpng
+    - libnuma
+    - lima-core
+
+test:
+  requires:
+    - cmake
+  imports:
+    - Lima.SlsDetector
+  commands:
+    - cmake --version
+    - ctest --version
+    - cpack --version
+
+about:
+  home: https://github.com/esrf-bliss/Lima
+  license: GPL
+  license_file: COPYING
+  summary: a library for the unified control of 2D detectors

conda/tango/bld.bat

+xcopy tango\*.* %SP_DIR%\Lima\Server\camera\

conda/tango/build.sh

+mkdir -p $SP_DIR/Lima/Server/camera && cp tango/*.* $SP_DIR/Lima/Server/camera

conda/tango/meta.yaml

+{% set version = GIT_DESCRIBE_TAG[1:] %}
+
+package:
+  name: lima-camera-slsdetector-tango
+  version: {{ version }}
+
+source:
+  path: ../..
+
+build:
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  noarch: python
+
+requirements:
+  run:
+    - lima-tango-server
+    - lima-camera-slsdetector
+
+about:
+  home: https://github.com/esrf-bliss/Lima
+  license: GPL
+  license_file: COPYING
+  summary: a library for the unified control of 2D detectors

doc/installation_eiger_server_and_fw.rst

@@ -28,7 +28,22 @@ is included:
 
 ::
 
-    lisgeiger1:~ % cat ~/.ssh/id_dsa.pub
+    lisgeiger1:~ % \
+        EIGER_MODULE_TOP=$(echo ${EIGER_MODULES} | cut -f1 -d" ")
+        cat ~/.ssh/id_dsa.pub
+        echo
+        if [ $(echo ${EIGER_MODULES} | wc -w) -eq 2 ]; then
+            det_name="500k$(echo ${EIGER_MODULES} | sed 's/ \?beb/_/g')"
+        else
+            det_name="2m"
+        fi;
+        base_dir="${HOME}/eiger/psi_eiger_${det_name}"
+        this_dir="${base_dir}/$(date +%Y-%m-%d-%H%M)"
+        mkdir -p ${this_dir} && cd ${this_dir}
+        for m in ${EIGER_MODULES}; do
+            ssh -x root@${m} cat .ssh/authorized_keys > ssh_authorized_keys_${m}
+        done
+        cat ssh_authorized_keys_${EIGER_MODULE_TOP} 
     ssh-dss AAAAB3NzaC1kc3MAAACBALGVR0qC2i/HgaJl4fuiwmOVrq46Bz3bs+o3/jdw/dqMaPjx35Ha
     shyC4zS+2wHyZVSjwTMIbVT8LPsNMGxL40ZxqWaAUyzn0XnjJMe3XT7h+yyx+iLUXvyCK489PAwT0srE
     iWbGNeQTgEYiwX+jqezQTiwss2sgypOrrwIrGrZBAAAAFQDjOUdgHjbCc1UMW37Zu+7b/AV1cQAAAIAu
@@ -38,13 +53,6 @@ is included:
     JQguFttMCNduiXmZfDYITld+86c9aWCR6g7re977ElFTbutWe+isu/ZFINXOvDEHmBUKd7++4lGDCjsM
     NOQQmG/Ftsi4jE2iWBaI91oyTQI= opid00@lisgeiger1
 
-    lisgeiger1:~ % this_dir="${HOME}/eiger/psi_eiger_500k_024_025/$(date +%Y-%m-%d-%H%M)"
-    lisgeiger1:~ % mkdir -p ${this_dir} && cd ${this_dir}
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \
-        ssh -x root@${m} cat .ssh/authorized_keys > ssh_authorized_keys_${m}; \
-    done
-
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % cat ssh_authorized_keys_beb024 
     ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxHKsWjHzIsIt0Pt1lkZA9Px5x0v6e2ZzCh+AEiQz1nk0
     l7kU6K0IzKvYbAj6HnQB3/epYHz6SBRrpsMQcFPHgtQIKlTzeKHNqS6pHBKxKR77jGGq70i7SWZsSBXP
     1/8QxUhV9CNbFJKAkEmvXa5ZO1fKgtiXYXR26X72foOKwZzOtPzOqz2IQ6icxqTMELK1H4R+s0Rvuurl
@@ -76,26 +84,29 @@ Check that all the keys are identical:
 
 ::
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % md5sum ssh_authorized_keys_beb*
+    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % \
+        md5sum ssh_authorized_keys_beb*
     1c183bdaa3a2f27029fca84b9cb3b857  ssh_authorized_keys_beb024
     1c183bdaa3a2f27029fca84b9cb3b857  ssh_authorized_keys_beb025
-    
+
 In case the *opid00@lisgeiger1* public key is not included (not the case before), 
 add them in order to open SSH sessions automatically on the detector modules:
 
 ::
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \
-        ssh -x root@${m} sh -c '"cat >> .ssh/authorized_keys"' < ~/.ssh/id_dsa.pub; \
-    done
-    
+    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % \
+        for m in ${EIGER_MODULES}; do
+            ssh -x root@${m} sh -c '"cat >> .ssh/authorized_keys"' < ~/.ssh/id_dsa.pub
+        done
+
 Also check that the SSH public host keys are identical (same Linux image):
 
 ::
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \
-        ssh-keygen -f ~/.ssh/known_hosts -F ${m} -l; \
-    done
+    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % \
+        for m in ${EIGER_MODULES}; do
+            ssh-keygen -f ~/.ssh/known_hosts -F ${m} -l
+        done
     # Host beb024 found: line 82 type RSA
     1040 21:78:5d:39:d5:cc:92:7a:42:f8:4d:69:38:3b:40:40 |1|m9PYbOqjp0h4qI8tq9u9H8x7pKQ=|wXZou5Y2oMKiULF5ZOuBjV0U7oo= (RSA)
     # Host beb025 found: line 84 type RSA
@@ -109,29 +120,30 @@ the current versions stored on the modules:
 
 ::
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \
-        ssh -x root@${m} 'ls -l executables/eigerDetectorServer*' \
-            > ls_executables_eigerDetectorServer_${m}.out; \
-    done
-
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % cat ls_executables_eigerDetectorServer_beb024.out 
+    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % \
+        for m in ${EIGER_MODULES}; do
+            ssh -x root@${m} 'ls -l executables/eigerDetectorServer*' \
+                > ls_executables_eigerDetectorServer_${m}.out
+        done
+        cat ls_executables_eigerDetectorServer_${EIGER_MODULE_TOP}.out
+        echo
+        for m in ${EIGER_MODULES}; do 
+            ssh -x root@${m} 'md5sum executables/eigerDetectorServer*' \
+                > md5sum_executables_eigerDetectorServer_${m}.out
+        done
+        cat md5sum_executables_eigerDetectorServer_${EIGER_MODULE_TOP}.out
+        echo
+        md5sum md5sum_executables_eigerDetectorServer_beb*
     -rwxr-xr-x    1 root     root        280601 Jan  1 01:15 executables/eigerDetectorServer
     -rwxr-xr-x    1 root     root        277442 Aug 26  2016 executables/eigerDetectorServer_bkp
     -rwxr-xr-x    1 root     root        277442 Aug 26  2016 executables/eigerDetectorServerv2.0.5.14.3
     -rwxr-xr-x    1 root     root        280601 Jan  1 01:14 executables/eigerDetectorServerv2.3.0.16.2
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 %  for m in ${EIGER_MODULES}; do 
-        ssh -x root@${m} 'md5sum executables/eigerDetectorServer*' \
-            > md5sum_executables_eigerDetectorServer_${m}.out; \
-    done
-
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 %  cat md5sum_executables_eigerDetectorServer_beb024.out 
     4fca193db64ed991da785043e7769082  executables/eigerDetectorServer
     e8a39956bbcb4aac62f109188e8ddbb2  executables/eigerDetectorServer_bkp
     e8a39956bbcb4aac62f109188e8ddbb2  executables/eigerDetectorServerv2.0.5.14.3
     4fca193db64ed991da785043e7769082  executables/eigerDetectorServerv2.3.0.16.2
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % md5sum md5sum_executables_eigerDetectorServer_beb*
     754a871d0608c28aa7544230ca728f86  md5sum_executables_eigerDetectorServer_beb024.out
     754a871d0608c28aa7544230ca728f86  md5sum_executables_eigerDetectorServer_beb025.out
 
@@ -139,86 +151,91 @@ Backup the current version, and transfer the new version:
 
 ::
 
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % SLS_DETECTOR_PACKAGE=${LIMA_DIR}/camera/slsdetector/slsDetectorPackage
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % eiger_servers=$(cd ${SLS_DETECTOR_PACKAGE} && find -name eigerDetectorServerv\*)
-    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % (cd ${SLS_DETECTOR_PACKAGE} && md5sum ${eiger_servers})
+    lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % \
+        for m in ${EIGER_MODULES}; do
+            ssh -x root@${m} 'mv executables/eigerDetectorServer executables/eigerDetectorServer_bkp'
+        done
+        SLS_DETECTOR_PACKAGE=${LIMA_DIR}/camera/slsdetec