servers in

CMakeLists.txt

@@ -157,37 +157,8 @@ 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 QUIET)
-    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()

RELEASE.txt

@@ -1,13 +1,14 @@
-SLS Detector Package 5.X.X released on XX.XX.2021 (Minor Release)
+SLS Detector Package 5.1.0 released on xx.xx.2020 (Minor Release)
 ===================================================================
 
-This document describes the differences between X and Y releases.   
+This document describes the differences between 5.1.0 and 5.x.x releases.   
 
 
 
     CONTENTS
     --------
-    1.  New Features
+    1.  Topics Concerning
+    2.  New Features
     2.  Resolved Issues
     3.  Known Issues
     4.  Firmware Requirements
@@ -15,15 +16,58 @@ This document describes the differences between X and Y releases.
 
 
 
+1. Topics Concerning
+====================
 
-1. New Features
+    - potentital memory leak in receiver
+    - scanParameters in Python
+    - cmk.sh refactored
+    - m3 settings and threshold
+
+
+2. New Features
 ===============
 
-    Setting Mythen3 gain from command line
+    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

cmake/FindZeroMQ.cmake

@@ -0,0 +1,112 @@
+
+# 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()

cmake/package_config.cmake

@@ -25,12 +25,6 @@ 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}"

cmake/project-config.cmake.in

@@ -12,21 +12,8 @@ include(CMakeFindDependencyMacro)
 
 set(SLS_USE_HDF5 "@SLS_USE_HDF5@")
 
-
-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
+find_dependency(Threads)
 if (SLS_USE_HDF5)
     find_dependency(HDF5)
 endif ()

conda-recepie/build.sh

@@ -13,9 +13,8 @@ cmake .. \
       -DCMAKE_BUILD_TYPE=Release \
       -DSLS_USE_HDF5=OFF\
      
-NCORES=$(getconf _NPROCESSORS_ONLN)
+
-echo "Building using: ${NCORES} cores"
+cmake --build . -- -j10
-cmake --build . -- -j${NCORES}
 cmake --build . --target install
 
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
+CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2

conda-recepie/copy_gui.sh

@@ -1,3 +1,3 @@
 #Copy the GUI 
-mkdir -p $PREFIX/bin
+mkdir $PREFIX/bin
-cp build/install/bin/slsDetectorGui $PREFIX/bin/.
+cp build/bin/slsDetectorGui $PREFIX/bin/.

conda-recepie/copy_lib.sh

@@ -1,6 +1,6 @@
 
-mkdir -p $PREFIX/lib
+mkdir $PREFIX/lib
-mkdir -p $PREFIX/bin
+mkdir $PREFIX/bin
 mkdir -p $PREFIX/include/sls
 # mkdir $PREFIX/include/slsDetectorPackage
 

conda-recepie/meta.yaml

@@ -59,16 +59,6 @@ outputs:
     script: copy_lib.sh
 
     requirements:
-      build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
-        - libstdcxx-ng
-        - libgcc-ng
-        - zeromq
-
-      host:
-        - zeromq
-
       run: 
         - libstdcxx-ng
         - libgcc-ng
@@ -88,8 +78,6 @@ outputs:
 
       host:
         - python
-        - {{ pin_subpackage('slsdetlib', exact=True) }}
-
 
       run:
         - libstdcxx-ng
@@ -106,13 +94,6 @@ 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.*

libzmq-pkg-config/FindZeroMQ.cmake

@@ -1,27 +0,0 @@
-#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})

python/scripts/compile_servers.py

@@ -1,80 +0,0 @@
-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'])

python/scripts/generate_enums.py

@@ -11,8 +11,6 @@ import subprocess
 
 from parse import remove_comments
 
-allow_bitwise_op = ["M3_GainCaps"]
-
 def single_line_enum(line):
     sub = line[line.find('{')+1:line.find('}')]
     return sub.strip().split(',')
@@ -51,11 +49,7 @@ def extract_enums(lines):
 def generate_enum_string(enums):
     data = []
     for key, value in enums.items():
-        if key in allow_bitwise_op:
+        data.append(f'py::enum_<slsDetectorDefs::{key}>(Defs, "{key}")\n')
-            tag=", py::arithmetic()"
-        else:
-            tag=""
-        data.append(f'py::enum_<slsDetectorDefs::{key}>(Defs, "{key}"{tag})\n')
         for v in value:
             data.append(f'\t.value("{v}", slsDetectorDefs::{key}::{v})\n')
         data.append('.export_values();\n\n')

python/slsdet/enums.py

@@ -14,5 +14,4 @@ clockIndex = _slsdet.slsDetectorDefs.clockIndex
 readoutMode = _slsdet.slsDetectorDefs.readoutMode
 masterFlags = _slsdet.slsDetectorDefs.masterFlags
 burstMode = _slsdet.slsDetectorDefs.burstMode
-timingSourceType = _slsdet.slsDetectorDefs.timingSourceType
+timingSourceType = _slsdet.slsDetectorDefs.timingSourceType
-M3_GainCaps = _slsdet.slsDetectorDefs.M3_GainCaps

python/src/detector.cpp

@@ -1136,16 +1136,6 @@ void init_det(py::module &m) {
              (Result<bool>(Detector::*)(sls::Positions) const) &
                  Detector::getMaster,
              py::arg() = Positions{})
