diff --git a/CMakeLists.txt b/CMakeLists.txt index 482520f18..47dd5dffb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) project(slsDetectorPackage) -set(PROJECT_VERSION 5.0.0) +set(PROJECT_VERSION 5.1.0) include(CheckIPOSupported) set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") @@ -157,8 +157,37 @@ set(CMAKE_INSTALL_RPATH $ORIGIN) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found") +#Adapted from: https://github.com/zeromq/cppzmq/ +if (NOT TARGET libzmq) + if(ZeroMQ_HINT) + message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}") + find_package(ZeroMQ 4 + NO_DEFAULT_PATH + HINTS ${ZeroMQ_DIR} + ) + else() + find_package(ZeroMQ 4) + endif() + -find_package(ZeroMQ 4 REQUIRED) + + # libzmq autotools install: fallback to pkg-config + if(NOT ZeroMQ_FOUND) + message(STATUS "CMake libzmq package not found, trying again with pkg-config (normal install of zeromq)") + list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config) + find_package(ZeroMQ 4 REQUIRED) + endif() + + # TODO "REQUIRED" above should already cause a fatal failure if not found, but this doesn't seem to work + if(NOT ZeroMQ_FOUND) + message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config") + endif() + + if (ZeroMQ_FOUND AND NOT TARGET libzmq) + message(FATAL_ERROR "ZeroMQ version not supported!") + endif() +endif() if (SLS_USE_TESTS) enable_testing() diff --git a/RELEASE.txt b/RELEASE.txt index a485871af..760a9fcc1 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,14 +1,13 @@ -SLS Detector Package 5.1.0 released on xx.xx.2020 (Minor Release) +SLS Detector Package 5.X.X released on XX.XX.2021 (Minor Release) =================================================================== -This document describes the differences between 5.1.0 and 5.x.x releases. +This document describes the differences between X and Y releases. CONTENTS -------- - 1. Topics Concerning - 2. New Features + 1. New Features 2. Resolved Issues 3. Known Issues 4. Firmware Requirements @@ -16,58 +15,14 @@ This document describes the differences between 5.1.0 and 5.x.x releases. -1. Topics Concerning -==================== - - potentital memory leak in receiver - - scanParameters in Python - - cmk.sh refactored - - m3 settings and threshold - - -2. New Features +1. New Features =============== - Client - ------ - - 1. Aded settings and threshold features for Mythen3. - 2. Internal modification of acquire for Mythen3. - 3. Added getMaster functio for M3 - - - Mythen3 server - ----------------- - - 1. Setting timing to auto, sets timing to trigger for slaves - - -3. Resolved Issues -================== - - - Receiver - -------- - - 1. Current code only calls Implementation::setDetectorType from constructor, - but potential memory leak if called out of constructor context. Fixed. - - Client - ------ - - 1. Fixed missing scanParameters class in Python - - 2. cmk.sh refactored to have better option handling - - - - 4. Firmware Requirements ======================== - - No updates from 5.0.0 - + 5. Known Issues diff --git a/cmake/FindZeroMQ.cmake b/cmake/FindZeroMQ.cmake deleted file mode 100755 index 5bc561386..000000000 --- a/cmake/FindZeroMQ.cmake +++ /dev/null @@ -1,112 +0,0 @@ - -# This file is originally from https://github.com/zeromq/azmq and distributed -# under Boost Software Lincese 1.0 -# Boost Software License - Version 1.0 - August 17th, 2003 - -# Permission is hereby granted, free of charge, to any person or organization -# obtaining a copy of the software and accompanying documentation covered by -# this license (the "Software") to use, reproduce, display, distribute, -# execute, and transmit the Software, and to prepare derivative works of the -# Software, and to permit third-parties to whom the Software is furnished to -# do so, all subject to the following: - -# The copyright notices in the Software and this entire statement, including -# the above license grant, this restriction and the following disclaimer, -# must be included in all copies of the Software, in whole or in part, and -# all derivative works of the Software, unless such copies or derivative -# works are solely in the form of machine-executable object code generated by -# a source language processor. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# -------------------------------------------------------------------------------- - -# Find ZeroMQ Headers/Libs - -# Variables -# ZMQ_ROOT - set this to a location where ZeroMQ may be found -# -# ZeroMQ_FOUND - True of ZeroMQ found -# ZeroMQ_INCLUDE_DIRS - Location of ZeroMQ includes -# ZeroMQ_LIBRARIES - ZeroMQ libraries - -include(FindPackageHandleStandardArgs) - -if (NOT ZMQ_ROOT) - set(ZMQ_ROOT "$ENV{ZMQ_ROOT}") -endif() - -if (NOT ZMQ_ROOT) - find_path(_ZeroMQ_ROOT NAMES include/zmq.h) -else() - set(_ZeroMQ_ROOT "${ZMQ_ROOT}") -endif() - -find_path(ZeroMQ_INCLUDE_DIRS NAMES zmq.h HINTS ${_ZeroMQ_ROOT}/include) - -if (ZeroMQ_INCLUDE_DIRS) - set(_ZeroMQ_H ${ZeroMQ_INCLUDE_DIRS}/zmq.h) - - function(_zmqver_EXTRACT _ZeroMQ_VER_COMPONENT _ZeroMQ_VER_OUTPUT) - set(CMAKE_MATCH_1 "0") - set(_ZeroMQ_expr "^[ \\t]*#define[ \\t]+${_ZeroMQ_VER_COMPONENT}[ \\t]+([0-9]+)$") - file(STRINGS "${_ZeroMQ_H}" _ZeroMQ_ver REGEX "${_ZeroMQ_expr}") - string(REGEX MATCH "${_ZeroMQ_expr}" ZeroMQ_ver "${_ZeroMQ_ver}") - set(${_ZeroMQ_VER_OUTPUT} "${CMAKE_MATCH_1}" PARENT_SCOPE) - endfunction() - - _zmqver_EXTRACT("ZMQ_VERSION_MAJOR" ZeroMQ_VERSION_MAJOR) - _zmqver_EXTRACT("ZMQ_VERSION_MINOR" ZeroMQ_VERSION_MINOR) - _zmqver_EXTRACT("ZMQ_VERSION_PATCH" ZeroMQ_VERSION_PATCH) - - message(STATUS "ZeroMQ version: ${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}.${ZeroMQ_VERSION_PATCH}") - - # We should provide version to find_package_handle_standard_args in the same format as it was requested, - # otherwise it can't check whether version matches exactly. - if (ZeroMQ_FIND_VERSION_COUNT GREATER 2) - set(ZeroMQ_VERSION "${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}.${ZeroMQ_VERSION_PATCH}") - else() - # User has requested ZeroMQ version without patch part => user is not interested in specific patch => - # any patch should be an exact match. - set(ZeroMQ_VERSION "${ZeroMQ_VERSION_MAJOR}.${ZeroMQ_VERSION_MINOR}") - endif() - - if (NOT ${CMAKE_CXX_PLATFORM_ID} STREQUAL "Windows") - find_library(ZeroMQ_LIBRARIES NAMES zmq HINTS ${_ZeroMQ_ROOT}/lib) - else() - find_library( - ZeroMQ_LIBRARY_RELEASE - NAMES - libzmq - "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-${ZeroMQ_VERSION_MAJOR}_${ZeroMQ_VERSION_MINOR}_${ZeroMQ_VERSION_PATCH}" - HINTS - ${_ZeroMQ_ROOT}/lib - ) - - find_library( - ZeroMQ_LIBRARY_DEBUG - NAMES - libzmq_d - "libzmq-${CMAKE_VS_PLATFORM_TOOLSET}-mt-gd-${ZeroMQ_VERSION_MAJOR}_${ZeroMQ_VERSION_MINOR}_${ZeroMQ_VERSION_PATCH}" - HINTS - ${_ZeroMQ_ROOT}/lib) - - # On Windows we have to use corresponding version (i.e. Release or Debug) of ZeroMQ because of `errno` CRT global variable - # See more at http://www.drdobbs.com/avoiding-the-visual-c-runtime-library/184416623 - set(ZeroMQ_LIBRARIES optimized "${ZeroMQ_LIBRARY_RELEASE}" debug "${ZeroMQ_LIBRARY_DEBUG}") - endif() -endif() - -find_package_handle_standard_args(ZeroMQ FOUND_VAR ZeroMQ_FOUND - REQUIRED_VARS ZeroMQ_INCLUDE_DIRS ZeroMQ_LIBRARIES - VERSION_VAR ZeroMQ_VERSION) - -if (ZeroMQ_FOUND) - mark_as_advanced(ZeroMQ_INCLUDE_DIRS ZeroMQ_LIBRARIES ZeroMQ_VERSION - ZeroMQ_VERSION_MAJOR ZeroMQ_VERSION_MINOR ZeroMQ_VERSION_PATCH) -endif() \ No newline at end of file diff --git a/cmake/package_config.cmake b/cmake/package_config.cmake index bfa0a31a8..7c07ee344 100755 --- a/cmake/package_config.cmake +++ b/cmake/package_config.cmake @@ -25,6 +25,12 @@ install(FILES DESTINATION ${CMAKE_INSTALL_DIR} ) +install(FILES + "${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake" + COMPONENT devel + DESTINATION ${CMAKE_INSTALL_DIR}/libzmq-pkg-config +) + if (PROJECT_LIBRARIES OR PROJECT_STATIC_LIBRARIES) install( EXPORT "${TARGETS_EXPORT_NAME}" diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 3d8646c6e..034688953 100755 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in @@ -12,8 +12,21 @@ include(CMakeFindDependencyMacro) set(SLS_USE_HDF5 "@SLS_USE_HDF5@") -# Add optional dependencies here + +find_package(ZeroMQ 4 QUIET) +# libzmq autotools install: fallback to pkg-config +if(NOT ZeroMQ_FOUND) + list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config) + find_package(ZeroMQ 4 REQUIRED) +endif() + +if(NOT ZeroMQ_FOUND) + message(FATAL_ERROR "ZeroMQ was NOT found!") +endif() + find_dependency(Threads) + +# Add optional dependencies here if (SLS_USE_HDF5) find_dependency(HDF5) endif () diff --git a/conda-recepie/build.sh b/conda-recepie/build.sh index 45607594c..4d573a716 100755 --- a/conda-recepie/build.sh +++ b/conda-recepie/build.sh @@ -13,8 +13,9 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DSLS_USE_HDF5=OFF\ - -cmake --build . -- -j10 +NCORES=$(getconf _NPROCESSORS_ONLN) +echo "Building using: ${NCORES} cores" +cmake --build . -- -j${NCORES} cmake --build . --target install -CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2 \ No newline at end of file +CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2 diff --git a/conda-recepie/copy_gui.sh b/conda-recepie/copy_gui.sh index 956ec8073..c35d018b0 100755 --- a/conda-recepie/copy_gui.sh +++ b/conda-recepie/copy_gui.sh @@ -1,3 +1,3 @@ #Copy the GUI -mkdir $PREFIX/bin -cp build/bin/slsDetectorGui $PREFIX/bin/. +mkdir -p $PREFIX/bin +cp build/install/bin/slsDetectorGui $PREFIX/bin/. diff --git a/conda-recepie/copy_lib.sh b/conda-recepie/copy_lib.sh index fa624418d..e153ad869 100755 --- a/conda-recepie/copy_lib.sh +++ b/conda-recepie/copy_lib.sh @@ -1,6 +1,6 @@ -mkdir $PREFIX/lib -mkdir $PREFIX/bin +mkdir -p $PREFIX/lib +mkdir -p $PREFIX/bin mkdir -p $PREFIX/include/sls # mkdir $PREFIX/include/slsDetectorPackage diff --git a/conda-recepie/meta.yaml b/conda-recepie/meta.yaml index d3bf39d60..216e509d5 100755 --- a/conda-recepie/meta.yaml +++ b/conda-recepie/meta.yaml @@ -59,6 +59,16 @@ outputs: script: copy_lib.sh requirements: + build: + - {{ compiler('c') }} + - {{compiler('cxx')}} + - libstdcxx-ng + - libgcc-ng + - zeromq + + host: + - zeromq + run: - libstdcxx-ng - libgcc-ng @@ -78,6 +88,8 @@ outputs: host: - python + - {{ pin_subpackage('slsdetlib', exact=True) }} + run: - libstdcxx-ng @@ -94,6 +106,13 @@ outputs: - name: slsdetgui script: copy_gui.sh requirements: + + build: + - {{ compiler('c') }} + - {{compiler('cxx')}} + - {{ pin_subpackage('slsdetlib', exact=True) }} + - qwt 6.* + run: - {{ pin_subpackage('slsdetlib', exact=True) }} - qwt 6.* diff --git a/libzmq-pkg-config/FindZeroMQ.cmake b/libzmq-pkg-config/FindZeroMQ.cmake new file mode 100755 index 000000000..9d9a4dfbf --- /dev/null +++ b/libzmq-pkg-config/FindZeroMQ.cmake @@ -0,0 +1,27 @@ +#From: https://github.com/zeromq/cppzmq/ +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON) +find_package(PkgConfig) +pkg_check_modules(PC_LIBZMQ QUIET libzmq) + +set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION}) +find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll + PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) +find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a + PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) + +if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY) + set(ZeroMQ_FOUND ON) +endif() + +if (TARGET libzmq) + # avoid errors defining targets twice + return() +endif() + +add_library(libzmq SHARED IMPORTED) +set_property(TARGET libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS}) +set_property(TARGET libzmq PROPERTY IMPORTED_LOCATION ${ZeroMQ_LIBRARY}) + +add_library(libzmq-static STATIC IMPORTED ${PC_LIBZMQ_INCLUDE_DIRS}) +set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS}) +set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY}) \ No newline at end of file diff --git a/python/scripts/compile_servers.py b/python/scripts/compile_servers.py new file mode 100644 index 000000000..992dae1c9 --- /dev/null +++ b/python/scripts/compile_servers.py @@ -0,0 +1,80 @@ +import subprocess +import os +import sys +from pathlib import Path +import shutil as sh +from argparse import ArgumentParser + +class color: + HEADER = "\033[95m" + BLUE = "\033[94m" + CYAN = "\033[96m" + GREEN = "\033[92m" + YELLOW = "\033[93m" + RED = "\033[91m" + ENDC = "\033[0m" + BOLD = "\033[1m" + UNDERLINE = "\033[4m" + MAGENTA = "\033[35m" + + @staticmethod + def red(s): + return f"{color.RED}{s}{color.ENDC}" + + @staticmethod + def green(s): + return f"{color.GREEN}{s}{color.ENDC}" + +def add_to_path(): + paths = [ + "/opt/uClinux/bfin-uclinux/bin", + "/opt/nios2-gcc/bin", + "/opt/eldk-5.1/powerpc-4xx-softfloat/sysroots/i686-eldk-linux/usr/bin/ppc405-linux", + ] + os.environ["PATH"] += os.pathsep + os.pathsep.join(paths) + + +def rc_to_string(rc): + if rc == 0: + return color.green("OK") + else: + return color.red("FAIL") + + + +parser = ArgumentParser() +parser.add_argument('-t', '--tag', help = 'Tag added to server file name', default='developer') +parser.add_argument('-g', '--git', help='Add new servers to the git repo', action="store_true") +args = parser.parse_args() + + +servers = [ + "eigerDetectorServer", + "jungfrauDetectorServer", + "mythen3DetectorServer", + "gotthard2DetectorServer", + "gotthardDetectorServer", + "ctbDetectorServer", + "moenchDetectorServer", +] + + +server_root = Path("../../slsDetectorServers/").resolve() + +add_to_path() +for server in servers: + bin_name = f"{server}_{args.tag}" + path = server_root / server + print(f"{bin_name} - ", end="") + os.chdir(path) + try: + sh.rmtree(path/'bin') + except FileNotFoundError: + pass + p = subprocess.run(["make"], stdout=subprocess.DEVNULL) + print(rc_to_string(p.returncode)) + if p.returncode == 0: + sh.move(f"bin/{server}", f"bin/{bin_name}") + if args.git: + print("Adding to git") + subprocess.run(['git', 'add', 'bin', '-f']) diff --git a/python/setup.py b/python/setup.py index db4ec2112..2e6422031 100755 --- a/python/setup.py +++ b/python/setup.py @@ -2,11 +2,12 @@ Setup file for slsdet Build upon the pybind11 example found here: https://github.com/pybind/python_example """ -from setuptools import setup, Extension, find_packages -from setuptools.command.build_ext import build_ext -import sys -import setuptools + import os +import sys +sys.path.append('../libs/pybind11') +from setuptools import setup, find_packages +from pybind11.setup_helpers import Pybind11Extension, build_ext __version__ = os.environ.get('GIT_DESCRIBE_TAG', 'developer') @@ -19,109 +20,29 @@ def get_conda_path(): return os.environ['CONDA_PREFIX'] -# class get_pybind_include(object): -# """Helper class to determine the pybind11 include path -# The purpose of this class is to postpone importing pybind11 -# until it is actually installed, so that the ``get_include()`` -# method can be invoked. """ - -# def __init__(self, user=False): -# self.user = user - -# def __str__(self): -# import pybind11 -# return pybind11.get_include(self.user) - - +#TODO migrate to CMake build? ext_modules = [ - Extension( + Pybind11Extension( '_slsdet', ['src/main.cpp', 'src/enums.cpp', 'src/detector.cpp', - 'src/network.cpp'], + 'src/network.cpp', + 'src/pattern.cpp', + 'src/scan.cpp',], include_dirs=[ - # Path to pybind11 headers - # get_pybind_include(), - # get_pybind_include(user=True), os.path.join('../libs/pybind11/include'), os.path.join(get_conda_path(), 'include'), ], - libraries=['SlsDetector', 'SlsReceiver', 'zmq'], + libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver', 'zmq'], library_dirs=[ os.path.join(get_conda_path(), 'lib'), - os.path.join(get_conda_path(), 'bin'), ], - language='c++' ), ] - -# As of Python 3.6, CCompiler has a `has_flag` method. -# cf http://bugs.python.org/issue26689 -def has_flag(compiler, flagname): - """Return a boolean indicating whether a flag name is supported on - the specified compiler. - """ - import tempfile - with tempfile.NamedTemporaryFile('w', suffix='.cpp') as f: - f.write('int main (int argc, char **argv) { return 0; }') - try: - compiler.compile([f.name], extra_postargs=[flagname]) - except setuptools.distutils.errors.CompileError: - return False - return True - - -def cpp_flag(compiler): - """Return the -std=c++[11/14] compiler flag. - The c++14 is prefered over c++11 (when it is available). - """ - if has_flag(compiler, '-std=c++14'): - return '-std=c++14' - elif has_flag(compiler, '-std=c++11'): - return '-std=c++11' - else: - raise RuntimeError('Unsupported compiler -- at least C++11 support ' - 'is needed!') - - -class BuildExt(build_ext): - """A custom build extension for adding compiler-specific options.""" - c_opts = { - 'msvc': ['/EHsc'], - 'unix': [], - } - - if sys.platform == 'darwin': - c_opts['unix'] += ['-stdlib=libc++', '-mmacosx-version-min=10.7'] - - def build_extensions(self): - ct = self.compiler.compiler_type - opts = self.c_opts.get(ct, []) - if ct == 'unix': - opts.append('-DVERSION_INFO="%s"' % self.distribution.get_version()) - opts.append(cpp_flag(self.compiler)) - if has_flag(self.compiler, '-fvisibility=hidden'): - opts.append('-fvisibility=hidden') - elif ct == 'msvc': - opts.append('/DVERSION_INFO=\\"%s\\"' % self.distribution.get_version()) - for ext in self.extensions: - ext.extra_compile_args = opts - - print('**************************************************') - print(ct) - print(opts) - print('**************************************************') - build_ext.build_extensions(self) - - - -def get_shared_lib(): - return [f for f in os.listdir('.') if '_slsdet' in f] - setup( name='slsdet', version=__version__, @@ -132,6 +53,6 @@ setup( long_description='', packages=find_packages(exclude=['contrib', 'docs', 'tests']), ext_modules=ext_modules, - cmdclass={'build_ext': BuildExt}, + cmdclass={"build_ext": build_ext}, zip_safe=False, ) diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index 244fe2733..70e8a2e9b 100755 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -91,7 +91,6 @@ target_include_directories(slsDetectorGui PUBLIC target_link_libraries(slsDetectorGui PUBLIC slsProjectOptions - slsProjectWarnings slsDetectorStatic ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} @@ -101,6 +100,9 @@ target_link_libraries(slsDetectorGui PUBLIC Qt4::QtOpenGL Qt4::QtSvg expat + + PRIVATE + slsProjectWarnings ) set_target_properties(slsDetectorGui PROPERTIES @@ -111,7 +113,7 @@ if(SLS_LTO_AVAILABLE) endif() install(TARGETS slsDetectorGui - EXPORT "${TARGETS_EXPORT_NAME}" + # EXPORT "${TARGETS_EXPORT_NAME}" #do not export gui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_5.1.0 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_5.1.0 new file mode 100755 index 000000000..2231a67b1 Binary files /dev/null and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_5.1.0 differ diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c index 78cbbdcef..82440f60b 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.c +++ b/slsDetectorServers/eigerDetectorServer/FebControl.c @@ -1395,7 +1395,7 @@ int Feb_Control_SetMaster(enum MASTERINDEX ind) { int Feb_Control_SetQuad(int val) { LOG(logINFO, ("Setting Quad to %d in Feb\n", val)); // only setting on the right feb if quad - return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_TOP, 0, 1); + return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_BOTTOM, 0, 1); } int Feb_Control_SetReadNLines(int value) { diff --git a/slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt b/slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt new file mode 100755 index 000000000..5bd098888 --- /dev/null +++ b/slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt @@ -0,0 +1,2 @@ +top 1 +master 1 diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0 new file mode 100755 index 000000000..7b29c540d Binary files /dev/null and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0 differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1 b/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1 deleted file mode 100755 index 4ab730239..000000000 Binary files a/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1 and /dev/null differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/config_gotthard2.txt b/slsDetectorServers/gotthard2DetectorServer/bin/config_gotthard2.txt new file mode 100755 index 000000000..e846a68a8 --- /dev/null +++ b/slsDetectorServers/gotthard2DetectorServer/bin/config_gotthard2.txt @@ -0,0 +1,33 @@ + + +#onchip dacs chip index value (max 0x3ff) +vchip_comp_fe -1 0x137 +vchip_opa_1st -1 0x000 +vchip_opa_fd -1 0x134 +vchip_comp_adc -1 0x3FF +vchip_ref_comp_fe -1 0x180 +vchip_cs -1 0x0D0 + +#dacs value (max 4096) +vref_h_adc 2116 +vb_comp_fe 0 +vb_comp_adc 0 +vcom_cds 705 +vref_rstore 150 +vb_opa_1st 0 +vref_comp_fe 0 +vcom_adc1 705 +vref_prech 869 +vref_l_adc 700 +vref_cds 700 +vb_cs 2799 +vb_opa_fd 0 +vcom_adc2 704 + +#configure adc chip index adc index value(max 0x7F) +confadc -1 -1 0x22 + +#vetoreference gain index value(max 4095) +vetoref 1 0 + + diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_5.1.0 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_5.1.0 new file mode 100755 index 000000000..04a079dbf Binary files /dev/null and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_5.1.0 differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/config_gotthard.txt b/slsDetectorServers/gotthardDetectorServer/bin/config_gotthard.txt new file mode 100755 index 000000000..721434a75 --- /dev/null +++ b/slsDetectorServers/gotthardDetectorServer/bin/config_gotthard.txt @@ -0,0 +1,23 @@ +#masterflags (no_master, is_master, is_slave) +masterflags no_master + +#master default delay +masterdefaultdelay 70 + +#patternphase +patternphase 0 + +#adcphase +adcphase 0 + +#slave pattern phase +slavepatternphase 0 + +#slave adc phase +slaveadcphase 0 + +#rst to sw1 delay +rsttosw1delay 2 + +#start acquisition delay +startacqdelay 1 \ No newline at end of file diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_5.1.0 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_5.1.0 new file mode 100755 index 000000000..aefdca309 Binary files /dev/null and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_5.1.0 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_5.1.0 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_5.1.0 new file mode 100755 index 000000000..71aadc17b Binary files /dev/null and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_5.1.0 differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt b/slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt new file mode 100755 index 000000000..0c64c23fa --- /dev/null +++ b/slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt @@ -0,0 +1,288 @@ +patword 0x0000 0x0008599f0418503a +patword 0x0001 0x0008599f0418503a +patword 0x0002 0x000859960418503a +patword 0x0003 0x000859960418503a +patword 0x0004 0x000859960418503a +patword 0x0005 0x000859960418503a +patword 0x0006 0x000859960418503a +patword 0x0007 0x000859960418503a +patword 0x0008 0x000859960418503a +patword 0x0009 0x000859960418503a +patword 0x000a 0x000859960418503a +patword 0x000b 0x000859960418503a +patword 0x000c 0x000859960418503a +patword 0x000d 0x000859960418503a +patword 0x000e 0x000859960418503a +patword 0x000f 0x000859960418503a +patword 0x0010 0x000859960418503a +patword 0x0011 0x000859960418503a +patword 0x0012 0x000859960418503a +patword 0x0013 0x000859960418503a +patword 0x0014 0x000859960418503a +patword 0x0015 0x000859960418503a +patword 0x0016 0x000819960418501a +patword 0x0017 0x000819960418501a +patword 0x0018 0x000819960418501a +patword 0x0019 0x000819960418501a +patword 0x001a 0x000819960418501a +patword 0x001b 0x000819960418501a +patword 0x001c 0x000819960418501a +patword 0x001d 0x000819960418501a +patword 0x001e 0x000819960418501a +patword 0x001f 0x000819960418501a +patword 0x0020 0x000819960418501a +patword 0x0021 0x000819960418501a +patword 0x0022 0x000819960418501a +patword 0x0023 0x000819960418501a +patword 0x0024 0x000819960418501a +patword 0x0025 0x000819960418501a +patword 0x0026 0x000819960418501a +patword 0x0027 0x000819960418501a +patword 0x0028 0x000819960418501a +patword 0x0029 0x000819960418501a +patword 0x002a 0x000819960418501a +patword 0x002b 0x000819960418501a +patword 0x002c 0x000819960418501a +patword 0x002d 0x000819960418501a +patword 0x002e 0x000819960418501a +patword 0x002f 0x000819960418501a +patword 0x0030 0x000819960008501a +patword 0x0031 0x000819960008501a +patword 0x0032 0x000819960008501a +patword 0x0033 0x000819960008501a +patword 0x0034 0x000819960008501a +patword 0x0035 0x000819960008501a +patword 0x0036 0x000819960008501a +patword 0x0037 0x000819960008501a +patword 0x0038 0x000819960008501a +patword 0x0039 0x000819960008501a +patword 0x003a 0x000819960008501a +patword 0x003b 0x000819960008501a +patword 0x003c 0x000819960008501a +patword 0x003d 0x000819960008501a +patword 0x003e 0x000819960008501a +patword 0x003f 0x000819960008501a +patword 0x0040 0x000819960008501a +patword 0x0041 0x000819960008501a +patword 0x0042 0x000819960008501a +patword 0x0043 0x000819960008501a +patword 0x0044 0x0008199f0008501a +patword 0x0045 0x0008199f0008501a +patword 0x0046 0x0008199f0008501a +patword 0x0047 0x0008199f0008501a +patword 0x0048 0x0008199f0008501a +patword 0x0049 0x0008199f0008501a +patword 0x004a 0x0008199f0008501a +patword 0x004b 0x0008199f0008501a +patword 0x004c 0x0008199f0008501a +patword 0x004d 0x0008199f0008501a +patword 0x004e 0x0008199f0008501a +patword 0x004f 0x0008199f0008501a +patword 0x0050 0x0008199f0008501a +patword 0x0051 0x0008199f0008501a +patword 0x0052 0x0008199f0008501a +patword 0x0053 0x0008199f0008501a +patword 0x0054 0x0008199f0008501a +patword 0x0055 0x0008199f0008501a +patword 0x0056 0x0008199f0008501a +patword 0x0057 0x0008199f0008501a +patword 0x0058 0x0008599f0008503a +patword 0x0059 0x0008599f0008503a +patword 0x005a 0x000c599f000850ba +patword 0x005b 0x000c599f000850ba +patword 0x005c 0x000c599f000850ba +patword 0x005d 0x000c599f000850ba +patword 0x005e 0x000c599f000850ba +patword 0x005f 0x000c599f000850ba +patword 0x0060 0x000c599f000850ba +patword 0x0061 0x000c599f000850ba +patword 0x0062 0x000c599f000850ba +patword 0x0063 0x000c599f000850ba +patword 0x0064 0x000c599f000850ba +patword 0x0065 0x000c599f000850ba +patword 0x0066 0x000c599f000850ba +patword 0x0067 0x000c599f000850ba +patword 0x0068 0x000c599f000850ba +patword 0x0069 0x000c599f000850ba +patword 0x006a 0x000c599f000850ba +patword 0x006b 0x000c599f000850ba +patword 0x006c 0x000c599f000850ba +patword 0x006d 0x000c599f000850ba +patword 0x006e 0x000c799f010858ba +patword 0x006f 0x000c799f010858ba +patword 0x0070 0x000c599f000850ba +patword 0x0071 0x000c599f000850ba +patword 0x0072 0x000c599f000850ba +patword 0x0073 0x000c599f000850ba +patword 0x0074 0x000c599f000850ba +patword 0x0075 0x000c599f000850ba +patword 0x0076 0x000c599f000850ba +patword 0x0077 0x000c599f000850ba +patword 0x0078 0x000c599f000850ba +patword 0x0079 0x000c599f000850ba +patword 0x007a 0x000c599f000850ba +patword 0x007b 0x000c599f000850ba +patword 0x007c 0x000c599f000850ba +patword 0x007d 0x000c599f000850ba +patword 0x007e 0x000c599f000850ba +patword 0x007f 0x000c599f000850ba +patword 0x0080 0x000c599f000850ba +patword 0x0081 0x000c599f000850ba +patword 0x0082 0x000c599f000850ba +patword 0x0083 0x000c599f000850ba +patword 0x0084 0x000c599f000850ba +patword 0x0085 0x000c599f000850ba +patword 0x0086 0x000c599f400850ba +patword 0x0087 0x000c599f400850ba +patword 0x0088 0x000c599f600850ba +patword 0x0089 0x000c599f400850ba +patword 0x008a 0x000c599f400850ba +patword 0x008b 0x000c599f400850ba +patword 0x008c 0x840c599f682e50ba +patword 0x008d 0x840c599f482850ba +patword 0x008e 0x840c599f000e50ba +patword 0x008f 0x840c599f000850ba +patword 0x0090 0x840c599f000e50ba +patword 0x0091 0x840c599f000850ba +patword 0x0092 0x840c599f000e50ba +patword 0x0093 0x840c599f000850ba +patword 0x0094 0x840c599f000e50ba +patword 0x0095 0x840c599f000850ba +patword 0x0096 0x840c599f000e50ba +patword 0x0097 0x840c599f000850ba +patword 0x0098 0x840c599f000e50ba +patword 0x0099 0x840c599f000850ba +patword 0x009a 0x840c599f000e50ba +patword 0x009b 0x840c599f000850ba +patword 0x009c 0x840c599f000e50ba +patword 0x009d 0x840c599f000850ba +patword 0x009e 0x840c599f000e50ba +patword 0x009f 0x840c599f000850ba +patword 0x00a0 0x840c599f000e50ba +patword 0x00a1 0x840c599f000850ba +patword 0x00a2 0x840c599f000e50ba +patword 0x00a3 0x840c599f000850ba +patword 0x00a4 0x840c599f000e50ba +patword 0x00a5 0x840c599f000850ba +patword 0x00a6 0x840c599f200e50ba +patword 0x00a7 0x840c599f000850ba +patword 0x00a8 0x840c599f000e50ba +patword 0x00a9 0x840c599f000850ba +patword 0x00aa 0x840c599f000e50ba +patword 0x00ab 0x840c599f000850ba +patword 0x00ac 0x840c599f000e50ba +patword 0x00ad 0x840c599f000850ba +patword 0x00ae 0x840c599f000e50ba +patword 0x00af 0x840c599f000850ba +patword 0x00b0 0x840c599f000e50ba +patword 0x00b1 0x840c599f000850ba +patword 0x00b2 0x840c599f000e50ba +patword 0x00b3 0x840c599f000850ba +patword 0x00b4 0x840c599f000e50ba +patword 0x00b5 0x840c599f000850ba +patword 0x00b6 0x840c599f000e50ba +patword 0x00b7 0x840c599f000850ba +patword 0x00b8 0x840c599f000e50ba +patword 0x00b9 0x840c599f000850ba +patword 0x00ba 0x840c599f000e50ba +patword 0x00bb 0x840c599f000850ba +patword 0x00bc 0x840c599f000e50ba +patword 0x00bd 0x840c599f000850ba +patword 0x00be 0x840c599f282e50ba +patword 0x00bf 0x840c599f082850ba +patword 0x00c0 0x840c599f000e50ba +patword 0x00c1 0x840c599f000850ba +patword 0x00c2 0x840c599f000e50ba +patword 0x00c3 0x840c599f000850ba +patword 0x00c4 0x840c599f000e50ba +patword 0x00c5 0x840c599f000850ba +patword 0x00c6 0x840c599f000e50ba +patword 0x00c7 0x840c599f000850ba +patword 0x00c8 0x840c599f000e50ba +patword 0x00c9 0x840c599f000850ba +patword 0x00ca 0x840c599f000e50ba +patword 0x00cb 0x840c599f000850ba +patword 0x00cc 0x840c599f000e50ba +patword 0x00cd 0x840c599f000850ba +patword 0x00ce 0x840c599f000e50ba +patword 0x00cf 0x840c599f000850ba +patword 0x00d0 0x840c599f000e50ba +patword 0x00d1 0x840c599f000850ba +patword 0x00d2 0x840c599f000e50ba +patword 0x00d3 0x840c599f000850ba +patword 0x00d4 0x840c599f000e50ba +patword 0x00d5 0x840c599f000850ba +patword 0x00d6 0x840c599f000e50ba +patword 0x00d7 0x840c599f000850ba +patword 0x00d8 0x840c599f200e50ba +patword 0x00d9 0x840c599f000850ba +patword 0x00da 0x840c599f000e50ba +patword 0x00db 0x840c599f000850ba +patword 0x00dc 0x840c599f000e50ba +patword 0x00dd 0x840c599f000850ba +patword 0x00de 0x840c599f000e50ba +patword 0x00df 0x840c599f000850ba +patword 0x00e0 0x840c599f000e50ba +patword 0x00e1 0x840c599f000850ba +patword 0x00e2 0x840c599f000e50ba +patword 0x00e3 0x840c599f000850ba +patword 0x00e4 0x840c599f000e50ba +patword 0x00e5 0x840c599f000850ba +patword 0x00e6 0x840c599f000e50ba +patword 0x00e7 0x840c599f000850ba +patword 0x00e8 0x840c599f000e50ba +patword 0x00e9 0x840c599f000850ba +patword 0x00ea 0x840c599f000e50ba +patword 0x00eb 0x840c599f000850ba +patword 0x00ec 0x840c599f000e50ba +patword 0x00ed 0x840c599f000850ba +patword 0x00ee 0x840c599f000e50ba +patword 0x00ef 0x840c599f000850ba +patword 0x00f0 0x040c599f000850ba +patword 0x00f1 0x040c599f000850ba +patword 0x00f2 0x000c599f000850ba +patword 0x00f3 0x000c599f000850ba +patword 0x00f4 0x0008599f200e503a +patword 0x00f5 0x0008599f0008503a +patword 0x00f6 0x0008599f200e503a +patword 0x00f7 0x0008599f0008503a +patword 0x00f8 0x0008599f0008503a +patword 0x00f9 0x0008599f0008503a +patword 0x00fa 0x0008599f0008503a +patword 0x00fb 0x0008599f0008503a +patword 0x00fc 0x0008599f0008503a +patword 0x00fd 0x0008599f0008503a +patword 0x00fe 0x0008599f0008503a +patword 0x00ff 0x0008599f0008503a +patword 0x0100 0x0008599f0008503a +patword 0x0101 0x0008599f0008503a +patword 0x0102 0x0008599f0008503a +patword 0x0103 0x0008599f0008503a +patword 0x0104 0x0008599f0008503a +patword 0x0105 0x0008599f0008503a +patword 0x0106 0x0008599f0008503a +patword 0x0107 0x0008599f0008503a +patword 0x0108 0x0008599f0008503a +patword 0x0109 0x0008599f0008503a +patword 0x010a 0x0008599f0008503a +patword 0x010b 0x0008599f0008503a +patword 0x010c 0x0008599f0008503a +patword 0x010d 0x0008599f0008503a +patword 0x010e 0x0008599f0008503a +patword 0x010f 0x0008599f0008503a +patword 0x0110 0x0008599f0008503a +patword 0x0111 0x0008599f0008503a +patioctrl 0x8f0effff6dbffdbf +patlimits 0x0000 0x0110 +patloop0 0x00be 0x00ef +patnloop0 199 +patloop1 0x0400 0x0400 +patnloop1 0 +patloop2 0x0400 0x0400 +patnloop2 0 +patwait0 0x002e +patwaittime0 800 +patwait1 0x0400 +patwaittime1 0 +patwait2 0x0400 +patwaittime2 0 diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_5.1.0 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_5.1.0 new file mode 100755 index 000000000..d8a2228b9 Binary files /dev/null and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_5.1.0 differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/DefaultPattern_mythen3.txt b/slsDetectorServers/mythen3DetectorServer/bin/DefaultPattern_mythen3.txt new file mode 100755 index 000000000..511d693b9 --- /dev/null +++ b/slsDetectorServers/mythen3DetectorServer/bin/DefaultPattern_mythen3.txt @@ -0,0 +1,256 @@ +patword 0x0000 0x0000000000000000 +patword 0x0001 0x0000000000000000 +patword 0x0002 0x0000000000000000 +patword 0x0003 0x0000000000000000 +patword 0x0004 0x0000000000000000 +patword 0x0005 0x0000000000000000 +patword 0x0006 0x0000000000c00000 +patword 0x0007 0x0000000000c00000 +patword 0x0008 0x0000000000c00000 +patword 0x0009 0x0000000000c00000 +patword 0x000a 0x0000000000c00000 +patword 0x000b 0x0000000000c00000 +patword 0x000c 0x0000000000000000 +patword 0x000d 0x0000000000000000 +patword 0x000e 0x0000000000000000 +patword 0x000f 0x0000000000000000 +patword 0x0010 0x0000000000000000 +patword 0x0011 0x0000000000000000 +patword 0x0012 0x0000000000200000 +patword 0x0013 0x0000000000200000 +patword 0x0014 0x0000000000e00000 +patword 0x0015 0x0000000000e00000 +patword 0x0016 0x0000000000e00000 +patword 0x0017 0x0000000000e00000 +patword 0x0018 0x0000000000e00000 +patword 0x0019 0x0000000000e00000 +patword 0x001a 0x0000000000e00000 +patword 0x001b 0x0000000000e00000 +patword 0x001c 0x0000000000200000 +patword 0x001d 0x0000000000200000 +patword 0x001e 0x0000000000200000 +patword 0x001f 0x0000000000200000 +patword 0x0020 0x0000000000200000 +patword 0x0021 0x0000000000200000 +patword 0x0022 0x0000000000200000 +patword 0x0023 0x0000000000200000 +patword 0x0024 0x0000000000200000 +patword 0x0025 0x0000000000200000 +patword 0x0026 0x0000000000200000 +patword 0x0027 0x0000000000200000 +patword 0x0028 0x0000000000200000 +patword 0x0029 0x0000000001200000 +patword 0x002a 0x0000000000200000 +patword 0x002b 0x0000000000200000 +patword 0x002c 0x0000000000200000 +patword 0x002d 0x0000000000200000 +patword 0x002e 0x0000000000200000 +patword 0x002f 0x0000000000200000 +patword 0x0030 0x0000000000200000 +patword 0x0031 0x0000000000200000 +patword 0x0032 0x0000000001200000 +patword 0x0033 0x0000000000200000 +patword 0x0034 0x0000000000200000 +patword 0x0035 0x0000000000200000 +patword 0x0036 0x0000000000200000 +patword 0x0037 0x0000000000200000 +patword 0x0038 0x0000000000200000 +patword 0x0039 0x0000000000200000 +patword 0x003a 0x0000000000200000 +patword 0x003b 0x0000000001200000 +patword 0x003c 0x0000000000200000 +patword 0x003d 0x0000000000200000 +patword 0x003e 0x0000000000200000 +patword 0x003f 0x0000000000200000 +patword 0x0040 0x0000000000200000 +patword 0x0041 0x0000000000200000 +patword 0x0042 0x0000000000200000 +patword 0x0043 0x0000000000200000 +patword 0x0044 0x0000000001200000 +patword 0x0045 0x0000000000200000 +patword 0x0046 0x0000000000200000 +patword 0x0047 0x0000000000200000 +patword 0x0048 0x0000000000200000 +patword 0x0049 0x0000000000200000 +patword 0x004a 0x0000000000200000 +patword 0x004b 0x0000000000200000 +patword 0x004c 0x0000000000200000 +patword 0x004d 0x0000000001200000 +patword 0x004e 0x0000000000200000 +patword 0x004f 0x0000000000200000 +patword 0x0050 0x0000000000200000 +patword 0x0051 0x0000000000200000 +patword 0x0052 0x0000000000200000 +patword 0x0053 0x0000000000200000 +patword 0x0054 0x0000000000200000 +patword 0x0055 0x0000000000200000 +patword 0x0056 0x0000000001200000 +patword 0x0057 0x0000000000200000 +patword 0x0058 0x0000000000200000 +patword 0x0059 0x0000000000200000 +patword 0x005a 0x0000000000280000 +patword 0x005b 0x0000000000280000 +patword 0x005c 0x0000000000280000 +patword 0x005d 0x0000000000280000 +patword 0x005e 0x0000000000280000 +patword 0x005f 0x0000000001280000 +patword 0x0060 0x0000000000280000 +patword 0x0061 0x0000000000200000 +patword 0x0062 0x0000000000200000 +patword 0x0063 0x0000000000200000 +patword 0x0064 0x0000000000200000 +patword 0x0065 0x0000000000200000 +patword 0x0066 0x0000000000200000 +patword 0x0067 0x0000000000200000 +patword 0x0068 0x0000000001200000 +patword 0x0069 0x0000000000200000 +patword 0x006a 0x0000000000200000 +patword 0x006b 0x0000000000200000 +patword 0x006c 0x0000000000200000 +patword 0x006d 0x0000000000200000 +patword 0x006e 0x0000000000200000 +patword 0x006f 0x0000000000200000 +patword 0x0070 0x0000000000200000 +patword 0x0071 0x0000000001200000 +patword 0x0072 0x0000000000200000 +patword 0x0073 0x0000000000200000 +patword 0x0074 0x0000000000200000 +patword 0x0075 0x0000000000200000 +patword 0x0076 0x0000000000200000 +patword 0x0077 0x0000000000200000 +patword 0x0078 0x0000000000200000 +patword 0x0079 0x0000000000200000 +patword 0x007a 0x0000000001200000 +patword 0x007b 0x0000000000200000 +patword 0x007c 0x0000000000200000 +patword 0x007d 0x0000000000200000 +patword 0x007e 0x0000000000280000 +patword 0x007f 0x0000000000280000 +patword 0x0080 0x0000000000280000 +patword 0x0081 0x0000000000280000 +patword 0x0082 0x0000000000280000 +patword 0x0083 0x0000000001280000 +patword 0x0084 0x0000000000280000 +patword 0x0085 0x0000000000200000 +patword 0x0086 0x0000000000200000 +patword 0x0087 0x0000000000200000 +patword 0x0088 0x0000000000200000 +patword 0x0089 0x0000000000200000 +patword 0x008a 0x0000000000200000 +patword 0x008b 0x0000000000200000 +patword 0x008c 0x0000000001200000 +patword 0x008d 0x0000000000200000 +patword 0x008e 0x0000000000200000 +patword 0x008f 0x0000000000200000 +patword 0x0090 0x0000000000200000 +patword 0x0091 0x0000000000200000 +patword 0x0092 0x0000000000200000 +patword 0x0093 0x0000000000200000 +patword 0x0094 0x0000000000200000 +patword 0x0095 0x0000000001200000 +patword 0x0096 0x0000000000200000 +patword 0x0097 0x0000000000200000 +patword 0x0098 0x0000000000200000 +patword 0x0099 0x0000000000200000 +patword 0x009a 0x0000000000200000 +patword 0x009b 0x0000000000200000 +patword 0x009c 0x0000000000200000 +patword 0x009d 0x0000000000200000 +patword 0x009e 0x0000000001200000 +patword 0x009f 0x0000000000200000 +patword 0x00a0 0x0000000000200000 +patword 0x00a1 0x0000000000200000 +patword 0x00a2 0x0000000000200000 +patword 0x00a3 0x0000000000200000 +patword 0x00a4 0x0000000000200000 +patword 0x00a5 0x0000000000200000 +patword 0x00a6 0x0000000000200000 +patword 0x00a7 0x0000000001200000 +patword 0x00a8 0x0000000000200000 +patword 0x00a9 0x0000000000200000 +patword 0x00aa 0x0000000000200000 +patword 0x00ab 0x0000000000200000 +patword 0x00ac 0x0000000000200000 +patword 0x00ad 0x0000000000200000 +patword 0x00ae 0x0000000000200000 +patword 0x00af 0x0000000000200000 +patword 0x00b0 0x0000000001200000 +patword 0x00b1 0x0000000000200000 +patword 0x00b2 0x0000000000200000 +patword 0x00b3 0x0000000000200000 +patword 0x00b4 0x0000000000200000 +patword 0x00b5 0x0000000000200000 +patword 0x00b6 0x0000000000200000 +patword 0x00b7 0x0000000000200000 +patword 0x00b8 0x0000000000200000 +patword 0x00b9 0x0000000001200000 +patword 0x00ba 0x0000000000200000 +patword 0x00bb 0x0000000000200000 +patword 0x00bc 0x0000000000200000 +patword 0x00bd 0x0000000000200000 +patword 0x00be 0x0000000000200000 +patword 0x00bf 0x0000000000200000 +patword 0x00c0 0x0000000000200000 +patword 0x00c1 0x0000000000200000 +patword 0x00c2 0x0000000001200000 +patword 0x00c3 0x0000000000200000 +patword 0x00c4 0x0000000000200000 +patword 0x00c5 0x0000000000200000 +patword 0x00c6 0x0000000000300000 +patword 0x00c7 0x0000000000300000 +patword 0x00c8 0x0000000000300000 +patword 0x00c9 0x0000000000300000 +patword 0x00ca 0x0000000000300000 +patword 0x00cb 0x0000000000200000 +patword 0x00cc 0x0000000000200000 +patword 0x00cd 0x0000000000200000 +patword 0x00ce 0x0000000000200000 +patword 0x00cf 0x0000000000200000 +patword 0x00d0 0x0000000000200000 +patword 0x00d1 0x0000000000200000 +patword 0x00d2 0x0000000000000000 +patword 0x00d3 0x0000000000000000 +patword 0x00d4 0x0000000000000000 +patword 0x00d5 0x0000000000000000 +patword 0x00d6 0x0000000000000000 +patword 0x00d7 0x0000000000000000 +patword 0x00d8 0x0000000000000000 +patword 0x00d9 0x0000000000000000 +patword 0x00da 0x0000000000c00000 +patword 0x00db 0x0000000000c00000 +patword 0x00dc 0x0000000000c00000 +patword 0x00dd 0x0000000000c00000 +patword 0x00de 0x0000000000c00000 +patword 0x00df 0x0000000000c00000 +patword 0x00e0 0x0000000000c00000 +patword 0x00e1 0x0000000000c00000 +patword 0x00e2 0x0000000000c00000 +patword 0x00e3 0x0000000000c00000 +patword 0x00e4 0x0000000000000000 +patword 0x00e5 0x0000000000000000 +patword 0x00e6 0x0000000000000000 +patword 0x00e7 0x0000000000000000 +patword 0x00e8 0x0000000000000000 +patword 0x00e9 0x0000000000000000 +patword 0x00ea 0x0000000000000000 +patword 0x00eb 0x0000000000000000 +patword 0x00ec 0x0000000000000000 +patword 0x00ed 0x0000000000000000 +patword 0x00ee 0x0000000000000000 +patword 0x00ef 0x0000000000000000 +patword 0x00f0 0x0000000000000000 +patword 0x00f1 0x0000000000000000 +patword 0x00f2 0x0000000000000000 +patlimits 0x0000 0x00f2 +patloop0 0x0400 0x0400 +patnloop0 0 +patloop1 0x0400 0x0400 +patnloop1 0 +patloop2 0x0400 0x0400 +patnloop2 0 +patwait0 0x0400 +patwaittime0 0 +patwait1 0x0400 +patwaittime1 0 +patwait2 0x0400 +patwaittime2 0 diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_5.1.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_5.1.0 new file mode 100755 index 000000000..347bb9f7c Binary files /dev/null and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_5.1.0 differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index 556b69e45..bac68d925 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -1,7 +1,7 @@ #pragma once #include "sls/sls_detector_defs.h" -#define REQRD_FRMWRE_VRSN (0x200925) +#define REQRD_FRMWRE_VRSN (0x210201) #define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020" #define ID_FILE "detid_mythen3.txt" @@ -47,7 +47,7 @@ #define DEFAULT_HIGHGAIN_VRPREAMP (1300) #define DEFAULT_STANDARD_VRSHAPER (1280) #define DEFAULT_FAST_VRSHAPER (1500) -#define DEFAULT_HIGHGAIN_VRSHAPER (900) +#define DEFAULT_HIGHGAIN_VRSHAPER (1100) #define DEFAULT_READOUT_C0 (10) //(100000000) // rdo_clk, 100 MHz #define DEFAULT_READOUT_C1 (10) //(100000000) // smp sample clk (x2), 100 MHz diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index d0a41b867..9a47d90f9 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -54,7 +54,7 @@ bool CmdProxy::ReplaceIfDepreciated(std::string &command) { if (d_it != depreciated_functions.end()) { LOG(logWARNING) << command - << " is depreciated and will be removed. Please migrate to: " + << " is deprecated and will be removed. Please migrate to: " << d_it->second; // insert old command into arguments (for dacs) if (d_it->second == "dac") { diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 1d833a0e4..b0892c2a2 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -675,7 +675,7 @@ void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); } void Detector::startDetector() { auto detector_type = getDetectorType().squash(); - if (detector_type == defs::MYTHEN3){ + if (detector_type == defs::MYTHEN3 && size() > 1){ auto is_master = getMaster(); std::vector master; std::vector slaves; diff --git a/slsSupportLib/CMakeLists.txt b/slsSupportLib/CMakeLists.txt index 215a625b5..2d67cadfc 100755 --- a/slsSupportLib/CMakeLists.txt +++ b/slsSupportLib/CMakeLists.txt @@ -57,14 +57,12 @@ target_include_directories(slsSupportObject PUBLIC "$" "$" - PRIVATE - ${ZeroMQ_INCLUDE_DIRS} ) target_link_libraries(slsSupportObject PUBLIC slsProjectOptions - ${ZeroMQ_LIBRARIES} + libzmq rapidjson PRIVATE slsProjectWarnings @@ -76,7 +74,6 @@ endif(SLS_USE_TESTS) # Add shared library version of the support lib add_library(slsSupportShared SHARED $) - target_link_libraries(slsSupportShared PUBLIC slsSupportObject) set_target_properties(slsSupportShared PROPERTIES @@ -108,3 +105,4 @@ install(TARGETS slsSupportShared slsSupportStatic slsSupportObject PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls ) + diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index bb8c27743..f39bec75f 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -1,12 +1,12 @@ /** API versions */ -#define GITBRANCH "developer" -#define APILIB 0x201119 -#define APIRECEIVER 0x201119 -#define APIGUI 0x201119 -#define APICTB 0x201214 -#define APIGOTTHARD 0x201214 -#define APIGOTTHARD2 0x201214 -#define APIJUNGFRAU 0x201214 -#define APIMOENCH 0x201214 -#define APIEIGER 0x201214 -#define APIMYTHEN3 0x201214 +#define GITBRANCH "5.1.0" +#define APICTB 0x210225 +#define APIGOTTHARD 0x210225 +#define APIGOTTHARD2 0x210225 +#define APIJUNGFRAU 0x210225 +#define APIMOENCH 0x210225 +#define APIEIGER 0x210225 +#define APIMYTHEN3 0x210225 +#define APILIB 0x210225 +#define APIRECEIVER 0x210225 +#define APIGUI 0x210225 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3cdb3d634..93c52afeb 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -18,22 +18,24 @@ set_target_properties(testserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) add_executable(tests ${SLS_TEST_SOURCES}) -target_link_libraries(tests - slsProjectOptions - slsProjectWarnings - slsSupportShared - pthread - rt +target_link_libraries(tests + PUBLIC + slsProjectOptions + slsSupportShared + pthread + rt + PRIVATE + slsProjectWarnings ) if (SLS_USE_TEXTCLIENT) - target_link_libraries(tests + target_link_libraries(tests PUBLIC slsDetectorShared ) endif (SLS_USE_TEXTCLIENT) if (SLS_USE_RECEIVER) - target_link_libraries(tests + target_link_libraries(tests PUBLIC slsReceiverShared ) endif (SLS_USE_RECEIVER)