-        .def("getChipStatusRegister",
-             (Result<int>(Detector::*)(sls::Positions) const) &
-                 Detector::getChipStatusRegister,
-             py::arg() = Positions{})
-        .def("setGainCaps",
-             (void (Detector::*)(int, sls::Positions)) & Detector::setGainCaps,
-             py::arg(), py::arg() = Positions{})
-        .def("getGainCaps",
-             (Result<int>(Detector::*)(sls::Positions)) & Detector::getGainCaps,
-             py::arg() = Positions{})
         .def("getNumberOfAnalogSamples",
              (Result<int>(Detector::*)(sls::Positions) const) &
                  Detector::getNumberOfAnalogSamples,

python/src/enums.cpp

@@ -277,14 +277,4 @@ void init_enums(py::module &m) {
         .value("TIMING_EXTERNAL",
                slsDetectorDefs::timingSourceType::TIMING_EXTERNAL)
         .export_values();
-
-    py::enum_<slsDetectorDefs::M3_GainCaps>(Defs, "M3_GainCaps",
-                                            py::arithmetic())
-        .value("M3_C10pre", slsDetectorDefs::M3_GainCaps::M3_C10pre)
-        .value("M3_C15sh", slsDetectorDefs::M3_GainCaps::M3_C15sh)
-        .value("M3_C30sh", slsDetectorDefs::M3_GainCaps::M3_C30sh)
-        .value("M3_C50sh", slsDetectorDefs::M3_GainCaps::M3_C50sh)
-        .value("M3_C225ACsh", slsDetectorDefs::M3_GainCaps::M3_C225ACsh)
-        .value("M3_C15pre", slsDetectorDefs::M3_GainCaps::M3_C15pre)
-        .export_values();
 }

slsDetectorGui/CMakeLists.txt

@@ -91,6 +91,7 @@ target_include_directories(slsDetectorGui PUBLIC
 
 target_link_libraries(slsDetectorGui PUBLIC
     slsProjectOptions 
+    slsProjectWarnings
     slsDetectorStatic
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTGUI_LIBRARIES}
@@ -100,9 +101,6 @@ target_link_libraries(slsDetectorGui PUBLIC
     Qt4::QtOpenGL
     Qt4::QtSvg
     expat
-    
-    PRIVATE
-    slsProjectWarnings
 )
 
 set_target_properties(slsDetectorGui PROPERTIES
@@ -113,7 +111,7 @@ if(SLS_LTO_AVAILABLE)
 endif()
 
 install(TARGETS slsDetectorGui
-    # EXPORT "${TARGETS_EXPORT_NAME}" #do not export gui
+    EXPORT "${TARGETS_EXPORT_NAME}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

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_BOTTOM, 0, 1);
+    return Feb_Control_SetTop(val == 0 ? TOP_HARDWARE : OW_TOP, 0, 1);
 }
 
 int Feb_Control_SetReadNLines(int value) {

slsDetectorServers/mythen3DetectorServer/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_executable(mythen3DetectorServer_virtual
     slsDetectorFunctionList.c
-    mythen3.c
     ../slsDetectorServer/src/slsDetectorServer.c
     ../slsDetectorServer/src/slsDetectorServer_funcs.c
     ../slsDetectorServer/src/communication_funcs.c
@@ -11,8 +10,7 @@ add_executable(mythen3DetectorServer_virtual
     ../slsDetectorServer/src/LTC2620_Driver.c
     ../slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c   
     ../slsDetectorServer/src/programFpgaNios.c
-    ../slsDetectorServer/src/readDefaultPattern.c 
+    ../slsDetectorServer/src/readDefaultPattern.c         
-    ../slsDetectorServer/src/loadPattern.c         
     ../slsDetectorServer/src/sharedMemory.c
 )
 

slsDetectorServers/mythen3DetectorServer/Makefile

@@ -13,7 +13,7 @@ DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
 SRCS	=	slsDetectorFunctionList.c 
-SRCS	+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)nios.c $(main_src)DAC6571.c $(main_src)common.c $(main_src)LTC2620_Driver.c $(main_src)ALTERA_PLL_CYCLONE10.c $(main_src)/programFpgaNios.c $(main_src)readDefaultPattern.c $(main_src)/sharedMemory.c $(main_src)/loadPattern.c mythen3.c
+SRCS	+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)nios.c $(main_src)DAC6571.c $(main_src)common.c $(main_src)LTC2620_Driver.c $(main_src)ALTERA_PLL_CYCLONE10.c $(main_src)/programFpgaNios.c $(main_src)readDefaultPattern.c $(main_src)/sharedMemory.c
 
 OBJS 	= 	$(SRCS:.c=.o) 
  
@@ -40,4 +40,4 @@ clean:
 	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb $(main_src)*.o
 	
 
-	
+	

slsDetectorServers/mythen3DetectorServer/mythen3.c

@@ -1,374 +0,0 @@
-
-#include "clogger.h"
-#include "common.h"
-#include "mythen3.h"
-#include "sls/ansi.h"
-#include "sls/sls_detector_defs.h"
-#include "slsDetectorServer_defs.h"
-
-#include <string.h>
-
-/*
-// Common C/C++ structure to handle pattern data
-typedef struct __attribute__((packed)) {
-    uint64_t word[MAX_PATTERN_LENGTH];
-    uint64_t ioctrl;
-    uint32_t limits[2];
-    // loop0 start, loop0 stop .. loop2 start, loop2 stop
-    uint32_t loop[6];
-    uint32_t nloop[3];
-    uint32_t wait[3];
-    uint64_t waittime[3];
-} patternParameters;
-*/
-
-int chipStatusRegister=0;
-
-int setBit(int ibit, int patword) { return patword |= (1 << ibit); }
-
-int clearBit(int ibit, int patword) { return patword &= ~(1 << ibit); }
-
-extern enum TLogLevel trimmingPrint ;
-
-
-int getChipStatusRegister(){
-  return chipStatusRegister;
-}
-
-int gainCapsToCsr(int caps){
-  //Translates bit representation
-  int csr = 0;
-  if (!(caps & M3_C10pre))
-    csr |= 1 << _CSR_C10pre;
-  if (caps & M3_C15sh)
-    csr |= 1 << CSR_C15sh;
-  if (caps & M3_C30sh)
-    csr |= 1 << CSR_C30sh;
-  if (caps & M3_C50sh)
-    csr |= 1 << CSR_C50sh;
-  if (caps & M3_C225ACsh)
-    csr |= 1 << CSR_C225ACsh;
-  if (!(caps & M3_C15pre))
-    csr |= 1 << _CSR_C15pre;
-
-  return csr;
-}
-
-int csrToGainCaps(int csr){
-  //Translates bit representation
-  int caps = 0;
-  if (!(csr & (1 << _CSR_C10pre)))
-    caps |= M3_C10pre;
-  if (csr & (1 << CSR_C15sh))
-    caps |= M3_C15sh;
-  if (csr & (1 << CSR_C30sh))
-    caps |= M3_C30sh;
-  if (csr & (1 << CSR_C50sh))
-    caps |= M3_C50sh;
-  if (csr & (1 << CSR_C225ACsh))
-    caps |= M3_C225ACsh;
-  if (!(csr & (1 << _CSR_C15pre)))
-    caps |= M3_C15pre;
-
-  return caps;
-}
-
-patternParameters *setChipStatusRegisterPattern(int csr) {
-  int iaddr=0;
-  int  nbits=18;
-  int error=0;
-  //int start=0, stop=MAX_PATTERN_LENGTH, loop=0;
-  int patword=0;
-  
-  patternParameters *pat = malloc(sizeof(patternParameters));
-  memset(pat, 0, sizeof(patternParameters));
-  
-  patword=setBit(SIGNAL_STATLOAD,patword);
-  for (int i=0; i<2; i++)
-    pat->word[iaddr++]=patword;
-  patword=setBit(SIGNAL_resStorage,patword);
-  patword=setBit(SIGNAL_resCounter,patword);
-  for (int i=0; i<8; i++)
-    pat->word[iaddr++]=patword;
-  patword=clearBit(SIGNAL_resStorage,patword);
-  patword=clearBit(SIGNAL_resCounter,patword);
-  for (int i=0; i<8; i++)
-    pat->word[iaddr++]=patword;
-  //#This version of the serializer pushes in the MSB first (compatible with the CSR bit numbering)
-  for (int ib=nbits-1; ib>=0; ib--) {
-    if (csr&(1<<ib))
-      patword=setBit(SIGNAL_serialIN,patword);
-    else
-      patword=clearBit(SIGNAL_serialIN,patword);
-    for (int i=0; i<4; i++)
-      pat->word[iaddr++]=patword;
-    patword=setBit(SIGNAL_CHSclk,patword);
-    pat->word[iaddr++]=patword;
-    patword=clearBit(SIGNAL_CHSclk,patword);
-    pat->word[iaddr++]=patword;
-  }
-
-  patword=clearBit(SIGNAL_serialIN,patword);
-  for (int i=0; i<2; i++)
-    pat->word[iaddr++]=patword;
-  patword=setBit(SIGNAL_STO,patword);
-  for (int i=0; i<5; i++)
-    pat->word[iaddr++]=patword;
-  patword=clearBit(SIGNAL_STO,patword);
-  for (int i=0; i<5; i++)
-    pat->word[iaddr++]=patword;
-  patword=clearBit(SIGNAL_STATLOAD,patword);
-  for (int i=0; i<5; i++)
-    pat->word[iaddr++]=patword;
-
-  if (iaddr >= MAX_PATTERN_LENGTH) {
-    LOG(logERROR, ("Addr 0x%x is past max_address_length 0x%x!\n",
-		   iaddr, MAX_PATTERN_LENGTH));
-    error = 1;
-  }
-  // set pattern wait address
-  for (int i = 0; i <= 2; i++)
-    pat->wait[i]=MAX_PATTERN_LENGTH - 1;
-  // pattern loop
-  for (int i = 0; i <= 2; i++) {
-    //int stop = MAX_PATTERN_LENGTH - 1, nloop = 0;
-    pat->loop[i * 2 + 0]=MAX_PATTERN_LENGTH - 1;
-    pat->loop[i * 2 + 1]=MAX_PATTERN_LENGTH - 1;
-    pat->nloop[i]=0;
-  }
-  
-  // pattern limits
-  {
-    pat->limits[0]=0;
-    pat->limits[1]=iaddr;
-  }
-  
-  if (error != 0) {
-    free(pat);
-    return NULL;
-  }
-  chipStatusRegister=csr;
-  return pat;
-
-}
-
-patternParameters *setInterpolation(int mask) {
-  int csr;
-  if (mask)
-    csr=chipStatusRegister|(1<< CSR_interp);
-  else
-    csr=chipStatusRegister & ~(1<< CSR_interp);
-
-  return setChipStatusRegisterPattern(csr);
-}
-
-
-
-patternParameters *setPumpProbe(int mask) {
-  int csr;
-  if (mask)
-    csr=chipStatusRegister|(1<< CSR_pumprobe);
-  else
-    csr=chipStatusRegister & ~(1<< CSR_pumprobe);
-
-  return setChipStatusRegisterPattern(csr);
-
-}
-patternParameters *setDigitalPulsing(int mask) {
-
-  int csr;
-  if (mask)
-    csr=chipStatusRegister|(1<< CSR_dpulse);
-  else
-    csr=chipStatusRegister & ~(1<< CSR_dpulse);
-
-  return setChipStatusRegisterPattern(csr);
-  
-}
-patternParameters *setAnalogPulsing(int mask){
-
-  int csr;
-  if (mask)
-    csr=chipStatusRegister|(1<< CSR_apulse);
-  else
-    csr=chipStatusRegister & ~(1<< CSR_apulse);
-
-  return setChipStatusRegisterPattern(csr);
-  
-}
-patternParameters *setNegativePolarity(int mask){
-
-  int csr;
-  if (mask)
-    csr=chipStatusRegister|(1<< CSR_invpol);
-  else
-    csr=chipStatusRegister & ~(1<< CSR_invpol);
-
-  return setChipStatusRegisterPattern(csr);
-  
-}
-
-patternParameters *setChannelRegisterChip(int ichip, int *mask, int *trimbits) {
-
-  patternParameters *pat = malloc(sizeof(patternParameters));
-  memset(pat, 0, sizeof(patternParameters));
-  
-
-    // validate
-  for (int ichan = ichip * NCHAN_1_COUNTER * NCOUNTERS; ichan < ichip * NCHAN_1_COUNTER * NCOUNTERS+NCHAN_1_COUNTER*NCOUNTERS; ichan++) {
-    if (trimbits[ichan]<0)  {
-      LOG(logERROR, ("Trimbit value (%d) for channel %d is invalid - setting it to 0\n",
-		     trimbits[ichan], ichan));
-      trimbits[ichan]=0;
-    }
-    if (trimbits[ichan] > 63) {
-      LOG(logERROR, ("Trimbit value (%d) for channel %d is invalid - settings it to 63\n",
-		     trimbits[ichan], ichan));
-      trimbits[ichan]=63;
-    }
-  }
-  LOG(logINFO, ("Trimbits validated\n"));
-  trimmingPrint = logDEBUG5;
-
-    
-  // trimming
-  int error = 0;
-  uint64_t patword = 0;
-  int iaddr = 0;
-  
-  LOG(logDEBUG1, (" Chip %d\n", ichip));
-  iaddr = 0;
-  patword = 0;
-  pat->word[iaddr++]=patword;
-  
-  // chip select
-  patword = setBit(SIGNAL_TBLoad_1 + ichip, patword);
-  pat->word[iaddr++]=patword;
-  
-  // reset trimbits
-  patword = setBit(SIGNAL_resStorage, patword);
-  patword = setBit(SIGNAL_resCounter, patword);
-  pat->word[iaddr++]=patword;
-  pat->word[iaddr++]=patword;
-  patword = clearBit(SIGNAL_resStorage, patword);
-  patword = clearBit(SIGNAL_resCounter, patword);
-  pat->word[iaddr++]=patword;
-  pat->word[iaddr++]=patword;
-  
-  // select first channel
-  patword = setBit(SIGNAL_CHSserialIN, patword);
-  pat->word[iaddr++]=patword;
-  // 1 clk pulse
-  patword = setBit(SIGNAL_CHSclk, patword);
-  pat->word[iaddr++]=patword;
-  patword = clearBit(SIGNAL_CHSclk, patword);
-  // clear 1st channel
-  pat->word[iaddr++]=patword;
-  patword = clearBit(SIGNAL_CHSserialIN, patword);
-  // 2 clk pulses
-  for (int i = 0; i < 2; i++) {
-    patword = setBit(SIGNAL_CHSclk, patword);
-    pat->word[iaddr++]=patword;
-    patword = clearBit(SIGNAL_CHSclk, patword);
-    pat->word[iaddr++]=patword;
-  }
-  
-  // for each channel (all chips)
-  for (int ich = 0; ich < NCHAN_1_COUNTER; ich++) {
-    LOG(logDEBUG1, (" Chip %d, Channel %d\n", ichip, ich));
-    int val = trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
-		       NCOUNTERS * ich] +
-      trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
-	       NCOUNTERS * ich + 1] *
-      64 +
-      trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
-	       NCOUNTERS * ich + 2] *
-      64 * 64;
-    
-    // push 6 0 bits
-    for (int i = 0; i < 3; i++) {
-      patword = clearBit(SIGNAL_serialIN, patword);
-      patword = clearBit(SIGNAL_clk, patword);
-      pat->word[iaddr++]=patword;
-      patword = setBit(SIGNAL_clk, patword);
-      pat->word[iaddr++]=patword;
-    }
-    
-    for (int i = 0; i < 3; i++) {
-      if (mask[i])
-	patword = setBit(SIGNAL_serialIN, patword);
-      else
-	patword = clearBit(SIGNAL_serialIN, patword);
-      patword = clearBit(SIGNAL_clk, patword);
-      pat->word[iaddr++]=patword;
-      patword = setBit(SIGNAL_clk, patword);
-      pat->word[iaddr++]=patword;
-    }
-    
-    // deserialize
-    for (int i = 0; i < 18; i++) {
-      if (val & (1 << i)) {
-	patword = setBit(SIGNAL_serialIN, patword);
-      } else {
-	patword = clearBit(SIGNAL_serialIN, patword);
-      }
-      patword = clearBit(SIGNAL_clk, patword);
-      pat->word[iaddr++]=patword;
-      
-      patword = setBit(SIGNAL_clk, patword);
-      pat->word[iaddr++]=patword;
-    }
-    pat->word[iaddr++]=patword;
-    pat->word[iaddr++]=patword;
-    
-    // move to next channel
-    for (int i = 0; i < 3; i++) {
-      patword = setBit(SIGNAL_CHSclk, patword);
-      pat->word[iaddr++]=patword;
-      patword = clearBit(SIGNAL_CHSclk, patword);
-      pat->word[iaddr++]=patword;
-    }
-  }
-  // chip unselect
-  patword = clearBit(SIGNAL_TBLoad_1 + ichip, patword);
-  pat->word[iaddr++]=patword;
-  
-  // last iaddr check
-  if (iaddr >= MAX_PATTERN_LENGTH) {
-    LOG(logERROR, ("Addr 0x%x is past max_address_length 0x%x!\n",
-		   iaddr, MAX_PATTERN_LENGTH));
-    error = 1;
-  }
-  
-  if (iaddr >= MAX_PATTERN_LENGTH) {
-    LOG(logERROR, ("Addr 0x%x is past max_address_length 0x%x!\n",
-		   iaddr, MAX_PATTERN_LENGTH));
-    error = 1;
-  }
-  // set pattern wait address
-  for (int i = 0; i <= 2; i++)
-    pat->wait[i]=MAX_PATTERN_LENGTH - 1;
-  // pattern loop
-  for (int i = 0; i <= 2; i++) {
-    //int stop = MAX_PATTERN_LENGTH - 1, nloop = 0;
-    pat->loop[i * 2 + 0]=MAX_PATTERN_LENGTH - 1;
-    pat->loop[i * 2 + 1]=MAX_PATTERN_LENGTH - 1;
-    pat->nloop[i]=0;
-  }
-  
-  // pattern limits
-  {
-    pat->limits[0]=0;
-    pat->limits[1]=iaddr;
-  }
-  
-  trimmingPrint = logINFO;
-  if (error == 0) {
-    
-    LOG(logINFO, ("All trimbits have been loaded\n"));
-  } else {
-    free(pat);
-    return NULL;
-  }
-  return pat;
-}

slsDetectorServers/mythen3DetectorServer/mythen3.h

@@ -1,68 +0,0 @@
-#ifndef MYTHEN3_H
-#define MYTHEN3_H
-
-#include "Pattern.h"
-
-/** Signal Definitions */
-#define SIGNAL_TBLoad_1    (0)
-#define SIGNAL_TBLoad_2    (1)
-#define SIGNAL_TBLoad_3    (2)
-#define SIGNAL_TBLoad_4    (3)
-#define SIGNAL_TBLoad_5    (4)
-#define SIGNAL_TBLoad_6    (5)
-#define SIGNAL_TBLoad_7    (6)
-#define SIGNAL_TBLoad_8    (7)
-#define SIGNAL_TBLoad_9    (8)
-#define SIGNAL_TBLoad_10   (9)
-#define SIGNAL_AnaMode     (10)
-#define SIGNAL_CHSserialIN (11)
-#define SIGNAL_READOUT     (12)
-#define SIGNAL_pulse       (13)
-#define SIGNAL_EN1         (14)
-#define SIGNAL_EN2         (15)
-#define SIGNAL_EN3         (16)
-#define SIGNAL_clk         (17)
-#define SIGNAL_SRmode      (18)
-#define SIGNAL_serialIN    (19)
-#define SIGNAL_STO         (20)
-#define SIGNAL_STATLOAD    (21)
-#define SIGNAL_resStorage  (22)
-#define SIGNAL_resCounter  (23)
-#define SIGNAL_CHSclk      (24)
-#define SIGNAL_exposing    (25)
-
-
-//CHIP STARTUS REGISTER BITS
-#define CSR_spypads  0
-#define CSR_invpol  4
-#define CSR_dpulse  5
-#define CSR_interp  6
-#define _CSR_C10pre  7 //#default, negative polarity
-#define CSR_pumprobe  8
-#define CSR_apulse  9
-#define CSR_C15sh  10 
-#define CSR_C30sh  11 //#default
-#define CSR_C50sh  12
-#define CSR_C225ACsh  13 // Connects 225fF SHAPER AC cap (1: 225 to shaper, 225 to GND. 0: 450 to shaper) 
-#define _CSR_C15pre  14 // negative polarity
-
-#define CSR_default  (1<<_CSR_C10pre )|(1<< CSR_C30sh)
-
-#define GAIN_MASK ((1 << _CSR_C10pre) | ( 1 << CSR_C15sh) | (1 << CSR_C30sh) | (1 << CSR_C50sh) | (1 << CSR_C225ACsh) | ( 1 << _CSR_C15pre))
-
-
-int setBit(int ibit, int patword);
-int clearBit(int ibit, int patword);
-int getChipStatusRegister();
-int gainCapsToCsr(int caps);
-int csrToGainCaps(int csr);
-
-patternParameters *setChipStatusRegisterPattern(int csr);
-patternParameters *setChannelRegisterChip(int ichip, int *mask, int *trimbits);
-patternParameters *setInterpolation(int mask);
-patternParameters *setPumpProbe(int mask);
-patternParameters *setDigitalPulsing(int mask);
-patternParameters *setAnalogPulsing(int mask);
-patternParameters *setNegativePolarity(int mask);
-
-#endif

slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c

@@ -5,8 +5,6 @@
 #include "RegisterDefs.h"
 #include "clogger.h"
 #include "common.h"
-#include "mythen3.h"
-#include "loadPattern.h"
 #include "sharedMemory.h"
 #include "sls/versionAPI.h"
 #ifdef VIRTUAL
@@ -21,6 +19,8 @@
 #include <time.h>
 #endif
 
+/// NOT the right place to put it!
+int setChipStatusRegister(int csr);
 
 // Global variable from slsDetectorServer_funcs
 extern int debugflag;
@@ -47,12 +47,11 @@ enum detectorSettings thisSettings;
 sls_detector_module *detectorModules = NULL;
 int *detectorChans = NULL;
 int *detectorDacs = NULL;
-int *channelMask=NULL;
 
+enum TLogLevel trimmingPrint = logINFO;
 int32_t clkPhase[NUM_CLOCKS] = {};
 uint32_t clkDivider[NUM_CLOCKS] = {};
 
-enum TLogLevel trimmingPrint = logINFO;
 int highvoltage = 0;
 int detPos[2] = {};
 int64_t exptimeReg[NCOUNTERS] = {0, 0, 0};
@@ -375,11 +374,7 @@ void allocateDetectorStructureMemory() {
     // Allocation of memory
     detectorModules = malloc(sizeof(sls_detector_module));
     detectorChans = malloc(NCHIP * NCHAN * sizeof(int));
-    channelMask = malloc(NCHIP * NCHAN * sizeof(char));
-    memset(channelMask, 0, NCHIP * NCHAN * sizeof(char));
     detectorDacs = malloc(NDAC * sizeof(int));
-
-    
     LOG(logDEBUG1,
         ("modules from 0x%x to 0x%x\n", detectorModules, detectorModules));
     LOG(logDEBUG1, ("chans from 0x%x to 0x%x\n", detectorChans, detectorChans));
@@ -517,11 +512,11 @@ void setupDetector() {
     }
 
     powerChip(1);
-
+    if (initError != FAIL) {
-    if (!initError) {
+      initError = setChipStatusRegister(CSR_default);
-      setChipStatusRegister(CSR_default);
+      //loadDefaultPattern(DEFAULT_PATTERN_FILE, initErrorMessage);
+      //startStateMachine(); //this was missing in previous code! runs the default pattern
     }
-
     setAllTrimbits(DEFAULT_TRIMBIT_VALUE);
 }
 
@@ -1057,44 +1052,72 @@ int64_t getMeasurementTime() {
 
 /* parameters - module, speed, readout */
 
-int setDACS(int* dacs){
+int setModule(sls_detector_module myMod, char *mess) {
+
+    LOG(logINFO, ("Setting module\n"));
+
+    // settings
+    if (myMod.reg >= 0) {
+        setSettings((enum detectorSettings)myMod.reg);
+        if (getSettings() != (enum detectorSettings)myMod.reg) {
+            sprintf(
+                mess,
+                "Could not set module. Could not set settings to %d, read %d\n",
+                myMod.reg, (int)getSettings());
+            LOG(logERROR, (mess));
+            return FAIL;
+        }
+        detectorModules->reg = myMod.reg;
+    }
+    // custom trimbit file
+    else {
+        // changed for setsettings (direct),
+        // custom trimbit file (setmodule with myMod.reg as -1),
+        // change of dac (direct)
+        for (int i = 0; i < NCOUNTERS; ++i) {
+            setThresholdEnergy(i, -1);
+        }
+    }
+
+    // dacs
     for (int i = 0; i < NDAC; ++i) {
-        if (dacs[i] != -1) {
+        // ignore dacs with -1
-            setDAC((enum DACINDEX)i, dacs[i], 0);
+        if (myMod.dacs[i] != -1) {
-            if (dacs[i] != detectorDacs[i]) {
+            setDAC((enum DACINDEX)i, myMod.dacs[i], 0);
+            if (myMod.dacs[i] != detectorDacs[i]) {
                 // dont complain if that counter was disabled
                 if ((i == M_VTH1 || i == M_VTH2 || i == M_VTH3) &&
                     (detectorDacs[i] == DEFAULT_COUNTER_DISABLED_VTH_VAL)) {
                     continue;
                 }
+                sprintf(mess,
+                        "Could not set module. Could not set dac %d, wrote %d, "
+                        "read %d\n",
+                        i, myMod.dacs[i], detectorDacs[i]);
+                LOG(logERROR, (mess));
                 return FAIL;
             }
         }
     }
-    return OK;
-}
 
-
+    // if settings given and cannot be validated (after setting dacs), return
-int setModule(sls_detector_module myMod, char *mess) {
+    // error
-    LOG(logINFO, ("Setting module\n"));
+    if (myMod.reg >= 0) {
-
+        if (getSettings() != (enum detectorSettings)myMod.reg) {
-    if (setChipStatusRegister(myMod.reg)){
+            sprintf(
-        sprintf(mess, "Could not CSR from module\n");
+                mess,
-        LOG(logERROR, (mess));
+                "Could not set module. The dacs in file do not correspond to "
-        return FAIL;
+                "settings %d\n",
-    }
+                myMod.reg);
-
+            LOG(logERROR, (mess));
-    if (setDACS(myMod.dacs)){
+            return FAIL;
-        sprintf(mess, "Could not set dacs\n");
+        }
-        LOG(logERROR, (mess));
-        return FAIL;
     }
 
+    // threshold
     for (int i = 0; i < NCOUNTERS; ++i) {
         if (myMod.eV[i] >= 0) {
             setThresholdEnergy(i, myMod.eV[i]);
-        }else{
-            setThresholdEnergy(i, -1);
         }
     }
 
@@ -1113,31 +1136,155 @@ int setModule(sls_detector_module myMod, char *mess) {
     return OK;
 }
 
+int setBit(int ibit, int patword) { return patword |= (1 << ibit); }
+
+int clearBit(int ibit, int patword) { return patword &= ~(1 << ibit); }
+
 int setTrimbits(int *trimbits) {
+    LOG(logINFOBLUE, ("Setting trimbits\n"));
+
+    // validate
+    for (int ichan = 0; ichan < ((detectorModules)->nchan); ++ichan) {
+        if (trimbits[ichan] < 0 || trimbits[ichan] > 63) {
+            LOG(logERROR, ("Trimbit value (%d) for channel %d is invalid\n",
+                           trimbits[ichan], ichan));
+            return FAIL;
+        }
+    }
+    LOG(logINFO, ("Trimbits validated\n"));
+    trimmingPrint = logDEBUG5;
+
     // remember previous run clock
     uint32_t prevRunClk = clkDivider[SYSTEM_C0];
-    patternParameters *pat = NULL;
+
-    int error = 0;
     // set to trimming clock
     if (setClockDivider(SYSTEM_C0, DEFAULT_TRIMMING_RUN_CLKDIV) == FAIL) {
         LOG(logERROR,
             ("Could not start trimming. Could not set to trimming clock\n"));
         return FAIL;
     }
-    /////////////////////////////////////////////////////////////////
-    for (int ichip = 0; ichip < NCHIP; ichip++) {
 
-        pat = setChannelRegisterChip(ichip, channelMask,
+    // trimming
-                                     trimbits); // change here!!!
+    int error = 0;
-        if (pat) {
+    uint64_t patword = 0;
-            error |= loadPattern(pat);
+    int iaddr = 0;
-            if (error == 0)
+    for (int ichip = 0; ichip < NCHIP; ichip++) {
-                startPattern();
+        if (error != 0) {
-            free(pat);
+            break;
-        } else
+        }
+        LOG(logDEBUG1, (" Chip %d\n", ichip));
+        iaddr = 0;
+        patword = 0;
+        writePatternWord(iaddr++, patword);
+
+        // chip select
+        patword = setBit(SIGNAL_TBLoad_1 + ichip, patword);
+        writePatternWord(iaddr++, patword);
+
+        // reset trimbits
+        patword = setBit(SIGNAL_resStorage, patword);
+        patword = setBit(SIGNAL_resCounter, patword);
+        writePatternWord(iaddr++, patword);
+        writePatternWord(iaddr++, patword);
+        patword = clearBit(SIGNAL_resStorage, patword);
+        patword = clearBit(SIGNAL_resCounter, patword);
+        writePatternWord(iaddr++, patword);
+        writePatternWord(iaddr++, patword);
+
+        // select first channel
+        patword = setBit(SIGNAL_CHSserialIN, patword);
+        writePatternWord(iaddr++, patword);
+        // 1 clk pulse
+        patword = setBit(SIGNAL_CHSclk, patword);
+        writePatternWord(iaddr++, patword);
+        patword = clearBit(SIGNAL_CHSclk, patword);
+        // clear 1st channel
+        writePatternWord(iaddr++, patword);
+        patword = clearBit(SIGNAL_CHSserialIN, patword);
+        // 2 clk pulses
+        for (int i = 0; i < 2; i++) {
+            patword = setBit(SIGNAL_CHSclk, patword);
+            writePatternWord(iaddr++, patword);
+            patword = clearBit(SIGNAL_CHSclk, patword);
+            writePatternWord(iaddr++, patword);
+        }
+
+        // for each channel (all chips)
+        for (int ich = 0; ich < NCHAN_1_COUNTER; ich++) {
+            LOG(logDEBUG1, (" Chip %d, Channel %d\n", ichip, ich));
+            int val = trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
+                               NCOUNTERS * ich] +
+                      trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
+                               NCOUNTERS * ich + 1] *
+                          64 +
+                      trimbits[ichip * NCHAN_1_COUNTER * NCOUNTERS +
+                               NCOUNTERS * ich + 2] *
+                          64 * 64;
+
+            // push 6 0 bits
+            for (int i = 0; i < 6; i++) {
+                patword = clearBit(SIGNAL_serialIN, patword);
+                patword = clearBit(SIGNAL_clk, patword);
+                writePatternWord(iaddr++, patword);
+                patword = setBit(SIGNAL_clk, patword);
+                writePatternWord(iaddr++, patword);
+            }
+
+            // deserialize
+            for (int i = 0; i < 18; i++) {
+                if (val & (1 << i)) {
+                    patword = setBit(SIGNAL_serialIN, patword);
+                } else {
+                    patword = clearBit(SIGNAL_serialIN, patword);
+                }
+                patword = clearBit(SIGNAL_clk, patword);
+                writePatternWord(iaddr++, patword);
+
+                patword = setBit(SIGNAL_clk, patword);
+                writePatternWord(iaddr++, patword);
+            }
+            writePatternWord(iaddr++, patword);
+            writePatternWord(iaddr++, patword);
+
+            // move to next channel
+            for (int i = 0; i < 3; i++) {
+                patword = setBit(SIGNAL_CHSclk, patword);
+                writePatternWord(iaddr++, patword);
+                patword = clearBit(SIGNAL_CHSclk, patword);
+                writePatternWord(iaddr++, patword);
+            }
+        }
+        // chip unselect
+        patword = clearBit(SIGNAL_TBLoad_1 + ichip, patword);
+        writePatternWord(iaddr++, patword);
+
+        // last iaddr check
+        if (iaddr >= MAX_PATTERN_LENGTH) {
+            LOG(logERROR, ("Addr 0x%x is past max_address_length 0x%x!\n",
+                           iaddr, MAX_PATTERN_LENGTH));
             error = 1;
+            break;
+        }
+
+        // set pattern wait address
+        for (int i = 0; i <= 2; i++)
+            setPatternWaitAddress(i, MAX_PATTERN_LENGTH - 1);
+
+        // pattern loop
+        for (int i = 0; i <= 2; i++) {
+            int stop = MAX_PATTERN_LENGTH - 1, nloop = 0;
+            setPatternLoop(i, &stop, &stop, &nloop);
+        }
+
+        // pattern limits
+        {
+            int start = 0, nloop = 0;
+            setPatternLoop(-1, &start, &iaddr, &nloop);
+        }
+        // send pattern to the chips
+        startPattern();
     }
-    /////////////////////////////////////////////////////////////////
+
     if (error == 0) {
         // copy trimbits locally
         for (int ichan = 0; ichan < ((detectorModules)->nchan); ++ichan) {
@@ -1145,6 +1292,7 @@ int setTrimbits(int *trimbits) {
         }
         LOG(logINFO, ("All trimbits have been loaded\n"));
     }
+
     trimmingPrint = logINFO;
     // set back to previous clock
     if (setClockDivider(SYSTEM_C0, prevRunClk) == FAIL) {
@@ -1155,6 +1303,7 @@ int setTrimbits(int *trimbits) {
     if (error != 0) {
         return FAIL;
     }
+
     return OK;
 }
 
@@ -2631,51 +2780,76 @@ int getNumberOfDACs() { return NDAC; }
 int getNumberOfChannelsPerChip() { return NCHAN; }
 
 int setChipStatusRegister(int csr) {
-    uint32_t prevRunClk = clkDivider[SYSTEM_C0];
+  int iaddr=0;
-    patternParameters *pat = NULL;
+  int  nbits=18;
+  int error=0;
+  //int start=0, stop=MAX_PATTERN_LENGTH, loop=0;
+  int patword=0;
+  patword=setBit(SIGNAL_STATLOAD,patword);
+  for (int i=0; i<2; i++)
+    writePatternWord(iaddr++, patword);
+  patword=setBit(SIGNAL_resStorage,patword);
+  patword=setBit(SIGNAL_resCounter,patword);
+  for (int i=0; i<8; i++)
+    writePatternWord(iaddr++, patword);
+  patword=clearBit(SIGNAL_resStorage,patword);
+  patword=clearBit(SIGNAL_resCounter,patword);
+  for (int i=0; i<8; i++)
+    writePatternWord(iaddr++, patword);
+  //#This version of the serializer pushes in the MSB first (compatible with the CSR bit numbering)
+  for (int ib=nbits-1; ib>=0; ib--) {
+    if (csr&(1<<ib))
+      patword=setBit(SIGNAL_serialIN,patword);
+    else
+      patword=clearBit(SIGNAL_serialIN,patword);
+    for (int i=0; i<4; i++)
+      writePatternWord(iaddr++, patword);
+    patword=setBit(SIGNAL_CHSclk,patword);
+    writePatternWord(iaddr++, patword);
+    patword=clearBit(SIGNAL_CHSclk,patword);
+    writePatternWord(iaddr++, patword);
+  }
 
-    int error = 0;
+  patword=clearBit(SIGNAL_serialIN,patword);
-    if (setClockDivider(SYSTEM_C0, DEFAULT_TRIMMING_RUN_CLKDIV) == FAIL) {
+  for (int i=0; i<2; i++)
-        LOG(logERROR,
+      writePatternWord(iaddr++, patword);
-            ("Could not set to trimming clock in order to change CSR\n"));
+  patword=setBit(SIGNAL_STO,patword);
-        return FAIL;
+  for (int i=0; i<5; i++)
-    }
+      writePatternWord(iaddr++, patword);
-    pat = setChipStatusRegisterPattern(csr);
+  patword=clearBit(SIGNAL_STO,patword);
+  for (int i=0; i<5; i++)
+    writePatternWord(iaddr++, patword);
+  patword=clearBit(SIGNAL_STATLOAD,patword);
+  for (int i=0; i<5; i++)
+    writePatternWord(iaddr++, patword);
 
-    if (pat) {
+  if (iaddr >= MAX_PATTERN_LENGTH) {
-        error |= loadPattern(pat);
+    LOG(logERROR, ("Addr 0x%x is past max_address_length 0x%x!\n",
-        if (!error)
+		   iaddr, MAX_PATTERN_LENGTH));
-            startPattern();
+    error = 1;
-        free(pat);
+  }
-    } else {
+  // set pattern wait address
-        error = 1;
+  for (int i = 0; i <= 2; i++)
-    }
+    setPatternWaitAddress(i, MAX_PATTERN_LENGTH - 1);
+  
+  // pattern loop
+  for (int i = 0; i <= 2; i++) {
+    int stop = MAX_PATTERN_LENGTH - 1, nloop = 0;
+    setPatternLoop(i, &stop, &stop, &nloop);
+  }
+  
+  // pattern limits
+  {
+    int start = 0, nloop = 0;
+    setPatternLoop(-1, &start, &iaddr, &nloop);
+  }
+  // send pattern to the chips
+  startPattern();
+  
+  if (error != 0) {
+    return FAIL;
+  }
+  
+  return OK;
 
-    if (!error) {
-        LOG(logINFO, ("CSR is now: 0x%x\n", csr));
-    }
-
-    if (setClockDivider(SYSTEM_C0, prevRunClk) == FAIL) {
-        LOG(logERROR,
-            ("Could not set to previous run clock after changing CSR\n"));
-        return FAIL;
-    }
-    return OK;
-}
-
-int setGainCaps(int caps){
-    // Update only gain caps, leave the rest of the CSR unchanged
-    int csr = getChipStatusRegister();
-    csr &= ~GAIN_MASK;
-
-    caps = gainCapsToCsr(caps);
-    // caps &= GAIN_MASK;
-    csr |= caps;
-    return setChipStatusRegister(csr);
-}
-
-int getGainCaps(){
-    int csr = getChipStatusRegister();
-    int caps = csrToGainCaps(csr);
-    return caps; 
 }

slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "sls/sls_detector_defs.h"
 
-#define REQRD_FRMWRE_VRSN (0x210201)
+#define REQRD_FRMWRE_VRSN (0x200925)
 #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 (1100)
+#define DEFAULT_HIGHGAIN_VRSHAPER (900)
 
 #define DEFAULT_READOUT_C0 (10) //(100000000) // rdo_clk, 100 MHz
 #define DEFAULT_READOUT_C1 (10) //(100000000) // smp sample clk (x2), 100 MHz
@@ -158,3 +158,47 @@ typedef struct udp_header_struct {
 #define UDP_IP_HEADER_LENGTH_BYTES (28)
 #define PACKETS_PER_FRAME_10G      (2)
 #define PACKETS_PER_FRAME_1G       (20)
+
+/** Signal Definitions */
+#define SIGNAL_TBLoad_1    (0)
+#define SIGNAL_TBLoad_2    (1)
+#define SIGNAL_TBLoad_3    (2)
+#define SIGNAL_TBLoad_4    (3)
+#define SIGNAL_TBLoad_5    (4)
+#define SIGNAL_TBLoad_6    (5)
+#define SIGNAL_TBLoad_7    (6)
+#define SIGNAL_TBLoad_8    (7)
+#define SIGNAL_TBLoad_9    (8)
+#define SIGNAL_TBLoad_10   (9)
+#define SIGNAL_AnaMode     (10)
+#define SIGNAL_CHSserialIN (11)
+#define SIGNAL_READOUT     (12)
+#define SIGNAL_pulse       (13)
+#define SIGNAL_EN1         (14)
+#define SIGNAL_EN2         (15)
+#define SIGNAL_EN3         (16)
+#define SIGNAL_clk         (17)
+#define SIGNAL_SRmode      (18)
+#define SIGNAL_serialIN    (19)
+#define SIGNAL_STO         (20)
+#define SIGNAL_STATLOAD    (21)
+#define SIGNAL_resStorage  (22)
+#define SIGNAL_resCounter  (23)
+#define SIGNAL_CHSclk      (24)
+#define SIGNAL_exposing    (25)
+
+//CHIP STARTUS REGISTER BITS
+#define CSR_spypads  0
+#define CSR_invpol  4
+#define CSR_dpulse  5
+#define CSR_interp  6
+#define CSR_C10pre  7 //#default
+#define CSR_pumprobe  8
+#define CSR_apulse  9
+#define CSR_C15sh  10 
+#define CSR_C30sh  11 //#default
+#define CSR_C50sh  12
+#define CSR_C225ACsh  13 // Connects 225fF SHAPER AC cap (1: 225 to shaper, 225 to GND. 0: 450 to shaper) 
+#define CSR_C15pre  14 
+
+#define CSR_default  (1<<CSR_C10pre )|(1<< CSR_C30sh)

slsDetectorServers/slsDetectorServer/include/loadPattern.h

@@ -1,6 +0,0 @@
-#ifndef LOADPATTERN_H
-#define LOADPATTERN_H
-#include "Pattern.h"
-
-int loadPattern(patternParameters *pat);
-#endif

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -25,10 +25,6 @@
 #include "blackfin.h"
 #endif
 
-#if defined(MYTHEN3D) 
-#include "mythen3.h"
-#endif
-
 #include <stdio.h> // FILE
 #include <stdlib.h>
 #include <sys/types.h>
@@ -357,10 +353,6 @@ enum timingMode getTiming();
 #ifdef MYTHEN3D
 void setInitialExtSignals();
 int isMaster();
-int setGainCaps(int caps);
-int getGainCaps();
-int setChipStatusRegister(int csr);
-int setDACS(int* dacs);
 #endif
 #if defined(GOTTHARDD) || defined(MYTHEN3D)
 void setExtSignal(int signalIndex, enum externalSignalFlag mode);

slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h

@@ -246,7 +246,4 @@ int is_virtual(int);
 int get_pattern(int);
 int load_default_pattern(int);
 int get_all_threshold_energy(int);
-int get_master(int);
+int get_master(int);
-int get_csr();
-int set_gain_caps(int);
-int get_gain_caps(int);

slsDetectorServers/slsDetectorServer/src/loadPattern.c

@@ -1,105 +0,0 @@
-#include "readDefaultPattern.h"
-#include "loadPattern.h"
-#include "clogger.h"
-#include "common.h"
-#include "sls/ansi.h"
-#include "sls/sls_detector_defs.h"
-#include "slsDetectorServer_defs.h"
-
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(MYTHEN3D)
-#include "Pattern.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-
-extern char initErrorMessage[MAX_STR_LENGTH];
-
-#ifndef MYTHEN3D
-extern uint64_t writePatternIOControl(uint64_t word);
-#endif
-extern uint64_t writePatternWord(int addr, uint64_t word);
-extern int setPatternWaitAddress(int level, int addr);
-extern uint64_t setPatternWaitTime(int level, uint64_t t);
-extern void setPatternLoop(int level, int *startAddr, int *stopAddr,
-                           int *nLoop);
-
-int loadPattern(patternParameters *pat) {
-
-  int ret=OK;
-
-  for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) {
-    if ((i % 10 == 0) && pat->word[i] != 0) {
-      LOG(logINFO, ("Setting Pattern Word (addr:0x%x, word:0x%llx)\n",
-		    i, (long long int)pat->word[i]));
-    }
-    writePatternWord(i, pat->word[i]);
-  }
-#ifndef MYTHEN3D 
-   if (ret == OK) { 
-     uint64_t retval64 = writePatternIOControl(pat->ioctrl); 
-     //validate64(pat->ioctrl, retval64, "set pattern IO Control", HEX); 
-   } 
-#endif 
-        if (ret == OK) {
-            int numLoops = -1;
-            int retval0 = pat->limits[0];
-            int retval1 = pat->limits[1];
-            setPatternLoop(-1, &retval0, &retval1, &numLoops);
-            //validate(pat->limits[0], retval0,
-	    // "set pattern Limits start address", HEX);
-	//validate(pat->limits[1], retval1,
-	    //       "set pattern Limits start address", HEX);
-        }
-	uint64_t retval64;
-        if (ret == OK) {
-            for (int i = 0; i <= 2; ++i) {
-                char msg[128];
-                int retval0 = -1, retval1 = -1, numLoops = -1;
-
-                // patloop
-                retval0 = pat->loop[i * 2 + 0];
-                retval1 = pat->loop[i * 2 + 1];
-                numLoops = pat->nloop[i];
-                setPatternLoop(i, &retval0, &retval1, &numLoops);
-                memset(msg, 0, sizeof(msg));
-                sprintf(msg, "set pattern Loop %d start address", i);
-                //validate(pat->loop[i * 2 + 0], retval0, msg, HEX);
-                if (ret == FAIL) {
-                    break;
-                }
-                memset(msg, 0, sizeof(msg));
-                sprintf(msg, "set pattern Loop %d stop address", i);
-                //validate(pat->loop[i * 2 + 1], retval1, msg, HEX);
-                if (ret == FAIL) {
-                    break;
-                }
-                memset(msg, 0, sizeof(msg));
-                sprintf(msg, "set pattern Loop %d num loops", i);
-                //validate(pat->nloop[i], numLoops, msg, HEX);
-                if (ret == FAIL) {
-                    break;
-                }
-                // patwait
-                memset(msg, 0, sizeof(msg));
-                sprintf(msg, "set pattern Loop %d wait address", i);
-                retval0 = setPatternWaitAddress(i, pat->wait[i]);
-                //validate(pat->wait[i], retval0, msg, HEX);
-                if (ret == FAIL) {
-                    break;
-                }
-
-                // patwaittime
-                memset(msg, 0, sizeof(msg));
-                sprintf(msg, "set pattern Loop %d wait time", i);
-                retval64 = setPatternWaitTime(i, pat->waittime[i]);
-                //validate64(pat->waittime[i], retval64, msg, HEX);
-                if (retval64 == FAIL) {
-                    break;
-                }
-	    }
-	}
-	return ret;
-}
-
-

slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c

@@ -1,5 +1,4 @@
 #include "readDefaultPattern.h"
-#include "loadPattern.h"
 #include "clogger.h"
 #include "common.h"
 #include "sls/ansi.h"

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -369,9 +369,6 @@ void function_table() {
     flist[F_LOAD_DEFAULT_PATTERN] = &load_default_pattern;
     flist[F_GET_ALL_THRESHOLD_ENERGY] = &get_all_threshold_energy;
     flist[F_GET_MASTER] = &get_master;
-    flist[F_GET_CSR] = &get_csr;
-    flist[F_SET_GAIN_CAPS] = &set_gain_caps;
-    flist[F_GET_GAIN_CAPS] = &get_gain_caps;
 
     // check
     if (NUM_DET_FUNCTIONS >= RECEIVER_ENUM_START) {
@@ -1550,11 +1547,18 @@ int set_module(int file_des) {
     // only set
     else if (Server_VerifyLock() == OK) {
         // check index
-
-#if !(defined(EIGERD) || defined(MYTHEN3D))
-//TODO! Check if this is used for any detector
         switch (module.reg) {
-#ifdef JUNGFRAUD
+#ifdef EIGERD
+        case STANDARD:
+        case HIGHGAIN:
+        case LOWGAIN:
+        case VERYHIGHGAIN:
+        case VERYLOWGAIN:
+#elif MYTHEN3D
+        case STANDARD:
+        case FAST:
+        case HIGHGAIN:
+#elif JUNGFRAUD
         case DYNAMICGAIN:
         case DYNAMICHG0:
         case FIXGAIN1:
@@ -1573,12 +1577,10 @@ int set_module(int file_des) {
             modeNotImplemented("Settings", (int)module.reg);
             break;
         }
-#endif
+
         ret = setModule(module, mess);
         enum detectorSettings retval = getSettings();
-#if !(defined(EIGERD) || defined(MYTHEN3D))
         validate(module.reg, (int)retval, "set module (settings)", DEC);
-#endif
         LOG(logDEBUG1, ("Settings: %d\n", retval));
     }
     free(myChan);
@@ -7576,22 +7578,18 @@ int set_pattern(int file_des) {
 
     patternParameters *pat = malloc(sizeof(patternParameters));
     memset(pat, 0, sizeof(patternParameters));
-      // ignoring endianness for eiger
+
+    // ignoring endianness for eiger
     if (receiveData(file_des, pat, sizeof(patternParameters), INT32) < 0) {
         if (pat != NULL)
             free(pat);
         return printSocketReadError();
     }
- 
+
     if (Server_VerifyLock() == OK) {
         LOG(logINFO, ("Setting Pattern from structure\n"));
         LOG(logINFO,
-            ("Setting Pattern Word (printing every 10 words that are not 0\n"));   
+            ("Setting Pattern Word (printing every 10 words that are not 0\n"));
-	/****************************************************************************************************************/
-	/* I SUGGEST TO VALIDATE THE VALUES HERE AND THEN WRITE THE PATTERN IN A SEPARATE FUNCTION WHICH COULD BE REUSED*/
-	/* added loadPattern.c/h - the same func could be reused also in readDefaultPattern                                  */
-	/***************************************************************************************************************/
-
         for (int i = 0; i < MAX_PATTERN_LENGTH; ++i) {
             if ((i % 10 == 0) && pat->word[i] != 0) {
                 LOG(logINFO, ("Setting Pattern Word (addr:0x%x, word:0x%llx)\n",
@@ -7664,7 +7662,6 @@ int set_pattern(int file_des) {
                 }
             }
         }
-	/******* DOWN TO HERE ***********/
     }
     if (pat != NULL)
         free(pat);
@@ -8386,63 +8383,3 @@ int get_master(int file_des){
 #endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
-
-int get_csr(int file_des){
-    ret = OK;
-    memset(mess, 0, sizeof(mess));
-    int retval = -1;
-
-    LOG(logDEBUG1, ("Getting csr\n"));
-
-#ifndef MYTHEN3D
-    functionNotImplemented();
-#else
-    retval = getChipStatusRegister();
-#endif
-    return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
-}
-
-int set_gain_caps(int file_des){
-    ret = OK;
-    memset(mess, 0, sizeof(mess));
-    int arg = 0;
-
-    if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
-        return printSocketReadError();
-    LOG(logINFO, ("Setting gain caps to: %u\n", arg));
-
-    int retval = -1;
-
-#ifndef MYTHEN3D
-    functionNotImplemented();
-#else
-    if (Server_VerifyLock() == OK) {
-        setGainCaps(arg);
-        retval = getChipStatusRegister(); //TODO! fix 
-        LOG(logDEBUG1, ("gain caps retval: %u\n", retval));
-    }
-#endif
-    return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
-}
-
-int get_gain_caps(int file_des){
-    ret = OK;
-    memset(mess, 0, sizeof(mess));
-    // int arg = 0;
-
-    // if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
-    //     return printSocketReadError();
-    LOG(logINFO, ("Getting gain caps\n"));
-
-    int retval = -1;
-
-#ifndef MYTHEN3D
-    functionNotImplemented();
-#else
-    if (Server_VerifyLock() == OK) {
-        retval = getGainCaps();
-        LOG(logDEBUG1, ("Gain caps: %u\n", retval));
-    }
-#endif
-    return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
-}

slsDetectorSoftware/include/sls/Detector.h

@@ -1308,14 +1308,6 @@ class Detector {
 
     Result<bool> getMaster(Positions pos = {}) const;
 
-
-    //TODO! check if we really want to expose this !!!!!
-    Result<int> getChipStatusRegister(Positions pos = {}) const;
-
-    void setGainCaps(int caps, Positions pos = {});
-
-    Result<int> getGainCaps(Positions pos = {});
-
     ///@{
 
     /** @name CTB / Moench Specific */

slsDetectorSoftware/src/CmdParser.cpp

@@ -55,12 +55,6 @@ void CmdParser::Parse(const std::string &s) {
         command_ = arguments_[0];
         arguments_.erase(begin(arguments_));
     }
-    //allow comma sep
-    for (auto& arg : arguments_){
-        if (arg.back() == ',')
-            arg.pop_back();
-    }
-
     DecodeIdAndPosition(command_.c_str());
 }
 

slsDetectorSoftware/src/CmdProxy.cpp

@@ -54,7 +54,7 @@ bool CmdProxy::ReplaceIfDepreciated(std::string &command) {
     if (d_it != depreciated_functions.end()) {
         LOG(logWARNING)
             << command
-            << " is deprecated and will be removed. Please migrate to: "
+            << " is depreciated and will be removed. Please migrate to: "
             << d_it->second;
         // insert old command into arguments (for dacs)
         if (d_it->second == "dac") {
@@ -1981,43 +1981,6 @@ std::string CmdProxy::GateDelay(int action) {
     return os.str();
 }
 
-
-std::string CmdProxy::GainCaps(int action){
-    std::ostringstream os;
-    os << cmd << ' ';
-    if (action == defs::HELP_ACTION) {
-        os << "[cap1, cap2, ...]\n\t[Mythen3] gain, options: C10pre, C15sh, C30sh, C50sh, C225ACsh, C15pre"
-           << '\n';
-    } else if (action == defs::GET_ACTION) {
-        if (!args.empty())
-            WrongNumberOfParameters(0);
-
-        auto tmp = det->getGainCaps();
-        sls::Result<defs::M3_GainCaps> csr;
-        for (auto val : tmp){
-            if (val)
-                csr.push_back(static_cast<defs::M3_GainCaps>(val));
-        }
-            
-        os << OutString(csr) << '\n';
-    } else if (action == defs::PUT_ACTION) {
-        if (args.size() < 1) {
-            WrongNumberOfParameters(1);
-        }
-        int caps = 0;
-        for (const auto& arg:args){
-            if (arg != "0")
-                caps |= sls::StringTo<defs::M3_GainCaps>(arg);
-        }
-            
-        det->setGainCaps(caps);
-        os << OutString(args) << '\n';
-    } else {
-        throw sls::RuntimeError("Unknown action");
-    }
-    return os.str();
-}
-
 /* CTB / Moench Specific */
 
 std::string CmdProxy::Samples(int action) {

slsDetectorSoftware/src/CmdProxy.h

@@ -571,6 +571,19 @@ class CmdProxy {
         return ToString(value, unit);
     }
 
+    // inline unsigned int stoiHex(const std::string& s) {
+    //     unsigned long lresult = stoul(s, nullptr, 16);
+    //     unsigned int result = lresult;
+    //     if (result != lresult) {
+    //         throw std::out_of_range("cannot convert to unsigned int");
+    //     }
+    //     return result;
+    // }
+
+    // inline unsigned long int stoulHex(const std::string& s) {
+    //     unsigned long result = stoul(s, nullptr, 16);
+    //     return result;
+    // }
 
     using FunctionMap = std::map<std::string, std::string (CmdProxy::*)(int)>;
     using StringMap = std::map<std::string, std::string>;
@@ -957,7 +970,6 @@ class CmdProxy {
         {"gatedelay1", &CmdProxy::GateDelay},
         {"gatedelay2", &CmdProxy::GateDelay},
         {"gatedelay3", &CmdProxy::GateDelay},
-        {"gaincaps", &CmdProxy::GainCaps},
 
         /* CTB/ Moench Specific */
         {"samples", &CmdProxy::Samples},
@@ -1125,7 +1137,6 @@ class CmdProxy {
     /* Mythen3 Specific */
     std::string Counters(int action);
     std::string GateDelay(int action);
-    std::string GainCaps(int action);
     /* CTB/ Moench Specific */
     std::string Samples(int action);
     /* CTB Specific */

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 && size() > 1){
+    if (detector_type == defs::MYTHEN3){
         auto is_master = getMaster();
         std::vector<int> master;
         std::vector<int> slaves;
@@ -1615,18 +1615,6 @@ Result<bool> Detector::getMaster(Positions pos) const{
     return pimpl->Parallel(&Module::isMaster, pos);
 }
 
-Result<int> Detector::getChipStatusRegister(Positions pos) const{
-    return pimpl->Parallel(&Module::getChipStatusRegister, pos);
-}
-
-void Detector::setGainCaps(int caps, Positions pos){
-    return pimpl->Parallel(&Module::setGainCaps, pos, caps);
-}
-
-Result<int> Detector::getGainCaps(Positions pos){
-    return pimpl->Parallel(&Module::getGainCaps, pos);
-}
-
 
 // CTB/ Moench Specific
 

slsDetectorSoftware/src/Module.cpp

@@ -1998,18 +1998,6 @@ bool Module::isMaster() const{
     return sendToDetector<int>(F_GET_MASTER);
 }
 
-int Module::getChipStatusRegister() const{
-    return sendToDetector<int>(F_GET_CSR);
-}
-
-void Module::setGainCaps(int caps){
-    sendToDetector<int>(F_SET_GAIN_CAPS, caps);
-}
-
-int Module::getGainCaps(){
-    return sendToDetector<int>(F_GET_GAIN_CAPS);
-}
-
 // CTB / Moench Specific
 int Module::getNumberOfAnalogSamples() const {
     return sendToDetector<int>(F_GET_NUM_ANALOG_SAMPLES);
@@ -3207,9 +3195,6 @@ sls_detector_module Module::readSettingsFile(const std::string &fname,
         throw RuntimeError("Could not open settings file: " + fname);
     }
 
-    auto file_size = getFileSize(infile);
-
-
     // eiger
     if (shm()->myDetectorType == EIGER) {
         infile.read(reinterpret_cast<char *>(myMod.dacs),
@@ -3235,16 +3220,6 @@ sls_detector_module Module::readSettingsFile(const std::string &fname,
 
     // mythen3 (dacs, trimbits)
     else if (shm()->myDetectorType == MYTHEN3) {
-        int expected_size =
-            sizeof(int) * myMod.ndac + sizeof(int) * myMod.nchan + sizeof(myMod.reg);
-        if (file_size != expected_size) {
-            throw RuntimeError("The size of the settings file: " + fname +
-                               " differs from the expected size, " +
-                               std::to_string(file_size) + " instead of " +
-                               std::to_string(expected_size) + " bytes");
-        }
-        infile.read(reinterpret_cast<char *>(&myMod.reg),
-                    sizeof(myMod.reg));
         infile.read(reinterpret_cast<char *>(myMod.dacs),
                     sizeof(int) * (myMod.ndac));
         for (int i = 0; i < myMod.ndac; ++i) {

slsDetectorSoftware/src/Module.h

@@ -426,9 +426,6 @@ class Module : public virtual slsDetectorDefs {
     void setGateDelay(int gateIndex, int64_t value);
     std::array<time::ns, 3> getGateDelayForAllGates() const;
     bool isMaster() const;
-    int getChipStatusRegister() const;
-    void setGainCaps(int caps);
-    int getGainCaps();
 
     /**************************************************
      *                                                *

slsSupportLib/CMakeLists.txt

@@ -57,12 +57,14 @@ target_include_directories(slsSupportObject
   PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+  PRIVATE
+    ${ZeroMQ_INCLUDE_DIRS}
 )
 
 target_link_libraries(slsSupportObject 
   PUBLIC
     slsProjectOptions 
-    libzmq
+    ${ZeroMQ_LIBRARIES}
     rapidjson
   PRIVATE
     slsProjectWarnings     
@@ -74,6 +76,7 @@ endif(SLS_USE_TESTS)
 
 # Add shared library version of the support lib
 add_library(slsSupportShared SHARED $<TARGET_OBJECTS:slsSupportObject>)
+
 target_link_libraries(slsSupportShared PUBLIC slsSupportObject)
 
 set_target_properties(slsSupportShared PROPERTIES
@@ -105,4 +108,3 @@ install(TARGETS slsSupportShared slsSupportStatic slsSupportObject
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
 )
 
-

slsSupportLib/include/sls/ToString.h

@@ -36,7 +36,6 @@ std::string ToString(const defs::dacIndex s);
 std::string ToString(const std::vector<defs::dacIndex> &vec);
 std::string ToString(const defs::burstMode s);
 std::string ToString(const defs::timingSourceType s);
-std::string ToString(const defs::M3_GainCaps s);
 
 std::string ToString(const slsDetectorDefs::xy &coord);
 std::ostream &operator<<(std::ostream &os, const slsDetectorDefs::xy &coord);
@@ -298,7 +297,6 @@ template <> defs::readoutMode StringTo(const std::string &s);
 template <> defs::dacIndex StringTo(const std::string &s);
 template <> defs::burstMode StringTo(const std::string &s);
 template <> defs::timingSourceType StringTo(const std::string &s);
-template <> defs::M3_GainCaps StringTo(const std::string &s);
 
 template <> uint32_t StringTo(const std::string &s);
 template <> uint64_t StringTo(const std::string &s);

slsSupportLib/include/sls/file_utils.h

@@ -48,7 +48,3 @@ int writeDataFile(std::string fname, int nch, short int *data);
 
 // mkdir -p path implemented by recursive calls
 void mkdir_p(const std::string &path, std::string dir = "");
-
-namespace sls {
-int getFileSize(std::ifstream &ifs);
-}

slsSupportLib/include/sls/sls_detector_defs.h

@@ -394,16 +394,6 @@ typedef struct {
      */
     enum timingSourceType { TIMING_INTERNAL, TIMING_EXTERNAL };
 
-    //gain caps Mythen3
-    enum M3_GainCaps {
-        M3_C10pre= 1<<7, 
-        M3_C15sh = 1<<10, 
-        M3_C30sh = 1<<11,
-        M3_C50sh = 1<<12,
-        M3_C225ACsh = 1<<13,
-        M3_C15pre = 1<<14, 
-    };
-
 #ifdef __cplusplus
 
     /** scan structure */
@@ -635,10 +625,6 @@ typedef struct {
 #endif
 
 #ifdef __cplusplus
-
-
-
-
 // TODO! discuss this
 #include <vector> //hmm... but currently no way around
 namespace sls {

slsSupportLib/include/sls/sls_detector_funcs.h

@@ -221,9 +221,6 @@ enum detFuncs {
     F_LOAD_DEFAULT_PATTERN,
     F_GET_ALL_THRESHOLD_ENERGY,
     F_GET_MASTER,
-    F_GET_CSR,
-    F_SET_GAIN_CAPS,
-    F_GET_GAIN_CAPS,
 
     NUM_DET_FUNCTIONS,
     RECEIVER_ENUM_START = 256, /**< detector function should not exceed this

slsSupportLib/include/sls/versionAPI.h

@@ -1,5 +1,5 @@
 /** API versions */
-#define GITBRANCH    "developer"
+#define GITBRANCH    "5.1.0.rc1"
 #define APICTB 0x210225
 #define APIGOTTHARD 0x210225
 #define APIGOTTHARD2 0x210225

slsSupportLib/src/ToString.cpp

@@ -859,44 +859,6 @@ template <> defs::timingSourceType StringTo(const std::string &s) {
     throw sls::RuntimeError("Unknown timing source type " + s);
 }
 
-template <> defs::M3_GainCaps StringTo(const std::string &s){
-    if (s == "C10pre")
-        return defs::M3_C10pre;
-    if (s == "C15sh")
-        return defs::M3_C15sh;
-    if (s == "C30sh")
-        return defs::M3_C30sh;
-    if (s == "C50sh")
-        return defs::M3_C50sh;
-    if (s == "C225ACsh")
-        return defs::M3_C225ACsh;
-    if (s == "C15pre")
-        return defs::M3_C15pre;
-    throw sls::RuntimeError("Unknown gain cap " + s);
-    
-}
-
-
-std::string ToString(defs::M3_GainCaps s){
-    std::ostringstream os; 
-    if (s & defs::M3_C10pre)
-        os << "C10pre, ";
-    if (s & defs::M3_C15sh)
-        os << "C15sh, ";
-    if (s & defs::M3_C30sh)
-        os << "C30sh, ";
-    if (s & defs::M3_C50sh)
-        os << "C50sh, ";
-    if (s & defs::M3_C225ACsh)
-        os << "C225ACsh, ";
-    if (s & defs::M3_C15pre)
-        os << "C15pre, ";
-    auto rs = os.str();
-    rs.erase(rs.end()-2);
-    return rs;
-    
-}
-
 template <> uint32_t StringTo(const std::string &s) {
     int base = s.find("0x") != std::string::npos ? 16 : 10;
     return std::stoul(s, nullptr, base);

slsSupportLib/src/file_utils.cpp

@@ -3,7 +3,6 @@
 #include "sls/sls_detector_exceptions.h"
 
 #include <errno.h>
-#include <ios>
 #include <iostream>
 #include <sstream>
 #include <sys/stat.h>
@@ -93,13 +92,3 @@ void mkdir_p(const std::string &path, std::string dir) {
     if (i + 1 < path.length())
         mkdir_p(path.substr(i + 1), dir);
 }
-
-namespace sls {
-int getFileSize(std::ifstream &ifs) {
-    auto current_pos = ifs.tellg();
-    ifs.seekg(0, std::ios::end);
-    int file_size = ifs.tellg();
-    ifs.seekg(current_pos);
-    return file_size;
-}
-} // namespace sls

slsSupportLib/tests/CMakeLists.txt

@@ -1,6 +1,5 @@
 target_sources(tests PRIVATE 
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-bit_utils.cpp
-                ${CMAKE_CURRENT_SOURCE_DIR}/test-file_utils.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-container_utils.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-network_utils.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-string_utils.cpp

slsSupportLib/tests/test-file_utils.cpp

@@ -1,28 +0,0 @@
-#include "catch.hpp"
-#include "sls/file_utils.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <iostream>
-#include <vector>
-
-TEST_CASE("Get size of empty file") {
-    char fname[] = "temfile_XXXXXX";
-    int fh = mkstemp(fname);
-    std::ifstream ifs(fname);
-    auto size = sls::getFileSize(ifs);
-    REQUIRE(size == 0);
-}
-
-TEST_CASE("Get size of file with data") {
-    constexpr size_t n_bytes = 137;
-    std::vector<char> data(n_bytes);
-    char fname[] = "temfile_XXXXXX";
-    int fh = mkstemp(fname);
-    write(fh, data.data(), n_bytes);
-
-    std::ifstream ifs(fname);
-    auto size = sls::getFileSize(ifs);
-    REQUIRE(size == n_bytes);
-    REQUIRE(ifs.tellg() == 0); //getting size resets pos!
-}
-

tests/CMakeLists.txt

@@ -18,24 +18,22 @@ set_target_properties(testserver PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
     
 add_executable(tests ${SLS_TEST_SOURCES})
-target_link_libraries(tests
+target_link_libraries(tests 
-    PUBLIC 
+    slsProjectOptions
-      slsProjectOptions
+    slsProjectWarnings
-      slsSupportShared
+    slsSupportShared
-      pthread
+    pthread
-      rt
+    rt
-    PRIVATE
-      slsProjectWarnings
 )  
 
 if (SLS_USE_TEXTCLIENT)
-    target_link_libraries(tests PUBLIC
+    target_link_libraries(tests
         slsDetectorShared
     )
 endif (SLS_USE_TEXTCLIENT)
 
 if (SLS_USE_RECEIVER)
-    target_link_libraries(tests PUBLIC
+    target_link_libraries(tests
         slsReceiverShared
     )
 endif (SLS_USE_RECEIVER)