fixed zmq path when building as submodule

* implemented testbus, testfpga, set/get #frames, triggers, allowed that and for connection to client, also allowed, getnumchannels, configuremac, getrunstatus, setdetectorposition with dummy values

* connected kernelversion, hardwareversion, versions, framesl, triggersl, dr, timingmode, pattern (except patioctrl) thats there for altera ctb

* replaced set/get64Bit to set/getU64bit in all loadpattern.c for (ctb and m3 also)

.github/workflows/cmake.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
-          packages: libzmq3-dev libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev
+          packages: libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev
           version: 1.0
 
       - name: Configure CMake

CMakeFiles/cmake.check_cache

@@ -0,0 +1 @@
+# This file is generated by cmake for dependency checking of the CMakeCache.txt file

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 cmake_minimum_required(VERSION 3.14)
 project(slsDetectorPackage)
-set(PROJECT_VERSION 8.0.1)
+set(PROJECT_VERSION 7.0.0)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 
@@ -244,6 +244,7 @@ if(SLS_USE_SANITIZER)
     # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
+
 if(SLS_TUNE_LOCAL)
     target_compile_options(slsProjectOptions INTERFACE -mtune=native -march=native)
 endif()

RELEASE.txt

@@ -1,13 +1,21 @@
-SLS Detector Package Major Release 8.0.1 released on 16.01.2024
+SLS Detector Package Major Release 7.x.x released on xx.xx.2023
 ===============================================================
 
-This document describes the differences between v8.0.1 and v8.0.0
+This document describes the differences between v7.x.x and v7.0.2   
 
 
 
     CONTENTS
     --------
-    1           Resolved Issues
+    1           New, Changed or Resolved Features
+        1.1     Compilation
+        1.2     Callback
+        1.3     Python
+        1.4     Client
+        1.5     Detector Server
+        1.6     Simulator
+        1.7     Receiver
+        1.8     Gui
     2           On-board Detector Server Compatibility
     3           Firmware Requirements
     4           Kernel Requirements
@@ -16,27 +24,13 @@ This document describes the differences between v8.0.1 and v8.0.0
 
 
 
-1 Resolved Issues
+1 New, Changed or Resolved Features
-=================
+=====================================
 
 
-    Compilation
+- moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb)
-    -----------
+- eiger febl and feb in versions
-
+- fix ctb slow adcs
-
-    *   Fixed compilation error when building without zmq-devel installed
-        and removed dependency on zeromq in conda build. 
-
-
-    *   Fixed libzmq compilation error to build the package as a submodule.
-
-
-    Calibration
-    -----------
-
-
-    *   [Moench] Fixed Moench calibration
-
 
 
 
@@ -44,13 +38,13 @@ This document describes the differences between v8.0.1 and v8.0.0
 ==========================================
 
 
-    Eiger       8.0.0
+    Eiger       7.0.0
-    Jungfrau    8.0.0
+    Jungfrau    7.0.2
-    Mythen3     8.0.0
+    Mythen3     7.0.0
-    Gotthard2   8.0.0
+    Gotthard2   7.0.0
-    Gotthard    8.0.0
+    Gotthard    7.0.0
-    Moench      8.0.0
+    Moench      7.0.0
-    Ctb         8.0.0
+    Ctb         7.0.0
     
 
     On-board Detector Server Upgrade
@@ -71,21 +65,21 @@ This document describes the differences between v8.0.1 and v8.0.0
 ========================
 
 
-    Eiger       02.10.2023 (v32)                    (updated in 7.0.3)
+    Eiger       20.02.2023 (v31)
     
-    Jungfrau    20.09.2023 (v1.5, HW v1.0)          (updated in 8.0.0)
+    Jungfrau    04.11.2022 (v1.4, HW v1.0) 
-                21.09.2023 (v2.5, HW v2.0)          (updated in 8.0.0)
+                03.11.2022 (v2.4, HW v2.0)
 
-    Mythen3     24.01.2023 (v1.4)                   (updated in 7.0.0)
+    Mythen3     24.01.2023 (v1.4)
 
-    Gotthard2   23.11.2022 (v0.3)                   (updated in 7.0.0)
+    Gotthard2   23.11.2022 (v0.3)
 
     Gotthard    08.02.2018 (50um and 25um Master)
                 09.02.2018 (25 um Slave) 
 
-    Moench      10.07.2023 (v0.3.2)                 (updated in 8.0.0, under development)
+    Moench      05.12.2022 (v0.3)
 
-    Ctb         28.08.2023 (v1.2)                   (updated in 8.0.0)
+    Ctb         03.04.2023 (v1.2?)
 
 
     Detector Upgrade

bash_autocomplete.sh

@@ -0,0 +1 @@
+slsDetectorSoftware/generator/autocomplete/bash_autocomplete.sh

examples/rawdata.config

@@ -1,22 +0,0 @@
-numfiles 1
-nthreads 5,
-fifosize 5000
-nsigma 5
-gainfile none
-detectorMode counting
-threshold 0
-pedestalfile none
-nframes 0
-xMin 0
-xMax 400
-yMin 0
-yMax 400
-outdir ./
-indir ./
-flist none
-fformat none
-runmin 0
-runmax -1
-readnrows 400
-eMin 0
-eMax 16000

examples/zmq.config

@@ -1,16 +0,0 @@
-numinterfaces 1
-rx_zmqip 10.1.2.102
-rx_zmqport 1978
-zmqip 129.129.202.57
-zmqport 1979
-nthreads 6
-fifosize 5000
-nsigma 5
-gainfile none
-nbinsx 5
-nbinsy 5
-etafile none
-etabinsx 1000
-etabinsy 1000
-etamin -1
-etamax 2

libs/rapidjson/rapidjson/document.h

@@ -316,8 +316,7 @@ struct GenericStringRef {
 
     GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
 
-    // Removed to fix failing build in GCC 14
+    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
-    // GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
 
     //! implicit conversion to plain CharType pointer
     operator const Ch *() const { return s; }

python/slsdet/detector.py

@@ -232,7 +232,7 @@ class Detector(CppDetectorApi):
     @element
     def hardwareversion(self):
         """
-        [Jungfrau][Moench][Gotthard2][Myhten3][Gotthard][Ctb] Hardware version of detector. \n
+        Hardware version of detector. \n
         [Eiger] Hardware version of front FPGA on detector.
         """
         return self.getHardwareVersion()
@@ -308,7 +308,7 @@ class Detector(CppDetectorApi):
         -----
         [Eiger] Options: 4, 8, 12, 16, 32. If set to 32, also sets clkdivider to 2 (quarter speed), else to 0 (full speed)\n
         [Mythen3] Options: 8, 16, 32 \n
-        [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16
+        [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2][Xilinx Ctb] 16
         """
         return self.getDynamicRange()
 
@@ -400,7 +400,7 @@ class Detector(CppDetectorApi):
     @element
     def framesl(self):
         """
-        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of frames left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of frames left in acquisition.\n
 
         Note
         ----
@@ -1951,7 +1951,7 @@ class Detector(CppDetectorApi):
     @element
     def triggersl(self):
         """
-        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB] Number of triggers left in acquisition.\n
+        [Gotthard][Jungfrau][Moench][Mythen3][Gotthard2][CTB][Xilinx CTB] Number of triggers left in acquisition.\n
         
         Note
         ----
@@ -2180,7 +2180,7 @@ class Detector(CppDetectorApi):
         Note
         -----
         Default: AUTO_TIMING \n
-        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2] AUTO_TIMING, TRIGGER_EXPOSURE \n
+        [Jungfrau][Moench][Gotthard][Ctb][Gotthard2][Xilinx Ctb] AUTO_TIMING, TRIGGER_EXPOSURE \n
         [Mythen3] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
         [Eiger] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
         """
@@ -3477,7 +3477,7 @@ class Detector(CppDetectorApi):
 
     @property
     def pattern(self):
-        """[Mythen3][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
+        """[Mythen3][Ctb][Xilinx Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
                
         :getter: Not Implemented
         
@@ -3495,7 +3495,7 @@ class Detector(CppDetectorApi):
     @property
     def patfname(self):
         """
-        [Ctb][Mythen3] Gets the pattern file name including path of the last pattern uploaded. Returns an empty if nothing was uploaded or via a server default
+        [Ctb][Mythen3][Xilinx Ctb] Gets the pattern file name including path of the last pattern uploaded. Returns an empty if nothing was uploaded or via a server default
         file
         """
         return self.getPatterFileName()
@@ -3520,7 +3520,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patlimits(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of complete pattern.
+        """[Ctb][Mythen3][Xilinx Ctb] Limits (start and stop address) of complete pattern.
         
         Example
         ---------
@@ -3540,7 +3540,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patsetbit(self):
-        """[Ctb][Mythen3] Sets the mask applied to every pattern to the selected bits. 
+        """[Ctb][Mythen3][Xilinx Ctb] Sets the mask applied to every pattern to the selected bits. 
         
         Example
         --------
@@ -3557,7 +3557,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patmask(self):
-        """[Ctb][Mythen3] Selects the bits that will have a pattern mask applied to the selected patmask for every pattern.
+        """[Ctb][Mythen3][Xilinx Ctb] Selects the bits that will have a pattern mask applied to the selected patmask for every pattern.
         
         Example
         --------
@@ -3575,7 +3575,7 @@ class Detector(CppDetectorApi):
     # @element
     def patwait(self):
         """
-        [Ctb][Mythen3] Wait address of loop level provided.
+        [Ctb][Mythen3][Xilinx Ctb] Wait address of loop level provided.
         
         Example
         -------
@@ -3592,7 +3592,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwait0(self):
-        """[Ctb][Mythen3] Wait 0 address.
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 0 address.
                 
         Example
         --------
@@ -3612,7 +3612,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwait1(self):
-        """[Ctb][Mythen3] Wait 1 address.
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 1 address.
                 
         Example
         --------
@@ -3632,7 +3632,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwait2(self):
-        """[Ctb][Mythen3] Wait 2 address.
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 2 address.
                 
         Example
         --------
@@ -3652,7 +3652,7 @@ class Detector(CppDetectorApi):
     @property
     def patwaittime(self):
         """
-        [Ctb][Mythen3] Wait time in clock cycles of loop level provided.
+        [Ctb][Mythen3][Xilinx Ctb] Wait time in clock cycles of loop level provided.
         
         Example
         -------
@@ -3669,7 +3669,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwaittime0(self):
-        """[Ctb][Mythen3] Wait 0 time in clock cycles."""
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 0 time in clock cycles."""
         return self.getPatternWaitTime(0)
 
     @patwaittime0.setter
@@ -3680,7 +3680,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwaittime1(self):
-        """[Ctb][Mythen3] Wait 1 time in clock cycles."""
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 1 time in clock cycles."""
         return self.getPatternWaitTime(1)
 
     @patwaittime1.setter
@@ -3691,7 +3691,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patwaittime2(self):
-        """[Ctb][Mythen3] Wait 2 time in clock cycles."""
+        """[Ctb][Mythen3][Xilinx Ctb] Wait 2 time in clock cycles."""
         return self.getPatternWaitTime(2)
 
     @patwaittime2.setter
@@ -3703,7 +3703,7 @@ class Detector(CppDetectorApi):
     @property
     def patloop(self):
         """
-        [Ctb][Mythen3] Limits (start and stop address) of the loop provided.
+        [Ctb][Mythen3][Xilinx Ctb] Limits (start and stop address) of the loop provided.
         
         Example
         -------
@@ -3720,7 +3720,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patloop0(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of loop 0.
+        """[Ctb][Mythen3][Xilinx Ctb] Limits (start and stop address) of loop 0.
         
         Example
         ---------
@@ -3740,7 +3740,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patloop1(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of loop 1.
+        """[Ctb][Mythen3][Xilinx Ctb] Limits (start and stop address) of loop 1.
         
         Example
         ---------
@@ -3761,7 +3761,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patloop2(self):
-        """[Ctb][Mythen3] Limits (start and stop address) of loop 2.
+        """[Ctb][Mythen3][Xilinx Ctb] Limits (start and stop address) of loop 2.
         
         Example
         ---------
@@ -3783,7 +3783,7 @@ class Detector(CppDetectorApi):
     @property
     def patnloop(self):
         """
-        [Ctb][Mythen3] Number of cycles of the loop provided.
+        [Ctb][Mythen3][Xilinx Ctb] Number of cycles of the loop provided.
         
         Example
         -------
@@ -3800,7 +3800,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patnloop0(self):
-        """[Ctb][Mythen3] Number of cycles of loop 0."""
+        """[Ctb][Mythen3][Xilinx Ctb] Number of cycles of loop 0."""
         return self.getPatternLoopCycles(0)
 
     @patnloop0.setter
@@ -3811,7 +3811,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patnloop1(self):
-        """[Ctb][Mythen3] Number of cycles of loop 1."""
+        """[Ctb][Mythen3][Xilinx Ctb] Number of cycles of loop 1."""
         return self.getPatternLoopCycles(1)
 
     @patnloop1.setter
@@ -3822,7 +3822,7 @@ class Detector(CppDetectorApi):
     @property
     @element
     def patnloop2(self):
-        """[Ctb][Mythen3] Number of cycles of loop 2."""
+        """[Ctb][Mythen3][Xilinx Ctb] Number of cycles of loop 2."""
         return self.getPatternLoopCycles(2)
 
     @patnloop2.setter

serverBin/ctbDetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer

serverBin/ctbDetectorServerv8.0.0

@@ -1 +0,0 @@
-../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv8.0.0

serverBin/eigerDetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer

serverBin/eigerDetectorServerv8.0.0

@@ -1 +0,0 @@
-../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv8.0.0

serverBin/gotthard2DetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer

serverBin/gotthard2DetectorServerv8.0.0

@@ -1 +0,0 @@
-../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv8.0.0

serverBin/gotthardDetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer

serverBin/gotthardDetectorServerv8.0.0

@@ -1 +0,0 @@
-../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv8.0.0

serverBin/jungfrauDetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer

serverBin/jungfrauDetectorServerv8.0.0

@@ -1 +0,0 @@
-../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv8.0.0

serverBin/moenchDetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer

serverBin/moenchDetectorServerv8.0.2

@@ -1 +0,0 @@
-../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv8.0.2

serverBin/mythen3DetectorServer_developer

@@ -0,0 +1 @@
+../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer

serverBin/mythen3DetectorServerv8.0.2

@@ -1 +0,0 @@
-../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.2

slsDetectorCalibration/dataStructures/moench03v2Data.h

@@ -1,240 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#ifndef MOENCH03v2DATA_H
-#define MOENCH03v2DATA_H
-//#define MYROOT
-
-#ifndef MYROOT
-#include "sls/sls_detector_defs.h"
-#endif
-
-
-
-
-#ifdef MYROOT
-
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t bunchId;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t reserved;
-        uint32_t debug;
-        uint16_t roundRNumber;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-#define MAX_NUM_PACKETS 512
-// using sls_bitset = std::bitset<MAX_NUM_PACKETS>;
-//  using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8];
-  struct sls_receiver_header {
-        sls_detector_header detHeader; /**< is the detector header */
-        uint8_t packetsMask[64];        /**< is the packets caught bit mask */
-    };
-#endif
-
-#include "slsDetectorData.h"
-#ifdef RAWDATA
-#define DATA_OFFSET sizeof(header)
-#endif
-#ifndef RAWDATA
-#define DATA_OFFSET 0
-#endif
-
-
-class moench03v2Data : public slsDetectorData<uint16_t> {
-
-  private:
-    int iframe;
-    const int nRows;
-    
-    
-
-    double ghost[200][25];
-
-    // Single point of definition if we need to customize
-#ifndef MYROOT
-    using header = sls::defs::sls_receiver_header;
-#endif
-#ifdef MYROOT
-    sls_receiver_header header;
-#endif
-  public:
-    /**
-       Implements the slsReceiverData structure for the moench02 prototype read
-       out by a module i.e. using the slsReceiver (160x160 pixels, 40 packets
-       1286 large etc.) \param c crosstalk parameter for the output buffer
-
-    */
-    moench03v2Data(int nrows = 200)
-        : slsDetectorData<uint16_t>(400, nrows*2,2* 400*nrows*2 + DATA_OFFSET),
-      nRows(nrows) {
-	
-	std::cout << "MOENCH width new firmware " << dataSize << std::endl;
-	
-	int off=DATA_OFFSET;
-	    for (int ix = 0; ix < 400; ix++) {
-	      for (int iy = 0; iy < nRows*2; iy++) {
-		dataMap[iy][ix]=off+2*(iy*400+ix);
-	      }
-	    }
-	    
-        iframe = 0;
-        //  cout << "data struct created" << endl;
-      };
-
-    /**
-       Returns the value of the selected channel for the given dataset as
-       double. \param data pointer to the dataset (including headers etc) \param
-       ix pixel number in the x direction \param iy pixel number in the y
-       direction \returns data for the selected channel, with inversion if
-       required as double
-
-    */
-    double getValue(char *data, int ix, int iy = 0) override {
-        uint16_t val = getChannel(data, ix, iy) & 0x3fff;
-        return val;
-    };
-
-    virtual void calcGhost(char *data, int ix, int iy) {
-        double val = 0;
-        /* for (int ix=0; ix<25; ix++){ */
-        /*   for (int iy=0; iy<200; iy++) { */
-        val = 0;
-        //	cout << "** ";
-        for (int isc = 0; isc < 16; isc++) {
-            //  for (int ii=0; ii<2; ii++) {
-            val += getChannel(data, ix + 25 * isc, iy);
-            //  cout << "(" << isc << "," << val << " " ;
-            val += getChannel(data, ix + 25 * isc, 399 - iy);
-            // cout << val << " " ;
-            // }
-        }
-        ghost[iy][ix] = val; //-6224;
-                             //	cout << " --"<< endl;
-                             /*   }  */
-                             /* } */
-                             // cout << "*" << endl;
-    }
-
-    virtual void calcGhost(char *data) {
-        for (int ix = 0; ix < 25; ix++) {
-            for (int iy = 0; iy < 200; iy++) {
-                calcGhost(data, ix, iy);
-            }
-        }
-        // cout << "*" << endl;
-    }
-
-    double getGhost(int ix, int iy) {
-        if (iy < 200)
-            return ghost[iy][ix % 25];
-        if (iy < 400)
-            return ghost[399 - iy][ix % 25];
-        return 0;
-    };
-
-    /**
-
-    Returns the frame number for the given dataset. Purely virtual func.
-    \param buff pointer to the dataset
-    \returns frame number
-
- */
-
-    int getFrameNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header *)buff)->detHeader.frameNumber;
-#endif
-#ifndef RAWDATA
-      return 1;
-#endif
-
-    }
-
-    /**
-
-       Returns the packet number for the given dataset. purely virtual func
-       \param buff pointer to the dataset
-       \returns packet number number
-
-
-
-    */
-    int getPacketNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header  *)buff)->detHeader.packetNumber;
-#endif
-#ifndef RAWDATA
-      return 0;
-#endif
-      
-    }
-
-    char *readNextFrame(std::ifstream &filebin) override {
-        int ff = -1, np = -1;
-        return readNextFrame(filebin, ff, np);
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff) {
-        int np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np) {
-        char *data = new char[dataSize];
-        char *d = readNextFrame(filebin, ff, np, data);
-        if (d == NULL) {
-            delete[] data;
-            data = NULL;
-        }
-        return data;
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np,
-                                char *data) {
-        np = 0;
-        if (filebin.is_open()) {
-            if (filebin.read(data, dataSize)) {
-                ff = getFrameNumber(data);
-                np = getPacketNumber(data);
-		//	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-
-                return data;
-            }
-        }
-	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-        return nullptr;
-    }
-
-    /**
-
-       Loops over a memory slot until a complete frame is found (i.e. all
-       packets 0 to nPackets, same frame number). purely virtual func \param
-       data pointer to the memory to be analyzed \param ndata reference to the
-       amount of data found for the frame, in case the frame is incomplete at
-       the end of the memory slot \param dsize size of the memory slot to be
-       analyzed \returns pointer to the beginning of the last good frame (might
-       be incomplete if ndata smaller than dataSize), or NULL if no frame is
-       found
-
-    */
-    char *findNextFrame(char *data, int &ndata, int dsize) override {
-        if (dsize < dataSize)
-            ndata = dsize;
-        else
-            ndata = dataSize;
-        return data;
-    }
-
-    // int getPacketNumber(int x, int y) {return dataMap[y][x]/packetSize;};
-};
-
-#endif

slsDetectorCalibration/dataStructures/moench03v2HalfData.h

@@ -1,240 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-#ifndef MOENCH03v2DATA_H
-#define MOENCH03v2DATA_H
-//#define MYROOT
-
-#ifndef MYROOT
-#include "sls/sls_detector_defs.h"
-#endif
-
-
-
-
-#ifdef MYROOT
-
-    typedef struct {
-        uint64_t frameNumber;
-        uint32_t expLength;
-        uint32_t packetNumber;
-        uint64_t bunchId;
-        uint64_t timestamp;
-        uint16_t modId;
-        uint16_t row;
-        uint16_t column;
-        uint16_t reserved;
-        uint32_t debug;
-        uint16_t roundRNumber;
-        uint8_t detType;
-        uint8_t version;
-    } sls_detector_header;
-#define MAX_NUM_PACKETS 512
-// using sls_bitset = std::bitset<MAX_NUM_PACKETS>;
-//  using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8];
-  struct sls_receiver_header {
-        sls_detector_header detHeader; /**< is the detector header */
-        uint8_t packetsMask[64];        /**< is the packets caught bit mask */
-    };
-#endif
-
-#include "slsDetectorData.h"
-#ifdef RAWDATA
-#define DATA_OFFSET sizeof(header)
-#endif
-#ifndef RAWDATA
-#define DATA_OFFSET 0
-#endif
-
-
-class moench03v2Data : public slsDetectorData<uint16_t> {
-
-  private:
-    int iframe;
-    const int nRows;
-    
-    
-
-    double ghost[200][25];
-
-    // Single point of definition if we need to customize
-#ifndef MYROOT
-    using header = sls::defs::sls_receiver_header;
-#endif
-#ifdef MYROOT
-    sls_receiver_header header;
-#endif
-  public:
-    /**
-       Implements the slsReceiverData structure for the moench02 prototype read
-       out by a module i.e. using the slsReceiver (160x160 pixels, 40 packets
-       1286 large etc.) \param c crosstalk parameter for the output buffer
-
-    */
-    moench03v2Data(int nrows = 200)
-        : slsDetectorData<uint16_t>(400, nrows*2,2* 400*nrows*2 + DATA_OFFSET),
-      nRows(nrows) {
-	
-	std::cout << "MOENCH width new firmware " << dataSize << std::endl;
-	
-	int off=DATA_OFFSET;
-	    for (int ix = 0; ix < 400; ix++) {
-	      for (int iy = 0; iy < nRows*2; iy++) {
-		dataMap[iy][ix]=off+2*(iy*400+ix);
-	      }
-	    }
-	    
-        iframe = 0;
-        //  cout << "data struct created" << endl;
-      };
-
-    /**
-       Returns the value of the selected channel for the given dataset as
-       double. \param data pointer to the dataset (including headers etc) \param
-       ix pixel number in the x direction \param iy pixel number in the y
-       direction \returns data for the selected channel, with inversion if
-       required as double
-
-    */
-    double getValue(char *data, int ix, int iy = 0) override {
-        uint16_t val = getChannel(data, ix, iy) & 0x3fff;
-        return val;
-    };
-
-    virtual void calcGhost(char *data, int ix, int iy) {
-        double val = 0;
-        /* for (int ix=0; ix<25; ix++){ */
-        /*   for (int iy=0; iy<200; iy++) { */
-        val = 0;
-        //	cout << "** ";
-        for (int isc = 0; isc < 16; isc++) {
-            //  for (int ii=0; ii<2; ii++) {
-            val += getChannel(data, ix + 25 * isc, iy);
-            //  cout << "(" << isc << "," << val << " " ;
-            val += getChannel(data, ix + 25 * isc, 399 - iy);
-            // cout << val << " " ;
-            // }
-        }
-        ghost[iy][ix] = val; //-6224;
-                             //	cout << " --"<< endl;
-                             /*   }  */
-                             /* } */
-                             // cout << "*" << endl;
-    }
-
-    virtual void calcGhost(char *data) {
-        for (int ix = 0; ix < 25; ix++) {
-            for (int iy = 0; iy < 200; iy++) {
-                calcGhost(data, ix, iy);
-            }
-        }
-        // cout << "*" << endl;
-    }
-
-    double getGhost(int ix, int iy) {
-        if (iy < 200)
-            return ghost[iy][ix % 25];
-        if (iy < 400)
-            return ghost[399 - iy][ix % 25];
-        return 0;
-    };
-
-    /**
-
-    Returns the frame number for the given dataset. Purely virtual func.
-    \param buff pointer to the dataset
-    \returns frame number
-
- */
-
-    int getFrameNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header *)buff)->detHeader.frameNumber;
-#endif
-#ifndef RAWDATA
-      return 1;
-#endif
-
-    }
-
-    /**
-
-       Returns the packet number for the given dataset. purely virtual func
-       \param buff pointer to the dataset
-       \returns packet number number
-
-
-
-    */
-    int getPacketNumber(char *buff) {
-#ifdef RAWDATA
-      return ((sls::defs::sls_receiver_header  *)buff)->detHeader.packetNumber;
-#endif
-#ifndef RAWDATA
-      return 0;
-#endif
-      
-    }
-
-    char *readNextFrame(std::ifstream &filebin) override {
-        int ff = -1, np = -1;
-        return readNextFrame(filebin, ff, np);
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff) {
-        int np = -1;
-        return readNextFrame(filebin, ff, np);
-    };
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np) {
-        char *data = new char[dataSize];
-        char *d = readNextFrame(filebin, ff, np, data);
-        if (d == NULL) {
-            delete[] data;
-            data = NULL;
-        }
-        return data;
-    }
-
-    // not present in base class
-    virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np,
-                                char *data) {
-        np = 0;
-        if (filebin.is_open()) {
-            if (filebin.read(data, dataSize)) {
-                ff = getFrameNumber(data);
-                np = getPacketNumber(data);
-	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-
-                return data;
-            }
-        }
-	std::cout << "**" << ff << " " << dataSize << " " << ff << " " << np << std::endl;
-        return nullptr;
-    }
-
-    /**
-
-       Loops over a memory slot until a complete frame is found (i.e. all
-       packets 0 to nPackets, same frame number). purely virtual func \param
-       data pointer to the memory to be analyzed \param ndata reference to the
-       amount of data found for the frame, in case the frame is incomplete at
-       the end of the memory slot \param dsize size of the memory slot to be
-       analyzed \returns pointer to the beginning of the last good frame (might
-       be incomplete if ndata smaller than dataSize), or NULL if no frame is
-       found
-
-    */
-    char *findNextFrame(char *data, int &ndata, int dsize) override {
-        if (dsize < dataSize)
-            ndata = dsize;
-        else
-            ndata = dataSize;
-        return data;
-    }
-
-    // int getPacketNumber(int x, int y) {return dataMap[y][x]/packetSize;};
-};
-
-#endif

slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp

@@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {
 #ifndef FF
     if (argc < 9) {
         cout << "Wrong usage! Should be: " << argv[0]
-             << " infile  etafile outfile runmin runmax ns [cmin cmax xmin xmax ymin ymax]" << endl;
+             << " infile  etafile outfile runmin runmax ns cmin cmax" << endl;
         return 1;
     }
 #endif
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
 #ifdef FF
     if (argc < 7) {
         cout << "Wrong usage! Should be: " << argv[0]
-             << " infile  etafile runmin runmax [cmin cmax xmin xmax ymin ymax]" << endl;
+             << " infile  etafile runmin runmax cmin cmax" << endl;
         return 1;
     }
 #endif
@@ -65,30 +65,13 @@ int main(int argc, char *argv[]) {
     nsubpix = atoi(argv[iarg++]);
     cout << "Subpix: " << nsubpix << endl;
 #endif
-    
+    float cmin = atof(argv[iarg++]);
-    float cmin = 0;
+    float cmax = atof(argv[iarg++]);
-    float cmax=1000000;
-    if (argc>iarg)
-      cmin=atof(argv[iarg++]);
-    if (argc>iarg)
-      cmax= atof(argv[iarg++]);
     cout << "Energy min: " << cmin << endl;
     cout << "Energy max: " << cmax << endl;
-    int xmin=0, xmax=NC, ymin=0, ymax=NR;
-    
-    if (argc>iarg)
-      xmin=atof(argv[iarg++]);
-    if (argc>iarg)
-      xmax= atof(argv[iarg++]);
-    
-    if (argc>iarg)
-      ymin=atof(argv[iarg++]);
-    if (argc>iarg)
-      ymax= atof(argv[iarg++]);
-    
     // int etabins=500;
     int etabins = 1000; // nsubpix*2*100;
-    double etamin = -0.25, etamax = 1.25;
+    double etamin = -1, etamax = 2;
     // double etamin=-0.1, etamax=1.1;
     //   double eta3min = -2, eta3max = 2;
     double sum, totquad;
@@ -97,7 +80,7 @@ int main(int argc, char *argv[]) {
     // double eta3x, eta3y, int3_x, int3_y, noint_x, noint_y;
    
     int ix, iy, isx, isy;
-    int nframes = 0, lastframe = -1, iframe, nphFrame;
+    int nframes = 0, lastframe = -1;
     //double d_x, d_y, res = 5, xx, yy;
     int nph = 0, totph = 0;
     //badph = 0, 
@@ -115,7 +98,7 @@ int main(int argc, char *argv[]) {
     //  int nSubPixels = nsubpix;
 #ifndef NOINTERPOLATION
     eta2InterpolationPosXY *interp =
-      new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix, etabins, etabins, etamin, etamax);
+      new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix,etabins,etabins, etamin, etamax);
     // eta2InterpolationCleverAdaptiveBins *interp=new
     // eta2InterpolationCleverAdaptiveBins(NC, NR, nsubpix, etabins, etamin,
     // etamax);
@@ -124,8 +107,8 @@ int main(int argc, char *argv[]) {
     noInterpolation *interp = new noInterpolation(NC, NR, nsubpix);
 #endif
 
-    int quad; 
 #ifndef FF
+    int quad; 
 #ifndef NOINTERPOLATION
     char fname[10000];
     int ok;
@@ -159,26 +142,19 @@ int main(int argc, char *argv[]) {
 #endif
 
     int irun;
-    for (irun = runmin; irun <= runmax; irun++) {
+    for (irun = runmin; irun < runmax; irun++) {
         sprintf(infname, argv[1], irun);
 #ifndef FF
         sprintf(outfname, argv[3], irun);
 #endif
 
-
         f = fopen(infname, "r");
         if (f) {
             cout << infname << endl;
             nframes = 0;
             //f0 = -1;
 
-	    //iff=0;
+            while (cl.read(f)) {
-	    while (fread((void*)&iframe, 1,  sizeof(int), f)) {
-	      //n=0;
-	      if (fread((void*)&nphFrame, 1,  sizeof(int), f)) {
-		for (int iph=0; iph<nphFrame; iph++) {
-		//while (cl.read(f)) {
-		  if (cl.read(f)) {
                 totph++;
                 if (lastframe != cl.iframe) {
                     lastframe = cl.iframe;
@@ -189,28 +165,18 @@ int main(int argc, char *argv[]) {
                     nframes++;
                 }
                 // quad=interp->calcQuad(cl.get_cluster(), sum, totquad, sDum);
-// #ifndef FF
+#ifndef FF
-//                 quad = interp->calcEta(cl.get_cluster(), etax, etay, sum,
-//                                        totquad, sDum);
-// #endif
-// #ifdef FF
-	
                 quad = interp->calcEta(cl.get_cluster(), etax, etay, sum,
                                        totquad, sDum);
-	
+#endif
-		
+#ifdef FF
-		/*	cl.print();
+                interp->calcEta(cl.get_cluster(), etax, etay, sum,
-		cout << "(" << etax <<","<< etay <<")"<< quad<< endl;
+                                       totquad, sDum);
-		*/
+#endif
-		//#endif
 
-		if (totquad > cmin && cl.x >= xmin && cl.x <= xmax && 
+      if (sum > cmin && totquad / sum > 0.8 && totquad / sum < 1.2 &&
-		    cl.y >= ymin && cl.y <= ymax &&
+                    sum < cmax) {
-		    totquad < cmax) {
+                    nph++;
-
-		  //	if (sum > cmin && totquad / sum > 0.8 && totquad / sum < 1.2 &&
-		  //	sum < cmax) {
-		  nph++;
                     //  if (sum>200 && sum<580) {
                     //  interp->getInterpolatedPosition(cl.x,cl.y,
                     //  totquad,quad,cl.get_cluster(),int_x, int_y);
@@ -261,12 +227,9 @@ int main(int argc, char *argv[]) {
 #ifdef FF
                         interp->writeFlatField(outfname);
 #endif
-		    }
                     }
                 }
-	      }
+            }
-	    }
-	    }
 
             fclose(f);
 #ifdef FF

slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp

@@ -13,7 +13,7 @@
 
 #ifndef MOENCH04
 #ifndef RECT
-#include "moench03v2Data.h"
+#include "moench03T1ReceiverDataNew.h"
 #endif
 #endif
 
@@ -41,147 +41,34 @@ using namespace std;
 
 int main(int argc, char *argv[]) {
 
-  std::map<std::string, std::string> args = {
+    if (argc < 4) {
-    {"numfiles","1"},
-    {"nthreads","5"},
-    {"fifosize","5000"},
-    {"nsigma","5"},
-    {"gainfile","none"},
-    {"detectorMode","counting"},
-    {"threshold","0"},
-    {"pedestalfile","none"},
-    {"nframes","0"},
-    {"xMin","0"},
-    {"xMax","400"},
-    {"yMin","0"},
-    {"yMax","400"},
-    {"eMin","0"},
-    {"eMax","16000"},
-    {"outdir","./"},
-    {"indir","./"},
-    {"flist","none"},
-    {"fformat","none"},
-    {"runmin","0"},
-    {"runmax","-1"},
-    {"readnrows","400"}
-  };
-  //float *gm;
-  
-  int ff, np;
-  // cout << " data size is " << dsize;
-  
-  ifstream filebin;
-  if (argc < 4) {
-    std::string name, value,sline;
-    int ic=0;
-    ifstream flist;
-    flist.open (argv[1], std::ifstream::in);
-    if (flist.is_open()) {
-      cout << "Using config file " <<argv[1] << endl;
-       while (std::getline(flist,sline)){
-	 if (sline.at(0)!='#') {
-	   ic=sline.find(' ');
-	   name = sline.substr(0,ic); 
-	   value = sline.substr(ic+1,sline.size()-ic); 
-	   args[name]=value;
-	 }
-	 
-       } 
-       flist.close();
-    } else {
         cout << "Usage is " << argv[0]
              << "indir outdir fname(no extension) [runmin] [runmax] [pedfile (raw or tiff)] [threshold] "
-	  "[nframes] [xmin xmax ymin ymax] [gainmap]"
+                "[nframes] [xmin xmax ymin ymax] [gainmap]"
              << endl;
         cout << "threshold <0 means analog; threshold=0 means cluster finder; "
-	  "threshold>0 means photon counting"
+                "threshold>0 means photon counting"
              << endl;
         cout << "nframes <0 means sum everything; nframes=0 means one file per "
-	  "run; nframes>0 means one file every nframes"
+                "run; nframes>0 means one file every nframes"
              << endl;
-	return EXIT_FAILURE;
+        return 1;
-      }
-    } else {
-      args["indir"]=argv[1];
-      args["outdir"]=argv[1];
-      args["fformat"]=argv[3];
-      if (argc >= 5) {
-	args["runmin"] = argv[4];
-      }
-	args["runmax"] = args["runmin"];
-
-      if (argc >= 6) {
-	args["runmax"] = argv[5];
-      }
-      if (argc >= 7) {
-        args["pedestalfile"] = argv[6];
-      }
-      if (argc >= 8) {
-        args["threshold"] = argv[7];
-      }
-      if (argc >= 9) {
-        args["nframes"] = argv[8];
-      }
-      if (argc >= 13) {
-        args["xMin"] = argv[9];
-        args["xMax"] = argv[10];
-        args["yMin"] = argv[11];
-        args["yMax"] = argv[12];
-      }
-      if (argc > 13) {
-	args["gainfile"] = argv[13];
-      }
-      
-      if (atof(args["threshold"].c_str())<0) {
-	args["detectorMode"]="analog";
-      }
-
     }
 
-
+    int fifosize = 1000;
-
+    int nthreads = 10;
-    for (auto const& x : args)
-      {
-	std::cout << x.first  // string (key)
-		  << ':' 
-		  << x.second // string's value 
-		  << std::endl;
-      }
-
-
-    string indir=args["indir"]; 
-    string outdir = args["outdir"];
-    string fformat= args["fformat"];
-    int runmin = atoi(args["runmin"].c_str());
-    int runmax = atoi(args["runmin"].c_str());
-    string pedfile =args["pedestalfile"];
-    double thr = atof(args["threshold"].c_str());
-    double thr1 = 1;
-    
-    int nframes = atoi(args["nframes"].c_str());
-    
-    int xmin =  atoi(args["xMin"].c_str()), xmax =  atoi(args["xMax"].c_str()), ymin = atoi(args["yMin"].c_str()), ymax = atoi(args["yMax"].c_str());
-    
-    string gainfname=args["gainfile"];
-    
-    int fifosize = atoi(args["fifosize"].c_str());
-    int nthreads = atoi(args["nthreads"].c_str());
-    int nsigma = atoi(args["nsigma"].c_str());
-    int nrows = atoi(args["readnrows"].c_str());
-    float eMin = atof(args["eMin"].c_str());
-    float eMax = atof(args["eMax"].c_str());
     int csize = 3;
-    int nped = 1000;
+    int nsigma = 5;
-    
+    int nped = 10000;
-    int cf = 0;
-    int numberOfPackets=nrows/8;
 
+    int cf = 0;
+    int numberOfPackets=40;
 #ifdef RECT
     cout << "Should be rectangular but now it will crash! No data structure defined!" << endl;
 #endif
-    
+
 #ifndef MOENCH04
-    moench03v2Data *decoder = new moench03v2Data(100);
+    moench03T1ReceiverDataNew *decoder = new moench03T1ReceiverDataNew();
     cout << "MOENCH03!" << endl;
 #endif
 
@@ -190,7 +77,7 @@ int main(int argc, char *argv[]) {
     moench04CtbZmq10GbData *decoder = new moench04CtbZmq10GbData(5000,0);
     cout << "MOENCH04!" << endl;
 #endif
-    
+
 #ifdef MOENCH04_DGS
     moench04CtbZmq10GbData *decoder = new moench04CtbZmq10GbData(5000,5000);
     cout << "MOENCH04 DGS!" << endl;
@@ -199,11 +86,63 @@ int main(int argc, char *argv[]) {
     
 #endif
 
+    //Read detector size from decoder
     int nx , ny;
     decoder->getDetectorSize(nx, ny);
 
-    //Read detector size from decoder
+    //float *gm;
-   
+
+    int ff, np;
+    // cout << " data size is " << dsize;
+
+    ifstream filebin;
+    char *indir = argv[1];
+    char *outdir = argv[2];
+    char *fformat = argv[3];
+    int runmin = 0;
+
+    // cout << "argc is " << argc << endl;
+    if (argc >= 5) {
+        runmin = atoi(argv[4]);
+    }
+
+    int runmax = runmin;
+
+    if (argc >= 6) {
+        runmax = atoi(argv[5]);
+    }
+
+    char *pedfile = NULL;
+    if (argc >= 7) {
+        pedfile = argv[6];
+    }
+    double thr = 0;
+    double thr1 = 1;
+
+    if (argc >= 8) {
+        thr = atof(argv[7]);
+    }
+
+    int nframes = 0;
+
+    if (argc >= 9) {
+        nframes = atoi(argv[8]);
+    }
+
+    int xmin = 0, xmax = nx, ymin = 0, ymax = ny;
+    if (argc >= 13) {
+        xmin = atoi(argv[9]);
+        xmax = atoi(argv[10]);
+        ymin = atoi(argv[11]);
+        ymax = atoi(argv[12]);
+    }
+
+    char *gainfname = NULL;
+    if (argc > 13) {
+        gainfname = argv[13];
+        cout << "Gain map file name is: " << gainfname << endl;
+    }
+
     char ffname[10000];
     char fname[10000];
     char imgfname[10000];
@@ -212,6 +151,17 @@ int main(int argc, char *argv[]) {
     std::time_t end_time;
 
     FILE *of = NULL;
+    cout << "input directory is " << indir << endl;
+    cout << "output directory is " << outdir << endl;
+    cout << "input file is " << fformat << endl;
+    cout << "runmin is " << runmin << endl;
+    cout << "runmax is " << runmax << endl;
+    if (pedfile)
+        cout << "pedestal file is " << pedfile << endl;
+    if (thr > 0)
+        cout << "threshold is " << thr << endl;
+    cout << "Nframes is " << nframes << endl;
+
     uint32_t nnx, nny;
 
 
@@ -232,62 +182,50 @@ int main(int argc, char *argv[]) {
     singlePhotonDetector *filter = new singlePhotonDetector(
         decoder, csize, nsigma, 1, cm, nped, 200, -1, -1, gainmap, gs);
 
-    //if (gainfname) {
+    if (gainfname) {
 
-    if (filter->readGainMap(gainfname.c_str()))
+        if (filter->readGainMap(gainfname))
             cout << "using gain map " << gainfname << endl;
         else
             cout << "Could not open gain map " << gainfname << endl;
-    // } else
+    } else
-    thr = 0.15 * thr;
+        thr = 0.15 * thr;
     filter->newDataSet();
     //int dsize = decoder->getDataSize();
 
     if (thr > 0) {
-      cout << "threshold is " << thr << endl;
+        cout << "threshold is " << thr << endl;
-      filter->setThreshold(thr);
+        filter->setThreshold(thr);
-      cf = 0;
+        cf = 0;
+
     } else
-      cf = 1;
+        cf = 1;
-    
+
     filter->setROI(xmin, xmax, ymin, ymax);
-    filter->setEnergyRange(eMin, eMax);
     std::time(&end_time);
     cout << std::ctime(&end_time) << endl;
 
     char *buff;
-    
+
     // multiThreadedAnalogDetector *mt=new
     // multiThreadedAnalogDetector(filter,nthreads,fifosize);
     multiThreadedCountingDetector *mt =
         new multiThreadedCountingDetector(filter, nthreads, fifosize);
-    
+#ifndef ANALOG
-    if (args["detectorMode"]=="counting") {
+    mt->setDetectorMode(ePhotonCounting);
-      mt->setDetectorMode(ePhotonCounting);
+    cout << "Counting!" << endl;
-      if (thr > 0) {
+    if (thr > 0) {
         cf = 0;
-      }
-    } else {
-      mt->setDetectorMode(eAnalog);
-      cf = 0;
     }
-      
+#endif
-      
+//{
-// #ifndef ANALOG
+#ifdef ANALOG
-//     mt->setDetectorMode(ePhotonCounting);
+    mt->setDetectorMode(eAnalog);
-//     cout << "Counting!" << endl;
+    cout << "Analog!" << endl;
-//     if (thr > 0) {
+    cf = 0;
-//         cf = 0;
+    // thr1=thr;
-//     }
+#endif
-// #endif
+    //  }
-// //{
-// #ifdef ANALOG
-//     mt->setDetectorMode(eAnalog);
-//     cout << "Analog!" << endl;
-//     cf = 0;
-//     // thr1=thr;
-// #endif
-//     //  }
 
     mt->StartThreads();
     mt->popFree(buff);
@@ -298,117 +236,84 @@ int main(int argc, char *argv[]) {
     char froot[1000];
     double *ped=new double[nx * ny];//, *ped1;
     int pos,pos1;
-    //return  0;
-    if (pedfile.find(".raw") != std::string::npos) {
-      pos1=pedfile.rfind("/");
-      strcpy(froot,pedfile.substr(pos1).c_str());
-      pos=string(froot).find(".raw");
-      froot[pos]='\0';
-    }
     
-    cout << "PEDESTAL " << endl;
+    if (pedfile) {
-    if (pedfile.find(".tif") == std::string::npos) {
+      if (string(pedfile).find(".raw") != std::string::npos) {
-      sprintf(fname, "%s", pedfile.c_str());
+	pos1=string(pedfile).rfind("/");
+	strcpy(froot,pedfile+pos1);
+	pos=string(froot).find(".raw");
+	froot[pos]='\0';
+      }
+
+      cout << "PEDESTAL " << endl;
+      if (string(pedfile).find(".tif") == std::string::npos) {
+            sprintf(fname, "%s", pedfile);
             cout << fname << endl;
             std::time(&end_time);
             //cout << "aaa" << std::ctime(&end_time) << endl;
-	    
+
             mt->setFrameMode(ePedestal);
             // sprintf(fn,fformat,irun);
             filebin.open((const char *)(fname), ios::in | ios::binary);
             //      //open file
             if (filebin.is_open()) {
-	      ff = -1;
+                ff = -1;
                 while (decoder->readNextFrame(filebin, ff, np, buff)) {
-		  if (np == numberOfPackets) {
+                    if (np == numberOfPackets) {
-		    mt->pushData(buff);
+                        mt->pushData(buff);
                         mt->nextThread();
                         mt->popFree(buff);
                         ifr++;
-			if (ifr % 100 == 0)
+                        if (ifr % 100 == 0)
-			  cout << ifr << " " << ff << " " << np << endl;
+                            cout << ifr << " " << ff << " " << np << endl;
-			    //	break;
+                    } else
-		  } else {
+                        cout << ifr << " " << ff << " " << np << endl;
-		    cout << ifr << " " << ff << " " << np << endl;
-		    break;
-		  }
                     ff = -1;
                 }
                 filebin.close();
                 while (mt->isBusy()) {
-		  ;
+                    ;
-
                 }
-		
+
-		sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot);
+		sprintf(imgfname, "%s/%s_ped.tiff", outdir,froot);
 		mt->writePedestal(imgfname);
-		sprintf(imgfname, "%s/%s_var.tiff", outdir.c_str(),froot);
+		sprintf(imgfname, "%s/%s_var.tiff", outdir,froot);
 		mt->writePedestalRMS(imgfname);
             } else
-	      cout << "Could not open pedestal file " << fname
+                cout << "Could not open pedestal file " << fname
-		   << " for reading " << endl;
-    } else {
-      float *pp = ReadFromTiff(pedfile.c_str(), nny, nnx);
-      if (pp && (int)nnx == nx && (int)nny == ny) {
-	for (int i = 0; i < nx * ny; i++) {
-                    ped[i] = pp[i];
-	}
-	delete[] pp;
-	mt->setPedestal(ped);
-	cout << "Pedestal set from tiff file " << pedfile << endl;
-      } else {
-	cout << "Could not open pedestal tiff file " << pedfile
                      << " for reading " << endl;
-      }
+        } else {
+            float *pp = ReadFromTiff(pedfile, nny, nnx);
+            if (pp && (int)nnx == nx && (int)nny == ny) {
+                for (int i = 0; i < nx * ny; i++) {
+                    ped[i] = pp[i];
+                }
+                delete[] pp;
+                mt->setPedestal(ped);
+                cout << "Pedestal set from tiff file " << pedfile << endl;
+            } else {
+                cout << "Could not open pedestal tiff file " << pedfile
+                     << " for reading " << endl;
+            }
+        }
+        std::time(&end_time);
+        cout << std::ctime(&end_time) << endl;
     }
-    std::time(&end_time);
-    cout << std::ctime(&end_time) << endl;
 
-    
     ifr = 0;
     int ifile = 0;
 
     mt->setFrameMode(eFrame);
-    //t filelist=0;
-    ifstream flist;
-    flist.open (args["flist"].c_str(), std::ifstream::in);
-    if (flist.is_open()) {
-      cout << "Using file list" << endl;
-      runmin=0;
-       runmax=0;
-       while (flist.getline(ffname,10000)){
-	 cout << ffname << endl;
-	 runmax++;
-       }
-       runmax--;
-       flist.close();
-       cout << "Found " << runmax << " files " << endl;
-       flist.open (fformat, std::ifstream::in);
-    } 
 
     for (int irun = runmin; irun <= runmax; irun++) {
         cout << "DATA ";
         // sprintf(fn,fformat,irun);
-        // sprintf(ffname, "%s/%s.raw", indir, fformat);
+        sprintf(ffname, "%s/%s.raw", indir, fformat);
-        // sprintf(fname, (const char*)ffname, irun);
+        sprintf(fname, (const char*)ffname, irun);
-        // sprintf(ffname, "%s/%s.tiff", outdir, fformat);
+        sprintf(ffname, "%s/%s.tiff", outdir, fformat);
-        // sprintf(imgfname, (const char*)ffname, irun);
+        sprintf(imgfname, (const char*)ffname, irun);
-        // sprintf(ffname, "%s/%s.clust", outdir, fformat);
+        sprintf(ffname, "%s/%s.clust", outdir, fformat);
-        // sprintf(cfname, (const char*)ffname, irun);
+        sprintf(cfname, (const char*)ffname, irun);
-	if (flist.is_open()) {
-	  flist.getline(ffname,10000);
-	  cout << "file list " << ffname << endl;
-	} else {
-	  //sprintf(ffname,(const char*)fformat,irun);
-	  sprintf(ffname,args["fformat"].c_str(),irun);
-	  cout << "loop " << ffname << endl;
-	}
-	cout << "ffname "<< ffname << endl;
-	sprintf(fname,  "%s/%s.raw",indir.c_str(),ffname);
-	sprintf(imgfname,  "%s/%s.tiff",outdir.c_str(),ffname);
-	sprintf(cfname,  "%s/%s.clust",outdir.c_str(),ffname);
-
-
         cout << fname << " ";
         cout << imgfname << endl;
         std::time(&end_time);
@@ -418,7 +323,7 @@ int main(int argc, char *argv[]) {
         //      //open file
         ifile = 0;
         if (filebin.is_open()) {
-            if (cf != 0) { // cluster finder
+            if (thr <= 0 && cf != 0) { // cluster finder
                 if (of == NULL) {
                     of = fopen(cfname, "w");
                     if (of) {
@@ -436,7 +341,7 @@ int main(int argc, char *argv[]) {
             ff = -1;
             ifr = 0;
             while (decoder->readNextFrame(filebin, ff, np, buff)) {
-	      if (np == numberOfPackets) {
+                if (np == numberOfPackets) {
                     //         //push
                     mt->pushData(buff);
                     // 	//         //pop
@@ -445,26 +350,21 @@ int main(int argc, char *argv[]) {
 
                     ifr++;
 		    if (ifr % 100 == 0)
-		      cout << ifr << " " << ff << " " << np << endl;
+                        cout << ifr << " " << ff << endl;
-		    //break;
                     if (nframes > 0) {
                         if (ifr % nframes == 0) {
-                            // sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat,
+                            sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat,
-                            //         ifile);
+                                    ifile);
-                            // sprintf(imgfname, (const char*)ffname, irun);
+                            sprintf(imgfname, (const char*)ffname, irun);
-			  sprintf(imgfname,  "%s/%s_f%05d.tiff",outdir.c_str(),ffname,ifile);
-                           while (mt->isBusy()) 
-                             ;
-
                             mt->writeImage(imgfname, thr1);
                             mt->clearImage();
                             ifile++;
                         }
                     }
-	      } else {
+                } else {
-		cout << "bp " << ifr << " " << ff << " " << np << endl;
+		  cout << "bp " << ifr << " " << ff << " " << np << endl;
-		//break;
+		  //break;
-	      }
+		}
                 ff = -1;
             }
             cout << "--" << endl;
@@ -474,17 +374,13 @@ int main(int argc, char *argv[]) {
             }
             if (nframes >= 0) {
                 if (nframes > 0) {
-		  sprintf(imgfname,  "%s/%s_f%05d.tiff",outdir.c_str(),ffname,ifile);
+                    sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat, ifile);
-                  //  sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat, ifile);
+                    sprintf(imgfname, (const char*)ffname, irun);
-		  //sprintf(imgfname, (const char*)ffname, irun);
                 } else {
-		  sprintf(imgfname,  "%s/%s.tiff",outdir.c_str(),ffname);
+                    sprintf(ffname, "%s/%s.tiff", outdir, fformat);
-                  //  sprintf(ffname, "%s/%s.tiff", outdir, fformat);
+                    sprintf(imgfname, (const char*)ffname, irun);
-                  //  sprintf(imgfname, (const char*)ffname, irun);
                 }
-                cout << "Writing tiff to " << imgfname << " " << thr1 << endl; 
+                cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
-		while (mt->isBusy()) 
-		  ;
                 mt->writeImage(imgfname, thr1);
                 mt->clearImage();
                 if (of) {
@@ -499,16 +395,11 @@ int main(int argc, char *argv[]) {
             cout << "Could not open " << fname << " for reading " << endl;
     }
     if (nframes < 0) {
-      //sprintf(ffname, "%s/%s.tiff", outdir, fformat);
+        sprintf(ffname, "%s/%s.tiff", outdir, fformat);
-      //  strcpy(imgfname, ffname);
+        strcpy(imgfname, ffname);
-      sprintf(imgfname,  "%s/%s_tot.tiff",outdir.c_str(),ffname);
+        cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
-      cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
+        mt->writeImage(imgfname, thr1);
-      while (mt->isBusy()) 
-	;
-      mt->writeImage(imgfname, thr1);
-    }
-    if (flist.is_open()) {
-      flist.close();
     }
+
     return 0;
 }

slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp

@@ -13,8 +13,7 @@
 #include "sls/sls_detector_defs.h"
 #ifndef MOENCH04
 //#ifndef RECT
-#include "moench03v2Data.h"
+#include "moench03T1ZmqDataNew.h"
-//#include "moench03T1ZmqDataNew.h"
 //#endif
 //#ifdef RECT
 //#include "moench03T1ZmqDataNewRect.h"
@@ -32,7 +31,6 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include <map>
 
 #include <rapidjson/document.h> //json header in zmq stream
 
@@ -65,48 +63,36 @@ int main(int argc, char *argv[]) {
      * trial.o [socket ip] [starting port number] [send_socket ip] [send port
      * number]
      *
-     */ 
+     */
-  std::map<std::string, std::string> args = {
+    FILE *of = NULL;
-    {"numinterfaces","1"},	
+    int fifosize = 5000;
-    {"rx_zmqip","10.1.2.102"},	
-    {"rx_zmqport","7770"},
-    {"zmqip","129.129.202.153"},
-    {"zmqport","7780"},
-    {"nthreads","5"},
-    {"fifosize","5000"},
-    {"nsigma","5"},
-    {"gainfile","none"},
-    {"nbinsx","5"},
-    {"nbinsy","5"},
-    {"etafile","none"},
-    {"etabinsx","1000"},
-    {"etamin","-1"},
-    {"etamax","2"}  };
-  FILE *of = NULL;
     int etabins = 1000, etabinsy = 1000; // nsubpix*2*100;
     double etamin = -1, etamax = 2;
     int nSubPixelsX = 2;
     int emin, emax;
     int nSubPixelsY = 2;
-    int nthreads = 5;
-    int fifosize = 5000;
-    uint32_t nSigma = 5;
 
-    string etafname;// = NULL;
+    // help
-    string gainfname;// = NULL;
+    if (argc < 3) {
+        cprintf(RED, "Help: ./trial [receive socket ip] [receive starting port "
+                     "number] [send_socket ip] [send starting port number] "
+                     "[nthreads] [nsubpix] [gainmap]  [etafile]\n");
+        return EXIT_FAILURE;
+    }
 
     // receive parameters
     bool send = false;
+    char *socketip = argv[1];
+    uint32_t portnum = atoi(argv[2]);
     // send parameters if any
-    string socketip2;// = 0;
+    char *socketip2 = 0;
-    uint32_t portnum2 = 0;  
+    uint32_t portnum2 = 0;
-    string socketip;// = 0;
-    uint32_t portnum = 0;
 
     sls::zmqHeader zHeader, outHeader;
     zHeader.jsonversion = SLS_DETECTOR_JSON_HEADER_VERSION;
     outHeader.jsonversion = SLS_DETECTOR_JSON_HEADER_VERSION;
 
+    uint32_t nSigma = 5;
 
     int ok;
 
@@ -116,85 +102,48 @@ int main(int argc, char *argv[]) {
     // time_t begin,end,finished;
     int rms = 0;
 
-    send = true;
+    if (argc > 4) {
-    // help
+        socketip2 = argv[3];
-    if (argc < 5) {
+        portnum2 = atoi(argv[4]);
-      std::string name, value,sline;
+        if (portnum2 > 0)
-      int ic=0;
+            send = true;
-      ifstream flist;
+    }
-      flist.open (argv[1], std::ifstream::in);
+    cout << "\nrx socket ip : " << socketip << "\nrx port num  : " << portnum;
-      if (flist.is_open()) {
+    if (send) {
-	cout << "Using config file " <<argv[1] << endl;
+        cout << "\ntx socket ip : " << socketip2
-       while (std::getline(flist,sline)){
+             << "\ntx port num  : " << portnum2;
-	 if (sline.at(0)!='#') {
+    }
-	   ic=sline.find(' ');
+    int nthreads = 5;
-	   name = sline.substr(0,ic); 
+    if (argc > 5)
-	   value = sline.substr(ic+1,sline.size()-ic); 
+        nthreads = atoi(argv[5]);
-	   args[name]=value;
-	 }
 
-       } 
+    cout << "Number of threads is: " << nthreads << endl;
-       flist.close();
+    if (argc > 6) {
-      } else {
+        nSubPixelsX = atoi(argv[6]);
-        cprintf(RED, "Arguments are either: \n [config file] \n or the following list (deprecated): [receive socket ip] [receive starting port "
+        nSubPixelsY = nSubPixelsX;
-		"number] [send_socket ip] [send starting port number] "
+#ifdef RECT
-		"[nthreads] [nsubpix] [gainmap]  [etafile]\n");
+        nSubPixelsX = 2;
-        return EXIT_FAILURE;
+#endif
-      }
+    }
-    } else {
+    cout << "Number of subpixels is: " << nSubPixelsX << " " << nSubPixelsY
-       args["rx_zmqip"]=argv[1];	
+         << endl;
-       args["rx_zmqport"]=argv[2];
-
-       args["zmqip"]=argv[3];
-       args["zmqport"]=argv[4];
-       if (argc > 5)
-        args["nthreads"] = argv[5];
-       if (argc > 6) {
-	 args["nbinsx"]=argv[6];
-	 args["nbinsy"]=argv[6];
-       }
-       
-      if (argc > 7) {
-	args["gainfile"]=argv[7];
-      }
-      if (argc > 8) {
-	args["etafilefile"]=argv[8];
-      }
 
+    char *gainfname = NULL;
+    if (argc > 7) {
+        gainfname = argv[7];
+        cout << "Gain map file name is: " << gainfname << endl;
     }
 
-       for (auto const& x : args)
+    char *etafname = NULL;
-	 {
+    if (argc > 8) {
-	   std::cout << x.first  // string (key)
+        etafname = argv[8];
-		     << ':' 
+        cout << "Eta file name is: " << etafname << endl;
-		     << x.second // string's value 
-		     << std::endl;
-	 }
-
-    socketip = args["rx_zmqip"];
-    portnum = atoi(args["rx_zmqport"].c_str());
-    
-    socketip2 = args["zmqip"];
-    portnum2 = atoi(args["zmqport"].c_str());
-
-    nthreads = atoi(args["nthreads"].c_str());
-    nSubPixelsX =atoi(args["nbinsx"].c_str());
-    nSubPixelsY =atoi(args["nbinsy"].c_str());
-    gainfname = args["gainfile"];
-    etafname = args["etafilefile"];
-    
-    if (atoi(args["nuninterfaces"].c_str())>1){
-      cprintf(RED, "Sorry, at the  moment only a single interface is supported instead of %d\n",atoi(args["nuninterfaces"].c_str()));
-      return EXIT_FAILURE;
     }
 
-
     // slsDetectorData *det=new moench03T1ZmqDataNew();
 #ifndef MOENCH04
-    cout << "This is a Moench03 v2" << endl;
+    cout << "This is a Moench03" << endl;
-    //moench03T1ZmqDataNew *det = new moench03T1ZmqDataNew();
+    moench03T1ZmqDataNew *det = new moench03T1ZmqDataNew();
-    moench03v2Data *det = new moench03v2Data();
-    cout << "MOENCH03!" << endl;
 #endif
 #ifdef MOENCH04
     cout << "This is a Moench04" << endl;
@@ -228,8 +177,8 @@ int main(int argc, char *argv[]) {
     double *gmap = NULL;
 
     uint32_t nnnx, nnny;
-    //if (gainfname) {
+    if (gainfname) {
-        gm = ReadFromTiff(gainfname.c_str(), nnny, nnnx);
+        gm = ReadFromTiff(gainfname, nnny, nnnx);
         if (gm && nnnx == (uint)npx && nnny == (uint)npy) {
             gmap = new double[npx * npy];
             for (int i = 0; i < npx * npy; i++) {
@@ -238,7 +187,7 @@ int main(int argc, char *argv[]) {
             delete[] gm;
         } else
             cout << "Could not open gain map " << gainfname << endl;
-	//}
+    }
 
     // analogDetector<uint16_t> *filter=new
     // analogDetector<uint16_t>(det,1,NULL,1000);
@@ -256,8 +205,8 @@ int main(int argc, char *argv[]) {
     eta2InterpolationPosXY *interp = new eta2InterpolationPosXY(
         npx, npy, nSubPixelsX, nSubPixelsY, etabins, etabinsy, etamin, etamax);
 
-    //if (etafname)
+    if (etafname)
-    interp->readFlatField(etafname.c_str());
+        interp->readFlatField(etafname);
 
     interpolatingDetector *filter = new interpolatingDetector(
         det, interp, nSigma, 1, cm, 1000, 10, -1, -1, gainmap, gs);
@@ -277,13 +226,13 @@ int main(int argc, char *argv[]) {
     try {
 #endif
 
-      zmqsocket = new sls::ZmqSocket(socketip.c_str(), portnum);
+      zmqsocket = new sls::ZmqSocket(socketip, portnum);
 
 #ifdef NEWZMQ
     } catch (...) {
         cprintf(RED,
                 "Error: Could not create Zmq socket on port %d with ip %s\n",
-                portnum, socketip.c_str());
+                portnum, socketip);
         delete zmqsocket;
         return EXIT_FAILURE;
     }
@@ -293,7 +242,7 @@ int main(int argc, char *argv[]) {
     if (zmqsocket->IsError()) {
         cprintf(RED,
                 "Error: Could not create Zmq socket on port %d with ip %s\n",
-                portnum, socketip.c_str());
+                portnum, socketip);
         delete zmqsocket;
         return EXIT_FAILURE;
     }
@@ -314,14 +263,14 @@ int main(int argc, char *argv[]) {
         // receive socket
         try {
 #endif
-	  zmqsocket2 = new sls::ZmqSocket(portnum2, socketip2.c_str());
+	  zmqsocket2 = new sls::ZmqSocket(portnum2, socketip2);
 
 #ifdef NEWZMQ
         } catch (...) {
             cprintf(RED,
                     "Error: Could not create Zmq socket server on port %d and "
                     "ip %s\n",
-                    portnum2, socketip2.c_str());
+                    portnum2, socketip2);
             //	delete zmqsocket2;
             //	zmqsocket2=NULL;
             //	delete zmqsocket;
@@ -335,7 +284,7 @@ int main(int argc, char *argv[]) {
             cprintf(RED,
                     "AAA Error: Could not create Zmq socket server on port %d "
                     "and ip %s\n",
-                    portnum2, socketip2.c_str());
+                    portnum2, socketip2);
             //	delete zmqsocket2;
             // delete zmqsocket;
             //	return EXIT_FAILURE;
@@ -773,25 +722,6 @@ int main(int argc, char *argv[]) {
 
             cprintf(MAGENTA, "%d %d %d %d\n", xmin, xmax, ymin, ymax);
             mt->setROI(xmin, xmax, ymin, ymax);
-
-             if (addJsonHeader.find("xMin") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("xMin")) >> xmin;
-             }
- 
-             if (addJsonHeader.find("yMin") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("yMin")) >> ymin;
-             }
- 
-             if (addJsonHeader.find("xMax") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("xMax")) >> xmax;
-             }
- 
-             if (addJsonHeader.find("yMax") != addJsonHeader.end()) {
-                 istringstream(addJsonHeader.at("yMax")) >> ymax;
-             }
-
-
-
             if (addJsonHeader.find("dynamicRange") != addJsonHeader.end()) {
                 istringstream(addJsonHeader.at("dynamicRange")) >> dr;
                 dr = 32;
@@ -891,7 +821,7 @@ int main(int argc, char *argv[]) {
         // cout << acqIndex << " " << frameIndex << " " << subFrameIndex << "
         // "<< detSpec1 << " " << timestamp << " " << packetNumber << endl;
         // cprintf(GREEN, "frame\n");
-        if (packetNumber <= 50) {
+        if (packetNumber >= 40) {
             //*((int*)buff)=frameIndex;
             if (insubframe == 0)
                 f0 = frameIndex;

slsDetectorServers/CMakeLists.txt

@@ -11,6 +11,7 @@ install(TARGETS slsProjectCSettings
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 add_subdirectory(ctbDetectorServer)
+add_subdirectory(xilinx_ctbDetectorServer)
 add_subdirectory(eigerDetectorServer)
 add_subdirectory(gotthardDetectorServer)
 add_subdirectory(jungfrauDetectorServer)

slsDetectorServers/compileAllServers.sh

@@ -8,7 +8,8 @@ det_list=("ctbDetectorServer
 	gotthard2DetectorServer 
 	jungfrauDetectorServer 
 	mythen3DetectorServer 
-	moenchDetectorServer" 
+	moenchDetectorServer
+	xilinx_ctbDetectorServer" 
 	)
 usage="\nUsage: compileAllServers.sh [server|all(opt)] [branch(opt)]. \n\tNo arguments mean all servers with 'developer' branch. \n\tNo 'branch' input means 'developer branch'"
 

slsDetectorServers/compileAllServers_noAPIUpdate.sh

@@ -9,6 +9,7 @@ det_list=("ctbDetectorServer"
 	"jungfrauDetectorServer"
 	"mythen3DetectorServer"
 	"moenchDetectorServer"
+	"xilinx_ctbDetectorServer"
 	)
 usage="\nUsage: compileAllServers.sh [server|all(opt)] [branch(opt)]. \n\tNo arguments mean all servers with 'developer' branch. \n\tNo 'branch' input means 'developer branch'"
 

slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c

@@ -90,6 +90,7 @@ void basictests() {
                "Could not map to memory. Cannot proceed. Check Firmware.\n");
         LOG(logERROR, (initErrorMessage));
         initError = FAIL;
+        return;
     }
 #ifndef VIRTUAL
     // does check only if flag is 0 (by default), set by command line

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -88,6 +88,7 @@ void basictests() {
                "Could not map to memory. Cannot proceed. Check Firmware.\n");
         LOG(logERROR, (initErrorMessage));
         initError = FAIL;
+        return;
     }
 #ifndef VIRTUAL
     // does check only if flag is 0 (by default), set by command line

slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c

@@ -82,6 +82,7 @@ void basictests() {
                "Could not map to memory. Cannot proceed. Check Firmware.\n");
         LOG(logERROR, ("%s\n\n", initErrorMessage));
         initError = FAIL;
+        return;
     }
 #ifndef VIRTUAL
     // does check only if flag is 0 (by default), set by command line

slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h

@@ -61,7 +61,7 @@
 #define ASIC_FILTER_MAX_RES_VALUE (1)
 #define MAX_SELECT_CHIP10_VAL     (63)
 
-#define MAX_PHASE_SHIFTS (200)
+#define MAX_PHASE_SHIFTS (240)
 #define BIT16_MASK       (0xFFFF)
 
 #define ADC_DECMT_QUARTER_SPEED (0x3)
@@ -70,7 +70,7 @@
 
 #define ADC_PHASE_DEG_QUARTER_SPEED (0)
 #define ADC_PHASE_DEG_HALF_SPEED    (0)
-#define ADC_PHASE_DEG_FULL_SPEED    (150)
+#define ADC_PHASE_DEG_FULL_SPEED    (300)
 
 #define ADC_OFST_QUARTER_SPEED (0x12)
 #define ADC_OFST_HALF_SPEED    (0x12)
@@ -133,7 +133,7 @@ enum DACINDEX {
         680,  /* MO_VB_SDA */                                                  \
         1428, /* MO_VCASC_SFP */                                               \
         1200, /* MO_VOUT_CM */                                                 \
-        1280, /* MO_VIPRE_CDS */                                               \
+        800,  /* MO_VIPRE_CDS */                                               \
         900   /* MO_IBIAS_SFP */                                               \
     };
 

slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c

@@ -92,6 +92,7 @@ void basictests() {
                "Could not map to memory. Cannot proceed. Check Firmware.\n");
         LOG(logERROR, (initErrorMessage));
         initError = FAIL;
+        return;
     }
 #ifndef VIRTUAL
     // does check only if flag is 0 (by default), set by command line
@@ -479,11 +480,6 @@ void setupDetector() {
         READOUT_PLL_VCO_FREQ_HZ, SYSTEM_PLL_VCO_FREQ_HZ);
     ALTERA_PLL_C10_ResetPLL(READOUT_PLL);
     ALTERA_PLL_C10_ResetPLL(SYSTEM_PLL);
-    // change startup clock divider in software
-    // because firmware only sets max clock divider
-    setClockDividerWithTimeUpdateOption(READOUT_C0, DEFAULT_READOUT_C0_STARTUP,
-                                        0);
-
     // hv
     DAC6571_SetDefines(HV_HARD_MAX_VOLTAGE, HV_DRIVER_FILE_NAME);
     // dac
@@ -2336,7 +2332,6 @@ int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val,
         return FAIL;
     }
     if (val < 2 || val > getMaxClockDivider()) {
-        LOG(logERROR, ("Invalid clock divider %d\n", val));
         return FAIL;
     }
     char *clock_names[] = {CLK_NAMES};

slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h

@@ -64,8 +64,6 @@
 #define DEFAULT_SYSTEM_C2           (5)  //(200000000) // smp_clk, 200 MHz const
 #define DEFAULT_TRIMMING_RUN_CLKDIV (40) // (25000000) // 25 MHz
 
-#define DEFAULT_READOUT_C0_STARTUP (20) //(50000000) // rdo_clk, 50 MHz
-
 #define DEFAULT_ASIC_LATCHING_NUM_PULSES (10)
 #define DEFAULT_MSTR_OTPT_P1_NUM_PULSES  (20)
 #define DEFAULT_ADIF_PIPELINE_VAL        (8)

slsDetectorServers/slsDetectorServer/include/arm64.h

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#pragma once
+
+#include <inttypes.h>
+#include <sys/types.h>
+
+void bus_w(u_int32_t offset, u_int32_t data);
+u_int32_t bus_r(u_int32_t offset);
+uint64_t getU64BitReg(int aLSB, int aMSB);
+void setU64BitReg(uint64_t value, int aLSB, int aMSB);
+int mapCSP0(void);

slsDetectorServers/slsDetectorServer/include/loadPattern.h

@@ -6,10 +6,12 @@
 #include "clogger.h"
 
 void initializePatternAddresses();
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
 #ifdef VIRTUAL
 void initializePatternWord();
 #endif
+#endif
+#if defined(CHIPTESTBOARDD) // TODO || defined(XILINX_CHIPTESTBOARDD)
 uint64_t validate_readPatternIOControl();
 int validate_writePatternIOControl(char *message, uint64_t arg);
 void writePatternIOControl(uint64_t word);

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -25,6 +25,10 @@
 #include "blackfin.h"
 #endif
 
+#ifdef ARMPROCESSOR
+#include "arm64.h"
+#endif
+
 #ifdef MYTHEN3D
 #include "mythen3.h"
 #endif
@@ -61,8 +65,7 @@ typedef struct udpStruct_s {
 int isInitCheckDone();
 int getInitResult(char **mess);
 void basictests();
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
+#if !defined(EIGERD)
-    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int checkType();
 int testFpga();
 int testBus();
@@ -81,13 +84,17 @@ u_int64_t getFirmwareVersion();
 #ifdef EIGERD
 uint64_t getFrontEndFirmwareVersion(enum fpgaPosition fpgaPosition);
 #endif
+#ifndef XILINX_CHIPTESTBOARDD
 u_int64_t getFirmwareAPIVersion();
+#endif
 void getHardwareVersion(char *version);
 #ifdef EIGERD
 int getHardwareVersionNumber();
 #else
+#ifndef XILINX_CHIPTESTBOARDD
 u_int16_t getHardwareVersionNumber();
 #endif
+#endif
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
 u_int16_t getHardwareSerialNumber();
 #endif
@@ -111,7 +118,6 @@ int updateModuleId();
 void setModuleId(int modid);
 #endif
 #endif
-
 u_int64_t getDetectorMAC();
 u_int32_t getDetectorIP();
 
@@ -136,7 +142,7 @@ int updateDatabytesandAllocateRAM();
 void updateDataBytes();
 #endif
 
-#ifndef CHIPTESTBOARDD
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)
 int resetToDefaultDacs(int hardReset);
 int getDefaultDac(enum DACINDEX index, enum detectorSettings sett, int *retval);
 int setDefaultDac(enum DACINDEX index, enum detectorSettings sett, int value);
@@ -245,12 +251,14 @@ void setNumFrames(int64_t val);
 int64_t getNumFrames();
 void setNumTriggers(int64_t val);
 int64_t getNumTriggers();
+#ifndef XILINX_CHIPTESTBOARDD
 #ifndef MYTHEN3D
 int setExpTime(int64_t val);
 int64_t getExpTime();
 #endif
 int setPeriod(int64_t val);
 int64_t getPeriod();
+#endif
 #ifdef MYTHEN3D
 void setNumIntGates(int val);
 void setNumGates(int val);
@@ -299,12 +307,15 @@ uint32_t getCounterMask();
 void updatePacketizing();
 #endif
 
+#ifndef EIGERD
+int64_t getNumFramesLeft();
+int64_t getNumTriggersLeft();
+#endif
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARDD) ||            \
     defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int setDelayAfterTrigger(int64_t val);
 int64_t getDelayAfterTrigger();
-int64_t getNumFramesLeft();
+
-int64_t getNumTriggersLeft();
 int64_t getDelayAfterTriggerLeft();
 int64_t getPeriodLeft();
 #endif
@@ -337,10 +348,12 @@ int setTrimbits(int *trimbits);
 int setAllTrimbits(int val);
 int getAllTrimbits();
 #endif
+#ifndef XILINX_CHIPTESTBOARDD
 #ifndef CHIPTESTBOARDD
 enum detectorSettings setSettings(enum detectorSettings sett);
 #endif
 enum detectorSettings getSettings();
+#endif
 #if defined(JUNGFRAUD)
 enum gainMode getGainMode();
 void setGainMode(enum gainMode mode);
@@ -366,10 +379,14 @@ void setDAC(enum DACINDEX ind, int val, int mV, int counterEnableCheck);
 void setGeneralDAC(enum DACINDEX ind, int val, int mV);
 void setVthDac(int index, int enable);
 #else
+#ifndef XILINX_CHIPTESTBOARDD
 void setDAC(enum DACINDEX ind, int val, int mV);
 #endif
+#endif
+#ifndef XILINX_CHIPTESTBOARDD
 int getDAC(enum DACINDEX ind, int mV);
 int getMaxDacSteps();
+#endif
 #if defined(CHIPTESTBOARDD)
 int dacToVoltage(int dac);
 int checkVLimitCompliant(int mV);
@@ -394,14 +411,17 @@ void powerOff();
 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getADC(enum ADCINDEX ind, int *value);
 #else
+#ifndef XILINX_CHIPTESTBOARDD
 int getADC(enum ADCINDEX ind);
 #endif
+#endif
 #ifdef CHIPTESTBOARDD
 int getSlowADC(int ichan);
 int getSlowADCTemperature();
 #endif
-
+#ifndef XILINX_CHIPTESTBOARDD
 int setHighVoltage(int val);
+#endif
 
 // parameters - timing, extsig
 #if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD) ||            \
@@ -674,11 +694,13 @@ int setTransmissionDelayRight(int value);
 #endif
 
 // aquisition
+#ifndef XILINX_CHIPTESTBOARDD
 int startStateMachine();
 #ifdef VIRTUAL
 void *start_timer(void *arg);
 #endif
 int stopStateMachine();
+#endif
 #ifdef MYTHEN3D
 int softwareTrigger();
 #endif
@@ -692,8 +714,10 @@ enum runStatus getRunStatus();
 #ifdef EIGERD
 void waitForAcquisitionEnd(int *ret, char *mess);
 #else
+#ifndef XILINX_CHIPTESTBOARDD
 void waitForAcquisitionEnd();
 #endif
+#endif
 #if defined(CHIPTESTBOARDD)
 int validateUDPSocket();
 void readandSendUDPFrames();
@@ -714,11 +738,15 @@ u_int32_t runState(enum TLogLevel lev);
 #endif
 
 // common
+#ifndef XILINX_CHIPTESTBOARDD
 int calculateDataBytes();
 int getTotalNumberOfChannels();
-#if defined(CHIPTESTBOARDD)
+#endif
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
 void getNumberOfChannels(int *nchanx, int *nchany);
 #endif
+#ifndef XILINX_CHIPTESTBOARDD
 int getNumberOfChips();
 int getNumberOfDACs();
 int getNumberOfChannelsPerChip();
+#endif

slsDetectorServers/slsDetectorServer/src/arm64.c

@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "arm64.h"
+#include "RegisterDefs.h"
+#include "clogger.h"
+#include "common.h"
+#include "sls/ansi.h"
+#include "sls/sls_detector_defs.h"
+
+#include <fcntl.h>    // open
+#include <sys/mman.h> // mmap
+
+/* global variables */
+#define CSP0     (0xB0010000)
+#define MEM_SIZE 0x100000
+
+u_int32_t *csp0base = 0;
+
+void bus_w(u_int32_t offset, u_int32_t data) {
+    volatile u_int32_t *ptr1;
+    ptr1 = (u_int32_t *)(csp0base + offset / (sizeof(u_int32_t)));
+    *ptr1 = data;
+}
+
+u_int32_t bus_r(u_int32_t offset) {
+    volatile u_int32_t *ptr1;
+    ptr1 = (u_int32_t *)(csp0base + offset / (sizeof(u_int32_t)));
+    return *ptr1;
+}
+
+uint64_t getU64BitReg(int aLSB, int aMSB) {
+    uint64_t retval = bus_r(aMSB);
+    retval = (retval << 32) | bus_r(aLSB);
+    return retval;
+}
+
+void setU64BitReg(uint64_t value, int aLSB, int aMSB) {
+    bus_w(aLSB, value & (0xffffffff));
+    bus_w(aMSB, (value >> 32) & (0xffffffff));
+}
+
+int mapCSP0(void) {
+    // if not mapped
+    if (csp0base == 0) {
+        LOG(logINFO, ("Mapping memory\n"));
+#ifdef VIRTUAL
+        csp0base = malloc(MEM_SIZE);
+        if (csp0base == NULL) {
+            LOG(logERROR, ("Could not allocate virtual memory.\n"));
+            return FAIL;
+        }
+        LOG(logINFO, ("memory allocated\n"));
+#else
+        int fd;
+        fd = open("/dev/mem", O_RDWR | O_SYNC, 0);
+        if (fd == -1) {
+            LOG(logERROR, ("Can't find /dev/mem\n"));
+            return FAIL;
+        }
+        LOG(logDEBUG1, ("/dev/mem opened\n"));
+        csp0base = (u_int32_t *)mmap(0, MEM_SIZE, PROT_READ | PROT_WRITE,
+                                     MAP_FILE | MAP_SHARED, fd, CSP0);
+        if (csp0base == MAP_FAILED) {
+            LOG(logERROR, ("Can't map memmory area\n"));
+            return FAIL;
+        }
+#endif
+        LOG(logINFO, ("csp0base mapped from %p to %p\n", csp0base,
+                      (csp0base + MEM_SIZE)));
+    } else
+        LOG(logINFO, ("Memory already mapped before\n"));
+    return OK;
+}

slsDetectorServers/slsDetectorServer/src/common.c

@@ -114,6 +114,10 @@ int getTimeFromString(char *buf, time_t *result) {
          t.tm_mday, t.tm_mon, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec));
 
     *result = mktime(&t);
+    if (*result == -1) {
+        LOG(logERROR, ("Could not convert time structure to time_t\n"));
+        return FAIL;
+    }
     return OK;
 }
 
@@ -143,14 +147,25 @@ int validateKernelVersion(char *expectedVersion) {
 #ifdef VIRTUAL
     strcpy(currentVersion, expectedVersion);
 #else
+#ifndef ARMPROCESSOR
     // remove first word (#version number)
-    const char *ptr = strchr(version, ' ');
+    const char *ptr = strstr(version, " ");
     if (ptr == NULL) {
         LOG(logERROR, ("Could not parse kernel version\n"));
         return FAIL;
     }
-    strcpy(currentVersion, version + (ptr - version + 1));
+    strcpy(currentVersion, ptr + 1);
+#else
+    // remove first two words (#version number and SMP)
+    const char *ptr = strstr(version, "SMP ");
+    if (ptr == NULL) {
+        LOG(logERROR, ("Could not parse kernel version\n"));
+        return FAIL;
+    }
+    strcpy(currentVersion, ptr + 4);
 #endif
+#endif
+    currentVersion[sizeof(currentVersion) - 1] = '\0';
 
     // convert kernel date string into time
     time_t kernelDate;
@@ -159,6 +174,7 @@ int validateKernelVersion(char *expectedVersion) {
             ("Could not parse retrieved kernel date, %s\n", currentVersion));
         return FAIL;
     }
+    LOG(logDEBUG, ("Kernel Date: [%s]\n", ctime(&kernelDate)));
 
     // convert expected date into time
     time_t expDate;
@@ -167,11 +183,12 @@ int validateKernelVersion(char *expectedVersion) {
             ("Could not parse expected kernel date, %s\n", expectedVersion));
         return FAIL;
     }
+    LOG(logDEBUG, ("Expected Date: [%s]\n", ctime(&expDate)));
 
     // compare if kernel time is older than expected time
     if (kernelDate < expDate) {
-        LOG(logERROR, ("Kernel Version Incompatible (too old)! Expected: [%s], "
+        LOG(logERROR, ("Kernel Version Incompatible (too old)!\nExpected: '%s'"
-                       "Got [%s]\n",
+                       "\nGot     : '%s'\n",
                        expectedVersion, currentVersion));
         return FAIL;
     }

slsDetectorServers/slsDetectorServer/src/loadPattern.c

@@ -13,7 +13,7 @@
 extern enum TLogLevel trimmingPrint;
 #endif
 
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
 #ifdef VIRTUAL
 uint64_t virtual_pattern[MAX_PATTERN_LENGTH];
 #endif
@@ -21,8 +21,8 @@ uint64_t virtual_pattern[MAX_PATTERN_LENGTH];
 
 extern void bus_w(u_int32_t offset, u_int32_t data);
 extern u_int32_t bus_r(u_int32_t offset);
-extern int64_t get64BitReg(int aLSB, int aMSB);
+// extern int64_t get64BitReg(int aLSB, int aMSB); TODO for all servers (only
-extern int64_t set64BitReg(int64_t value, int aLSB, int aMSB);
+// uint64_t) extern int64_t set64BitReg(int64_t value, int aLSB, int aMSB);
 extern uint64_t getU64BitReg(int aLSB, int aMSB);
 extern void setU64BitReg(uint64_t value, int aLSB, int aMSB);
 
@@ -44,13 +44,15 @@ void initializePatternAddresses() {
     }
 }
 
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
 #ifdef VIRTUAL
 void initializePatternWord() {
     memset(virtual_pattern, 0, sizeof(virtual_pattern));
 }
 #endif
+#endif
 
+#if defined(CHIPTESTBOARDD) // TODO || defined(XILINX_CHIPTESTBOARDD)
 uint64_t validate_readPatternIOControl() {
     return getU64BitReg(PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG);
 }
@@ -101,7 +103,7 @@ uint64_t readPatternWord(int addr) {
     // the first word in RAM as base plus the offset of the word to write (addr)
     uint32_t reg_lsb = PATTERN_STEP0_LSB_REG + addr * REG_OFFSET * 2;
     uint32_t reg_msb = PATTERN_STEP0_MSB_REG + addr * REG_OFFSET * 2;
-    return get64BitReg(reg_lsb, reg_msb);
+    return getU64BitReg(reg_lsb, reg_msb);
 #else
     LOG(logDEBUG1, ("  Reading (Executing) Pattern Word (addr:0x%x)\n", addr));
     uint32_t reg = PATTERN_CNTRL_REG;
@@ -118,7 +120,7 @@ uint64_t readPatternWord(int addr) {
 
     // read value
 #ifndef VIRTUAL
-    return get64BitReg(PATTERN_OUT_LSB_REG, PATTERN_OUT_MSB_REG);
+    return getU64BitReg(PATTERN_OUT_LSB_REG, PATTERN_OUT_MSB_REG);
 #else
     return virtual_pattern[addr];
 #endif
@@ -160,7 +162,7 @@ void writePatternWord(int addr, uint64_t word) {
     uint32_t reg = PATTERN_CNTRL_REG;
 
     // write word
-    set64BitReg(word, PATTERN_IN_LSB_REG, PATTERN_IN_MSB_REG);
+    setU64BitReg(word, PATTERN_IN_LSB_REG, PATTERN_IN_MSB_REG);
 
     // overwrite with  only addr
     bus_w(reg, ((addr << PATTERN_CNTRL_ADDR_OFST) & PATTERN_CNTRL_ADDR_MSK));
@@ -178,7 +180,7 @@ void writePatternWord(int addr, uint64_t word) {
     // the first word in RAM as base plus the offset of the word to write (addr)
     uint32_t reg_lsb = PATTERN_STEP0_LSB_REG + addr * REG_OFFSET * 2;
     uint32_t reg_msb = PATTERN_STEP0_MSB_REG + addr * REG_OFFSET * 2;
-    set64BitReg(word, reg_lsb, reg_msb);
+    setU64BitReg(word, reg_lsb, reg_msb);
 #endif
 }
 
@@ -311,24 +313,24 @@ int validate_getPatternWaitTime(char *message, int level, uint64_t *waittime) {
 uint64_t getPatternWaitTime(int level) {
     switch (level) {
     case 0:
-        return get64BitReg(PATTERN_WAIT_TIMER_0_LSB_REG,
+        return getU64BitReg(PATTERN_WAIT_TIMER_0_LSB_REG,
-                           PATTERN_WAIT_TIMER_0_MSB_REG);
+                            PATTERN_WAIT_TIMER_0_MSB_REG);
     case 1:
-        return get64BitReg(PATTERN_WAIT_TIMER_1_LSB_REG,
+        return getU64BitReg(PATTERN_WAIT_TIMER_1_LSB_REG,
-                           PATTERN_WAIT_TIMER_1_MSB_REG);
+                            PATTERN_WAIT_TIMER_1_MSB_REG);
     case 2:
-        return get64BitReg(PATTERN_WAIT_TIMER_2_LSB_REG,
+        return getU64BitReg(PATTERN_WAIT_TIMER_2_LSB_REG,
-                           PATTERN_WAIT_TIMER_2_MSB_REG);
+                            PATTERN_WAIT_TIMER_2_MSB_REG);
 #ifndef MYTHEN3D
     case 3:
-        return get64BitReg(PATTERN_WAIT_TIMER_3_LSB_REG,
+        return getU64BitReg(PATTERN_WAIT_TIMER_3_LSB_REG,
-                           PATTERN_WAIT_TIMER_3_MSB_REG);
+                            PATTERN_WAIT_TIMER_3_MSB_REG);
     case 4:
-        return get64BitReg(PATTERN_WAIT_TIMER_4_LSB_REG,
+        return getU64BitReg(PATTERN_WAIT_TIMER_4_LSB_REG,
-                           PATTERN_WAIT_TIMER_4_MSB_REG);
+                            PATTERN_WAIT_TIMER_4_MSB_REG);
     case 5:
-        return get64BitReg(PATTERN_WAIT_TIMER_5_LSB_REG,
+        return getU64BitReg(PATTERN_WAIT_TIMER_5_LSB_REG,
-                           PATTERN_WAIT_TIMER_5_MSB_REG);
+                            PATTERN_WAIT_TIMER_5_MSB_REG);
 #endif
     default:
         return -1;
@@ -369,29 +371,29 @@ void setPatternWaitTime(int level, uint64_t t) {
          (long long int)t));
     switch (level) {
     case 0:
-        set64BitReg(t, PATTERN_WAIT_TIMER_0_LSB_REG,
+        setU64BitReg(t, PATTERN_WAIT_TIMER_0_LSB_REG,
-                    PATTERN_WAIT_TIMER_0_MSB_REG);
+                     PATTERN_WAIT_TIMER_0_MSB_REG);
         break;
     case 1:
-        set64BitReg(t, PATTERN_WAIT_TIMER_1_LSB_REG,
+        setU64BitReg(t, PATTERN_WAIT_TIMER_1_LSB_REG,
-                    PATTERN_WAIT_TIMER_1_MSB_REG);
+                     PATTERN_WAIT_TIMER_1_MSB_REG);
         break;
     case 2:
-        set64BitReg(t, PATTERN_WAIT_TIMER_2_LSB_REG,
+        setU64BitReg(t, PATTERN_WAIT_TIMER_2_LSB_REG,
-                    PATTERN_WAIT_TIMER_2_MSB_REG);
+                     PATTERN_WAIT_TIMER_2_MSB_REG);
         break;
 #ifndef MYTHEN3D
     case 3:
-        set64BitReg(t, PATTERN_WAIT_TIMER_3_LSB_REG,
+        setU64BitReg(t, PATTERN_WAIT_TIMER_3_LSB_REG,
-                    PATTERN_WAIT_TIMER_3_MSB_REG);
+                     PATTERN_WAIT_TIMER_3_MSB_REG);
         break;
     case 4:
-        set64BitReg(t, PATTERN_WAIT_TIMER_4_LSB_REG,
+        setU64BitReg(t, PATTERN_WAIT_TIMER_4_LSB_REG,
-                    PATTERN_WAIT_TIMER_4_MSB_REG);
+                     PATTERN_WAIT_TIMER_4_MSB_REG);
         break;
     case 5:
-        set64BitReg(t, PATTERN_WAIT_TIMER_5_LSB_REG,
+        setU64BitReg(t, PATTERN_WAIT_TIMER_5_LSB_REG,
-                    PATTERN_WAIT_TIMER_5_MSB_REG);
+                     PATTERN_WAIT_TIMER_5_MSB_REG);
         break;
 #endif
     default:
@@ -775,7 +777,7 @@ int loadPattern(char *message, enum TLogLevel printLevel,
         }
     }
     // iocontrol
-#ifndef MYTHEN3D
+#if !defined(MYTHEN3D) && !defined(XILINX_CHIPTESTBOARDD) // TODO
     if (ret == OK) {
         ret = validate_writePatternIOControl(message, pat->ioctrl);
     }
@@ -835,7 +837,7 @@ int getPattern(char *message, patternParameters *pat) {
         pat->word[i] = retval64;
     }
     // iocontrol
-#ifndef MYTHEN3D
+#if !defined(MYTHEN3D) && !defined(XILINX_CHIPTESTBOARDD) // TODO
     if (ret == OK) {
         validate_readPatternIOControl();
     }
@@ -956,7 +958,7 @@ int loadPatternFile(char *patFname, char *errMessage) {
             uint64_t word = 0;
 
             // cannot scan values
-#ifdef VIRTUAL
+#if defined(VIRTUAL) || defined(XILINX_CHIPTESTBOARDD)
             if (sscanf(line, "%s 0x%x 0x%lx", command, &addr, &word) != 3) {
 #else
             if (sscanf(line, "%s 0x%x 0x%llx", command, &addr, &word) != 3) {
@@ -971,7 +973,7 @@ int loadPatternFile(char *patFname, char *errMessage) {
         }
 
         // patioctrl
-#ifndef MYTHEN3D
+#if !defined(MYTHEN3D) && !defined(XILINX_CHIPTESTBOARDD) // TODO
         if (!strncmp(line, "patioctrl", strlen("patioctrl"))) {
             uint64_t arg = 0;
 
@@ -1063,7 +1065,7 @@ int loadPatternFile(char *patFname, char *errMessage) {
             uint64_t waittime = 0;
 
             // cannot scan values
-#ifdef VIRTUAL
+#if defined(VIRTUAL) || defined(XILINX_CHIPTESTBOARDD)
             if (sscanf(line, "%s %d %ld", command, &level, &waittime) != 3) {
 #else
             if (sscanf(line, "%s %d %lld", command, &level, &waittime) != 3) {

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -7,7 +7,8 @@
 #include "sls/sls_detector_funcs.h"
 #include "slsDetectorFunctionList.h"
 
-#if defined(CHIPTESTBOARDD) || defined(MYTHEN3D)
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD) ||               \
+    defined(MYTHEN3D)
 #include "Pattern.h"
 #include "loadPattern.h"
 #endif
@@ -33,6 +34,8 @@ const enum detectorType myDetectorType = MOENCH;
 const enum detectorType myDetectorType = MYTHEN3;
 #elif GOTTHARD2D
 const enum detectorType myDetectorType = GOTTHARD2;
+#elif XILINX_CHIPTESTBOARDD
+const enum detectorType myDetectorType = XILINX_CHIPTESTBOARD;
 #else
 const enum detectorType myDetectorType = GENERIC;
 #endif
@@ -787,7 +790,7 @@ int get_serial_number(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
     int64_t retval = -1;
-#ifdef EIGERD
+#if defined(EIGERD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     retval = getDetectorNumber();
@@ -1119,6 +1122,8 @@ enum DACINDEX getDACIndex(enum dacIndex ind) {
     case IBIAS_SFP:
         serverDacIndex = MO_IBIAS_SFP;
         break;
+#elif XILINX_CHIPTESTBOARDD
+
 #endif
 
     default:
@@ -1137,8 +1142,9 @@ enum DACINDEX getDACIndex(enum dacIndex ind) {
 
 int validateAndSetDac(enum dacIndex ind, int val, int mV) {
     int retval = -1;
-    enum DACINDEX serverDacIndex = 0;
 
+#ifndef XILINX_CHIPTESTBOARDD
+    enum DACINDEX serverDacIndex = 0;
     // valid enums
     switch (ind) {
     case HIGH_VOLTAGE:
@@ -1389,6 +1395,7 @@ int validateAndSetDac(enum dacIndex ind, int val, int mV) {
 #endif
         break;
     }
+#endif
     return retval;
 }
 
@@ -1401,6 +1408,9 @@ int set_dac(int file_des) {
     if (receiveData(file_des, args, sizeof(args), INT32) < 0)
         return printSocketReadError();
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     enum dacIndex ind = args[0];
     int mV = args[1];
     int val = args[2];
@@ -1411,6 +1421,7 @@ int set_dac(int file_des) {
     if ((val == GET_FLAG) || (Server_VerifyLock() == OK)) {
         retval = validateAndSetDac(ind, val, mV);
     }
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
@@ -1423,6 +1434,9 @@ int get_adc(int file_des) {
     if (receiveData(file_des, &ind, sizeof(ind), INT32) < 0)
         return printSocketReadError();
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     enum ADCINDEX serverAdcIndex = 0;
 
     // get
@@ -1544,6 +1558,7 @@ int get_adc(int file_des) {
         LOG(logDEBUG1, ("ADC(%d): %d\n", serverAdcIndex, retval));
 #endif
     }
+#endif
 
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
@@ -1560,6 +1575,9 @@ int write_register(int file_des) {
     uint32_t val = args[1];
     LOG(logDEBUG1, ("Writing to register 0x%x, data 0x%x\n", addr, val));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
 #ifdef GOTTHARDD
@@ -1594,6 +1612,7 @@ int write_register(int file_des) {
         }
         LOG(logDEBUG1, ("Write register (0x%x): 0x%x\n", retval));
     }
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
@@ -1608,6 +1627,10 @@ int read_register(int file_des) {
 
     LOG(logDEBUG1, ("Reading from register 0x%x\n", addr));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
+
     // get
 #ifdef GOTTHARDD
     retval = readRegister16And32(addr);
@@ -1624,7 +1647,7 @@ int read_register(int file_des) {
     retval = readRegister(addr);
 #endif
     LOG(logINFO, ("Read register (0x%x): 0x%x\n", addr, retval));
-
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
@@ -1828,7 +1851,7 @@ int set_settings(int file_des) {
     if (receiveData(file_des, &isett, sizeof(isett), INT32) < 0)
         return printSocketReadError();
 
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     LOG(logDEBUG1, ("Setting settings %d\n", isett));
@@ -1905,6 +1928,9 @@ int acquire(int blocking, int file_des) {
     } else {
         LOG(logINFOBLUE, ("Unblocking Acquisition\n"));
     }
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
 #if defined(JUNGFRAUD)
@@ -2003,10 +2029,12 @@ int acquire(int blocking, int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
 void *start_state_machine(void *arg) {
+#ifndef XILINX_CHIPTESTBOARDD
     int *blocking = (int *)arg;
     int times = 1;
     // start of scan
@@ -2132,6 +2160,7 @@ void *start_state_machine(void *arg) {
     if (scan && sharedMemory_getScanStatus() != ERROR) {
         sharedMemory_setScanStatus(IDLE);
     }
+#endif
     return NULL;
 }
 
@@ -2149,6 +2178,9 @@ int stop_acquisition(int file_des) {
     memset(mess, 0, sizeof(mess));
 
     LOG(logDEBUG1, ("Stopping Acquisition\n"));
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         ret = stopStateMachine();
@@ -2158,6 +2190,7 @@ int stop_acquisition(int file_des) {
         }
         LOG(logDEBUG1, ("Stopping Acquisition ret: %d\n", ret));
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -2167,9 +2200,13 @@ int get_run_status(int file_des) {
     enum runStatus retval = ERROR;
 
     LOG(logDEBUG1, ("Getting status\n"));
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only get
     retval = getRunStatus();
     LOG(logDEBUG1, ("Status: %d\n", retval));
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
@@ -2447,6 +2484,9 @@ int get_exptime(int file_des) {
     if (receiveData(file_des, &gateIndex, sizeof(gateIndex), INT32) < 0)
         return printSocketReadError();
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
         // get only
 #ifdef MYTHEN3D
     if (gateIndex < 0 || gateIndex > 2) {
@@ -2470,6 +2510,7 @@ int get_exptime(int file_des) {
         retval = getExpTime();
         LOG(logDEBUG1, ("retval exptime %lld ns\n", (long long int)retval));
     }
+#endif
 #endif
     return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
 }
@@ -2486,6 +2527,9 @@ int set_exptime(int file_des) {
     LOG(logDEBUG1, ("Setting exptime %lld ns (gateIndex:%d)\n",
                     (long long int)val, gateIndex));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
 #ifdef MYTHEN3D
@@ -2550,6 +2594,7 @@ int set_exptime(int file_des) {
         }
 #endif
     }
+#endif
     return Server_SendResult(file_des, INT64, NULL, 0);
 }
 
@@ -2558,9 +2603,13 @@ int get_period(int file_des) {
     memset(mess, 0, sizeof(mess));
     int64_t retval = -1;
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // get only
     retval = getPeriod();
     LOG(logDEBUG1, ("retval period %lld ns\n", (long long int)retval));
+#endif
     return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
 }
 
@@ -2573,6 +2622,9 @@ int set_period(int file_des) {
         return printSocketReadError();
     LOG(logDEBUG1, ("Setting period %lld ns\n", (long long int)arg));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         ret = setPeriod(arg);
@@ -2584,6 +2636,7 @@ int set_period(int file_des) {
             LOG(logERROR, (mess));
         }
     }
+#endif
     return Server_SendResult(file_des, INT64, NULL, 0);
 }
 
@@ -2825,7 +2878,8 @@ int get_frames_left(int file_des) {
     int64_t retval = -1;
 
 #if !defined(JUNGFRAUD) && !defined(MOENCHD) && !defined(GOTTHARDD) &&         \
-    !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D)
+    !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D) &&  \
+    !defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // get only
@@ -2841,7 +2895,8 @@ int get_triggers_left(int file_des) {
     int64_t retval = -1;
 
 #if !defined(JUNGFRAUD) && !defined(MOENCHD) && !defined(GOTTHARDD) &&         \
-    !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D)
+    !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D) &&  \
+    !defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // get only
@@ -3011,7 +3066,8 @@ int set_dynamic_range(int file_des) {
         case 32:
 #endif
 #if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
-    defined(CHIPTESTBOARDD) || defined(GOTTHARD2D)
+    defined(CHIPTESTBOARDD) || defined(GOTTHARD2D) ||                          \
+    defined(XILINX_CHIPTESTBOARDD)
         case 16:
 #endif
             if (dr >= 0) {
@@ -3153,7 +3209,7 @@ int enable_ten_giga(int file_des) {
     LOG(logDEBUG, ("Setting 10GbE: %d\n", arg));
 
 #if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARDD) ||            \
-    defined(GOTTHARD2D)
+    defined(GOTTHARD2D) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // set & get
@@ -3284,7 +3340,8 @@ int set_pattern_word(int file_des) {
 
     if (receiveData(file_des, args, sizeof(args), INT64) < 0)
         return printSocketReadError();
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     int addr = (int)args[0];
@@ -3312,7 +3369,8 @@ int set_pattern_loop_addresses(int file_des) {
 
     if (receiveData(file_des, args, sizeof(args), INT32) < 0)
         return printSocketReadError();
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     int loopLevel = args[0];
@@ -3358,7 +3416,8 @@ int set_pattern_loop_cycles(int file_des) {
 
     if (receiveData(file_des, args, sizeof(args), INT32) < 0)
         return printSocketReadError();
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     int loopLevel = args[0];
@@ -3387,7 +3446,8 @@ int set_pattern_wait_addr(int file_des) {
 
     if (receiveData(file_des, args, sizeof(args), INT32) < 0)
         return printSocketReadError();
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     int loopLevel = args[0];
@@ -3416,7 +3476,8 @@ int set_pattern_wait_time(int file_des) {
 
     if (receiveData(file_des, args, sizeof(args), INT32) < 0)
         return printSocketReadError();
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     int loopLevel = (int)args[0];
@@ -3446,7 +3507,8 @@ int set_pattern_mask(int file_des) {
         return printSocketReadError();
     LOG(logDEBUG1, ("Set Pattern Mask to %d\n", arg));
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     // only set
@@ -3474,7 +3536,8 @@ int get_pattern_mask(int file_des) {
 
     LOG(logDEBUG1, ("Get Pattern Mask\n"));
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     // only get
@@ -3495,7 +3558,8 @@ int set_pattern_bit_mask(int file_des) {
         return printSocketReadError();
     LOG(logDEBUG1, ("Set Pattern Bit Mask to %d\n", arg));
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     // only set
@@ -3524,7 +3588,8 @@ int get_pattern_bit_mask(int file_des) {
 
     LOG(logDEBUG1, ("Get Pattern Bit Mask\n"));
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     // only get
@@ -3547,7 +3612,8 @@ int write_adc_register(int file_des) {
     uint32_t val = args[1];
     LOG(logDEBUG1, ("Writing 0x%x to ADC Register 0x%x\n", val, addr));
 
-#if defined(EIGERD) || defined(GOTTHARD2D) || defined(MYTHEN3D)
+#if defined(EIGERD) || defined(GOTTHARD2D) || defined(MYTHEN3D) ||             \
+    defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
 #ifndef VIRTUAL
@@ -3942,7 +4008,7 @@ int reset_fpga(int file_des) {
 
     LOG(logDEBUG1, ("Reset FPGA\n"));
 #if defined(EIGERD) || defined(GOTTHARDD) || defined(GOTTHARD2D) ||            \
-    defined(MYTHEN3D)
+    defined(MYTHEN3D) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // only set
@@ -4322,7 +4388,7 @@ int reboot_controller(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
-#ifdef EIGERD
+#if defined(EIGERD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #elif VIRTUAL
     ret = GOODBYE;
@@ -5080,6 +5146,9 @@ int set_source_udp_ip(int file_des) {
     arg = __builtin_bswap32(arg);
     LOG(logINFO, ("Setting udp source ip: 0x%x\n", arg));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (check_detector_idle("configure mac") == OK) {
@@ -5092,6 +5161,7 @@ int set_source_udp_ip(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -5101,11 +5171,14 @@ int get_source_udp_ip(int file_des) {
     uint32_t retval = -1;
     LOG(logDEBUG1, ("Getting udp source ip\n"));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // get only
     retval = udpDetails[0].srcip;
     retval = __builtin_bswap32(retval);
     LOG(logDEBUG1, ("udp soure ip retval: 0x%x\n", retval));
-
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
@@ -5165,6 +5238,9 @@ int set_dest_udp_ip(int file_des) {
     arg = __builtin_bswap32(arg);
     LOG(logINFO, ("Setting udp destination ip: 0x%x\n", arg));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (check_detector_idle("configure mac") == OK) {
@@ -5174,6 +5250,7 @@ int set_dest_udp_ip(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -5183,11 +5260,14 @@ int get_dest_udp_ip(int file_des) {
     uint32_t retval = -1;
     LOG(logDEBUG1, ("Getting destination ip\n"));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // get only
     retval = udpDetails[0].dstip;
     retval = __builtin_bswap32(retval);
     LOG(logDEBUG1, ("udp destination ip retval: 0x%x\n", retval));
-
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
@@ -5243,6 +5323,9 @@ int set_source_udp_mac(int file_des) {
         return printSocketReadError();
     LOG(logINFO, ("Setting udp source mac: 0x%lx\n", arg));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (check_detector_idle("configure mac") == OK) {
@@ -5264,6 +5347,7 @@ int set_source_udp_mac(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT64, NULL, 0);
 }
 
@@ -5272,11 +5356,13 @@ int get_source_udp_mac(int file_des) {
     memset(mess, 0, sizeof(mess));
     uint64_t retval = -1;
     LOG(logDEBUG1, ("Getting udp source mac\n"));
-
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // get only
     retval = udpDetails[0].srcmac;
     LOG(logDEBUG1, ("udp soure mac retval: 0x%lx\n", retval));
-
+#endif
     return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
 }
 
@@ -5333,6 +5419,9 @@ int set_dest_udp_mac(int file_des) {
         return printSocketReadError();
     LOG(logINFO, ("Setting udp destination mac: 0x%lx\n", arg));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (check_detector_idle("configure mac") == OK) {
@@ -5342,6 +5431,7 @@ int set_dest_udp_mac(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT64, NULL, 0);
 }
 
@@ -5350,11 +5440,13 @@ int get_dest_udp_mac(int file_des) {
     memset(mess, 0, sizeof(mess));
     uint64_t retval = -1;
     LOG(logDEBUG1, ("Getting udp destination mac\n"));
-
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // get only
     retval = udpDetails[0].dstmac;
     LOG(logDEBUG1, ("udp destination mac retval: 0x%lx\n", retval));
-
+#endif
     return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
 }
 
@@ -5408,6 +5500,9 @@ int set_dest_udp_port(int file_des) {
         return printSocketReadError();
     LOG(logINFO, ("Setting udp destination port: %hu\n", arg));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (check_detector_idle("configure mac") == OK) {
@@ -5417,6 +5512,7 @@ int set_dest_udp_port(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT16, NULL, 0);
 }
 
@@ -5425,11 +5521,13 @@ int get_dest_udp_port(int file_des) {
     memset(mess, 0, sizeof(mess));
     uint16_t retval = -1;
     LOG(logDEBUG1, ("Getting destination port"));
-
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // get only
     retval = udpDetails[0].dstport;
     LOG(logDEBUG, ("udp destination port retval: %hu\n", retval));
-
+#endif
     return Server_SendResult(file_des, INT16, &retval, sizeof(retval));
 }
 
@@ -5485,7 +5583,8 @@ int set_num_interfaces(int file_des) {
         return printSocketReadError();
     LOG(logINFO, ("Setting number of interfaces: %d\n", arg));
 
-#if !defined(JUNGFRAUD) && !defined(MOENCHD) && !defined(GOTTHARD2D)
+#if !defined(JUNGFRAUD) && !defined(MOENCHD) && !defined(GOTTHARD2D) &&        \
+    !defined(XLINX_CHIPTESTBOARDD)
     // fixed number of udp interfaces
     int num_interfaces = getNumberofUDPInterfaces();
     if (arg != num_interfaces) {
@@ -5557,7 +5656,6 @@ int get_num_interfaces(int file_des) {
 
     // get only
     retval = getNumberofUDPInterfaces();
-
     LOG(logDEBUG1, ("Number of udp interfaces retval: %u\n", retval));
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
@@ -6988,7 +7086,7 @@ int get_num_channels(int file_des) {
 
     LOG(logDEBUG1, ("Getting number of channels\n"));
 
-#if !defined(CHIPTESTBOARDD)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // get only
@@ -7020,6 +7118,10 @@ int get_receiver_parameters(int file_des) {
     memset(mess, 0, sizeof(mess));
 
     LOG(logDEBUG1, ("Getting receiver parameters\n"));
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+    Server_SendResult(file_des, INT32, NULL, 0);
+#else
     // get only
     Server_SendResult(file_des, INT32, NULL, 0);
 
@@ -7477,7 +7579,7 @@ int get_receiver_parameters(int file_des) {
         return printSocketReadError();
 
     LOG(logINFO, ("Sent %d bytes for receiver parameters\n", n));
-
+#endif
     return OK;
 }
 
@@ -7706,7 +7808,8 @@ int set_pattern(int file_des) {
     char args[MAX_STR_LENGTH];
     memset(args, 0, MAX_STR_LENGTH);
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
 
@@ -7743,7 +7846,8 @@ int get_pattern_file(int file_des) {
 
     LOG(logDEBUG1, ("Getting pattern file name\n"));
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
 #else
     // get only
@@ -7757,7 +7861,8 @@ int get_pattern(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
-#if !defined(CHIPTESTBOARDD) && !defined(MYTHEN3D)
+#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) &&             \
+    !defined(MYTHEN3D)
     functionNotImplemented();
     return Server_SendResult(file_des, INT32, NULL, 0);
 #else
@@ -7819,6 +7924,9 @@ int set_scan(int file_des) {
     if (receiveData(file_des, &dacTime, sizeof(dacTime), INT64) < 0)
         return printSocketReadError();
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         int enable = args[0];
@@ -7908,6 +8016,7 @@ int set_scan(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT64, &retval, sizeof(retval));
 }
 
@@ -8265,6 +8374,9 @@ int reconfigure_udp(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     if (Server_VerifyLock() == OK) {
         LOG(logINFO, ("Reconfiguring UDP\n"));
         if (check_detector_idle("configure mac") == OK) {
@@ -8277,6 +8389,7 @@ int reconfigure_udp(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -8377,7 +8490,7 @@ int reset_to_default_dacs(int file_des) {
         return printSocketReadError();
     LOG(logDEBUG1, ("Resetting dacs to defaults (hard reset: %d)\n", arg));
 
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     if (Server_VerifyLock() == OK) {
@@ -8792,7 +8905,7 @@ int get_default_dac(int file_des) {
     LOG(logDEBUG1,
         ("Getting default dac [dacindex:%d, settings: %d]\n", dacindex, sett));
 
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // get only
@@ -8832,7 +8945,7 @@ int set_default_dac(int file_des) {
     LOG(logDEBUG1, ("Setting default dac [dacindex: %d, settings: %d] to %d\n",
                     (int)dacindex, (int)sett, value));
 
-#ifdef CHIPTESTBOARDD
+#if defined(CHIPTESTBOARDD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
 #else
     // only set
@@ -9452,6 +9565,11 @@ int clear_all_udp_dst(int file_des) {
     memset(mess, 0, sizeof(mess));
 
     LOG(logINFO, ("Clearing all udp destinations\n"));
+
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
+
     if (Server_VerifyLock() == OK) {
         if (check_detector_idle("clear all udp destinations") == OK) {
             memset(udpDetails, 0, sizeof(udpDetails));
@@ -9479,6 +9597,7 @@ int clear_all_udp_dst(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -9637,7 +9756,7 @@ int get_kernel_version(int file_des) {
 int update_kernel(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
-#ifdef EIGERD
+#if defined(EIGERD) || defined(XILINX_CHIPTESTBOARDD)
     functionNotImplemented();
     return Server_SendResult(file_des, INT32, NULL, 0);
 #else
@@ -9689,7 +9808,8 @@ int receive_program(int file_des, enum PROGRAM_INDEX index) {
             LOG(logINFO, ("\tServer Name: %s\n", serverName));
         }
 
-#if !defined(GOTTHARD2D) && !defined(MYTHEN3D) && !defined(EIGERD)
+#if !defined(GOTTHARD2D) && !defined(MYTHEN3D) && !defined(EIGERD) &&          \
+    !defined(XILINX_CHIPTESTBOARDD)
         int forceDeleteNormalFile = 0;
         if (receiveData(file_des, &forceDeleteNormalFile,
                         sizeof(forceDeleteNormalFile), INT32) < 0)
@@ -9725,7 +9845,8 @@ int receive_program(int file_des, enum PROGRAM_INDEX index) {
         }
 
         if (ret == OK) {
-#if defined(GOTTHARD2D) || defined(MYTHEN3D) || defined(EIGERD)
+#if defined(GOTTHARD2D) || defined(MYTHEN3D) || defined(EIGERD) ||             \
+    defined(XILINX_CHIPTESTBOARDD)
             receive_program_default(file_des, index, functionType, filesize,
                                     checksum, serverName);
 #else
@@ -9871,7 +9992,8 @@ void receive_program_via_blackfin(int file_des, enum PROGRAM_INDEX index,
 void receive_program_default(int file_des, enum PROGRAM_INDEX index,
                              char *functionType, uint64_t filesize,
                              char *checksum, char *serverName) {
-#if !defined(GOTTHARD2D) && !defined(MYTHEN3D) && !defined(EIGERD)
+#if !defined(GOTTHARD2D) && !defined(MYTHEN3D) && !defined(EIGERD) &&          \
+    !defined(XILINX_CHIPTESTBOARDD)
     ret = FAIL;
     sprintf(mess,
             "Could not %s. program via blackfin not implmented for this "
@@ -10389,8 +10511,10 @@ int get_hardware_version(int file_des) {
     memset(mess, 0, sizeof(mess));
     char retvals[MAX_STR_LENGTH];
     memset(retvals, 0, MAX_STR_LENGTH);
+
     getHardwareVersion(retvals);
     LOG(logDEBUG1, ("hardware version retval: %s\n", retvals));
+
     return Server_SendResult(file_des, OTHER, retvals, sizeof(retvals));
 }
 
@@ -10443,6 +10567,10 @@ int set_bit(int file_des) {
     int nBit = (int)args[1];
     LOG(logDEBUG1, ("Setting bit %d of reg 0x%x\n", nBit, addr));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
+
     // only set
     if (Server_VerifyLock() == OK) {
         if (nBit < 0 || nBit > 31) {
@@ -10473,6 +10601,7 @@ int set_bit(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -10487,6 +10616,9 @@ int clear_bit(int file_des) {
     int nBit = (int)args[1];
     LOG(logDEBUG1, ("Clearing bit %d of reg 0x%x\n", nBit, addr));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     // only set
     if (Server_VerifyLock() == OK) {
         if (nBit < 0 || nBit > 31) {
@@ -10517,6 +10649,7 @@ int clear_bit(int file_des) {
             }
         }
     }
+#endif
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
@@ -10532,6 +10665,9 @@ int get_bit(int file_des) {
     int nBit = (int)args[1];
     LOG(logDEBUG1, ("Getting bit %d of reg 0x%x\n", nBit, addr));
 
+#ifdef XILINX_CHIPTESTBOARDD
+    functionNotImplemented();
+#else
     if (nBit < 0 || nBit > 31) {
         ret = FAIL;
         sprintf(mess,
@@ -10556,6 +10692,7 @@ int get_bit(int file_des) {
         LOG(logDEBUG1, ("regval: 0x%x bit value:0%d\n", regval, retval));
 #endif
     }
+#endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 

slsDetectorServers/xilinx_ctbDetectorServer/CMakeLists.txt

@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+add_executable(xilinx_ctbDetectorServer_virtual
+    slsDetectorFunctionList.c
+    ../slsDetectorServer/src/slsDetectorServer.c
+    ../slsDetectorServer/src/slsDetectorServer_funcs.c
+    ../slsDetectorServer/src/communication_funcs.c
+    ../slsDetectorServer/src/arm64.c
+    ../slsDetectorServer/src/common.c
+    ../slsDetectorServer/src/sharedMemory.c
+    ../slsDetectorServer/src/loadPattern.c
+    ../../slsSupportLib/src/md5.c
+)
+
+include_directories(
+    ../slsDetectorServer/include
+    ../../slsSupportLib/include
+    ../../slsDetectorSoftware/include/sls/
+)
+
+target_include_directories(xilinx_ctbDetectorServer_virtual
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_compile_definitions(xilinx_ctbDetectorServer_virtual
+    PUBLIC XILINX_CHIPTESTBOARDD ARMPROCESSOR VIRTUAL STOP_SERVER
+)
+
+target_link_libraries(xilinx_ctbDetectorServer_virtual
+    PUBLIC pthread rt slsProjectCSettings
+)
+
+set_target_properties(xilinx_ctbDetectorServer_virtual PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+install(TARGETS xilinx_ctbDetectorServer_virtual
+    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

slsDetectorServers/xilinx_ctbDetectorServer/Makefile

@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: LGPL-3.0-or-other
+# Copyright (C) 2021 Contributors to the SLS Detector Package
+current_dir = $(shell pwd)
+main_inc = ../slsDetectorServer/include/
+main_src = ../slsDetectorServer/src/
+support_lib = ../../slsSupportLib/include/
+det_lib = ../../slsDetectorSoftware/include/sls/
+md5_dir = ../../slsSupportLib/src/
+
+CROSS  		= aarch64-none-linux-gnu-
+CC    		= $(CROSS)gcc
+#TODO: allow these warnings and fix code
+CFLAGS		+=  -Wall -std=gnu99 -Wno-format-overflow -Wno-format-truncation -DXILINX_CHIPTESTBOARDD -DARMPROCESSOR -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir)  #-DDEBUG1 #-DVERBOSEI #-DVERBOSE 
+#CFLAGS		+=  -Wall -std=gnu99  -DXILINX_CHIPTESTBOARDD -DARMPROCESSOR -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir)  #-DDEBUG1 #-DVERBOSEI #-DVERBOSE 
+LDLIBS		+= 	-lm -lrt -pthread 
+PROGS		= 	xilinx_ctbDetectorServer 
+DESTDIR		?= 	bin
+INSTMODE	= 	0777
+
+SRCS 		= 	slsDetectorFunctionList.c  
+SRCS		+=	$(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)arm64.c $(main_src)common.c $(main_src)/sharedMemory.c $(main_src)/loadPattern.c $(md5_dir)md5.c
+
+OBJS 		= 	$(SRCS:.c=.o) 
+ 
+all: clean $(PROGS)
+version: clean versioning $(PROGS)
+
+boot: $(OBJS) 
+
+version_branch=$(API_BRANCH)
+version_name=APIXILINXCTB
+version_path=slsDetectorServers/xilinx_ctbDetectorServer
+versioning: 
+	cd ../../ && echo $(PWD) && echo `tput setaf 6; ./updateAPIVersion.sh $(version_name) $(version_path) $(version_branch);  tput sgr0;`
+
+
+$(PROGS): $(OBJS)
+#	echo $(OBJS) 
+	mkdir -p $(DESTDIR) 
+	$(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) 
+	mv $(PROGS) $(DESTDIR)
+	rm $(main_src)*.o $(md5_dir)*.o
+clean:
+	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb $(main_src)*.o $(md5_dir)*.o
+	
+
+	

slsDetectorServers/xilinx_ctbDetectorServer/RegisterDefs.h

@@ -0,0 +1,968 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#pragma once
+
+#define CTRLREG1 (0x0)
+
+#define CTRLREG2 (0x4)
+
+#define STATUSREG1 (0x8)
+
+#define STATUSREG2 (0xC)
+
+#define FPGAVERSIONREG (0x10)
+
+#define COMPDATE_OFST (0)
+#define COMPDATE_MSK  (0x00ffffff << COMPDATE_OFST)
+#define DETTYPE_OFST  (24)
+#define DETTYPE_MSK   (0x000000ff << DETTYPE_OFST)
+
+#define EMPTY14REG (0x14)
+
+#define EMPTY18REG (0x18)
+
+#define EMPTY1CREG (0x1C)
+
+#define EMPTY20REG (0x20)
+
+#define EMPTY24REG (0x24)
+
+#define PKTPACKETLENGTHREG (0x28)
+
+#define PACKETLENGTH1G_OFST  (0)
+#define PACKETLENGTH1G_MSK   (0x0000ffff << PACKETLENGTH1G_OFST)
+#define PACKETLENGTH10G_OFST (16)
+#define PACKETLENGTH10G_MSK  (0x0000ffff << PACKETLENGTH10G_OFST)
+
+#define EMPTY2CREG (0x2C)
+
+#define PKTNOPACKETSREG (0x30)
+
+#define NOPACKETS1G_OFST  (0)
+#define NOPACKETS1G_MSK   (0x0000003f << NOPACKETS1G_OFST)
+#define NOPACKETS10G_OFST (16)
+#define NOPACKETS10G_MSK  (0x0000003f << NOPACKETS10G_OFST)
+
+#define EMPTY34REG (0x34)
+
+#define PKTCTRLREG (0x38)
+
+#define NOSERVERS_OFST   (0)
+#define NOSERVERS_MSK    (0x0000003f << NOSERVERS_OFST)
+#define SERVERSTART_OFST (8)
+#define SERVERSTART_MSK  (0x0000001f << SERVERSTART_OFST)
+#define ETHINTERF_OFST   (16)
+#define ETHINTERF_MSK    (0x00000001 << ETHINTERF_OFST)
+
+#define EMPTY3CREG (0x3C)
+
+#define PKTCOORDREG1 (0x40)
+
+#define COORDX_OFST (0)
+#define COORDX_MSK  (0x0000ffff << COORDX_OFST)
+#define COORDY_OFST (16)
+#define COORDY_MSK  (0x0000ffff << COORDY_OFST)
+
+#define EMPTY44REG (0x44)
+
+#define PKTCOORDREG2 (0x48)
+
+#define COORDZ_OFST (0)
+#define COORDZ_MSK  (0x0000ffff << COORDZ_OFST)
+
+#define EMPTY4CREG (0x4C)
+
+#define EMPTY50REG (0x50)
+
+#define EMPTY54REG (0x54)
+
+#define EMPTY58REG (0x58)
+
+#define EMPTY5CREG (0x5C)
+
+#define EMPTY60REG (0x60)
+
+#define EMPTY64REG (0x64)
+
+#define EMPTY68REG (0x68)
+
+#define EMPTY6CREG (0x6C)
+
+#define EMPTY70REG (0x70)
+
+#define EMPTY74REG (0x74)
+
+#define EMPTY78REG (0x78)
+
+#define EMPTY7CREG (0x7C)
+
+#define EMPTY80REG (0x80)
+
+#define EMPTY84REG (0x84)
+
+#define EMPTY88REG (0x88)
+
+#define EMPTY8CREG (0x8C)
+
+#define EMPTY90REG (0x90)
+
+#define EMPTY94REG (0x94)
+
+#define EMPTY98REG (0x98)
+
+#define EMPTY9CREG (0x9C)
+
+#define FLOWSTATUSREG (0x100)
+
+#define RSMBUSY_OFST    (0)
+#define RSMBUSY_MSK     (0x00000001 << RSMBUSY_OFST)
+#define RSMTRGWAIT_OFST (3)
+#define RSMTRGWAIT_MSK  (0x00000001 << RSMTRGWAIT_OFST)
+#define CSMBUSY_OFST    (17)
+#define CSMBUSY_MSK     (0x00000001 << CSMBUSY_OFST)
+
+#define EMPTY104REG (0x104)
+
+#define FLOWCONTROLREG (0x108)
+
+#define STARTF_OFST        (0)
+#define STARTF_MSK         (0x00000001 << STARTF_OFST)
+#define STOPF_OFST         (1)
+#define STOPF_MSK          (0x00000001 << STOPF_OFST)
+#define RSTF_OFST          (2)
+#define RSTF_MSK           (0x00000001 << RSTF_OFST)
+#define SWTRIGGERF_OFST    (3)
+#define SWTRIGGERF_MSK     (0x00000001 << SWTRIGGERF_OFST)
+#define TRIGGERENABLE_OFST (4)
+#define TRIGGERENABLE_MSK  (0x00000001 << TRIGGERENABLE_OFST)
+
+#define EMPTY10CREG (0x10C)
+
+#define TIMEFROMSTARTOUTREG1 (0x110)
+
+#define TIMEFROMSTARTOUTREG2 (0x114)
+
+#define FRAMESFROMSTARTOUTREG1 (0x118)
+
+#define FRAMESFROMSTARTOUTREG2 (0x11C)
+
+#define FRAMETIMEOUTREG1 (0x120)
+
+#define FRAMETIMEOUTREG2 (0x124)
+
+#define DELAYOUTREG1 (0x128)
+
+#define DELAYOUTREG2 (0x12C)
+
+#define CYCLESOUTREG1 (0x130)
+
+#define CYCLESOUTREG2 (0x134)
+
+#define FRAMESOUTREG1 (0x138)
+
+#define FRAMESOUTREG2 (0x13C)
+
+#define PERIODOUTREG1 (0x140)
+
+#define PERIODOUTREG2 (0x144)
+
+#define DELAYINREG1 (0x148)
+
+#define DELAYINREG2 (0x14C)
+
+#define CYCLESINREG1 (0x150)
+
+#define CYCLESINREG2 (0x154)
+
+#define FRAMESINREG1 (0x158)
+
+#define FRAMESINREG2 (0x15C)
+
+#define PERIODINREG1 (0x160)
+
+#define PERIODINREG2 (0x164)
+
+#define EMPTY168REG (0x168)
+
+#define EMPTY16CREG (0x16C)
+
+#define EMPTY170REG (0x170)
+
+#define EMPTY174REG (0x174)
+
+#define EMPTY178REG (0x178)
+
+#define EMPTY17CREG (0x17C)
+
+#define EMPTY180REG (0x180)
+
+#define EMPTY184REG (0x184)
+
+#define EMPTY188REG (0x188)
+
+#define EMPTY18CREG (0x18C)
+
+#define EMPTY190REG (0x190)
+
+#define EMPTY194REG (0x194)
+
+#define EMPTY198REG (0x198)
+
+#define EMPTY19CREG (0x19C)
+
+#define PATTERN_OUT_LSB_REG (0x200)
+
+#define PATTERN_OUT_MSB_REG (0x204)
+
+#define PATTERN_IN_LSB_REG (0x208)
+
+#define PATTERN_IN_MSB_REG (0x20C)
+
+#define PATTERN_MASK_LSB_REG (0x210)
+
+#define PATTERN_MASK_MSB_REG (0x214)
+
+#define PATTERN_SET_LSB_REG (0x218)
+
+#define PATTERN_SET_MSB_REG (0x21C)
+
+#define PATTERN_CNTRL_REG (0x220)
+
+#define PATTERN_CNTRL_WR_OFST   (0)
+#define PATTERN_CNTRL_WR_MSK    (0x00000001 << PATTERN_CNTRL_WR_OFST)
+#define PATTERN_CNTRL_RD_OFST   (1)
+#define PATTERN_CNTRL_RD_MSK    (0x00000001 << PATTERN_CNTRL_RD_OFST)
+#define PATTERN_CNTRL_ADDR_OFST (16)
+#define PATTERN_CNTRL_ADDR_MSK  (0x00001fff << PATTERN_CNTRL_ADDR_OFST)
+
+#define EMPTY224REG (0x224)
+
+#define PATTERN_LIMIT_REG (0x228)
+
+#define PATTERN_LIMIT_STRT_OFST (0)
+#define PATTERN_LIMIT_STRT_MSK  (0x00001fff << PATTERN_LIMIT_STRT_OFST)
+#define PATTERN_LIMIT_STP_OFST  (16)
+#define PATTERN_LIMIT_STP_MSK   (0x00001fff << PATTERN_LIMIT_STP_OFST)
+
+#define EMPTY22CREG (0x22C)
+
+#define PATTERN_LOOP_0_ADDR_REG (0x230)
+
+#define PATTERN_LOOP_0_ADDR_STRT_OFST (0)
+#define PATTERN_LOOP_0_ADDR_STRT_MSK                                           \
+    (0x00001fff << PATTERN_LOOP_0_ADDR_STRT_OFST)
+#define PATTERN_LOOP_0_ADDR_STP_OFST (16)
+#define PATTERN_LOOP_0_ADDR_STP_MSK  (0x00001fff << PATTERN_LOOP_0_ADDR_STP_OFST)
+
+#define EMPTY234REG (0x234)
+
+#define PATTERN_LOOP_0_ITERATION_REG (0x238)
+
+#define EMPTY23CREG (0x23C)
+
+#define PATTERN_WAIT_0_ADDR_REG (0x240)
+
+#define PATTERN_WAIT_0_ADDR_OFST (0)
+#define PATTERN_WAIT_0_ADDR_MSK  (0x00001fff << PATTERN_WAIT_0_ADDR_OFST)
+
+#define EMPTY244REG (0x244)
+
+#define PATTERN_WAIT_TIMER_0_LSB_REG (0x248)
+
+#define PATTERN_WAIT_TIMER_0_MSB_REG (0x24C)
+
+#define PATTERN_LOOP_1_ADDR_REG (0x250)
+
+#define PATTERN_LOOP_1_ADDR_STRT_OFST (0)
+#define PATTERN_LOOP_1_ADDR_STRT_MSK                                           \
+    (0x00001fff << PATTERN_LOOP_1_ADDR_STRT_OFST)
+#define PATTERN_LOOP_1_ADDR_STP_OFST (16)
+#define PATTERN_LOOP_1_ADDR_STP_MSK  (0x00001fff << PATTERN_LOOP_1_ADDR_STP_OFST)
+
+#define EMPTY254REG (0x254)
+
+#define PATTERN_LOOP_1_ITERATION_REG (0x258)
+
+#define EMPTY25CREG (0x25C)
+
+#define PATTERN_WAIT_1_ADDR_REG (0x260)
+
+#define PATTERN_WAIT_1_ADDR_OFST (0)
+#define PATTERN_WAIT_1_ADDR_MSK  (0x00001fff << PATTERN_WAIT_1_ADDR_OFST)
+
+#define EMPTY264REG (0x264)
+
+#define PATTERN_WAIT_TIMER_1_LSB_REG (0x268)
+
+#define PATTERN_WAIT_TIMER_1_MSB_REG (0x26C)
+
+#define PATTERN_LOOP_2_ADDR_REG (0x270)
+
+#define PATTERN_LOOP_2_ADDR_STRT_OFST (0)
+#define PATTERN_LOOP_2_ADDR_STRT_MSK                                           \
+    (0x00001fff << PATTERN_LOOP_2_ADDR_STRT_OFST)
+#define PATTERN_LOOP_2_ADDR_STP_OFST (16)
+#define PATTERN_LOOP_2_ADDR_STP_MSK  (0x00001fff << PATTERN_LOOP_2_ADDR_STP_OFST)
+
+#define EMPTY274REG (0x274)
+
+#define PATTERN_LOOP_2_ITERATION_REG (0x278)
+
+#define EMPTY27CREG (0x27C)
+
+#define PATTERN_WAIT_2_ADDR_REG (0x280)
+
+#define PATTERN_WAIT_2_ADDR_OFST (0)
+#define PATTERN_WAIT_2_ADDR_MSK  (0x00001fff << PATTERN_WAIT_2_ADDR_OFST)
+
+#define EMPTY284REG (0x284)
+
+#define PATTERN_WAIT_TIMER_2_LSB_REG (0x288)
+
+#define PATTERN_WAIT_TIMER_2_MSB_REG (0x28C)
+
+#define PATTERN_LOOP_3_ADDR_REG (0x290)
+
+#define PATTERN_LOOP_3_ADDR_STRT_OFST (0)
+#define PATTERN_LOOP_3_ADDR_STRT_MSK                                           \
+    (0x00001fff << PATTERN_LOOP_3_ADDR_STRT_OFST)
+#define PATTERN_LOOP_3_ADDR_STP_OFST (16)
+#define PATTERN_LOOP_3_ADDR_STP_MSK  (0x00001fff << PATTERN_LOOP_3_ADDR_STP_OFST)
+
+#define EMPTY294REG (0x294)
+
+#define PATTERN_LOOP_3_ITERATION_REG (0x298)
+
+#define EMPTY29CREG (0x29C)
+
+#define PATTERN_WAIT_3_ADDR_REG (0x300)
+
+#define PATTERN_WAIT_3_ADDR_OFST (0)
+#define PATTERN_WAIT_3_ADDR_MSK  (0x00001fff << PATTERN_WAIT_3_ADDR_OFST)
+
+#define EMPTY304REG (0x304)
+
+#define PATTERN_WAIT_TIMER_3_LSB_REG (0x308)
+
+#define PATTERN_WAIT_TIMER_3_MSB_REG (0x30C)
+
+#define PATTERN_LOOP_4_ADDR_REG (0x310)
+
+#define PATTERN_LOOP_4_ADDR_STRT_OFST (0)
+#define PATTERN_LOOP_4_ADDR_STRT_MSK                                           \
+    (0x00001fff << PATTERN_LOOP_4_ADDR_STRT_OFST)
+#define PATTERN_LOOP_4_ADDR_STP_OFST (16)
+#define PATTERN_LOOP_4_ADDR_STP_MSK  (0x00001fff << PATTERN_LOOP_4_ADDR_STP_OFST)
+
+#define EMPTY314REG (0x314)
+
+#define PATTERN_LOOP_4_ITERATION_REG (0x318)
+
+#define EMPTY31CREG (0x31C)
+
+#define PATTERN_WAIT_4_ADDR_REG (0x320)
+
+#define PATTERN_WAIT_4_ADDR_OFST (0)
+#define PATTERN_WAIT_4_ADDR_MSK  (0x00001fff << PATTERN_WAIT_4_ADDR_OFST)
+
+#define EMPTY324REG (0x324)
+
+#define PATTERN_WAIT_TIMER_4_LSB_REG (0x328)
+
+#define PATTERN_WAIT_TIMER_4_MSB_REG (0x32C)
+
+#define PATTERN_LOOP_5_ADDR_REG (0x330)
+
+#define PATTERN_LOOP_5_ADDR_STRT_OFST (0)
+#define PATTERN_LOOP_5_ADDR_STRT_MSK                                           \
+    (0x00001fff << PATTERN_LOOP_5_ADDR_STRT_OFST)
+#define PATTERN_LOOP_5_ADDR_STP_OFST (16)
+#define PATTERN_LOOP_5_ADDR_STP_MSK  (0x00001fff << PATTERN_LOOP_5_ADDR_STP_OFST)
+
+#define EMPTY334REG (0x334)
+
+#define PATTERN_LOOP_5_ITERATION_REG (0x338)
+
+#define EMPTY33CREG (0x33C)
+
+#define PATTERN_WAIT_5_ADDR_REG (0x340)
+
+#define PATTERN_WAIT_5_ADDR_OFST (0)
+#define PATTERN_WAIT_5_ADDR_MSK  (0x00001fff << PATTERN_WAIT_5_ADDR_OFST)
+
+#define EMPTY344REG (0x344)
+
+#define PATTERN_WAIT_TIMER_5_LSB_REG (0x348)
+
+#define PATTERN_WAIT_TIMER_5_MSB_REG (0x34C)
+
+#define PINIOCTRLREG (0x350)
+
+#define EMPTY354REG (0x354)
+
+#define EMPTY358REG (0x358)
+
+#define EMPTY35CREG (0x35C)
+
+#define EMPTY360REG (0x360)
+
+#define EMPTY364REG (0x364)
+
+#define EMPTY368REG (0x368)
+
+#define EMPTY36CREG (0x36C)
+
+#define EMPTY370REG (0x370)
+
+#define EMPTY374REG (0x374)
+
+#define EMPTY378REG (0x378)
+
+#define EMPTY37CREG (0x37C)
+
+#define EMPTY380REG (0x380)
+
+#define EMPTY384REG (0x384)
+
+#define EMPTY388REG (0x388)
+
+#define EMPTY38CREG (0x38C)
+
+#define EMPTY390REG (0x390)
+
+#define EMPTY394REG (0x394)
+
+#define EMPTY398REG (0x398)
+
+#define EMPTY39CREG (0x39C)
+
+#define EMPTY3A0REG (0x3A0)
+
+#define EMPTY3A4REG (0x3A4)
+
+#define EMPTY3A8REG (0x3A8)
+
+#define EMPTY3ACREG (0x3AC)
+
+#define EMPTY3B0REG (0x3B0)
+
+#define EMPTY3B4REG (0x3B4)
+
+#define EMPTY3B8REG (0x3B8)
+
+#define EMPTY3BCREG (0x3BC)
+
+#define EMPTY3C0REG (0x3C0)
+
+#define EMPTY3C4REG (0x3C4)
+
+#define EMPTY3C8REG (0x3C8)
+
+#define EMPTY3CCREG (0x3CC)
+
+#define EMPTY3D0REG (0x3D0)
+
+#define EMPTY3D4REG (0x3D4)
+
+#define EMPTY3D8REG (0x3D8)
+
+#define EMPTY3DCREG (0x3DC)
+
+#define EMPTY3E0REG (0x3E0)
+
+#define EMPTY3E4REG (0x3E4)
+
+#define EMPTY3E8REG (0x3E8)
+
+#define EMPTY3ECREG (0x3EC)
+
+#define EMPTY3F0REG (0x3F0)
+
+#define EMPTY3F4REG (0x3F4)
+
+#define EMPTY3F8REG (0x3F8)
+
+#define EMPTY3FCREG (0x3FC)
+
+#define EXPCTRLREG (0x400)
+
+#define STARTP_OFST (0)
+#define STARTP_MSK  (0x00000001 << STARTP_OFST)
+
+#define EMPTY404REG (0x404)
+
+#define EXPFRAMESREG (0x408)
+
+#define EMPTY40CREG (0x40C)
+
+#define EXPTIMEREG (0x410)
+
+#define EMPTY414REG (0x414)
+
+#define EMPTY418REG (0x418)
+
+#define EMPTY41CREG (0x41C)
+
+#define EMPTY420REG (0x420)
+
+#define EMPTY424REG (0x424)
+
+#define EMPTY428REG (0x428)
+
+#define EMPTY42CREG (0x42C)
+
+#define EMPTY430REG (0x430)
+
+#define EMPTY434REG (0x434)
+
+#define EMPTY438REG (0x438)
+
+#define EMPTY43CREG (0x43C)
+
+#define EMPTY440REG (0x440)
+
+#define EMPTY444REG (0x444)
+
+#define EMPTY448REG (0x448)
+
+#define EMPTY44CREG (0x44C)
+
+#define EMPTY450REG (0x450)
+
+#define EMPTY454REG (0x454)
+
+#define EMPTY458REG (0x458)
+
+#define EMPTY45CREG (0x45C)
+
+#define EMPTY460REG (0x460)
+
+#define EMPTY464REG (0x464)
+
+#define EMPTY468REG (0x468)
+
+#define EMPTY46CREG (0x46C)
+
+#define EMPTY470REG (0x470)
+
+#define EMPTY474REG (0x474)
+
+#define EMPTY478REG (0x478)
+
+#define EMPTY47CREG (0x47C)
+
+#define EMPTY480REG (0x480)
+
+#define EMPTY484REG (0x484)
+
+#define EMPTY488REG (0x488)
+
+#define EMPTY48CREG (0x48C)
+
+#define EMPTY490REG (0x490)
+
+#define EMPTY494REG (0x494)
+
+#define EMPTY498REG (0x498)
+
+#define EMPTY49CREG (0x49C)
+
+#define EMPTY4A0REG (0x4A0)
+
+#define EMPTY4A4REG (0x4A4)
+
+#define EMPTY4A8REG (0x4A8)
+
+#define EMPTY4ACREG (0x4AC)
+
+#define EMPTY4B0REG (0x4B0)
+
+#define EMPTY4B4REG (0x4B4)
+
+#define EMPTY4B8REG (0x4B8)
+
+#define EMPTY4BCREG (0x4BC)
+
+#define EMPTY4C0REG (0x4C0)
+
+#define EMPTY4C4REG (0x4C4)
+
+#define EMPTY4C8REG (0x4C8)
+
+#define EMPTY4CCREG (0x4CC)
+
+#define EMPTY4D0REG (0x4D0)
+
+#define EMPTY4D4REG (0x4D4)
+
+#define EMPTY4D8REG (0x4D8)
+
+#define EMPTY4DCREG (0x4DC)
+
+#define EMPTY4E0REG (0x4E0)
+
+#define EMPTY4E4REG (0x4E4)
+
+#define EMPTY4E8REG (0x4E8)
+
+#define EMPTY4ECREG (0x4EC)
+
+#define EMPTY4F0REG (0x4F0)
+
+#define EMPTY4F4REG (0x4F4)
+
+#define EMPTY4F8REG (0x4F8)
+
+#define EMPTY4FCREG (0x4FC)
+
+#define FIFOTOGBCONTROLREG (0x500)
+
+#define ENABLEDCHANNELS_OFST       (0)
+#define ENABLEDCHANNELS_MSK        (0x00001fff << ENABLEDCHANNELS_OFST)
+#define ROMODE_OFST                (13)
+#define ROMODE_MSK                 (0x00000007 << ROMODE_OFST)
+#define COUNTFRAMESFROMUPDATE_OFST (16)
+#define COUNTFRAMESFROMUPDATE_MSK  (0x00000001 << COUNTFRAMESFROMUPDATE_OFST)
+#define STARTSTREAMING_P_OFST      (17)
+#define STARTSTREAMING_P_MSK       (0x00000001 << STARTSTREAMING_P_OFST)
+
+#define EMPTY504REG (0x504)
+
+#define NOSAMPLESDREG (0x508)
+
+#define NOSAMPLESD_OFST (0)
+#define NOSAMPLESD_MSK  (0x00003fff << NOSAMPLESD_OFST)
+
+#define EMPTY50CREG (0x50C)
+
+#define NOSAMPLESAREG (0x510)
+
+#define NOSAMPLESA_OFST (0)
+#define NOSAMPLESA_MSK  (0x00003fff << NOSAMPLESA_OFST)
+
+#define EMPTY514REG (0x514)
+
+#define NOSAMPLESXREG (0x518)
+
+#define NOSAMPLESX_OFST (0)
+#define NOSAMPLESX_MSK  (0x00001fff << NOSAMPLESX_OFST)
+
+#define EMPTY51CREG (0x51C)
+
+#define COUNTFRAMESFROMREG1 (0x520)
+
+#define COUNTFRAMESFROMREG2 (0x524)
+
+#define LOCALFRAMENUMBERREG1 (0x528)
+
+#define LOCALFRAMENUMBERREG2 (0x52C)
+
+#define EMPTY530REG (0x530)
+
+#define EMPTY534REG (0x534)
+
+#define EMPTY538REG (0x538)
+
+#define EMPTY53CREG (0x53C)
+
+#define EMPTY540REG (0x540)
+
+#define EMPTY544REG (0x544)
+
+#define EMPTY548REG (0x548)
+
+#define EMPTY54CREG (0x54C)
+
+#define EMPTY550REG (0x550)
+
+#define EMPTY554REG (0x554)
+
+#define EMPTY558REG (0x558)
+
+#define EMPTY55CREG (0x55C)
+
+#define EMPTY560REG (0x560)
+
+#define EMPTY564REG (0x564)
+
+#define EMPTY568REG (0x568)
+
+#define EMPTY56CREG (0x56C)
+
+#define EMPTY570REG (0x570)
+
+#define EMPTY574REG (0x574)
+
+#define EMPTY578REG (0x578)
+
+#define EMPTY57CREG (0x57C)
+
+#define EMPTY580REG (0x580)
+
+#define EMPTY584REG (0x584)
+
+#define EMPTY588REG (0x588)
+
+#define EMPTY58CREG (0x58C)
+
+#define EMPTY590REG (0x590)
+
+#define EMPTY594REG (0x594)
+
+#define EMPTY598REG (0x598)
+
+#define EMPTY59CREG (0x59C)
+
+#define EMPTY5A0REG (0x5A0)
+
+#define EMPTY5A4REG (0x5A4)
+
+#define EMPTY5A8REG (0x5A8)
+
+#define EMPTY5ACREG (0x5AC)
+
+#define EMPTY5B0REG (0x5B0)
+
+#define EMPTY5B4REG (0x5B4)
+
+#define EMPTY5B8REG (0x5B8)
+
+#define EMPTY5BCREG (0x5BC)
+
+#define EMPTY5C0REG (0x5C0)
+
+#define EMPTY5C4REG (0x5C4)
+
+#define EMPTY5C8REG (0x5C8)
+
+#define EMPTY5CCREG (0x5CC)
+
+#define EMPTY5D0REG (0x5D0)
+
+#define EMPTY5D4REG (0x5D4)
+
+#define EMPTY5D8REG (0x5D8)
+
+#define EMPTY5DCREG (0x5DC)
+
+#define EMPTY5E0REG (0x5E0)
+
+#define EMPTY5E4REG (0x5E4)
+
+#define EMPTY5E8REG (0x5E8)
+
+#define EMPTY5ECREG (0x5EC)
+
+#define EMPTY5F0REG (0x5F0)
+
+#define EMPTY5F4REG (0x5F4)
+
+#define EMPTY5F8REG (0x5F8)
+
+#define EMPTY5FCREG (0x5FC)
+
+#define MATTERHORNSPIREG1 (0x600)
+
+#define MATTERHORNSPIREG2 (0x604)
+
+#define MATTERHORNSPICTRL (0x608)
+
+#define MATTERHORNSPICTRL_EN_OFST (0)
+#define MATTERHORNSPICTRL_EN_MSK  (0x00000001 << MATTERHORNSPICTRL_EN_OFST)
+#define CONFIGSTART_OFST          (1)
+#define CONFIGSTART_MSK           (0x00000001 << CONFIGSTART_OFST)
+#define START_P_OFST              (2)
+#define START_P_MSK               (0x00000001 << START_P_OFST)
+#define STARTREAD_P_OFST          (3)
+#define STARTREAD_P_MSK           (0x00000001 << STARTREAD_P_OFST)
+#define BUSY_OFST                 (4)
+#define BUSY_MSK                  (0x00000001 << BUSY_OFST)
+
+#define EMPTY60CREG (0x60C)
+
+#define EMPTY610REG (0x610)
+
+#define EMPTY614REG (0x614)
+
+#define EMPTY618REG (0x618)
+
+#define EMPTY61CREG (0x61C)
+
+#define EMPTY620REG (0x620)
+
+#define EMPTY624REG (0x624)
+
+#define EMPTY628REG (0x628)
+
+#define EMPTY62CREG (0x62C)
+
+#define TRANSCEIVERRXCTRL0REG1 (0x630)
+
+#define TRANSCEIVERRXCTRL0REG2 (0x634)
+
+#define TRANSCEIVERRXCTRL1REG1 (0x638)
+
+#define TRANSCEIVERRXCTRL1REG2 (0x63C)
+
+#define TRANSCEIVERRXCTRL2REG (0x640)
+
+#define EMPTY644REG (0x644)
+
+#define TRANSCEIVERRXCTRL3REG (0x648)
+
+#define EMPTY64CREG (0x64C)
+
+#define TRANSCEIVERSTATUS (0x650)
+
+#define LINKDOWNLATCHEDOUT_OFST (0)
+#define LINKDOWNLATCHEDOUT_MSK  (0x00000001 << LINKDOWNLATCHEDOUT_OFST)
+#define TXUSERCLKACTIVE_OFST    (1)
+#define TXUSERCLKACTIVE_MSK     (0x00000001 << TXUSERCLKACTIVE_OFST)
+#define RXUSERCLKACTIVE_OFST    (2)
+#define RXUSERCLKACTIVE_MSK     (0x00000001 << RXUSERCLKACTIVE_OFST)
+#define RXCOMMADET_OFST         (3)
+#define RXCOMMADET_MSK          (0x0000000f << RXCOMMADET_OFST)
+#define RXBYTEREALIGN_OFST      (7)
+#define RXBYTEREALIGN_MSK       (0x0000000f << RXBYTEREALIGN_OFST)
+#define RXBYTEISALIGNED_OFST    (11)
+#define RXBYTEISALIGNED_MSK     (0x0000000f << RXBYTEISALIGNED_OFST)
+#define GTWIZRXCDRSTABLE_OFST   (15)
+#define GTWIZRXCDRSTABLE_MSK    (0x00000001 << GTWIZRXCDRSTABLE_OFST)
+#define RESETTXDONE_OFST        (16)
+#define RESETTXDONE_MSK         (0x00000001 << RESETTXDONE_OFST)
+#define RESETRXDONE_OFST        (17)
+#define RESETRXDONE_MSK         (0x00000001 << RESETRXDONE_OFST)
+#define RXPMARESETDONE_OFST     (18)
+#define RXPMARESETDONE_MSK      (0x0000000f << RXPMARESETDONE_OFST)
+#define TXPMARESETDONE_OFST     (22)
+#define TXPMARESETDONE_MSK      (0x0000000f << TXPMARESETDONE_OFST)
+#define GTTPOWERGOOD_OFST       (26)
+#define GTTPOWERGOOD_MSK        (0x0000000f << GTTPOWERGOOD_OFST)
+
+#define EMPTY654REG (0x654)
+
+#define TRANSCEIVERCONTROL (0x658)
+
+#define GTWIZRESETALL_OFST         (0)
+#define GTWIZRESETALL_MSK          (0x00000001 << GTWIZRESETALL_OFST)
+#define RESETTXPLLANDDATAPATH_OFST (1)
+#define RESETTXPLLANDDATAPATH_MSK  (0x00000001 << RESETTXPLLANDDATAPATH_OFST)
+#define RESETTXDATAPATHIN_OFST     (2)
+#define RESETTXDATAPATHIN_MSK      (0x00000001 << RESETTXDATAPATHIN_OFST)
+#define RESETRXPLLANDDATAPATH_OFST (3)
+#define RESETRXPLLANDDATAPATH_MSK  (0x00000001 << RESETRXPLLANDDATAPATH_OFST)
+#define RESETRXDATAPATHIN_OFST     (4)
+#define RESETRXDATAPATHIN_MSK      (0x00000001 << RESETRXDATAPATHIN_OFST)
+
+#define EMPTY65CREG (0x65C)
+
+#define EMPTY660REG (0x660)
+
+#define EMPTY664REG (0x664)
+
+#define EMPTY668REG (0x668)
+
+#define EMPTY66CREG (0x66C)
+
+#define EMPTY670REG (0x670)
+
+#define EMPTY674REG (0x674)
+
+#define EMPTY678REG (0x678)
+
+#define EMPTY67CREG (0x67C)
+
+#define EMPTY680REG (0x680)
+
+#define EMPTY684REG (0x684)
+
+#define EMPTY688REG (0x688)
+
+#define EMPTY68CREG (0x68C)
+
+#define EMPTY690REG (0x690)
+
+#define EMPTY694REG (0x694)
+
+#define EMPTY698REG (0x698)
+
+#define EMPTY69CREG (0x69C)
+
+#define EMPTY6A0REG (0x6A0)
+
+#define EMPTY6A4REG (0x6A4)
+
+#define EMPTY6A8REG (0x6A8)
+
+#define EMPTY6ACREG (0x6AC)
+
+#define EMPTY6B0REG (0x6B0)
+
+#define EMPTY6B4REG (0x6B4)
+
+#define EMPTY6B8REG (0x6B8)
+
+#define EMPTY6BCREG (0x6BC)
+
+#define EMPTY6C0REG (0x6C0)
+
+#define EMPTY6C4REG (0x6C4)
+
+#define EMPTY6C8REG (0x6C8)
+
+#define EMPTY6CCREG (0x6CC)
+
+#define EMPTY6D0REG (0x6D0)
+
+#define EMPTY6D4REG (0x6D4)
+
+#define EMPTY6D8REG (0x6D8)
+
+#define EMPTY6DCREG (0x6DC)
+
+#define EMPTY6E0REG (0x6E0)
+
+#define EMPTY6E4REG (0x6E4)
+
+#define EMPTY6E8REG (0x6E8)
+
+#define EMPTY6ECREG (0x6EC)
+
+#define EMPTY6F0REG (0x6F0)
+
+#define EMPTY6F4REG (0x6F4)
+
+#define EMPTY6F8REG (0x6F8)
+
+#define EMPTY6FCREG (0x6FC)
+
+#define DBITFIFOCTRLREG (0x700)
+
+#define DBITRD_OFST        (0)
+#define DBITRD_MSK         (0x00000001 << DBITRD_OFST)
+#define DBITRST_OFST       (1)
+#define DBITRST_MSK        (0x00000001 << DBITRST_OFST)
+#define DBITFULL_OFST      (2)
+#define DBITFULL_MSK       (0x00000001 << DBITFULL_OFST)
+#define DBITEMPTY_OFST     (3)
+#define DBITEMPTY_MSK      (0x00000001 << DBITEMPTY_OFST)
+#define DBITUNDERFLOW_OFST (4)
+#define DBITUNDERFLOW_MSK  (0x00000001 << DBITUNDERFLOW_OFST)
+#define DBITOVERFLOW_OFST  (5)
+#define DBITOVERFLOW_MSK   (0x00000001 << DBITOVERFLOW_OFST)
+
+#define EMPTYREG (0x704)
+
+#define DBITFIFODATAREG1 (0x708)
+
+#define DBITFIFODATAREG2 (0x70C)
+
+#define EMPTY710REG (0x710)
+
+#define EMPTY714REG (0x714)
+
+#define EMPTY718REG (0x718)
+
+#define EMPTY71CREG (0x71C)
+
+#define EMPTY720REG (0x720)

slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c

@@ -0,0 +1,435 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#include "slsDetectorFunctionList.h"
+#include "arm64.h"
+#include "clogger.h"
+#include "common.h"
+#include "sharedMemory.h"
+#include "sls/versionAPI.h"
+
+#include "loadPattern.h"
+
+#include <arpa/inet.h> // INET_ADDRSTRLEN
+#include <string.h>
+#include <unistd.h> // usleep
+
+// Global variable from slsDetectorServer_funcs
+extern int debugflag;
+extern int updateFlag;
+extern const enum detectorType myDetectorType;
+
+// Global variable from communication_funcs.c
+extern int isControlServer;
+
+int initError = OK;
+int initCheckDone = 0;
+char initErrorMessage[MAX_STR_LENGTH];
+
+int detPos[2] = {0, 0};
+
+int isInitCheckDone() { return initCheckDone; }
+
+int getInitResult(char **mess) {
+    *mess = initErrorMessage;
+    return initError;
+}
+
+void basictests() {
+    initError = OK;
+    initCheckDone = 0;
+    memset(initErrorMessage, 0, MAX_STR_LENGTH);
+#ifdef VIRTUAL
+    LOG(logINFOBLUE, ("****** Xilinx Chip Test Board Virtual Server ******\n"));
+#else
+    LOG(logINFOBLUE, ("********** Xilinx Chip Test Board Server **********\n"));
+#endif
+    if (mapCSP0() == FAIL) {
+        strcpy(initErrorMessage,
+               "Could not map to memory. Cannot proceed. Check Firmware.\n");
+        LOG(logERROR, (initErrorMessage));
+        initError = FAIL;
+        return;
+    }
+
+#ifndef VIRTUAL
+    if ((!debugflag) && (!updateFlag) &&
+        ((validateKernelVersion(KERNEL_DATE_VRSN) == FAIL) ||
+         (checkType() == FAIL) || (testFpga() == FAIL) ||
+         (testBus() == FAIL))) {
+        sprintf(initErrorMessage,
+                "Could not pass basic tests of FPGA and bus. Cannot proceed. "
+                "Check Firmware. (Firmware version:0x%lx) \n",
+                getFirmwareVersion());
+        LOG(logERROR, ("%s\n\n", initErrorMessage));
+        initError = FAIL;
+        return;
+    }
+#endif
+    uint32_t ipadd = getDetectorIP();
+    uint64_t macadd = getDetectorMAC();
+    int64_t fwversion = getFirmwareVersion();
+    char swversion[MAX_STR_LENGTH] = {0};
+    memset(swversion, 0, MAX_STR_LENGTH);
+    getServerVersion(swversion);
+    uint32_t requiredFirmwareVersion = REQRD_FRMWRE_VRSN;
+
+    LOG(logINFOBLUE,
+        ("**************************************************\n"
+         "Detector IP Addr:\t\t 0x%x\n"
+         "Detector MAC Addr:\t\t 0x%lx\n\n"
+
+         "Firmware Version:\t\t 0x%lx\n"
+         "Software Version:\t\t %s\n"
+         "Required Firmware Version:\t 0x%x\n"
+         "********************************************************\n",
+         ipadd, macadd, fwversion, swversion, requiredFirmwareVersion));
+}
+
+int checkType() {
+#ifdef VIRTUAL
+    return OK;
+#endif
+    u_int32_t type = ((bus_r(FPGAVERSIONREG) & DETTYPE_MSK) >> DETTYPE_OFST);
+    if (type != XILINX_CHIPTESTBOARD) {
+        LOG(logERROR,
+            ("This is not a Xilinx CTB firmware (read %d, expected %d)\n", type,
+             XILINX_CHIPTESTBOARD));
+        return FAIL;
+    }
+    return OK;
+}
+
+int testFpga() {
+#ifdef VIRTUAL
+    return OK;
+#endif
+    LOG(logINFO, ("Testing FPGA:\n"));
+
+    // fixed pattern
+    int ret = OK;
+
+    /* TODO: FIX PATTERN not defined in firmware
+    uint32_t val = bus_r(FIX_PATT_REG);
+    if (val == FIX_PATT_VAL) {
+        LOG(logINFO, ("\tFixed pattern: successful match (0x%08x)\n", val));
+    } else {
+        LOG(logERROR,
+            ("Fixed pattern does not match! Read 0x%08x, expected 0x%08x\n",
+             val, FIX_PATT_VAL));
+        ret = FAIL;
+    }
+    */
+
+    if (ret == OK) {
+        // Delay LSB reg
+        LOG(logINFO, ("\tTesting Delay LSB Register:\n"));
+        uint32_t addr = DELAYINREG1;
+
+        // store previous delay value
+        uint32_t previousValue = bus_r(addr);
+
+        volatile uint32_t val = 0, readval = 0;
+        int times = 1000 * 1000;
+        for (int i = 0; i < times; ++i) {
+            val = 0x5A5A5A5A - i;
+            bus_w(addr, val);
+            readval = bus_r(addr);
+            if (readval != val) {
+                LOG(logERROR, ("1:Mismatch! Loop(%d): Wrote 0x%x, read 0x%x\n",
+                               i, val, readval));
+                ret = FAIL;
+                break;
+            }
+            val = (i + (i << 10) + (i << 20));
+            bus_w(addr, val);
+            readval = bus_r(addr);
+            if (readval != val) {
+                LOG(logERROR, ("2:Mismatch! Loop(%d): Wrote 0x%x, read 0x%x\n",
+                               i, val, readval));
+                ret = FAIL;
+                break;
+            }
+            val = 0x0F0F0F0F;
+            bus_w(addr, val);
+            readval = bus_r(addr);
+            if (readval != val) {
+                LOG(logERROR, ("3:Mismatch! Loop(%d): Wrote 0x%x, read 0x%x\n",
+                               i, val, readval));
+                ret = FAIL;
+                break;
+            }
+            val = 0xF0F0F0F0;
+            bus_w(addr, val);
+            readval = bus_r(addr);
+            if (readval != val) {
+                LOG(logERROR, ("4:Mismatch! Loop(%d): Wrote 0x%x, read 0x%x\n",
+                               i, val, readval));
+                ret = FAIL;
+                break;
+            }
+        }
+        // write back previous value
+        bus_w(addr, previousValue);
+        if (ret == OK) {
+            LOG(logINFO,
+                ("\tSuccessfully tested FPGA Delay LSB Register %d times\n",
+                 times));
+        }
+    }
+
+    return ret;
+}
+
+int testBus() {
+#ifdef VIRTUAL
+    return OK;
+#endif
+    LOG(logINFO, ("Testing Bus:\n"));
+
+    int ret = OK;
+    uint32_t addr = DELAYINREG1;
+
+    // store previous delay value
+    uint32_t previousValue = bus_r(addr);
+
+    volatile uint32_t val = 0, readval = 0;
+    int times = 1000 * 1000;
+
+    for (int i = 0; i < times; ++i) {
+        val += 0xbbbbb;
+        bus_w(addr, val);
+        readval = bus_r(addr);
+        if (readval != val) {
+            LOG(logERROR, ("Mismatch! Loop(%d): Wrote 0x%x, read 0x%x\n", i,
+                           val, readval));
+            ret = FAIL;
+        }
+    }
+
+    // write back previous value
+    bus_w(addr, previousValue);
+
+    if (ret == OK) {
+        LOG(logINFO, ("\tSuccessfully tested bus %d times\n", times));
+    }
+    return ret;
+}
+
+/* Ids */
+
+void getServerVersion(char *version) { strcpy(version, APIXILINXCTB); }
+
+uint64_t getFirmwareVersion() {
+#ifdef VIRTUAL
+    return REQRD_FRMWRE_VRSN;
+#endif
+    return ((bus_r(FPGAVERSIONREG) & COMPDATE_MSK) >> COMPDATE_OFST);
+}
+
+void getHardwareVersion(char *version) { strcpy(version, "Not applicable"); }
+
+u_int64_t getDetectorMAC() {
+#ifdef VIRTUAL
+    return 0;
+#else
+    char output[255], mac[255] = "";
+    u_int64_t res = 0;
+    FILE *sysFile =
+        popen("ifconfig eth0 | grep ether |  awk '{ print $2 }'", "r");
+    fgets(output, sizeof(output), sysFile);
+    pclose(sysFile);
+    // getting rid of ":"
+    char *pch;
+    pch = strtok(output, ":");
+    while (pch != NULL) {
+        strcat(mac, pch);
+        pch = strtok(NULL, ":");
+    }
+    sscanf(mac, "%lx", &res);
+    return res;
+#endif
+}
+
+u_int32_t getDetectorIP() {
+#ifdef VIRTUAL
+    return 0;
+#endif
+    char temp[INET_ADDRSTRLEN] = "";
+    u_int32_t res = 0;
+    // execute and get address
+    char output[255];
+    FILE *sysFile = popen(
+        "ifconfig  | grep 'inet '| grep -v '127.0.0.1' | awk '{ print $2 }'",
+        "r");
+    fgets(output, sizeof(output), sysFile);
+    pclose(sysFile);
+
+    // converting IPaddress to hex.
+    char *pcword = strtok(output, ".");
+    while (pcword != NULL) {
+        sprintf(output, "%02x", atoi(pcword));
+        strcat(temp, output);
+        pcword = strtok(NULL, ".");
+    }
+    strcpy(output, temp);
+    sscanf(output, "%x", &res);
+    // LOG(logINFO, ("ip:%x\n",res);
+
+    return res;
+}
+
+/* initialization */
+
+void initControlServer() {
+    if (!updateFlag && initError == OK) {
+        setupDetector();
+    }
+    initCheckDone = 1;
+}
+
+void initStopServer() {
+    if (!updateFlag && initError == OK) {
+        usleep(CTRL_SRVR_INIT_TIME_US);
+        if (mapCSP0() == FAIL) {
+            initError = FAIL;
+            strcpy(initErrorMessage,
+                   "Stop Server: Map Fail. Cannot proceed. Check Firmware.\n");
+            LOG(logERROR, (initErrorMessage));
+            initCheckDone = 1;
+            return;
+        }
+#ifdef VIRTUAL
+        sharedMemory_setStop(0);
+#endif
+    }
+    initCheckDone = 1;
+}
+
+/* set up detector */
+
+void setupDetector() {
+    LOG(logINFO, ("Setting up Server for 1 Xilinx Chip Test Board\n"));
+#ifdef VIRTUAL
+    sharedMemory_setStatus(IDLE);
+    initializePatternWord();
+#endif
+
+    LOG(logINFOBLUE, ("Setting Default parameters\n"));
+    initializePatternAddresses();
+
+    setNumFrames(DEFAULT_NUM_FRAMES);
+    setNumTriggers(DEFAULT_NUM_CYCLES);
+    setTiming(DEFAULT_TIMING_MODE);
+}
+
+/* set parameters -  dr */
+
+int setDynamicRange(int dr) {
+    if (dr == 16)
+        return OK;
+    return FAIL;
+}
+
+int getDynamicRange(int *retval) {
+    *retval = DYNAMIC_RANGE;
+    return OK;
+}
+
+/* parameters - timer */
+
+void setNumFrames(int64_t val) {
+    if (val > 0) {
+        LOG(logINFO, ("Setting number of frames %ld\n", val));
+        setU64BitReg(val, FRAMESINREG1, FRAMESINREG2);
+    }
+}
+
+int64_t getNumFrames() { return getU64BitReg(FRAMESINREG1, FRAMESINREG2); }
+
+void setNumTriggers(int64_t val) {
+    if (val > 0) {
+        LOG(logINFO, ("Setting number of triggers %ld\n", val));
+        setU64BitReg(val, CYCLESINREG1, CYCLESINREG2);
+    }
+}
+
+int64_t getNumTriggers() { return getU64BitReg(CYCLESINREG1, CYCLESINREG2); }
+
+int64_t getNumFramesLeft() {
+    return getU64BitReg(FRAMESOUTREG1, FRAMESOUTREG2);
+}
+
+int64_t getNumTriggersLeft() {
+    return getU64BitReg(CYCLESOUTREG1, CYCLESOUTREG2);
+}
+
+/* parameters - timing, extsig */
+
+void setTiming(enum timingMode arg) {
+    switch (arg) {
+    case AUTO_TIMING:
+        LOG(logINFO, ("Set Timing: Auto\n"));
+        bus_w(FLOWCONTROLREG, bus_r(FLOWCONTROLREG) & ~TRIGGERENABLE_MSK);
+        break;
+    case TRIGGER_EXPOSURE:
+        LOG(logINFO, ("Set Timing: Trigger\n"));
+        bus_w(FLOWCONTROLREG, bus_r(FLOWCONTROLREG) | TRIGGERENABLE_MSK);
+        break;
+    default:
+        LOG(logERROR, ("Unknown timing mode %d\n", arg));
+    }
+}
+
+enum timingMode getTiming() {
+    if (bus_r(FLOWCONTROLREG) == TRIGGERENABLE_MSK)
+        return TRIGGER_EXPOSURE;
+    return AUTO_TIMING;
+}
+
+int setDetectorPosition(int pos[]) {
+    memcpy(detPos, pos, sizeof(detPos));
+    // TODO
+    return OK;
+}
+
+int configureMAC() {
+    // TODO
+    LOG(logINFO, ("Configuring MAC\n"));
+    return OK;
+}
+
+int *getDetectorPosition() { return detPos; }
+
+int getNumberofUDPInterfaces() { return 1; }
+
+/* aquisition */
+
+enum runStatus getRunStatus() {
+    LOG(logDEBUG1, ("Getting status\n"));
+    // scan error or running
+    if (sharedMemory_getScanStatus() == ERROR) {
+        LOG(logINFOBLUE, ("Status: scan ERROR\n"));
+        return ERROR;
+    }
+    if (sharedMemory_getScanStatus() == RUNNING) {
+        LOG(logINFOBLUE, ("Status: scan RUNNING\n"));
+        return RUNNING;
+    }
+#ifdef VIRTUAL
+    if (sharedMemory_getStatus() == RUNNING) {
+        LOG(logINFOBLUE, ("Status: RUNNING\n"));
+        return RUNNING;
+    }
+    LOG(logINFOBLUE, ("Status: IDLE\n"));
+    return IDLE;
+#endif
+    // TODO: get status
+    LOG(logINFOBLUE, ("Status: IDLE\n"));
+    return IDLE;
+}
+
+void getNumberOfChannels(int *nchanx, int *nchany) {
+    // TODO
+    *nchanx = NCHAN;
+    *nchany = 1;
+}

slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: LGPL-3.0-or-other
+// Copyright (C) 2021 Contributors to the SLS Detector Package
+#pragma once
+#include "RegisterDefs.h"
+#include "sls/sls_detector_defs.h"
+
+#define REQRD_FRMWRE_VRSN (0x230000)
+#define KERNEL_DATE_VRSN  "Wed Nov 29 17:32:14 CET 2023"
+
+#define LINKED_SERVER_NAME "xilinx_ctbDetectorServer"
+
+#define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
+
+/* Hardware Definitions */
+#define NCHAN (1)
+
+enum ADCINDEX { V_PWR_IO };
+enum DACINDEX { D0 };
+
+/** Default Parameters */
+#define DEFAULT_NUM_FRAMES  (1)
+#define DEFAULT_NUM_CYCLES  (1)
+#define DYNAMIC_RANGE       (16)
+#define DEFAULT_TIMING_MODE (AUTO_TIMING)
+
+/* Defines in the Firmware */
+#define WAIT_TIME_PATTERN_READ (10)

slsDetectorSoftware/CMakeLists.txt

@@ -4,10 +4,13 @@ set(SOURCES
     src/DetectorImpl.cpp 
     src/Module.cpp 
     src/Detector.cpp
-    src/CmdProxy.cpp
+    src/HelpDacs.cpp
     src/CmdParser.cpp
     src/Pattern.cpp
     src/CtbConfig.cpp
+    src/Caller.cpp
+    src/CallerSpecial.cpp
+    src/inferAction.cpp
 )
 
 add_library(slsDetectorObject OBJECT
@@ -76,26 +79,30 @@ endif()
 
 
 if(SLS_USE_TEXTCLIENT)
-    # Loop over list to generate command line binaries
+    set(det_bin_names "sls_detector_put" 
-    set(bin_names "sls_detector_put" 
             "sls_detector_get" 
             "sls_detector_acquire" 
-            "sls_detector_help")
+            "sls_detector_help"
-    set(cmd_name "PUT" "GET" "READOUT" "HELP")
+            "sls_detector"
-    list(LENGTH bin_names len1)
+            )
+    set(det_cmd_name "PUT" "GET" "READOUT" "HELP" "INFER")
+    list(LENGTH det_bin_names len1)
     math(EXPR len2 "${len1} - 1")
 
     foreach(val RANGE ${len2})
-        list(GET bin_names ${val} val1)
+        list(GET det_bin_names ${val} val1)
-        list(GET cmd_name ${val} val2)
+        list(GET det_cmd_name ${val} val2)
         message(STATUS "${val1}  ${val2}")
 
-        add_executable(${val1} src/CmdLineApp.cpp)
+        add_executable(${val1} src/CmdApp.cpp)
+
         target_link_libraries(${val1} 
-            slsDetectorStatic
+        slsDetectorStatic
-            pthread
+        pthread
-            rt
+        rt
         )
+        SET_SOURCE_FILES_PROPERTIES( src/Caller.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-but-set-variable")
+
         set_target_properties(${val1} PROPERTIES 
             RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
             COMPILE_DEFINITIONS ${val2}=1
@@ -104,7 +111,8 @@ if(SLS_USE_TEXTCLIENT)
             set_property(TARGET ${val1} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
         endif()
     endforeach()
-    install(TARGETS ${bin_names} DESTINATION bin)
+    install(TARGETS ${det_bin_names} DESTINATION bin)
+
 
 endif(SLS_USE_TEXTCLIENT)
 

slsDetectorSoftware/generator/Caller.in.cpp

@@ -0,0 +1,10 @@
+#include "Caller.h"
+#include "sls/logger.h"
+#include "sls/string_utils.h"
+#include <iostream>
+
+namespace sls {
+
+// THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE
+
+}

slsDetectorSoftware/generator/Caller.in.h

@@ -0,0 +1,88 @@
+// This file is used as input to generate the caller class
+
+#include "CmdParser.h"
+#include "HelpDacs.h"
+#include "sls/Detector.h"
+
+#include <iostream>
+#include <string>
+#include <vector>
+namespace sls {
+
+class Caller {
+  public:
+    Caller(Detector *ptr) : det(ptr) {}
+    void call(const std::string &command,
+              const std::vector<std::string> &arguments, int detector_id,
+              int action, std::ostream &os = std::cout, int receiver_id = -1);
+
+    IpAddr getDstIpFromAuto();
+    IpAddr getSrcIpFromAuto();
+    UdpDestination getUdpEntry();
+    void GetLevelAndUpdateArgIndex(int action,
+                                   std::string levelSeparatedCommand,
+                                   int &level, int &iArg, size_t nGetArgs,
+                                   size_t nPutArgs);
+    void WrongNumberOfParameters(size_t expected);
+
+    template <typename V> std::string OutStringHex(const V &value) {
+        if (value.equal())
+            return ToStringHex(value.front());
+        return ToStringHex(value);
+    }
+
+    template <typename V> std::string OutStringHex(const V &value, int width) {
+        if (value.equal())
+            return ToStringHex(value.front(), width);
+        return ToStringHex(value, width);
+    }
+
+    template <typename V> std::string OutString(const Result<V> &value) {
+        if (value.equal())
+            return ToString(value.front());
+        return ToString(value);
+    }
+
+    template <typename V> std::string OutString(const V &value) {
+        return ToString(value);
+    }
+
+    template <typename V>
+    std::string OutString(const V &value, const std::string &unit) {
+        if (value.equal())
+            return ToString(value.front(), unit);
+        return ToString(value, unit);
+    }
+
+    std::vector<std::string> getAllCommands();
+    std::string list(int action);
+
+    // THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1)
+
+    std::vector<std::string> args;
+    std::string cmd;
+    Detector *det;
+    int det_id{-1};
+    int rx_id{-1};
+
+  private:
+    bool ReplaceIfDepreciated(std::string &command);
+    using FunctionMap = std::map<std::string, std::string (Caller::*)(int)>;
+    using StringMap = std::map<std::string, std::string>;
+    Detector *ptr; // pointer to the detector that executes the command
+
+    FunctionMap functions{
+        {"list", &Caller::list},
+
+        // THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (2)
+
+    };
+
+    StringMap depreciated_functions{
+
+        // THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (3)
+
+    };
+};
+
+} // namespace sls

slsDetectorSoftware/generator/autocomplete/autocomplete.py

@@ -0,0 +1,236 @@
+import argparse
+import json
+from pathlib import Path
+
+# command to generate the ast
+# clang version: 14.0.0-1ubuntu1.1
+# clang++ -Xclang -ast-dump=json -Xclang -ast-dump-filter -Xclang StringTo  -c ToString.cpp -I ../include/ -std=gnu++11
+#
+import yaml
+
+AUTOCOMPLETE_PATH = Path(__file__).parent
+DUMP_PATH = AUTOCOMPLETE_PATH / 'dump.json'
+FIXED_PATH = AUTOCOMPLETE_PATH / 'fixed.json'
+
+type_values = {
+    'special::mv': ["mv", "mV"],
+    "special::deg": ["deg"],
+    "special::time_unit": ["s", "ms", "us", "ns"],
+    "special::hard": ["hard"],
+    "special::force-delete-normal-file": ["--force-delete-normal-file"],
+    "special::currentSourceFix": ["fix", "nofix"],
+    "special::currentSourceLow": ["normal", "low"],
+    "special::path": [],
+    "special::pedestal_parameters" : ["", "0"]
+
+}
+
+
+def get_types(arg_types):
+    ret = set()
+    for arg_type in arg_types:
+        if type_info(arg_type) == 'base':
+            if arg_type == 'bool':
+                ret  = ret.union(["0", "1"])
+        else:
+            tmp = [not_list for not_list in type_values[arg_type] if not isinstance(not_list, list)]
+            ret = ret.union(tmp)
+
+    #Intercept the options and in case detector specific options appear replace the
+    #list of options with a command line call that fetches them
+    #TODO! Rename sls_detector_get 
+    if "defs::dacIndex" in arg_types:
+        return "`sls_detector_get daclist | sed -e 's/.*\[\(.*\)\].*/\\1/' | sed 's/,//g'`"
+    elif "defs::detectorSettings" in arg_types:
+        return "`sls_detector_get settingslist | sed -e 's/.*\[\(.*\)\].*/\\1/' | sed 's/,//g'`"
+    elif "defs::timingMode" in arg_types:
+        return "`sls_detector_get timinglist | sed -e 's/.*\[\(.*\)\].*/\\1/' | sed 's/,//g'`"
+
+    
+    return ret
+
+
+def type_info(type_name):
+    if type_name.startswith('defs::') or type_name.startswith('slsDetectorDefs::'):
+        return 'enum'
+    if type_name.startswith('special::'):
+        return 'special'
+    return 'base'
+
+
+def get_enum(function):
+    return function['type']['qualType'].split(' ')[0]
+
+
+def get_literal(ifstmt):
+    stringliteral = []
+    expression = ifstmt['inner'][0]
+    if expression['kind'] == 'BinaryOperator':
+        if expression['opcode'] == '!=':
+            return None, None
+        for cxxOperatorCall in expression['inner']:
+            if cxxOperatorCall['kind'] == 'CXXOperatorCallExpr':
+                implicitCastExpr = cxxOperatorCall['inner'][2]
+                stringliteral.append(implicitCastExpr['inner'][0]['value'][1:-1])
+    else:
+        cxxOperatorCall = expression
+        implicitCastExpr = cxxOperatorCall['inner'][2]
+        stringliteral = implicitCastExpr['inner'][0]['value'][1:-1]
+
+    retstmt = get_object_by_kind(ifstmt['inner'], 'ReturnStmt')
+    declrefexpt = get_object_by_kind(retstmt['inner'], 'DeclRefExpr')
+    enum_val = declrefexpt["referencedDecl"]["name"]
+
+    return enum_val, stringliteral
+
+
+def get_object_by_kind(inner, kind, position=1):
+    for obj in inner:
+        if obj['kind'] == kind:
+            position -= 1
+            if position == 0:
+                return obj
+    return None
+
+
+def generate_type_values():
+    functions = json.loads(FIXED_PATH.read_text())
+    for function in functions:
+        if function['kind'] != 'FunctionDecl' or function['name'] != 'StringTo':
+            continue
+        enum = get_enum(function)
+
+        if not enum.startswith('defs::'):
+            continue
+        # if enum != 'defs::dacIndex':
+        #     continue
+        if not function['loc']['file'].endswith('ToString.cpp'):
+            continue
+
+        compound_stmt = get_object_by_kind(function['inner'], 'CompoundStmt')
+
+        for ifstmt in compound_stmt['inner']:
+            if ifstmt['kind'] != 'IfStmt':
+                continue
+            enum_val, stringliteral = get_literal(ifstmt)
+            if enum_val is None:
+                continue
+
+            if enum not in type_values or type_values[enum] is None:
+                type_values[enum] = []
+            type_values[enum].append(stringliteral)
+    items = list(type_values.items())
+    for key, val in items:
+        if key.startswith('defs::'):
+            new_key = key.split('::')[1]
+            new_key = 'slsDetectorDefs::' + new_key
+            type_values[new_key] = val
+        elif key.startswith('slsDetectorDefs::'):
+            new_key = key.split('::')[1]
+            new_key = 'defs::' + new_key
+            type_values[new_key] = val
+
+    return json.dumps(type_values, indent=2)
+
+
+def fix_json():
+    with DUMP_PATH.open('r') as f:
+        tmp = '[\n'
+        for line in f.read().split('\n'):
+            if line.startswith('}'):
+                tmp += line + ',\n'
+            else:
+                tmp += line + '\n'
+        tmp = tmp[:-3] + '\n]'
+    with FIXED_PATH.open('w') as f:
+        f.write(tmp)
+
+
+def generate_bash_autocomplete(output_path=Path(__file__).parent / 'bash_autocomplete.sh', input_path=Path(__file__).parent / 'bash_autocomplete.in.sh'):
+    generate_type_values()
+    output_file = output_path.open('w')
+    template_file = input_path.open('r')
+
+    def writeline(line):
+        output_file.write(line + '\n')
+
+    class if_block:
+        def __init__(self, condition):
+            self.condition = condition
+
+        def __enter__(self):
+            output_file.write('if [[ ' + self.condition + ' ]]; then\n')
+
+        def __exit__(self, type, value, traceback):
+            output_file.write('fi\n')
+
+    class function:
+        def __init__(self, name):
+            self.name = name
+
+        def __enter__(self):
+            output_file.write(self.name + '() {\n')
+
+        def __exit__(self, type, value, traceback):
+            output_file.write('}\n')
+
+    command_path = Path(__file__).parent.parent / 'extended_commands.yaml'
+    commands = yaml.unsafe_load(command_path.open('r'))
+
+    for line in template_file:
+        if '-- THIS LINE WILL BE REPLACED WITH GENERATED CODE --' not in line:
+            output_file.write(line)
+            continue
+        writeline(f'local SLS_COMMANDS=" {" ".join(commands.keys())} "')
+        # generate functions
+        for command_name, command in commands.items():
+            # added for debugging
+            if command_name == 'xxxexptime':
+                continue
+            with function('__' + command_name):
+                writeline('FCN_RETURN=""')
+
+                actions = ['GET', 'PUT']
+                for action in actions:
+                    if action in command['actions'] and 'args' in command['actions'][action]:
+                        args = command['actions'][action]['args']
+                        possible_argc = {}
+                        for arg in args:
+                            if arg['argc'] == 0:
+                                pass
+                            for i in range(arg['argc']):
+                                if i + 1 not in possible_argc:
+                                    possible_argc[i + 1] = []
+                                possible_argc[i + 1].append(arg['arg_types'][i])
+                    if possible_argc:
+                        with if_block(f'${{IS_GET}} -eq {"1" if action == "GET" else "0"}'):
+                            for argc in possible_argc:
+                                with if_block(f'"${{cword}}" == "{argc + 1}"'):
+                                    if "defs::detectorSettings" in possible_argc[argc]:
+                                        print(argc, command_name, possible_argc[argc])
+                                    choices = get_types(possible_argc[argc])
+
+                                    #check if we got choices back or a bash command
+                                    if isinstance(choices, (list,set)):
+                                        writeline(f'FCN_RETURN="{" ".join(sorted(choices))}"')
+                                    else:
+                                        writeline(f'FCN_RETURN="{choices}"')
+                                    if 'special::path' in possible_argc[argc]:
+                                        writeline('IS_PATH=1')
+
+                writeline('return 0')
+
+
+
+    output_file.close()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='use parsed c++ code to generate autocomplete snippets')
+    parser.add_argument('-f', '--fix', action='store_true', help='fix the parsed ast to make it loadable')
+    # parser.add_argument('-p', '--path', type=str, help='output path to the fixed ast', default='ast.json')
+    args = parser.parse_known_args()
+    if args[0].fix:
+        fix_json()
+    ret = generate_type_values()
+    print(ret)

slsDetectorSoftware/generator/autocomplete/bash_autocomplete.in.sh

@@ -0,0 +1,167 @@
+# GENERATED FILE - DO NOT EDIT
+# ANY CHANGES TO THIS FILE WILL BE OVERWRITTEN
+
+_sd() {
+
+  # Taken from https://github.com/scop/bash-completion/blob/15b74b1050333f425877a7cbd99af2998b95c476/bash_completion#L770C12-L770C12
+  # Reassemble command line words, excluding specified characters from the
+  # list of word completion separators (COMP_WORDBREAKS).
+  # @param $1 chars  Characters out of $COMP_WORDBREAKS which should
+  #     NOT be considered word breaks. This is useful for things like scp where
+  #     we want to return host:path and not only path, so we would pass the
+  #     colon (:) as $1 here.
+  # @param $2 words  Name of variable to return words to
+  # @param $3 cword  Name of variable to return cword to
+  #
+  _comp__reassemble_words()
+{
+    local exclude="" i j line ref
+    # Exclude word separator characters?
+    if [[ $1 ]]; then
+        # Yes, exclude word separator characters;
+        # Exclude only those characters, which were really included
+        exclude="[${1//[^$COMP_WORDBREAKS]/}]"
+    fi
+
+    # Default to cword unchanged
+    printf -v "$3" %s "$COMP_CWORD"
+    # Are characters excluded which were former included?
+    if [[ $exclude ]]; then
+        # Yes, list of word completion separators has shrunk;
+        line=$COMP_LINE
+        # Re-assemble words to complete
+        for ((i = 0, j = 0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+            # Is current word not word 0 (the command itself) and is word not
+            # empty and is word made up of just word separator characters to
+            # be excluded and is current word not preceded by whitespace in
+            # original line?
+            while [[ $i -gt 0 && ${COMP_WORDS[i]} == +($exclude) ]]; do
+                # Is word separator not preceded by whitespace in original line
+                # and are we not going to append to word 0 (the command
+                # itself), then append to current word.
+                [[ $line != [[:blank:]]* ]] && ((j >= 2)) && ((j--))
+                # Append word separator to current or new word
+                ref="$2[$j]"
+                printf -v "$ref" %s "${!ref-}${COMP_WORDS[i]}"
+                # Indicate new cword
+                ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
+                # Remove optional whitespace + word separator from line copy
+                line=${line#*"${COMP_WORDS[i]}"}
+                # Indicate next word if available, else end *both* while and
+                # for loop
+                if ((i < ${#COMP_WORDS[@]} - 1)); then
+                    ((i++))
+                else
+                    break 2
+                fi
+                # Start new word if word separator in original line is
+                # followed by whitespace.
+                [[ $line == [[:blank:]]* ]] && ((j++))
+            done
+            # Append word to current word
+            ref="$2[$j]"
+            printf -v "$ref" %s "${!ref-}${COMP_WORDS[i]}"
+            # Remove optional whitespace + word from line copy
+            line=${line#*"${COMP_WORDS[i]}"}
+            # Indicate new cword
+            ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
+        done
+        ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
+    else
+        # No, list of word completions separators hasn't changed;
+        for i in "${!COMP_WORDS[@]}"; do
+            printf -v "$2[i]" %s "${COMP_WORDS[i]}"
+        done
+    fi
+}
+
+
+  local FCN_RETURN=""
+  local IS_PATH=0
+
+
+  # -- THIS LINE WILL BE REPLACED WITH GENERATED CODE --
+
+
+  COMPREPLY=()
+  local OPTIONS_NEW=""
+
+  # check if bash or zsh
+  # _get_comp_words_by_ref is a bash built-in function, we check if it exists
+  declare -Ff _get_comp_words_by_ref > /dev/null && IS_BASH=1 || IS_BASH=0
+
+
+  # bash interprets the colon character : as a special character and splits the argument in two
+  # different than what zsh does
+  # https://stackoverflow.com/a/3224910
+  # https://stackoverflow.com/a/12495727
+  local cur
+  local cword words=()
+  _comp__reassemble_words ":" words cword
+  cur=${words[cword]}
+
+  #  check the action (get or put)
+  case "${words[0]}" in
+    "sls_detector_get" | "g" | "detg")
+      local IS_GET=1
+      ;;
+    *)
+      local IS_GET=0
+      ;;
+  esac
+
+  # if no command is written, autocomplete with the commands
+  if [[ ${cword} -eq 1 ]]; then
+#    local SLS_COMMANDS="trimbits exptime"
+    local SLS_COMMANDS_NEW=""
+
+    case "$cur" in
+    	[0-9]*:*)
+				local suggestions=($(compgen -W "${SLS_COMMANDS}" -- "${cur#*:}"))
+				COMPREPLY=( ${suggestions[*]} )
+        ;;
+      [0-9]*)
+        COMPREPLY=()
+        ;;
+      *)
+				COMPREPLY=( $( compgen -W "$SLS_COMMANDS -h" -- "$cur" ) );;
+
+		esac
+    return 0
+  fi
+
+  if [[ ${cword} -eq 2 ]] && [[ ${words[1]} == "-h" ]]; then
+    COMPREPLY=( $( compgen -W "$SLS_COMMANDS" -- "$cur" ) )
+    return 0
+  fi
+
+  # if a command is written, autocomplete with the options
+  # call the function for the command
+
+  if [[ "$SLS_COMMANDS" == *"${words[1]##*:}"* ]]; then
+      __"${words[1]##*:}"
+  fi
+
+  # if IS_PATH is activated, autocomplete with the path
+  if [[ ${IS_PATH} -eq 1 ]]; then
+    COMPREPLY=($(compgen -f -- "${cur}"))
+    return 0
+  fi
+
+  # autocomplete with the options
+  COMPREPLY=($(compgen -W "${FCN_RETURN}" -- "${cur}"))
+
+
+
+}
+
+complete -F _sd -o filenames sls_detector_get
+complete -F _sd -o filenames g
+complete -F _sd -o filenames detg
+
+complete -F _sd -o filenames sls_detector_put
+complete -F _sd -o filenames p
+complete -F _sd -o filenames detp
+
+complete -F _sd -o filenames sls_detector
+complete -F _sd -o filenames det

slsDetectorSoftware/generator/autocomplete/slsdet-completion.bash

@@ -0,0 +1,177 @@
+#### simpler version of autocomplete.sh to understand the logic
+#### each command has its own function when called it will produce the possible values for autocompletion
+
+
+_sd() {
+
+  # Reassemble command line words, excluding specified characters from the
+  # list of word completion separators (COMP_WORDBREAKS).
+  # @param $1 chars  Characters out of $COMP_WORDBREAKS which should
+  #     NOT be considered word breaks. This is useful for things like scp where
+  #     we want to return host:path and not only path, so we would pass the
+  #     colon (:) as $1 here.
+  # @param $2 words  Name of variable to return words to
+  # @param $3 cword  Name of variable to return cword to
+  #
+  _comp__reassemble_words()
+{
+    local exclude="" i j line ref
+    # Exclude word separator characters?
+    if [[ $1 ]]; then
+        # Yes, exclude word separator characters;
+        # Exclude only those characters, which were really included
+        exclude="[${1//[^$COMP_WORDBREAKS]/}]"
+    fi
+
+    # Default to cword unchanged
+    printf -v "$3" %s "$COMP_CWORD"
+    # Are characters excluded which were former included?
+    if [[ $exclude ]]; then
+        # Yes, list of word completion separators has shrunk;
+        line=$COMP_LINE
+        # Re-assemble words to complete
+        for ((i = 0, j = 0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+            # Is current word not word 0 (the command itself) and is word not
+            # empty and is word made up of just word separator characters to
+            # be excluded and is current word not preceded by whitespace in
+            # original line?
+            while [[ $i -gt 0 && ${COMP_WORDS[i]} == +($exclude) ]]; do
+                # Is word separator not preceded by whitespace in original line
+                # and are we not going to append to word 0 (the command
+                # itself), then append to current word.
+                [[ $line != [[:blank:]]* ]] && ((j >= 2)) && ((j--))
+                # Append word separator to current or new word
+                ref="$2[$j]"
+                printf -v "$ref" %s "${!ref-}${COMP_WORDS[i]}"
+                # Indicate new cword
+                ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
+                # Remove optional whitespace + word separator from line copy
+                line=${line#*"${COMP_WORDS[i]}"}
+                # Indicate next word if available, else end *both* while and
+                # for loop
+                if ((i < ${#COMP_WORDS[@]} - 1)); then
+                    ((i++))
+                else
+                    break 2
+                fi
+                # Start new word if word separator in original line is
+                # followed by whitespace.
+                [[ $line == [[:blank:]]* ]] && ((j++))
+            done
+            # Append word to current word
+            ref="$2[$j]"
+            printf -v "$ref" %s "${!ref-}${COMP_WORDS[i]}"
+            # Remove optional whitespace + word from line copy
+            line=${line#*"${COMP_WORDS[i]}"}
+            # Indicate new cword
+            ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
+        done
+        ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
+    else
+        # No, list of word completions separators hasn't changed;
+        for i in "${!COMP_WORDS[@]}"; do
+            printf -v "$2[i]" %s "${COMP_WORDS[i]}"
+        done
+    fi
+}
+
+
+
+  __exptime(){
+    if [ "${IS_GET}" == "1" ]; then
+      if [ "${cword}" == "2" ]; then
+        FCN_RETURN="s ms us ns"
+      fi
+    else
+      if [ "${cword}" == "2" ]; then
+        FCN_RETURN=""
+      fi
+
+      if [ "${cword}" == "3" ]; then
+        FCN_RETURN="s ms us ns"
+      fi
+
+    fi
+  }
+
+  # trimbits will activate IS_PATH and signal that its input is a path
+  __trimbits(){
+    if [ "${IS_GET}" == "1" ]; then
+      if [ "${cword}" == "2" ]; then
+        FCN_RETURN=""
+        IS_PATH=1
+      fi
+    else
+      if [ "${cword}" == "2" ]; then
+        FCN_RETURN=""
+        IS_PATH=1
+      fi
+    fi
+  }
+
+  local cword words=()
+  _comp__reassemble_words ":" words cword
+  local FCN_RETURN=""
+  local IS_PATH=0
+  COMPREPLY=()
+  local OPTIONS_NEW=""
+#  _get_comp_words_by_ref -n : cur
+  local cur=${words[cword]}
+  #  check the action (get or put)
+  if [ "${words[0]}" == "sls_detector_get" ]; then
+    local IS_GET=1
+  else
+    local IS_GET=0
+  fi
+
+
+  # if no command is written, autocomplete with the commands
+  if [[ ${cword} -eq 1 ]]; then
+    local SLS_COMMANDS="trimbits exptime"
+    local SLS_COMMANDS_NEW=""
+
+    case "$cur" in
+    	[0-9]*:*)
+				local suggestions=($(compgen -W "${SLS_COMMANDS}" -- "${cur#*:}"))
+				COMPREPLY=( ${suggestions[*]} )
+        ;;
+      [0-9]*)
+        COMPREPLY=()
+        ;;
+      *)
+				COMPREPLY=( $( compgen -W "$SLS_COMMANDS -h" -- "$cur" ) );;
+
+		esac
+    return 0
+  fi
+
+  # if a command is written, autocomplete with the options
+  # call the function for the command
+  __"${words[1]##*:}"
+
+  # if IS_PATH is activated, autocomplete with the path
+  if [[ ${IS_PATH} -eq 1 ]]; then
+    COMPREPLY=($(compgen -f -- "${cur}"))
+    return 0
+  fi
+
+  # autocomplete with the options
+  COMPREPLY=($(compgen -W "${FCN_RETURN}" -- "${cur}"))
+
+
+
+}
+
+complete -F _sd -o filenames sls_detector_put
+complete -F _sd -o filenames sls_detector_get
+
+complete -F _sd -o filenames g
+complete -F _sd -o filenames p
+
+complete -F _sd -o filenames detg
+complete -F _sd -o filenames detp
+
+
+complete -F _sd -o filenames sls_detector
+complete -F _sd -o filenames det
+

slsDetectorSoftware/generator/autocomplete/zsh_autocomplete.in.sh

@@ -0,0 +1,77 @@
+# GENERATED FILE - DO NOT EDIT
+# ANY CHANGES TO THIS FILE WILL BE OVERWRITTEN
+
+_sd() {
+
+
+  # -- THIS LINE WILL BE REPLACED WITH GENERATED CODE --
+
+
+  local FCN_RETURN=""
+  local IS_PATH=0
+  COMPREPLY=()
+  local OPTIONS_NEW=""
+  words=("${COMP_WORDS[@]}")
+  cword=$COMP_CWORD
+
+  local cur=${words[cword]}
+  #  check the action (get or put)
+  case "${words[0]}" in
+    "sls_detector_get" | "g" | "detg")
+      local IS_GET=1
+      ;;
+    *)
+      local IS_GET=0
+      ;;
+  esac
+
+  # if no command is written, autocomplete with the commands
+  if [[ ${cword} -eq 1 ]]; then
+
+    case "$cur" in
+			[0-9]*)
+				for i in $SLS_COMMANDS; do
+					SLS_COMMANDS_NEW="${SLS_COMMANDS_NEW} ${cur%%:*}:$i"
+				done
+				COMPREPLY=( $( compgen -W "${SLS_COMMANDS_NEW}" -- "$cur" ) );;
+			*)
+				COMPREPLY=( $( compgen -W "$SLS_COMMANDS -h" -- "$cur" ) );;
+		esac
+    return 0
+  fi
+
+  if [[ ${cword} -eq 2 ]] && [[ ${words[1]} == "-h" ]]; then
+    COMPREPLY=( $( compgen -W "$SLS_COMMANDS" -- "$cur" ) )
+    return 0
+  fi
+
+  # if a command is written, autocomplete with the options
+  # call the function for the command
+
+  if [[ "$SLS_COMMANDS" == *"${words[1]##*:}"* ]]; then
+      __"${words[1]##*:}"
+  fi
+
+  # if IS_PATH is activated, autocomplete with the path
+  if [[ ${IS_PATH} -eq 1 ]]; then
+    COMPREPLY=($(compgen -f -- "${cur}"))
+    return 0
+  fi
+
+  # autocomplete with the options
+  COMPREPLY=($(compgen -W "${FCN_RETURN}" -- "${cur}"))
+
+
+
+}
+
+complete -F _sd -o filenames sls_detector_get
+complete -F _sd -o filenames g
+complete -F _sd -o filenames detg
+
+complete -F _sd -o filenames sls_detector_put
+complete -F _sd -o filenames p
+complete -F _sd -o filenames detp
+
+complete -F _sd -o filenames sls_detector
+complete -F _sd -o filenames det

slsDetectorSoftware/generator/commands_parser/commands_parser.py

@@ -0,0 +1,379 @@
+import copy
+import logging
+import yaml
+from pathlib import Path
+
+
+class CommandParser:
+    def __init__(
+            self,
+            commands_file: Path = Path(__file__).parent.parent / 'commands.yaml',
+            output_file: Path = Path(__file__).parent.parent / 'extended_commands.yaml'
+    ):
+
+        self.output_file = output_file
+        self.commands_file = commands_file
+        self.fp = self.commands_file.open('r')
+        self.simple_commands = yaml.unsafe_load(self.fp)
+        self.extended_commands = {}
+        self.argc_set = set()
+        self.logger = logging.getLogger('command_parser')
+        self.__current_action: str = ''
+        FORMAT = '[%(levelname)s] %(message)s'
+        logging.basicConfig(format=FORMAT, level=logging.INFO)
+
+        self.propagate_config = {
+            'require_det_id': False,
+            'convert_det_id': True,
+            'input': [],
+            'input_types': [],
+            'function': '',
+            'output': [],
+            'cast_input': [],
+            'check_det_id': False,
+            'arg_types': [],
+            # 'store_result_in_t': False,  # always true in GET action
+        }
+        self.default_config = {
+            'infer_action': True,
+            'help': '',
+            'actions': {}
+        }
+
+    def _verify_argument(self, arg, infer_action, command_name, action):
+        if arg['function'] == '' and 'ctb_output_list' not in arg:
+            special_exception_message_list = ["Cannot put", "Cannot get"]
+            if 'exceptions' in arg and arg['exceptions'][0]['condition'] == 'true' and any(ele in arg['exceptions'][0]['message'] for ele in special_exception_message_list):
+                self.logger.warning(f"{command_name} has a special exception message for {action}.")
+            else:
+                self.logger.warning(f"{command_name} [{action}] does not have a function")
+        if len(arg['input_types']) != len(arg['input']):
+            raise ValueError(f'Argument {arg} does not have the correct number of inputs')
+        if 'separate_time_units' in arg:
+
+            if arg['separate_time_units']['input'] == "":
+                raise ValueError(f'Argument {arg} does not have the correct number of inputs for separate_time_units')
+            if len(arg['separate_time_units']['output']) != 2:
+                raise ValueError(f'Argument {arg} does not have the correct number of outputs for separate_time_units')
+        if 'convert_to_time' in arg:
+            if len(arg['convert_to_time']['input']) != 2:
+                raise ValueError(f'Argument {arg} does not have the correct number of inputs for convert_to_time')
+            if len(arg['convert_to_time']['output']) == "":
+                raise ValueError(f'Argument {arg} does not have the correct number of outputs for convert_to_time')
+        # if infer_action:
+        #     if arg['argc'] in self.argc_set:
+        #         raise ValueError(f'Argument {arg} has a duplicate argc')
+        #     self.argc_set.add(arg['argc'])
+
+    def verify_format(self):
+        # todo verify detectors
+        # todo verify circular inheritance
+        # todo verify child commands (those that inherit)
+        # todo verify that there is no wrongly typed parameters
+        # todo verify that the same number of input_types and input are given
+        # todo verify that each argument has argc (error can happen when inheriting)
+        for command_name, command in self.simple_commands.items():
+            if 'inherit_actions' in command or 'template' in command and command[
+                'template'] or 'is_description' in command and command['is_description']:
+                continue
+            self.argc_set = set()
+            if 'infer_action' not in command:
+                command['infer_action'] = True
+            if 'actions' not in command:
+                raise ValueError(f'Command {command_name} does not have any actions')
+            for action, action_params in command['actions'].items():
+                if 'argc' in action_params:
+                    if 'args' in action_params:
+                        raise ValueError(f'Action {action} has both argc and args')
+                    arg = {**self.propagate_config, **action_params}
+                    self._verify_argument(arg, command['infer_action'], command_name, action)
+                elif 'args' in action_params:
+                    if type(action_params['args']) is not list:
+                        raise ValueError(f'Action {action} args is not a list')
+                    if len(action_params['args']) == 0:
+                        raise ValueError(f'Action {action} args is empty')
+                    action_args = {**self.propagate_config, **action_params}
+                    del action_args['args']
+                    for arg in action_params['args']:
+                        arg = {**action_args, **arg}
+                        self._verify_argument(arg, command['infer_action'], command_name, action)
+        self.logger.info('Commands file is valid ✅️')
+        return True
+
+    def _parse_inherited_command(self, parent, command, simple_parent):
+        """
+        parse a command that inherits from parent command
+        :param parent: parsed parent command
+        :param command: the current command
+        :param simple_parent: unparsed parent command
+        :return: parsed command
+        """
+        # deepcopy parent and command to avoid modifying the originals
+        command = copy.deepcopy(command)
+        config = copy.deepcopy(parent)
+        # add help
+        if 'help' in command:
+            config['help'] = command['help']
+        if 'actions' not in command:
+            return config
+        for action, command_params in command['actions'].items():
+            self.__current_action = action
+            if action not in config['actions']:
+                # todo: handle this case
+                pass
+            parent_params = config['actions'][action]
+            if 'args' in command_params:
+                # child has args => inherit action level params from parent + override with child args + use child's
+                # action level params
+                context = {**self.propagate_config, **simple_parent['actions'][action], **command_params}
+                config['actions'][action]['args'] = self.parse_action(context, command_params['args'])
+            elif 'argc' in command_params:
+                # child has action level args (argc)
+                context = {**self.propagate_config, **simple_parent['actions'][action], **command_params}
+                config['actions'][action]['args'] = self.parse_action(context, [])
+            else:
+                # child does not have args => use parent's action level params + override with child's action level
+                if 'args' in parent_params:
+                    config['actions'][action]['args'] = self.parse_action({}, parent_params['args'], command_params)
+
+            if 'detectors' in command_params:
+                if command_params['detectors'] is None:
+                    # if child has an empty detector section, then delete the parent's detector section
+                    del config['actions'][action]['detectors']
+                    continue
+
+                for detector_name, detector_params in command_params['detectors'].items():
+                    if 'detectors' not in config['actions'][action]:
+                        config['actions'][action]['detectors'] = {}
+                    config_detector = config['actions'][action]['detectors']
+                    if 'detectors' not in parent_params or detector_name not in parent_params['detectors']:
+                        if 'args' in detector_params:
+                            # if child has detector args and parent does not have detectors
+                            # => use child's detector args
+                            context = {**self.propagate_config, **simple_parent['actions'][action], **detector_params}
+                            config_detector[detector_name] = self.parse_action(context, detector_params['args'])
+                        elif 'args' in parent_params:
+                            # if child does not have detector args and parent does not have detectors
+                            # => use the child's action args
+                            context = {**self.propagate_config, **simple_parent['actions'][action]}
+                            config_detector[detector_name] = self.parse_action(context,
+                                                                               config['actions'][action]['args'],
+                                                                               detector_params)
+                    elif detector_name in parent_params['detectors']:
+
+                        if 'args' in detector_params:
+                            # child and parent have the same detector and child has detector args
+                            # => use child's detector args
+                            context = {
+                                **self.propagate_config,
+                                **simple_parent['actions'][action],
+                                **simple_parent['actions'][action]['detectors'][detector_name],
+
+                            }
+                            config_detector[detector_name] = self.parse_action(context, detector_params['args'])
+                        else:
+                            # child and parent have the same detector and child does not have detector args
+                            # => use parent's detector args
+                            priority_context = {**command_params, **detector_params}
+                            config_detector[detector_name] = self.parse_action(
+                                {},
+                                parent_params['detectors'][detector_name],
+                                priority_context
+                            )
+
+                    else:
+                        pass
+
+        return config
+
+    def _parse_command(self, command):
+        """
+        logic function for parse_command.
+        This function is recursive
+        :return: parsed command
+        """
+        config = self.default_config.copy()
+        config.update(command)
+        config['actions'] = {}
+
+        # check if command inherits from another command
+        if 'inherit_actions' in command:
+            if command['inherit_actions'] in self.extended_commands:
+                # if parent command has already been parsed, use that
+                parent = self.extended_commands[command['inherit_actions']]
+            else:
+                # if parent command has not been parsed, parse it
+                parent = self.parse_command(command['inherit_actions'])
+            # parse the current command and merge it with the parent command
+            config = self._parse_inherited_command(parent, command, self.simple_commands[command['inherit_actions']])
+            return config
+
+        if 'actions' not in command:
+            return config
+
+        for action, action_params in command['actions'].items():
+            self.__current_action = action
+
+            config['actions'][action] = {}
+            config_action = config['actions'][action]
+            # the context in the current command and the current action
+            action_context = {**self.propagate_config, **action_params}
+            if 'args' not in action_params:
+                # parse the action with the action context
+                if action_params.keys() != {'detectors'}:
+                    config_action['args'] = self.parse_action(action_context, [])
+            else:
+                config_action['args'] = self.parse_action(action_context, action_params['args'])
+
+            # check if the action has detectors
+            if 'detectors' in action_params:
+                config_action['detectors'] = {}
+                for detector_name, detector_params in action_params['detectors'].items():
+                    # get the context for the detector and merge it with the action context
+                    detector_context = {**action_context, **detector_params}
+
+                    # if the detector does not have args, then use the action args
+                    # otherwise, use the detector args and override the action args
+                    tmp_args = []
+                    if 'args' not in detector_params:
+                        if 'args' in config_action:
+                            tmp_args = config_action['args']
+                    else:
+                        tmp_args = detector_params['args']
+                    detector_params['args'] = tmp_args
+
+                    # parse the action with the detector context
+                    config_action['detectors'][detector_name] = self.parse_action(detector_context,
+                                                                                  tmp_args,
+                                                                                  detector_params)
+        return config
+
+    def sanitize_argument(func):
+        def f(self, action_context, args_old, priority_context={}):
+            args = func(self, action_context, args_old, priority_context)
+            for i, arg in enumerate(args):
+                if 'args' in arg:
+                    del arg['args']
+                if 'detectors' in arg:
+                    del arg['detectors']
+                if not arg['cast_input']:
+                    # if the cast_input is empty, then set it to False
+                    arg['cast_input'] = [False] * len(arg['input'])
+
+                elif len(arg['cast_input']) != len(arg['input']):
+                    # if the cast_input is not the same length as the input, then set it to False
+                    arg['cast_input'] = [False] * len(arg['input'])
+                    self.logger.warning(f'cast_input for {arg["function"]} '
+                                        f'with argc: {arg["argc"]} has different length than input')
+                if 'store_result_in_t' not in arg:
+                    if self.__current_action == 'GET':
+                        arg['store_result_in_t'] = True
+                    else:
+                        arg['store_result_in_t'] = False
+            return args
+
+        return f
+
+    @sanitize_argument
+    def parse_action(self, action_context, args, priority_context={}):
+        """
+        parse an action
+        :param action_context: context of the action
+        :param args: arguments to be used in the action
+        :param priority_context: context that should override the arguments params
+        :return: parsed action
+        """
+
+        def add_cast_input(argument):
+            return argument
+
+        # deepcopy action_context to avoid modifying the original
+        action_context = {**self.propagate_config, **copy.deepcopy(action_context)}
+        priority_context = copy.deepcopy(priority_context)
+
+        if 'detectors' in action_context:
+            del action_context['detectors']
+        if 'detectors' in priority_context:
+            del priority_context['detectors']
+
+        if args == []:
+            # if there are no arguments, then the action has only one argument
+            context = {**action_context, **priority_context}
+            return [add_cast_input(context)]
+
+        ret_args = []
+        if 'args' in action_context:
+            del action_context['args']
+        if 'args' in priority_context:
+            del priority_context['args']
+
+        # if there are arguments, then merge them with the action context and priority context
+        for arg in args:
+            arg = {**action_context, **arg, **priority_context}
+            ret_args.append(add_cast_input(arg))
+        return ret_args
+
+    def parse_command(self, command_name):
+        """
+        parse a single command
+        This function is recursive
+
+        :param command_name: name of the command to parse
+        :return: the parsed command
+        """
+        command = self.simple_commands[command_name]
+        parsed_command = self._parse_command(command)
+        if 'function_alias' not in command:
+            if 'command_name' in command:
+                parsed_command['function_alias'] = command['command_name']
+            else:
+                parsed_command['function_alias'] = command_name
+
+        if 'command_name' not in command:
+            parsed_command['command_name'] = command_name
+
+        if 'template' in command and command['template']:
+            return parsed_command
+        self.extended_commands[command_name] = parsed_command
+        return self.extended_commands[command_name]
+
+    def parse_all_commands(self):
+        """
+        iterate over all commands in yaml file and parse them
+        :return: None
+        """
+
+        for command_name in self.simple_commands:
+            # todo remove this (added for debugging)
+            if command_name != 'xtiming':
+                self.parse_command(command_name)
+
+        # post-process the parsed commands
+        self.post_process_all_commands()
+
+        yaml.Dumper.ignore_aliases = lambda *args: True
+        self.logger.info(f'parsed {len(self.extended_commands)} commands')
+        yaml.dump(self.extended_commands, self.output_file.open('w'), default_flow_style=False)
+
+    def post_process_all_commands(self):
+        for command_name, command in self.extended_commands.items():
+            if 'is_description' in command and command['is_description']:
+                continue
+            for action_name, action, in command['actions'].items():
+                for arg in action['args']:
+                    if arg['argc'] == 0:
+                        arg['arg_types'] = []
+                        continue
+                    if arg['argc'] == -1:
+                        pass
+                    if arg['arg_types'] == []:
+                        arg['arg_types'] = arg['input_types']
+
+
+# command_parser = CommandParser(Path(
+#     '/afs/psi.ch/user/b/braham_b/github/slsDetectorPackage/slsDetectorSoftware/generator/tests/command_parser/data/detectors.yaml'))
+command_parser = CommandParser()
+
+if __name__ == '__main__':
+    command_parser.verify_format()
+    command_parser.parse_all_commands()

slsDetectorSoftware/generator/cpp_codegen/codegen.py

@@ -0,0 +1,282 @@
+class CodeGenerator:
+    def __init__(self):
+        self.file = None
+        self.actions_dict = {
+            'GET': 'slsDetectorDefs::GET_ACTION',
+            'PUT': 'slsDetectorDefs::PUT_ACTION',
+            'READOUT': 'slsDetectorDefs::READOUT_ACTION',
+            'HELP': 'slsDetectorDefs::HELP_ACTION',
+        }
+        self.template_file = None
+
+    def open(self, path):
+        self.file = path.open('w')
+
+    def close(self):
+        self.file.close()
+        self.file = None
+
+    def write_line(self, line):
+        self.file.write(line + '\n')
+
+    def write(self, text):
+        self.file.write(text)
+
+    def write_opening(self, path):
+        """Write the opening file for the caller.cpp file"""
+        self.template_file = path.open('r')
+        for line in self.template_file:
+            if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE" in line:
+                return
+            self.file.write(line)
+
+    def write_closing(self):
+        """Write the closing file for the caller.cpp file"""
+        for line in self.template_file.readlines():
+            self.file.write(line)
+        self.template_file.close()
+
+    def write_header(self, in_path, out_path, commands, deprecated_commands):
+        """Write the header file for the caller.h file"""
+        with out_path.open('w') as fp:
+            with in_path.open('r') as fp2:
+                for line in fp2:
+                    if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1)" in line:
+                        for command_name, command in commands.items():
+                            if 'duplicate_function' in command and command['duplicate_function']:
+                                continue
+                            fp.write(f'std::string {command["function_alias"]}(int action);\n')
+                        continue
+                    if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (2)" in line:
+                        map_string = ''
+                        for command_name, command in commands.items():
+                            map_string += f'{{"{command_name}", &Caller::{command["function_alias"]}}},'
+                        fp.write(map_string[:-1] + '\n')
+                        continue
+
+                    if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (3)" in line:
+                        for key, value in deprecated_commands.items():
+                            fp.write(f'{{"{key}", "{value}"}},\n')
+                        continue
+
+                    fp.write(line)
+
+    def write_infer_header(self, in_path, out_path, commands):
+        """Write the header file for the inferAction.h file"""
+        with out_path.open('w+') as fp:
+            with in_path.open('r') as fp2:
+                for line in fp2:
+                    if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1) - DO NOT REMOVE" in line:
+                        for command_name, command in commands.items():
+                            if 'duplicate_function' in command and command['duplicate_function']:
+                                continue
+
+                            fp.write(f'int {command["function_alias"]}();\n')
+                        continue
+                    if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (2) - DO NOT REMOVE" in line:
+                        map_string = ''
+                        for command_name, command in commands.items():
+                            map_string += f'{{"{command_name}", &InferAction::{command["function_alias"]}}},'
+                        fp.write(map_string[:-1] + '\n')
+                        continue
+                    fp.write(line)
+
+    def write_infer_cpp(self, in_path, out_path, commands, non_dist, type_dist):
+        """Write the source file for the inferAction.cpp file"""
+        with in_path.open('r') as fp2:
+            for line in fp2:
+                if "THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1) - DO NOT REMOVE" in line:
+                    for command_name, command in commands.items():
+                        if 'duplicate_function' in command and command['duplicate_function']:
+                            continue
+
+                        with function('int', f"InferAction::{command['function_alias']}", []) as f:
+                            if (command_name, -1) in non_dist| type_dist:
+                                self.write_line(
+                                    f'throw RuntimeError("sls_detector is disabled for command: {command_name}. Use sls_detector_get or sls_detector_put");')
+                            elif not command['infer_action']:
+                                self.write_line('throw RuntimeError("infer_action is disabled");')
+                            else:
+                                checked_argcs = set()
+                                for action, action_params in command['actions'].items():
+                                    for arg in action_params['args']:
+                                        if arg['argc'] in checked_argcs:
+                                            continue
+                                        checked_argcs.add(arg['argc'])
+                                        with if_block(f'args.size() == {arg["argc"]}'):
+                                            # check if this argc is not distinguishable
+                                            if (command_name, arg["argc"]) in non_dist | type_dist:
+                                                self.write_line(
+                                                    f'throw RuntimeError("sls_detector is disabled for command: {command_name} with number of arguments {arg["argc"]}. Use sls_detector_get or sls_detector_put");')
+                                            else:
+                                                self.write_line(f'return {self.actions_dict[action]};')
+                                with else_block():
+                                    self.write_line(
+                                        'throw RuntimeError("Could not infer action: Wrong number of arguments");')
+                    continue
+                self.write_line(line)
+
+    def write_check_arg(self):
+        pass
+
+    def write_arg(self, args, action, command_name):
+        for arg in args:
+            if arg['argc'] != -1:
+                if_block(f'args.size() == {arg["argc"]}',).__enter__()
+            if 'pattern_command' in arg and arg['pattern_command']:
+                self.write_line(f'int level = -1, iArg = 0, '
+                                f'nGetArgs = {arg["pattern_command"]["nGetArgs"]},'
+                                f' nPutArgs = {arg["pattern_command"]["nPutArgs"]};\nGetLevelAndUpdateArgIndex(action, '
+                                f'"{arg["pattern_command"]["command_name"]}", level, iArg, nGetArgs,nPutArgs);'
+                                )
+
+            if 'extra_variables' in arg:
+                for var in arg['extra_variables']:
+                    codegen.write_line(f'{var["type"]} {var["name"]} = {var["value"]};')
+            if 'separate_time_units' in arg and arg['separate_time_units']:
+                self.write_line(f'std::string tmp_time({arg["separate_time_units"]["input"]});')
+                self.write_line(f'std::string {arg["separate_time_units"]["output"][1]}'
+                                f' = RemoveUnit(tmp_time);')
+                self.write_line(f'auto {arg["separate_time_units"]["output"][0]} = '
+                                f'StringTo < time::ns > (tmp_time,'
+                                f' {arg["separate_time_units"]["output"][1]});')
+            if 'convert_to_time' in arg and arg['convert_to_time']:
+                self.write_line(f'auto {arg["convert_to_time"]["output"]} = '
+                                f'StringTo < time::ns > ({", ".join(arg["convert_to_time"]["input"])});')
+            input_arguments = []
+            if 'exceptions' in arg:
+                for exception in arg['exceptions']:
+                    self.write_line(f'if ({exception["condition"]}) {{ throw RuntimeError({exception["message"]}); }}')
+            if 'check_det_id' in arg and arg['check_det_id']:
+                self.write_line(
+                    f'if (det_id != -1) {{ throw RuntimeError("Cannot execute {command_name} at module level"); }} '
+                )
+            # only used for 3 commands :(
+            if 'ctb_output_list' in arg:
+                self.write_line(f"""
+                    std::string suffix = " {arg['ctb_output_list']['suffix']}";                                        
+                    auto t = det->{arg['ctb_output_list']['GETFCNLIST']}();""")
+                if arg['ctb_output_list']['GETFCNNAME'] != '':
+                    self.write_line(f"""
+                    auto names = det->{arg['ctb_output_list']['GETFCNNAME']}();                                    
+                    auto name_it = names.begin();""")
+                self.write_line("os << '[';")
+                with if_block(f't.size() > 0'):
+                    self.write_line(f"""
+                    auto it = t.cbegin();                                              
+                    os << ToString({arg['ctb_output_list']['printable_name']}) << ' ';                                 
+                    os << OutString(det->{arg['ctb_output_list']['GETFCN']}(*it++, std::vector<int>{{det_id}}))<< suffix;                                                      
+                    while (it != t.cend()) {{                                         
+                        os << ", " << ToString({arg['ctb_output_list']['printable_name']}) << ' ';                     
+                        os << OutString(det->{arg['ctb_output_list']['GETFCN']}(*it++, std::vector<int>{{det_id}}))<< suffix;
+                    }}                                                                  
+                    """)
+                self.write_line('os << "]\\n";')
+                if arg['argc'] != -1:
+                    if_block().__exit__()
+
+                return
+
+            for i in range(len(arg['input'])):
+                if arg['cast_input'][i]:
+                    self.write_line(
+                        f'auto arg{i} = StringTo<{arg["input_types"][i]}>({arg["input"][i]});')
+                    input_arguments.append(f'arg{i}')
+                else:
+                    input_arguments.append(arg["input"][i])
+            if 'require_det_id' in arg and arg['require_det_id']:
+                if 'convert_det_id' in arg and arg['convert_det_id']:
+                    input_arguments.append("std::vector<int>{ det_id }")
+                else:
+                    input_arguments.append("det_id")
+
+            input_arguments = ", ".join(input_arguments)
+            # call function
+            if arg["function"]:
+                if arg['store_result_in_t']:
+                    self.write_line(f'auto t = det->{arg["function"]}({input_arguments});')
+                else:
+                    self.write_line(f'det->{arg["function"]}({input_arguments});')
+            else:
+                pass #We have no function so skip block
+
+            output_args = []
+            for output in arg['output']:
+                output_args.append(output)
+            if len(output_args) > 0:
+                self.write_line(f"os << {'<< '.join(output_args)} << '\\n';")
+
+            if arg['argc'] != -1:
+                if_block().__exit__()
+
+
+class if_block:
+    def __init__(self, condition="", elseif=False):
+        self.condition = condition
+        self.elseif = elseif
+        self.block = False
+
+    def __enter__(self):
+        if self.elseif:
+            codegen.write_line('else if (' + self.condition + ') {')
+        else:
+            codegen.write_line('if (' + self.condition + ') {')
+        if self.block:
+            codegen.write_line('{\n')
+
+    def __exit__(self, *args):
+        codegen.write_line('}')
+        if self.block:
+            codegen.write_line('}')
+        codegen.write_line('')
+
+
+class else_block:
+    def __init__(self):
+        pass
+
+    def __enter__(self):
+        codegen.write_line('else {')
+        codegen.write_line('')
+
+    def __exit__(self, *args):
+        codegen.write_line('}')
+        codegen.write_line('')
+
+
+class for_block:
+    def __init__(self, condition):
+        self.condition = condition
+
+    def __enter__(self):
+        codegen.write_line('for (' + self.condition + ') {')
+        codegen.write_line('')
+
+    def __exit__(self, *args):
+        codegen.write_line('}')
+        codegen.write_line('')
+
+
+class function:
+    def __init__(self, return_type, name, args: list[tuple[str, str]]):
+        self.name = name
+        self.args = args
+        self.return_type = return_type
+
+    def __enter__(self):
+        s = ""
+        for arg in self.args:
+            arg_type, arg_name = arg
+            s += arg_type + ' ' + arg_name + ', '
+        s = s[:-2]
+        codegen.write_line(self.return_type + ' ' + self.name +
+                           f'({s}) {{')
+        codegen.write_line('')
+        return self
+
+    def __exit__(self, *args):
+        codegen.write_line('}')
+        codegen.write_line('')
+
+
+codegen = CodeGenerator()

slsDetectorSoftware/generator/deprecated_commands.yaml

@@ -0,0 +1,176 @@
+#configuration
+detectorversion:  firmwareversion
+softwareversion:  detectorserverversion
+receiverversion:  rx_version
+detectornumber:  serialnumber
+thisversion:  clientversion
+detsizechan:  detsize
+trimdir:  settingspath
+settingsdir:  settingspath
+flippeddatax:  fliprows
+
+#acquisition parameters
+cycles:  triggers
+cyclesl:  triggersl
+clkdivider:  readoutspeed
+speed:  readoutspeed
+vhighvoltage:  highvoltage
+digitest:  imagetest
+filter:  filterresistor
+readnlines:  readnrows
+
+# temperature
+
+# super old dacs
+vtr:  vtrim
+vrf:  vrpreamp
+vrs:  vrshaper
+vcall:  vcal
+vis:  vishaper
+vshaper:  vrshaper
+vpreamp:  vrpreamp
+vshaperneg:  vrshaper_n
+viinsh:  vishaper
+vpl:  vcal_n
+vph:  vcal_p
+
+# dacs
+vthreshold:  dac
+vsvp:  dac
+vsvn:  dac
+vtrim:  dac
+vrpreamp:  dac
+vrshaper:  dac
+vtgstv:  dac
+vcmp_ll:  dac
+vcmp_lr:  dac
+vcal:  dac
+vcmp_rl:  dac
+vcmp_rr:  dac
+rxb_rb:  dac
+rxb_lb:  dac
+vcp:  dac
+vcn:  dac
+vishaper:  dac
+iodelay:  dac
+vref_ds:  dac
+vcascn_pb:  dac
+vcascp_pb:  dac
+vout_cm:  dac
+vcasc_out:  dac
+vin_cm:  dac
+vref_comp:  dac
+ib_test_c:  dac
+vrshaper_n:  dac
+vipre:  dac
+vdcsh:  dac
+vth1:  dac
+vth2:  dac
+vth3:  dac
+vcal_n:  dac
+vcal_p:  dac
+vcassh:  dac
+vcas:  dac
+vicin:  dac
+vipre_out:  dac
+vref_h_adc:  dac
+vb_comp_fe:  dac
+vb_comp_adc:  dac
+vcom_cds:  dac
+vref_rstore:  dac
+vb_opa_1st:  dac
+vref_comp_fe:  dac
+vcom_adc1:  dac
+vref_prech:  dac
+vref_l_adc:  dac
+vref_cds:  dac
+vb_cs:  dac
+vb_opa_fd:  dac
+vcom_adc2:  dac
+vb_ds:  dac
+vb_comp:  dac
+vb_pixbuf:  dac
+vin_com:  dac
+vdd_prot:  dac
+vbp_colbuf:  dac
+vb_sda:  dac
+vcasc_sfp:  dac
+vipre_cds:  dac
+ibias_sfp:  dac
+
+defaultdacs:  resetdacs
+
+#acquisition
+busy:  clearbusy
+receiver:  rx_status
+framescaught:  rx_framescaught
+startingfnum:  nextframenumber
+
+#Network Configuration (Detector<->Receiver)
+detectorip:  udp_srcip
+detectorip2:  udp_srcip2
+detectormac:  udp_srcmac
+detectormac2:  udp_srcmac2
+rx_udpip:  udp_dstip
+rx_udpip2:  udp_dstip2
+rx_udpmac:  udp_dstmac
+rx_udpmac2:  udp_dstmac2
+rx_udpport:  udp_dstport
+rx_udpport2:  udp_dstport2
+flowcontrol_10g:  flowcontrol10g
+txndelay_frame:  txdelay_frame
+txndelay_left:  txdelay_left
+txndelay_right:  txdelay_right
+
+#Receiver Config
+r_silent:  rx_silent
+r_discardpolicy:  rx_discardpolicy
+r_padding:  rx_padding
+r_lock:  rx_lock
+r_lastclient:  rx_lastclient
+
+#File
+fileformat:  fformat
+outdir:  fpath
+index:  findex
+enablefwrite:  fwrite
+masterfile:  fmaster
+overwrite:  foverwrite
+r_framesperfile:  rx_framesperfile
+
+#ZMQ Streaming Parameters (Receiver<->Client)
+r_readfreq:  rx_zmqfreq
+rx_readfreq:  rx_zmqfreq
+rx_datastream:  rx_zmqstream
+
+#Eiger Specific
+resmat:  partialreset
+
+#Jungfrau Specific
+storagecells:  extrastoragecells
+auto_comp_disable:  autocompdisable
+comp_disable_time:  compdisabletime
+
+#Gotthard Specific
+#Gotthard2 Specific
+#Mythen3 Specific
+#CTB Specific
+adc:  slowadc
+flags:  romode
+i_a:  im_a
+i_b:  im_b
+i_c:  im_c
+i_d:  im_d
+i_io:  im_io
+
+#Pattern
+#Moench
+
+#Advanced
+copydetectorserver:  updatedetectorserver
+
+#Insignificant
+nframes:  framecounter
+now:  runtime
+timestamp:  frametime
+frameindex:  rx_frameindex

slsDetectorSoftware/generator/gen_commands.py

@@ -0,0 +1,276 @@
+import argparse
+import os
+import subprocess
+from pathlib import Path
+
+import yaml
+
+from autocomplete.autocomplete import type_info
+from cpp_codegen.codegen import codegen, if_block, for_block, function, else_block
+from infer_action.check_infer import check_infer
+from autocomplete.autocomplete import type_values
+
+GEN_PATH = Path(__file__).parent
+
+COMMANDS_PATH = GEN_PATH / 'extended_commands.yaml'
+DEPRECATED_COMMANDS_PATH = GEN_PATH / 'deprecated_commands.yaml'
+CPP_INPUT_PATH = GEN_PATH / 'Caller.in.cpp'
+HEADER_INPUT_PATH = GEN_PATH / 'Caller.in.h'
+CPP_OUTPUT_PATH = GEN_PATH.parent / 'src' / 'Caller.cpp'
+HEADER_OUTPUT_PATH = GEN_PATH.parent / 'src' / 'Caller.h'
+
+INFER_HEADER_INPUT_PATH = GEN_PATH / 'inferAction.in.h'
+INFER_CPP_INPUT_PATH = GEN_PATH / 'inferAction.in.cpp'
+INFER_HEADER_OUTPUT_PATH = GEN_PATH.parent / 'src' / 'inferAction.h'
+INFER_CPP_OUTPUT_PATH = GEN_PATH.parent / 'src' / 'inferAction.cpp'
+
+
+def generate(
+        commands_path=COMMANDS_PATH,
+        cpp_input_path=CPP_INPUT_PATH,
+        header_input_path=HEADER_INPUT_PATH,
+        cpp_output_path=CPP_OUTPUT_PATH,
+        header_output_path=HEADER_OUTPUT_PATH,
+        infer_header_input_path=INFER_HEADER_INPUT_PATH,
+        infer_cpp_input_path=INFER_CPP_INPUT_PATH,
+        infer_header_output_path=INFER_HEADER_OUTPUT_PATH,
+        infer_cpp_output_path=INFER_CPP_OUTPUT_PATH,
+
+):
+    commands_config = yaml.unsafe_load(commands_path.open('r'))
+    deprecated_commands_config = yaml.unsafe_load(DEPRECATED_COMMANDS_PATH.open('r'))
+    type_dist, non_dist = check_infer(commands=commands_config)
+
+    codegen.open(cpp_output_path)
+    # write call function
+    codegen.write_opening(cpp_input_path)
+
+    # iterate over the commands and generate code for each
+    print(f"[X] found {len(commands_config)} commands")
+    print('[*] generating code for commands')
+    for command_name, command in commands_config.items():
+        if 'is_description' in command and command['is_description']:
+            continue
+        with function('std::string', 'Caller::' + command['function_alias'], [('int', 'action')]) as fn:
+            codegen.write_line('std::ostringstream os;')
+
+            # print help
+            codegen.write_line('// print help')
+            with if_block('action == slsDetectorDefs::HELP_ACTION'):
+                if command["help"].startswith('code:'):
+                    codegen.write_line(command["help"].strip('code:'))
+                else:
+                    codegen.write_line(f'os << "Command: {command_name}" << std::endl;')
+                    codegen.write_line(f'os << R"V0G0N({command["help"]} )V0G0N" << std::endl;')
+                    codegen.write_line('return os.str();')
+
+            # check if action and arguments are valid
+
+            codegen.write_line('// check if action and arguments are valid')
+            first = True
+            for action, action_params in command['actions'].items():
+
+                with if_block(f'action == {codegen.actions_dict[action]}', elseif=not first):
+
+                    check_argc = True
+                    for arg in action_params['args']:
+                        if arg['argc'] == -1:
+                            check_argc = False
+                            break
+                    # check number of arguments
+                    condition = "1" if check_argc else "0"
+
+                    if check_argc:
+                        for arg in action_params['args']:
+                            condition += f' && args.size() != {arg["argc"]}'
+
+                    with if_block(condition):
+                        codegen.write_line(f'throw RuntimeError("Wrong number of arguments for action {action}");')
+
+                    for arg in action_params['args']:
+                        if not check_argc:
+                            continue
+                        with if_block(f'args.size() == {arg["argc"]}'):
+                            # check argument types
+                            if 'extra_variables' in arg:
+                                for var in arg['extra_variables']:
+                                    codegen.write_line(f'{var["type"]} {var["name"]} = {var["value"]};')
+
+                            if 'separate_time_units' in arg and arg['separate_time_units']:
+                                codegen.write_line(f'try {{')
+                                # TODO: refactor this repeating code
+                                codegen.write_line(f'std::string tmp_time({arg["separate_time_units"]["input"]});')
+                                codegen.write_line(f'std::string {arg["separate_time_units"]["output"][1]}'
+                                                   f' = RemoveUnit(tmp_time);')
+                                codegen.write_line(f'auto {arg["separate_time_units"]["output"][0]} = '
+                                                   f'StringTo < time::ns > (tmp_time,'
+                                                   f' {arg["separate_time_units"]["output"][1]});')
+                                codegen.write_line(
+                                    f'}} catch (...) {{  throw RuntimeError("Could not convert argument to time::ns");}}')
+
+                            elif 'convert_to_time' in arg and arg['convert_to_time']:
+                                codegen.write_line(f'try {{')
+
+                                codegen.write_line(
+                                    f'StringTo < time::ns > ({", ".join(arg["convert_to_time"]["input"])});')
+                                codegen.write_line(
+                                    f'}} catch (...) {{  throw RuntimeError("Could not convert arguments to time::ns");}}')
+
+                            for i in range(len(arg['input'])):
+                                if not arg['cast_input'][i]:
+                                    continue
+                                codegen.write_line(f'try {{')
+                                codegen.write_line(f'StringTo<{arg["input_types"][i]}>({arg["input"][i]});')
+                                codegen.write_line(f'}} catch (...) {{')
+                                codegen.write_line(
+                                    f'  throw RuntimeError("Could not convert argument {i} to {arg["input_types"][i]}");')
+                                codegen.write_line(f'}}')
+                    first = False
+            with else_block():
+                codegen.write_line(
+                    f'throw RuntimeError("INTERNAL ERROR: Invalid action: supported actions are {list(command["actions"].keys())}");')
+
+            # generate code for each action
+            codegen.write_line('// generate code for each action')
+            for action, action_params in command['actions'].items():
+                if 'detectors' in action_params:
+                    codegen.write_line('auto detector_type = det->getDetectorType().squash();')
+
+                with if_block(f'action == {codegen.actions_dict[action]}'):
+                    if 'detectors' in action_params:
+                        first = True
+                        for detector, detector_params in action_params['detectors'].items():
+                            with if_block(f'detector_type == defs::{detector}', elseif=not first):
+                                codegen.write_arg(detector_params, action, command_name)
+
+                        else_block().__enter__()
+
+                    if not action_params:
+                        codegen.write_line(f'throw RuntimeError("detector not supported for action: {action}");')
+                    else:
+                        tmp_args = []
+                        if 'args' in action_params:
+                            tmp_args = action_params['args']
+                        codegen.write_arg(tmp_args, action, command_name)
+
+                    if 'detectors' in action_params:
+                        else_block().__exit__()
+
+            codegen.write_line('return os.str();')
+
+    # close sls namespace
+    codegen.write_closing()
+    codegen.close()
+    print('[X] .cpp code generated')
+    deprecated_commands = []
+    codegen.write_header(header_input_path, header_output_path, commands_config, deprecated_commands_config)
+    print('[X] header code generated')
+
+    
+    codegen.write_infer_header(infer_header_input_path, infer_header_output_path, commands_config) #TODO: add deprecated commands
+    print('[X] infer header code generated')
+    codegen.open(infer_cpp_output_path)
+
+    codegen.write_infer_cpp(infer_cpp_input_path, infer_cpp_output_path, commands_config, non_dist, type_dist)
+    codegen.close()
+    print('[X] infer cpp code generated')
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='generate c++ code for cli commands from the commands.yaml file',
+    )
+    parser.add_argument('-f', '--format', action='store_true', default=False, dest='format',
+                        help='format header and cpp file using clang-format')
+    parser.add_argument('-p', '--parse', action='store_true', default=False, dest='parse',
+                        help='parse the commands.yaml file into extended_commands.yaml')
+    parser.add_argument('-c', '--check', action='store_true', default=False, dest='check',
+                        help='check missing commands')
+    parser.add_argument('-g', '--generate', action='store_true', default=False, dest='generate', help='generate code (C++ or bash if -a is used)')
+    parser.add_argument('-a', '--autocomplete', action='store_true', default=False, dest='autocomplete',
+                        help='print bash autocomplete values')
+    cli_args = parser.parse_args()
+
+    if cli_args.autocomplete:
+        from autocomplete.autocomplete import generate_type_values, generate_bash_autocomplete
+        if cli_args.generate:
+            generate_bash_autocomplete()
+            print('[X] bash autocomplete generated')
+            generate_bash_autocomplete(
+                output_path=Path(__file__).parent / 'autocomplete' / 'zsh_autocomplete.sh',
+                input_path=Path(__file__).parent / 'autocomplete' / 'zsh_autocomplete.in.sh'
+            )
+            print('[X] zsh autocomplete generated')
+            exit(0)
+        else:
+            ret = generate_type_values()
+            print(ret)
+            exit(0)
+
+    if cli_args.check:
+        from commands_parser.commands_parser import command_parser
+
+        commands_config = yaml.unsafe_load(COMMANDS_PATH.open('r'))
+
+        # infer action based on number of arguments and types
+        type_dist, non_dist = check_infer(commands=commands_config)
+
+        command_parser.verify_format()
+        command_parser.parse_all_commands()
+        # generate list of commands found in sls_detector_get
+        glist_path = GEN_PATH / 'glist'
+        ret = subprocess.run([f"sls_detector_get list | tail -n +2 | sort > {glist_path.absolute()}"], shell=True,
+                             capture_output=True, check=True)
+        if ret.stderr != b'':
+            print('[!] glist generation failed and glist not found')
+            exit(1)
+
+        if not COMMANDS_PATH.exists():
+            print('[!] extended_commands.yaml not found')
+            exit(1)
+        detglist = set(command['command_name'] for __, command in commands_config.items())
+        detglist.add('free')
+        detglist.add('list')
+
+        g_path = GEN_PATH / 'glist'
+        if not g_path.exists():
+            print('[!] glist not found')
+            exit(1)
+        glist = set(g_path.read_text().split('\n'))
+        if "" in glist:
+            glist.remove("")
+        if "" in detglist:
+            detglist.remove("")
+
+        not_found = set()
+        for command in glist:
+            if command not in detglist:
+                not_found.add(command)
+        print()
+        if len(not_found) > 0:
+            print(f'[!] found {len(not_found)} missing')
+            print(f"not_found: {not_found}")
+        else:
+            print(f'[X] found no missing commands')
+
+        for command in detglist:
+            if command not in glist:
+                print(f'[!] command {command} found in commands.yaml but not found in g list')
+
+        exit(0)
+
+    if cli_args.parse:
+        from commands_parser.commands_parser import command_parser
+
+        command_parser.verify_format()
+        command_parser.parse_all_commands()
+
+    if cli_args.generate:
+        generate()
+
+    if cli_args.format:
+        files = [CPP_OUTPUT_PATH, HEADER_OUTPUT_PATH, INFER_HEADER_OUTPUT_PATH, INFER_CPP_OUTPUT_PATH]
+        for file in files:
+            os.system(f'clang-format -i  {file.absolute()}')
+            #os.system(f'clang-format -i  --style="{{Standard: C++11}}" {file.absolute()}')
+        print('[X] code formatted')

slsDetectorSoftware/generator/inferAction.in.cpp

@@ -0,0 +1,20 @@
+#include "inferAction.h"
+#include "sls/sls_detector_defs.h"
+namespace sls {
+
+int InferAction::infer(sls::CmdParser &parser, std::ostream &os) {
+    args = parser.arguments();
+    cmd = parser.command();
+    auto it = functions.find(parser.command());
+    if (it != functions.end()) {
+        return ((*this).*(it->second))();
+    } else {
+        throw RuntimeError(
+            "sls_detector not implemented for command: " + parser.command() +
+            ". Use sls_detector_get or sls_detector_put.");
+    }
+}
+
+// THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1) - DO NOT REMOVE
+
+} // namespace sls

slsDetectorSoftware/generator/inferAction.in.h

@@ -0,0 +1,30 @@
+#include "CmdParser.h"
+#include <iostream>
+#include <map>
+#include <vector>
+
+namespace sls {
+class InferAction {
+  public:
+    InferAction() {}
+    int infer(sls::CmdParser &parser, std::ostream &os = std::cout);
+    std::vector<std::string> args;
+    std::string cmd;
+
+    // generated functions
+    // THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (1) - DO NOT REMOVE
+    //     int frames();
+
+  private:
+    using FunctionMap = std::map<std::string, int (InferAction::*)()>;
+    FunctionMap functions{
+        // generated functions
+
+        // THIS COMMENT TO BE REPLACED BY THE ACTUAL CODE (2) - DO NOT REMOVE
+
+        //        {"frames",&InferAction::frames}
+
+    };
+};
+
+} // namespace sls

slsDetectorSoftware/generator/infer_action/check_infer.py

@@ -0,0 +1,64 @@
+from pathlib import Path
+
+import argparse
+import yaml
+
+
+def check_infer(EXTENDED_COMMANDS_PATH=Path(__file__).parent.parent / "extended_commands.yaml", commands=None):
+    if commands is None:
+        # load yaml file
+        with EXTENDED_COMMANDS_PATH.open('r') as f:
+            commands = yaml.safe_load(f)
+
+    type_distinguishable = {}
+    non_distinguishable = {}
+
+    for command_name, command in commands.items():
+        # todo: remove this (added for debug)
+        # if command_name != 'badchannels':
+        #     continue
+        if len(command["actions"]) == 1:
+            action = list(command["actions"].items())[0][1]
+            for arg in action['args']:
+                if arg['argc'] == -1:
+                    non_distinguishable[(command_name, arg['argc'])] = ([], arg['arg_types'])
+            continue
+
+
+        get_argcs = {}
+        get_args = command['actions']['GET']['args']
+        for arg in get_args:
+            if arg['argc'] != -1:
+                get_argcs[arg["argc"]] = arg['arg_types']
+            else:
+                non_distinguishable[(command_name, arg['argc'])] = ([], arg['arg_types'])
+        put_args = command['actions']['PUT']['args']
+        for arg in put_args:
+            if arg['argc'] == -1:
+                non_distinguishable[(command_name, arg['argc'])] = ([], arg['arg_types'])
+            elif arg['argc'] in get_argcs:
+                if arg['arg_types'] != get_argcs[arg['argc']]:
+                    type_distinguishable[(command_name, arg['argc'])] = (get_argcs[arg['argc']], arg['arg_types'])
+                else:
+                    non_distinguishable[(command_name, arg['argc'])] = (get_argcs[arg['argc']], arg['arg_types'])
+
+    return type_distinguishable, non_distinguishable
+
+
+if __name__ == "__main__":
+    argparse = argparse.ArgumentParser()
+    argparse.add_argument("--print", choices=['all', 'type', 'impossible'], default="all", help="command name")
+    args = argparse.parse_args()
+
+    type_distinguishable, non_distinguishable = check_infer()
+    if args.print == 'type' or args.print == 'all':
+        print("type distinguishable:")
+        print("command_name: argc get_arg_type put_arg_type\n")
+        for (command_name, argc), (get_arg_types, put_arg_types) in type_distinguishable.items():
+            print(f"{command_name}: {argc} {get_arg_types} {put_arg_types}")
+
+    if args.print == 'impossible' or args.print == 'all':
+        print("\n\nimpossible to distinguish:")
+        print("command_name: argc get_arg_type put_arg_type")
+        for (command_name, argc), (get_arg_types, put_arg_types) in non_distinguishable.items():
+            print(f"{command_name}: {argc} {get_arg_types} {put_arg_types}")

slsDetectorSoftware/generator/readme.md

@@ -0,0 +1,288 @@
+# Generator
+used to generate C++ cli commands. and bash autocompletion scripts.
+## Autocomplete
+
+### Overview
+
+Looks through the `dump.json` file for the different values of an enum and stores them in the dictionary `type_values`.  
+```sh
+# To print the different values for enums 
+python gen_commands.py -a
+```
+
+also the autocomplete.py generates shell autocompletion scripts for both bash and zsh. It uses the template file `bash_autocomplete.in.sh` and adds the necessary code in an output file `bash_autocomplete.sh` (same for zsh).  
+To use the bash autocompletion the   `bash_autocomplete.sh` must be sourced.
+
+```sh
+source bash_autocomplete.sh
+# g <Tab><Tab> will give the list of all commands
+# p 0:<Tab><Tab> will also give the list of all commands 
+# g exp<Tab> will autocomplete to g exptime
+# g exptime <Tab><Tab> will return "s ms us ns"
+# p timing <Tab><Tab> will return "auto,burst_trigger,gating..."
+```
+  
+**Note:**  
+The dump.json is the AST of the file `slsDetectorPackage/slsSupportLib/src/ToString.cpp`. 
+
+```sh
+# to generate the dump.json file
+cd slsSupportLib/src/ToString.cpp
+clang++ -Xclang -ast-dump=json -Xclang -ast-dump-filter -Xclang StringTo  -c ToString.cpp -I ../include/ -std=gnu++11
+# clang version used: 14.0.0-1ubuntu1.1
+```
+
+the `dump.json` file produced by clang is not a correct json file because we used the `-ast-dump-filter`. autocomplete.py can be used to fix the format of `dump.json` and produce a new file called `fixed.json` that is json format.
+```
+# to convert dump.json into correct json format. 
+python autocomplete.py -f # produces the file fixed.json
+``` 
+
+### Code components
+
+- `type_values` is a dictionary that contains the different values for commands args. It is populated with enum values that stard with defs:: or slsDetectorDefs:: (eg. defs::burstMode). Also it contains values added manually such as "mv,mV" and those start with special::
+- `generate_type_values` parses the AST file to find the part that contains if statements. and extracts the different possible values for an enum. 
+- `generate_bash_autocomplete` generates autocompletion scripts for bash or zsh. the difference between zsh and bash scripts can be found in the template files. (bash handles 0:<Tab><Tab> completion differently than zsh more details can be found in the comments of the template files )
+- `fix_json` fixes the file 'autocomplete/dump.json' and outputs a new corrected file in 'autocomplete/fixed.json'
+
+## Command Parser
+
+Definitely the most important component of all the generator module. 
+
+command_parser exist to keep the commands.yaml file concise and easy to read and produce a complete version of the commands.yaml for the code generator to work on. 
+
+The goal is that the code generator works on a version of commands.yaml that is easy to iterate over and generate code. 
+```
+# complete version
+some_command:
+    help: "do this"
+    infer_action: true
+    actions:
+        GET:
+            args:
+                - argc: 0
+                  function: "getCommand"
+                  ...
+                - argc: 1
+                  function: "getCommand"
+                  ...
+            detectors:
+                MYTHEN3:
+                    - argc: 0
+                      function: "getCommandMythen"
+                      ...
+        PUT:
+            args:
+                - argc: 2
+                  function: "setCommand"
+                  ...
+                - argc: 3
+                  function: "setCommand"
+                  ...
+    
+```
+
+the complete vesion can only have `args` or `detectors` field inside an action (GET or PUT). **Each element in the args array have a different argc**. and in each element in the args array we can find all the information needed to generate the code for that one argc case. for example in the code  `if(action == 'GET')` and `if (args.size() == 1)`  then we can generate the code for that one case independetly. 
+
+
+commands.yaml has a lot on ~inheritance~. examples show best what it is:
+
+> fields insides an action will be passed to args and detectors  
+
+> the extended args for default actions will be used for detectors 
+
+> any field can be overriden 
+
+```
+resetdacs:
+  help: "[(optional) hard] ..."
+  actions:
+    PUT:
+      function: resetToDefaultDacs
+      require_det_id: true
+      output: [ '"successful"' ]
+      input_types: [ bool ]
+      args:
+        - argc: 1
+          arg_types: [ special::hard ]
+          input: [ '"1"' ]
+        - argc: 0
+          input: [ '"0"' ]
+
+# this will be converted to 
+
+resetdacs:
+  actions:
+    PUT:
+      args:
+      - arg_types:
+        - special::hard
+        argc: 1
+        cast_input:
+        - false
+        check_det_id: false
+        convert_det_id: true
+        function: resetToDefaultDacs
+        input:
+        - '"1"'
+        input_types:
+        - bool
+        output:
+        - '"successful"'
+        require_det_id: true
+        store_result_in_t: false
+      - arg_types: []
+        argc: 0
+        cast_input:
+        - false
+        check_det_id: false
+        convert_det_id: true
+        function: resetToDefaultDacs
+        input:
+        - '"0"'
+        input_types:
+        - bool
+        output:
+        - '"successful"'
+        require_det_id: true
+        store_result_in_t: false
+  command_name: resetdacs
+  function_alias: resetdacs
+  help: "[(optional) hard] ..."
+  infer_action: true
+
+```
+
+command_parser does not have a specific schema for the commands.yaml this is by design so it can be very extensible and future-proof. This also can have problems when there is typos (writing intput instead of input...)
+
+command_parser first verifies the commands.yaml and checks if there's some obvious problems in it. 
+
+templates found in commands.yaml were taken from the CmdProxy code they were added for debugging purposes when writing the generator. 
+
+
+tricky things:
+--
+- if input array has n elements and cast_input array is empty. command_parser will fill it with n false values.
+- store_result_in_t will be added by default as true to GET action. but as false to PUT action. (unless it is written in the action)
+- infer_action by default is true
+- commands that have is_description true won't be verified 
+- function_alias is the name of the function in the c++ code. by default it is the command name. errors came up with the command virtual as virtual is a reserved keyword in c++
+- command_name is the string of the command that will be typed in cli. (frames, exptime, ...). by default it is the command name. pattern is a special keyword in yaml. problems came up with the command pattern
+- arg_types is by default input_types unless otherwise specified
+- when the parent has specific detector behaviour and the child does not. writing an empty detector section in the action would not inherit any detector specific fields (check exptime1)
+- commands can inherit other commands (check exptime1 and exptime2)
+- argc: -1 means that the command has an unknown number of arguments
+
+
+### Code Walkthrough
+the code is well commented it is well explained in the script
+
+### Tests
+tests for command_parser can be found in `generator/tests/command_parser/` 
+```
+pip install -r requirements.txt
+python -m pytests
+```
+
+verification is not well tested 
+
+
+
+## codegen
+
+Now for C++ code generation. After parsing the commands.yaml file and producing the extended_commands.yaml `gen_commands.py` will iterate over the commands and generate `Caller.h`, `Caller.cpp`, `inferAction.cpp` and `inferAction.h` .  
+
+### infer action
+
+the generated code will produce 5 new targets: "sls_detector_get sls_detector_put sls_detector_acquire sls_detector_help sls_detector"
+
+`sls_detector_get` will set the action as GET  
+`sls_detector_put` will the action as PUT
+
+`sls_detector` will guess the action depending on the number of arguments
+
+the codegen module will generate a function for every command that will return the action based on the number of arguments
+
+```cpp
+int InferAction::activate() {
+
+  if (args.size() == 0) {
+    return slsDetectorDefs::GET_ACTION;
+  }
+
+  if (args.size() == 1) {
+    return slsDetectorDefs::PUT_ACTION;
+  } else {
+
+    throw RuntimeError("Could not infer action: Wrong number of arguments");
+  }
+}
+```
+
+the `inferAction` class will be called from  `CmdApp.cpp` to infer the action and the command function will be called with the appropriate action.
+
+some commands have the same number of argument count for both get and put. These commands can be found using the the `check_infer.py` script. in the generated code it will say that "sls_detector is disabled"
+```bash
+# to see these commands
+python infer_action/check_infer.py 
+```
+
+### Caller.cpp code
+
+in this level we only use the extended_commands.yaml file. 
+the `generate()` function in `gen_commands.py` will iterate over all of the commands and :
+- write the function signature
+- write the help
+- write c++ code to check the inputs: check argument count and check if we are able to convert the arguments into the required types
+- iterate over actions and arguments
+- iterate over the detectors and write code for each one of them (if mythen3 ... if eiger ... else default code... ) and call `codegen.write_arg()` to write the argument for a single argument 
+
+codegen.write_arg()
+-
+write_arg in codegen reads the argument fields and generate c++ code accordingly.
+
+## fields explanations
+- arg_types:[array of types] it is only used for autocompletion no C++ code is dependent on it
+- is_description:[boolean] same as above
+- template:[boolean] only used in commands.yaml and it won't present in extended_commands.yaml. it is inspired by the CmdProxy.h code 
+- help:[string] command help
+- input:[array of variable names] the input arguments that will be passed to the function
+- input_types:[array of types] the types of the input arguments given to the function
+- cast_input:[array of boolean] if true it will cast the corresponding input to the type in input_types
+- output:[array] outputs that will be printed (eg. ["123", "'a'"] will be os<<123<<'a')
+- function: the function that will be called
+- function_alias: the name of the function in the c++ code (more on it in tricky things)
+- command_name: the string of the command that will be typed in cli.  (more on it in tricky things)
+- require_det_id: if true it will require a detector id to be passed as the last argument
+- check_det_id: if true it will check the detector id and throw an error if it is not valid
+- convert_det_id: if true it will convert the detector id to the correct type `std::vector<int>{ det_id }`
+- store_result_in_t: if true it will store the result of the function in the variable t (more on it in tricky things)
+- infer_action: if true it will infer the action (only if sls_detector is used)
+- detectors: the detectors that have specific behaviour
+- args: the arguments of the command
+- argc: the number of arguments
+- extra_variables[array]: each element takes three parameters: value, name, type and creates that variable in the beginning of the argument code
+- exceptions[array]: each element takes two parameters: condition, message
+- pattern_command: takes three arguments: nGetArgs, nPutArgs and command_name and it will write this code
+  ```cpp
+  int level = -1, iArg = 0, nGetArgs = $nGetArgs$, nPutArgs = $nPutArgs$;
+  GetLevelAndUpdateArgIndex(action, $command_name$, level, iArg, nGetArgs,nPutArgs);
+  ```
+- separate_time_units: takes three parameters: input, output[0], output[1] each one is a variable name
+  ```cpp
+  std::string tmp_time($input$);
+  std::string $output[1]$ = RemoveUnit(tmp_time);
+  auto $output[0]$ = StringTo<time::ns>(tmp_time, $output[1]$);
+  ```
+- convert_to_time: takes three parameters: input[0], input[1], output
+  ```cpp
+  auto output = StringTo<time::ns>(input[0], input[1]);
+  ```
+- ctb_output_list: **maybe it should be removed?** takes 5 parameters: GETFCNLIST, GETFCNNAME, GETFCN, suffix, printable_name
+
+
+
+
+
+
+

slsDetectorSoftware/generator/requirements.txt

@@ -0,0 +1,6 @@
+coverage==7.3.1
+iniconfig==2.0.0
+packaging==23.1
+pluggy==1.3.0
+pytest==7.4.2
+PyYAML==6.0.1

slsDetectorSoftware/generator/tests/command_parser/data/basic.yaml

@@ -0,0 +1,16 @@
+basic:
+  infer_action: false
+  help: "xx11"
+  actions:
+    GET:
+      function: 'func1'
+      output: [ OutString(t) ]
+      args:
+        - argc: 0
+    PUT:
+      function: 'func2'
+      output: [ 'args.front()' ]
+      input: [ 'args[0]' ]
+      input_types: [ int ]
+      cast_input: [ true ]
+      argc: 1

slsDetectorSoftware/generator/tests/command_parser/data/basic_inheritance.yaml

@@ -0,0 +1,66 @@
+---
+template:
+  infer_action: false
+  help: ""
+  actions:
+    GET:
+      function: 'func1'
+      args:
+        - argc: 0
+          output: [ OutString(t) ]
+    PUT:
+      function: 'func2'
+      output: [ 'args.front()' ]
+      input: [ 'args[0]' ]
+      input_types: [ int ]
+      cast_input: [ true ]
+      argc: 1
+
+basic:
+  help: "xx11"
+  inherit_actions: template
+  actions:
+    GET:
+      function: 'x'
+      argc: 2
+      args:
+        - check_det_id: true
+
+
+template2:
+  infer_action: false
+  template: true
+  help: ""
+  actions:
+    GET:
+      convert_to_time:
+        input: [ 'args[0]', 'args[1]' ]
+        output: converted_time
+      separate_time_units:
+        input: 'args[0]'
+        output: [ converted_time, unit ]
+      function: 'func1'
+      output: [ OutString(t) ]
+      args:
+        - argc: 0
+        - argc: 99
+    PUT:
+      function: funcTemplatePUT
+      args:
+        - argc: 19
+          function: 'func19'
+        - argc: 91
+
+basic2:
+  inherit_actions: template2
+  actions:
+    GET:
+      function: 'x'
+      argc: 2
+      args:
+        - check_det_id: true
+          input: [ 'args[0]', a,b,c ]
+          input_types: [ int, int, int, int ]
+    PUT:
+      function: 'y'
+

slsDetectorSoftware/generator/tests/command_parser/data/detectors.yaml

@@ -0,0 +1,208 @@
+basic:
+  infer_action: false
+  help: "xx11"
+  actions:
+    GET:
+      function: 'func1'
+      output: [ OutString(t) ]
+      args:
+        - argc: 0
+        - argc : 1
+          output: [ testytest ]
+      detectors:
+        MYTHEN3:
+          function: 'do_mythen3'
+        CHIPTESTBOARD:
+          args:
+            - argc: 55
+              output: [ ctbOutput ]
+    PUT:
+      detectors:
+        EIGER:
+          function: 'do_eiger'
+          argc: 99
+          output: [ eigerOutput ]
+
+
+# classes of tests:
+# classes of template tests: has args or has detectors => 4 cases noted (0,0) ... (1,1)
+# classes of childs: has args or has detectors => 4 cases noted (0,0) ... (1,1)
+# => 16 cases
+# example: case_0111: template (0,1) and child (1,1)
+#################### exhaustive testing over chosen classes of tests
+
+template_01:
+  infer_action: true
+  help: "vv12"
+  template: true
+
+  actions:
+    GET:
+      detectors:
+        MYTHEN3:
+          function: 'do_mythen3'
+          argc: 99
+        CHIPTESTBOARD:
+          function: 'do_ctb'
+          argc: 98
+
+case_0100:
+  inherit_actions: template_01
+  help: "0100"
+
+case_0101:
+  inherit_actions: template_01
+  help: "0101"
+  actions:
+      GET:
+        function: 'get_function'
+        detectors:
+            MYTHEN3:
+              function: 'do_mythen23'
+              argc: 420
+
+case_0110:
+  inherit_actions: template_01
+  help: "0110"
+  actions:
+      GET:
+        argc: 111
+        function: 'get_function'
+
+case_0110v2:
+  inherit_actions: template_01
+  help: "0110v2"
+  actions:
+      GET:
+        args:
+            - argc: 111
+              function: 'get_function'
+
+
+case_0111:
+  inherit_actions: template_01
+  help: "0111"
+  actions:
+      GET:
+        args:
+            - argc: 111
+              function: 'get_function'
+        detectors:
+          MYTHEN3:
+            function: 'do_mythen23'
+            argc: 420
+
+##### cases 10** tests
+template_10:
+  template: true
+  actions:
+    GET:
+      args:
+        - argc: 0
+        - argc : 1
+          output: [ testytest ]
+
+case_1000:
+  inherit_actions: template_10
+  help: "1000"
+
+case_1001:
+  inherit_actions: template_10
+  help: "1001"
+  actions:
+    GET:
+      detectors:
+        MYTHEN3:
+          args:
+            - function: 'do_mythen23'
+              argc: 420
+            - function: 'do_mythen3'
+              argc: 99
+
+
+
+case_1010:
+  inherit_actions: template_10
+  help: "1010"
+  actions:
+    GET:
+      args:
+        - argc: 111
+          function: 'get_function'
+
+case_1011:
+  inherit_actions: template_10
+  help: "1011"
+  actions:
+      GET:
+        args:
+            - argc: 111
+              function: 'get_function'
+        detectors:
+          MYTHEN3:
+            function: 'do_mythen23'
+
+##### cases 11** tests
+template_11:
+    template: true
+    actions:
+        GET:
+          args:
+              - argc: 0
+              - argc : 1
+                output: [ testytest ]
+          detectors:
+              EIGER:
+                function: 'do_eiger'
+                args:
+                    - argc: 99
+                      output: [ eigerOutput ]
+              POTATO:
+                function: 'do_potato'
+
+
+case_1100:
+    inherit_actions: template_11
+    help: "1100"
+
+case_1101:
+    inherit_actions: template_11
+    help: "1101"
+    actions:
+        GET:
+          detectors:
+              MYTHEN3:
+                function: 'do_mythen3'
+              POTATO:
+                function: 'do_potato'
+                args:
+                    - argc: 101
+                      function: 'potato_function'
+                    - argc: 202
+
+case_1110:
+    inherit_actions: template_11
+    help: "1110"
+    actions:
+        GET:
+          argc: 77
+          function: 'get_function'
+
+
+
+case_1111:
+    inherit_actions: template_11
+    help: "1111"
+    actions:
+        GET:
+          argc: 77
+          function: 'get_function'
+          detectors:
+              MYTHEN3:
+                function: 'do_mythen3'
+              POTATO:
+                function: 'do_potato'
+                args:
+                    - argc: 101
+                      function: 'potato_function'
+                    - argc: 202

slsDetectorSoftware/generator/tests/command_parser/functional_tests/test_commands_parser_basic.py

@@ -0,0 +1,101 @@
+from pathlib import Path
+
+import yaml
+
+from commands_parser.commands_parser import CommandParser
+
+data_path = Path(__file__).parent.parent / "data"
+
+
+def test_basic_propagation(tmp_path):
+    output_file = tmp_path / "basic.yaml"
+    command_parser = CommandParser(commands_file=data_path / "basic.yaml", output_file=output_file)
+    command_parser.verify_format()
+    command_parser.parse_all_commands()
+
+    assert output_file.exists()
+    command = yaml.unsafe_load(output_file.open('r'))['basic']
+    assert command['help'] == "xx11"
+    assert len(command['actions']) == 2
+    # test 'GET' action
+    assert 'args' in command['actions']['GET']
+    assert len(command['actions']['GET'].keys()) == 1  # only 'args' key
+    assert len(command['actions']['GET']['args']) == 1  # only one argument
+    assert command['actions']['GET']['args'][0]['argc'] == 0
+    assert command['actions']['GET']['args'][0]['function'] == 'func1'
+    assert command['actions']['GET']['args'][0]['output'] == ['OutString(t)']
+    assert command['actions']['GET']['args'][0]['input'] == []
+    assert command['actions']['GET']['args'][0]['cast_input'] == []
+    assert command['actions']['GET']['args'][0]['require_det_id'] is False
+    # test PUT action
+    assert 'args' in command['actions']['PUT']
+    assert len(command['actions']['PUT'].keys()) == 1  # only 'args' key
+    assert len(command['actions']['PUT']['args']) == 1  # only one argument
+    assert command['actions']['PUT']['args'][0]['argc'] == 1
+    assert command['actions']['PUT']['args'][0]['function'] == 'func2'
+    assert command['actions']['PUT']['args'][0]['cast_input'] == [True]
+    assert command['actions']['PUT']['args'][0]['output'] == ['args.front()']
+    assert command['actions']['PUT']['args'][0]['input_types'] == ['int']
+    assert command['actions']['PUT']['args'][0]['require_det_id'] is False
+
+
+def test_basic_inheritance(tmp_path):
+    output_file = tmp_path / "basic_inheritance.yaml"
+    command_parser = CommandParser(commands_file=data_path / "basic_inheritance.yaml", output_file=output_file)
+    command_parser.verify_format()
+    command_parser.parse_all_commands()
+    assert output_file.exists()
+    command = yaml.unsafe_load(output_file.open('r'))['basic']
+    assert command['help'] == "xx11"
+    assert command['actions'].keys() == {'GET', 'PUT'}
+    # test 'GET' action
+    assert 'args' in command['actions']['GET']
+    assert command['actions']['GET'].keys() == {'args'}  # only 'args' key
+    assert len(command['actions']['GET']['args']) == 1  # only one argument
+    assert command['actions']['GET']['args'][0]['argc'] == 2
+    assert command['actions']['GET']['args'][0]['function'] == 'x'
+    assert command['actions']['GET']['args'][0]['output'] == []  # test overwriting args when they are present in child
+    assert command['actions']['GET']['args'][0]['input'] == []
+    assert command['actions']['GET']['args'][0]['cast_input'] == []
+    assert command['actions']['GET']['args'][0]['require_det_id'] is False
+    # test PUT action
+    assert 'args' in command['actions']['PUT']
+    assert command['actions']['PUT'].keys() == {'args'}  # only 'args' key
+    assert len(command['actions']['PUT']['args']) == 1  # only one argument
+    assert command['actions']['PUT']['args'][0]['argc'] == 1
+    assert command['actions']['PUT']['args'][0]['function'] == 'func2'
+    assert command['actions']['PUT']['args'][0]['cast_input'] == [True]
+    assert command['actions']['PUT']['args'][0]['output'] == ['args.front()']
+    assert command['actions']['PUT']['args'][0]['input_types'] == ['int']
+    assert command['actions']['PUT']['args'][0]['require_det_id'] is False
+
+
+def test_basic_inheritance2(tmp_path):
+    output_file = tmp_path / "basic_inheritance.yaml"
+    command_parser = CommandParser(commands_file=data_path / "basic_inheritance.yaml", output_file=output_file)
+    command_parser.verify_format()
+    command_parser.parse_all_commands()
+    assert output_file.exists()
+    command = yaml.unsafe_load(output_file.open('r'))['basic2']
+    # check GET
+    assert len(command['actions']['GET']['args']) == 1
+    assert command['actions']['GET'].keys() == {'args'}
+    arg = command['actions']['GET']['args'][0]
+    assert arg['argc'] == 2
+    assert arg['output'] == ['OutString(t)']
+    # check that length of cast input is equal to length of input_types and input
+    assert len(arg['input']) == len(arg['input_types']) == len(arg['cast_input']) == 4
+    assert arg['function'] == 'x'
+    assert 'convert_to_time' in arg
+    assert arg['convert_to_time'].keys() == {'input', 'output'}
+    assert 'separate_time_units' in arg
+    assert arg['separate_time_units'].keys() == {'input', 'output'}
+
+    # check PUT
+    assert command['actions']['PUT'].keys() == {'args'}
+    assert len(command['actions']['PUT']['args']) == 2
+    assert command['actions']['PUT']['args'][0]['argc'] == 19
+    assert command['actions']['PUT']['args'][0]['function'] == 'y'
+    assert command['actions']['PUT']['args'][1]['argc'] == 91
+    assert command['actions']['PUT']['args'][1]['function'] == 'y'
+

slsDetectorSoftware/generator/tests/command_parser/functional_tests/test_commands_parser_detector.py

@@ -0,0 +1,309 @@
+import json
+from pathlib import Path
+
+import pytest as pytest
+import yaml
+
+from commands_parser.commands_parser import CommandParser
+
+data_path = Path(__file__).parent.parent / "data"
+
+
+@pytest.fixture()
+def detector_file_commands(tmp_path):
+    output_file = tmp_path / "detectors.yaml"
+    command_parser = CommandParser(commands_file=data_path / "detectors.yaml", output_file=output_file)
+    command_parser.verify_format()
+
+    def func(command):
+        return command_parser.parse_command(command)
+
+    return func
+
+
+def test_basic_propagation(tmp_path, detector_file_commands):
+    command = detector_file_commands('basic')
+
+    assert command['help'] == "xx11"
+
+    # GET
+    assert command['actions']['GET'].keys() == {'detectors', 'args'}
+    assert command['actions']['GET']['detectors'].keys() == {'MYTHEN3', 'CHIPTESTBOARD'}
+    mythen = command['actions']['GET']['detectors']['MYTHEN3']
+    assert len(mythen) == 2
+    assert mythen[0]['argc'] == 0
+    assert mythen[1]['argc'] == 1
+    assert mythen[0]['function'] == mythen[1]['function'] == 'do_mythen3'
+    assert mythen[0]['output'] == ['OutString(t)']
+    assert mythen[1]['output'] == ['testytest']
+
+    ctb = command['actions']['GET']['detectors']['CHIPTESTBOARD']
+    assert len(ctb) == 1
+    assert ctb[0]['argc'] == 55
+    assert ctb[0]['function'] == 'func1'
+
+    # PUT
+    assert command['actions']['PUT'].keys() == {'detectors'}
+    assert command['actions']['PUT']['detectors'].keys() == {'EIGER'}
+    eiger = command['actions']['PUT']['detectors']['EIGER']
+    assert len(eiger) == 1
+    assert eiger[0]['argc'] == 99
+    assert eiger[0]['function'] == 'do_eiger'
+    assert eiger[0]['output'] == ['eigerOutput']
+
+# 16 test cases for inheritance
+# 1st bit: parent has args
+# 2nd bit: parent has detectors
+# 3rd bit: child has args
+# 4th bit: child has detectors
+# each test case is a combination of the above bits
+# all the possible combinations are tested 
+
+def test_inheritance_0100(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_0100')
+    assert command['help'] == "0100"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'detectors'}
+    assert command['actions']['GET']['detectors'].keys() == {'MYTHEN3', 'CHIPTESTBOARD'}
+    mythen = command['actions']['GET']['detectors']['MYTHEN3']
+    assert len(mythen) == 1
+    assert mythen[0]['argc'] == 99
+    assert mythen[0]['function'] == 'do_mythen3'
+
+
+def test_inheritance_0101(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_0101')
+    assert command['help'] == "0101"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'detectors'}
+    assert command['actions']['GET']['detectors'].keys() == {'MYTHEN3', 'CHIPTESTBOARD'}
+    mythen = command['actions']['GET']['detectors']['MYTHEN3']
+    assert len(mythen) == 1
+    assert mythen[0]['argc'] == 420
+    assert mythen[0]['function'] == 'do_mythen23'
+    ctb = command['actions']['GET']['detectors']['CHIPTESTBOARD']
+    assert len(ctb) == 1
+    assert ctb[0]['argc'] == 98
+    assert ctb[0]['function'] == 'do_ctb'
+
+
+def test_inheritance_0110(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_0110')
+    assert command['help'] == "0110"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert command['actions']['GET']['args'][0]['argc'] == 111
+    mythen = command['actions']['GET']['detectors']['MYTHEN3']
+    assert len(mythen) == 1
+    assert mythen[0]['argc'] == 99
+    assert mythen[0]['function'] == 'do_mythen3'
+    ctb = command['actions']['GET']['detectors']['CHIPTESTBOARD']
+    assert len(ctb) == 1
+    assert ctb[0]['argc'] == 98
+    assert ctb[0]['function'] == 'do_ctb'
+
+
+def test_inheritance_0110v2(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_0110v2')
+    assert command['help'] == "0110v2"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert command['actions']['GET']['args'][0]['argc'] == 111
+    mythen = command['actions']['GET']['detectors']['MYTHEN3']
+    assert len(mythen) == 1
+    assert mythen[0]['argc'] == 99
+    assert mythen[0]['function'] == 'do_mythen3'
+    ctb = command['actions']['GET']['detectors']['CHIPTESTBOARD']
+    assert len(ctb) == 1
+    assert ctb[0]['argc'] == 98
+    assert ctb[0]['function'] == 'do_ctb'
+
+
+def test_inheritacnce_0111(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_0111')
+    assert command['help'] == "0111"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert command['actions']['GET']['detectors'].keys() == {'MYTHEN3', 'CHIPTESTBOARD'}
+    mythen = command['actions']['GET']['detectors']['MYTHEN3']
+    assert len(mythen) == 1
+    assert command['actions']['GET']['args'][0]['argc'] == 111
+    assert len(mythen) == 1
+    assert mythen[0]['argc'] == 420
+    assert mythen[0]['function'] == 'do_mythen23'
+    ctb = command['actions']['GET']['detectors']['CHIPTESTBOARD']
+    assert len(ctb) == 1
+    assert ctb[0]['argc'] == 98
+    assert ctb[0]['function'] == 'do_ctb'
+
+
+# cases 1000, 1001, 1010, 1011
+def test_inheritance_1000(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1000')
+    assert command['help'] == "1000"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args'}
+    assert len(command['actions']['GET']['args']) == 2
+    assert command['actions']['GET']['args'][0]['argc'] == 0
+    assert command['actions']['GET']['args'][0]['output'] == []
+
+    assert command['actions']['GET']['args'][1]['argc'] == 1
+    assert command['actions']['GET']['args'][1]['output'] == ['testytest']
+
+
+def test_inheritance_1001(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1001')
+    assert command['help'] == "1001"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert len(command['actions']['GET']['args']) == 2
+    assert command['actions']['GET']['args'][0]['argc'] == 0
+    assert command['actions']['GET']['args'][0]['output'] == []
+    assert command['actions']['GET']['args'][1]['argc'] == 1
+    assert command['actions']['GET']['args'][1]['output'] == ['testytest']
+
+    assert command['actions']['GET']['detectors'].keys() == {'MYTHEN3'}
+    assert len(command['actions']['GET']['detectors']['MYTHEN3']) == 2
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['argc'] == 420
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['function'] == 'do_mythen23'
+    assert command['actions']['GET']['detectors']['MYTHEN3'][1]['argc'] == 99
+    assert command['actions']['GET']['detectors']['MYTHEN3'][1]['function'] == 'do_mythen3'
+
+
+def test_inheritance_1010(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1010')
+    assert command['help'] == "1010"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args'}
+    assert len(command['actions']['GET']['args']) == 1
+    assert command['actions']['GET']['args'][0]['argc'] == 111
+    assert command['actions']['GET']['args'][0]['function'] == 'get_function'
+
+
+def test_inheritance_1011(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1011')
+    assert command['help'] == "1011"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert len(command['actions']['GET']['args']) == 1
+    assert command['actions']['GET']['args'][0]['argc'] == 111
+    assert command['actions']['GET']['args'][0]['function'] == 'get_function'
+
+    assert command['actions']['GET']['detectors'].keys() == {'MYTHEN3'}
+    assert len(command['actions']['GET']['detectors']['MYTHEN3']) == 1
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['argc'] == 111
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['function'] == 'do_mythen23'
+
+
+# cases 1100, 1101, 1110, 1111
+
+def test_inheritance_1100(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1100')
+    assert command['help'] == "1100"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert len(command['actions']['GET']['args']) == 2
+    assert command['actions']['GET']['args'][0]['argc'] == 0
+    assert command['actions']['GET']['args'][0]['output'] == []
+
+    assert command['actions']['GET']['args'][1]['argc'] == 1
+    assert command['actions']['GET']['args'][1]['output'] == ['testytest']
+
+    assert command['actions']['GET']['detectors'].keys() == {'EIGER', 'POTATO'}
+    assert len(command['actions']['GET']['detectors']['EIGER']) == 1
+    assert command['actions']['GET']['detectors']['EIGER'][0]['argc'] == 99
+    assert command['actions']['GET']['detectors']['EIGER'][0]['function'] == 'do_eiger'
+    assert command['actions']['GET']['detectors']['EIGER'][0]['output'] == ['eigerOutput']
+
+    assert len(command['actions']['GET']['detectors']['POTATO']) == 2
+    assert command['actions']['GET']['detectors']['POTATO'][0]['argc'] == 0
+    assert command['actions']['GET']['detectors']['POTATO'][0]['function'] == 'do_potato'
+
+
+def test_inheritance_1101(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1101')
+    assert command['help'] == "1101"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert len(command['actions']['GET']['args']) == 2
+    assert command['actions']['GET']['args'][0]['argc'] == 0
+    assert command['actions']['GET']['args'][0]['output'] == []
+    assert command['actions']['GET']['args'][1]['argc'] == 1
+    assert command['actions']['GET']['args'][1]['output'] == ['testytest']
+
+    assert command['actions']['GET']['detectors'].keys() == {'EIGER', 'MYTHEN3', 'POTATO'}
+    assert len(command['actions']['GET']['detectors']['MYTHEN3']) == 2
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['argc'] == 0
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['function'] == 'do_mythen3'
+    assert command['actions']['GET']['detectors']['MYTHEN3'][1]['argc'] == 1
+    assert command['actions']['GET']['detectors']['MYTHEN3'][1]['function'] == 'do_mythen3'
+
+    assert len(command['actions']['GET']['detectors']['EIGER']) == 1
+    assert command['actions']['GET']['detectors']['EIGER'][0]['argc'] == 99
+    assert command['actions']['GET']['detectors']['EIGER'][0]['function'] == 'do_eiger'
+    assert command['actions']['GET']['detectors']['EIGER'][0]['output'] == ['eigerOutput']
+
+    assert len(command['actions']['GET']['detectors']['POTATO']) == 2
+    assert command['actions']['GET']['detectors']['POTATO'][0]['argc'] == 101
+    assert command['actions']['GET']['detectors']['POTATO'][0]['function'] == 'potato_function'
+    assert command['actions']['GET']['detectors']['POTATO'][1]['argc'] == 202
+    assert command['actions']['GET']['detectors']['POTATO'][1]['function'] == 'do_potato'
+
+
+def test_inheritance_1110(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1110')
+    assert command['help'] == "1110"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert len(command['actions']['GET']['args']) == 1
+    assert command['actions']['GET']['args'][0]['argc'] == 77
+    assert command['actions']['GET']['args'][0]['function'] == 'get_function'
+
+    assert command['actions']['GET']['detectors'].keys() == {'EIGER', 'POTATO'}
+    assert len(command['actions']['GET']['detectors']['EIGER']) == 1
+    assert command['actions']['GET']['detectors']['EIGER'][0]['argc'] == 99
+    assert command['actions']['GET']['detectors']['EIGER'][0]['function'] == 'do_eiger'
+
+    assert len(command['actions']['GET']['detectors']['POTATO']) == 2
+    assert command['actions']['GET']['detectors']['POTATO'][0]['argc'] == 0
+    assert command['actions']['GET']['detectors']['POTATO'][0]['function'] == 'do_potato'
+    assert command['actions']['GET']['detectors']['POTATO'][1]['argc'] == 1
+    assert command['actions']['GET']['detectors']['POTATO'][1]['function'] == 'do_potato'
+
+
+def test_inheritance_1111(tmp_path, detector_file_commands):
+    command = detector_file_commands('case_1111')
+    assert command['help'] == "1111"
+    assert 'actions' in command
+    assert command['actions'].keys() == {'GET'}
+    assert command['actions']['GET'].keys() == {'args', 'detectors'}
+    assert len(command['actions']['GET']['args']) == 1
+    assert command['actions']['GET']['args'][0]['argc'] == 77
+    assert command['actions']['GET']['args'][0]['function'] == 'get_function'
+
+    assert command['actions']['GET']['detectors'].keys() == {'EIGER', 'MYTHEN3', 'POTATO'}
+    assert len(command['actions']['GET']['detectors']['MYTHEN3']) == 1
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['argc'] == 77
+    assert command['actions']['GET']['detectors']['MYTHEN3'][0]['function'] == 'do_mythen3'
+
+    assert len(command['actions']['GET']['detectors']['EIGER']) == 1
+    assert command['actions']['GET']['detectors']['EIGER'][0]['argc'] == 99
+    assert command['actions']['GET']['detectors']['EIGER'][0]['function'] == 'do_eiger'
+
+    assert len(command['actions']['GET']['detectors']['POTATO']) == 2
+    assert command['actions']['GET']['detectors']['POTATO'][0]['argc'] == 101
+    assert command['actions']['GET']['detectors']['POTATO'][0]['function'] == 'potato_function'
+    assert command['actions']['GET']['detectors']['POTATO'][1]['argc'] == 202
+    assert command['actions']['GET']['detectors']['POTATO'][1]['function'] == 'do_potato'

slsDetectorSoftware/generator/tests/test_parse_and_generate.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+from commands_parser.commands_parser import CommandParser
+import gen_commands
+
+data_path = Path(__file__).parent.parent
+
+
+def test_parse_and_generate(tmp_path):
+    """
+    tests that the parse and generate functions work without errors
+    :param tmp_path:
+    :return:
+    """
+    output_file = tmp_path / "detectors.yaml"
+    command_parser = CommandParser(commands_file=data_path / "commands.yaml", output_file=output_file)
+    command_parser.verify_format()
+    command_parser.parse_all_commands()
+    assert output_file.exists()
+
+    GEN_PATH = Path(__file__).parent.parent
+    gen_commands.generate(
+        output_file,
+        GEN_PATH / "Caller.in.cpp",
+        GEN_PATH / "Caller.in.h",
+        tmp_path / "Caller.cpp",
+        tmp_path / "Caller.h",
+    )
+    assert (tmp_path / "Caller.cpp").exists()
+    assert (tmp_path / "Caller.h").exists()

slsDetectorSoftware/generator/very_special_functions.txt

@@ -0,0 +1,28 @@
+hostname (find +)
+acquire
+versions (maybe with few tweaks)
+threshold (+++++)
+trimen (maybe with few tweaks)
+badchannels (somewhat special)
+currentsource (special)
+dacvalues (can be done with the ctb_output_list)
+udp_srcip (could be done if I add condition functionality for logging)
+udp_srcip2 (same as above)
+udp_dstip (same as above)
+udp_dstip2
+rx_hostname (split('+'))
+rx_roi (can be done if there;s condition support?)
+ratecorr (can be done if there's condition support?)
+burstmode (very special)
+vetostream
+counters
+gaincaps (has for loop and condition)
+samples (ask Dhanya if it is okay to change the order of calling the ctb functions in PUT)
+slowadc (has for loop)
+rx_dbitlist (very special)
+rx_jsonaddheader (very special)
+execcommand (has for loop)
+thresholdnotb
+# notes
+# ReceiverStatus error on put is not done
+# ask about burstmode function

slsDetectorSoftware/include/sls/Detector.h

@@ -71,7 +71,6 @@ class Detector {
     /** Gets shared memory ID */
     int getShmId() const;
 
-    /** package git branch */
     std::string getPackageVersion() const;
 
     std::string getClientVersion() const;
@@ -99,7 +98,7 @@ class Detector {
     Result<std::string> getReceiverVersion(Positions pos = {}) const;
 
     /** Options: EIGER, JUNGFRAU, GOTTHARD, MOENCH, MYTHEN3, GOTTHARD2,
-     * CHIPTESTBOARD */
+     * CHIPTESTBOARD, XILINX_CHIPTESTBOARD */
     Result<defs::detectorType> getDetectorType(Positions pos = {}) const;
 
     /** Gets the total number of modules in shared memory */
@@ -323,11 +322,11 @@ class Detector {
     /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Gotthard2] */
     void setDelayAfterTrigger(ns value, Positions pos = {});
 
-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Xilinx CTB]
      * [Gotthard2] only in continuous auto mode */
     Result<int64_t> getNumberOfFramesLeft(Positions pos = {}) const;
 
-    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3]
+    /** [Gotthard][Jungfrau][Moench][CTB][Mythen3][Xilinx CTB]
      * Only when external trigger used */
     Result<int64_t> getNumberOfTriggersLeft(Positions pos = {}) const;
 
@@ -344,7 +343,7 @@ class Detector {
     /**
      * [Eiger] Options: 4, 8, 12, 16, 32. If i is 32, also sets clkdivider to 2,
      * else sets clkdivider to 1 \n [Mythen3] Options: 8, 16, 32 \n
-     * [Jungfrau][Moench][Gotthard][Ctb][Mythen3][Gotthard2] 16
+     * [Jungfrau][Moench][Gotthard][CTB][Mythen3][Gotthard2][Xilinx CTB] 16
      */
     void setDynamicRange(int value);
 
@@ -354,10 +353,10 @@ class Detector {
     Result<defs::timingMode> getTimingMode(Positions pos = {}) const;
 
     /**
-     * [Gotthard][Jungfrau][Moench][Gotthard][CTB][Gotthard2] Options:
+     * [Gotthard][Jungfrau][Moench][Gotthard][CTB][Gotthard2][Xilinx CTB]
-     * AUTO_TIMING, TRIGGER_EXPOSURE \n
+     * Options: AUTO_TIMING, TRIGGER_EXPOSURE \n [Mythen3] Options: AUTO_TIMING,
-     * [Mythen3] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n
+     * TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n [Eiger] Options: AUTO_TIMING,
-     * [Eiger] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
+     * TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
      */
     void setTimingMode(defs::timingMode value, Positions pos = {});
 
@@ -1847,20 +1846,20 @@ class Detector {
      *    Pattern                                     *
      *                                                *
      * ************************************************/
-    /** [CTB][Mythen3] Gets the pattern file name including path of the last
+    /** [CTB][Mythen3][Xilinx CTB] Gets the pattern file name including path of
-     * pattern uploaded. \n Returns an empty if nothing was uploaded or via a
+     * the last pattern uploaded. \n Returns an empty if nothing was uploaded or
-     * server default file*/
+     * via a server default file*/
     Result<std::string> getPatterFileName(Positions pos = {}) const;
 
-    /** [CTB][Mythen3]  Loads ASCII pattern file directly to server
+    /** [CTB][Mythen3][Xilinx CTB] Loads ASCII pattern file directly to server
      * (instead of executing line by line)*/
     void setPattern(const std::string &fname, Positions pos = {});
 
-    /** [CTB][Mythen3]  Loads pattern parameters structure directly to
+    /** [CTB][Mythen3][Xilinx CTB] Loads pattern parameters structure directly
-     * server */
+     * to server */
     void setPattern(const Pattern &pat, Positions pos = {});
 
-    /** [CTB][Mythen3] [Ctb][Mythen3] Saves pattern to file
+    /** [CTB][Mythen3][Xilinx CTB] Saves pattern to file
      * (ascii). \n [Ctb] Also executes pattern.*/
     void savePattern(const std::string &fname);
 
@@ -1873,57 +1872,57 @@ class Detector {
     /** [CTB] */
     void setPatternIOControl(uint64_t word, Positions pos = {});
 
-    /** [CTB][Mythen3] same as executing for ctb */
+    /** [CTB][Mythen3][Xilinx CTB] same as executing for ctb */
     Result<uint64_t> getPatternWord(int addr, Positions pos = {});
 
-    /** [CTB] Caution: If word is  -1  reads the addr (same as
+    /** [CTB][Xilinx CTB] Caution: If word is  -1  reads the addr (same as
      * executing the pattern)
      * [Mythen3] */
     void setPatternWord(int addr, uint64_t word, Positions pos = {});
 
-    /**[CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /**[CTB][Mythen3][Xilinx CTB] Options: level: -1 (complete pattern) and 0-2
      * levels
      * @returns array of start address and stop address
      */
     Result<std::array<int, 2>>
     getPatternLoopAddresses(int level, Positions pos = {}) const;
 
-    /** [CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /** [CTB][Mythen3][Xilinx CTB] Options: level: -1 (complete pattern) and 0-2
      * levels */
     void setPatternLoopAddresses(int level, int start, int stop,
                                  Positions pos = {});
 
-    /**[CTB][Mythen3] Options: level: -1 (complete pattern) and 0-2
+    /**[CTB][Mythen3][Xilinx CTB] Options: level: -1 (complete pattern) and 0-2
      * levels  */
     Result<int> getPatternLoopCycles(int level, Positions pos = {}) const;
 
-    /** [CTB][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2
+    /** [CTB][Mythen3][Xilinx CTB] n: 0-2, level: -1 (complete pattern) and 0-2
      * levels */
     void setPatternLoopCycles(int level, int n, Positions pos = {});
 
-    /**[CTB][Mythen3] */
+    /**[CTB][Mythen3][Xilinx CTB] */
     Result<int> getPatternWaitAddr(int level, Positions pos = {}) const;
 
-    /** [CTB][Mythen3] Options: level 0-2 */
+    /** [CTB][Mythen3][Xilinx CTB] Options: level 0-2 */
     void setPatternWaitAddr(int level, int addr, Positions pos = {});
 
-    /** [CTB][Mythen3]  */
+    /** [CTB][Mythen3][Xilinx CTB]  */
     Result<uint64_t> getPatternWaitTime(int level, Positions pos = {}) const;
 
-    /** [CTB][Mythen3] Options: level 0-2 */
+    /** [CTB][Mythen3][Xilinx CTB] Options: level 0-2 */
     void setPatternWaitTime(int level, uint64_t t, Positions pos = {});
 
-    /** [CTB][Mythen3] */
+    /** [CTB][Mythen3][Xilinx CTB] */
     Result<uint64_t> getPatternMask(Positions pos = {});
 
-    /** [CTB][Mythen3] Selects the bits that will have a pattern mask
+    /** [CTB][Mythen3][Xilinx CTB] Selects the bits that will have a pattern
-     * applied to the selected patmask for every pattern. */
+     * mask applied to the selected patmask for every pattern. */
     void setPatternMask(uint64_t mask, Positions pos = {});
 
-    /** [CTB][Mythen3]  */
+    /** [CTB][Mythen3][Xilinx CTB]  */
     Result<uint64_t> getPatternBitMask(Positions pos = {}) const;
 
-    /** [CTB][Mythen3] Sets the mask applied to every pattern to the
+    /** [CTB][Mythen3][Xilinx CTB] Sets the mask applied to every pattern to the
      * selected bits */
     void setPatternBitMask(uint64_t mask, Positions pos = {});
 

slsDetectorSoftware/src/Caller.h

@@ -0,0 +1,878 @@
+// This file is used as input to generate the caller class
+
+#include "CmdParser.h"
+#include "HelpDacs.h"
+#include "sls/Detector.h"
+
+#include <iostream>
+#include <string>
+#include <vector>
+namespace sls {
+
+class Caller {
+  public:
+    Caller(Detector *ptr) : det(ptr) {}
+    void call(const std::string &command,
+              const std::vector<std::string> &arguments, int detector_id,
+              int action, std::ostream &os = std::cout, int receiver_id = -1);
+
+    IpAddr getDstIpFromAuto();
+    IpAddr getSrcIpFromAuto();
+    UdpDestination getUdpEntry();
+    void GetLevelAndUpdateArgIndex(int action,
+                                   std::string levelSeparatedCommand,
+                                   int &level, int &iArg, size_t nGetArgs,
+                                   size_t nPutArgs);
+    void WrongNumberOfParameters(size_t expected);
+
+    template <typename V> std::string OutStringHex(const V &value) {
+        if (value.equal())
+            return ToStringHex(value.front());
+        return ToStringHex(value);
+    }
+
+    template <typename V> std::string OutStringHex(const V &value, int width) {
+        if (value.equal())
+            return ToStringHex(value.front(), width);
+        return ToStringHex(value, width);
+    }
+
+    template <typename V> std::string OutString(const Result<V> &value) {
+        if (value.equal())
+            return ToString(value.front());
+        return ToString(value);
+    }
+
+    template <typename V> std::string OutString(const V &value) {
+        return ToString(value);
+    }
+
+    template <typename V>
+    std::string OutString(const V &value, const std::string &unit) {
+        if (value.equal())
+            return ToString(value.front(), unit);
+        return ToString(value, unit);
+    }
+
+    std::vector<std::string> getAllCommands();
+    std::string list(int action);
+
+    std::string acquire(int action);
+    std::string activate(int action);
+    std::string adcclk(int action);
+    std::string adcenable(int action);
+    std::string adcenable10g(int action);
+    std::string adcindex(int action);
+    std::string adcinvert(int action);
+    std::string adclist(int action);
+    std::string adcname(int action);
+    std::string adcphase(int action);
+    std::string adcpipeline(int action);
+    std::string adcreg(int action);
+    std::string adcvpp(int action);
+    std::string apulse(int action);
+    std::string asamples(int action);
+    std::string autocompdisable(int action);
+    std::string badchannels(int action);
+    std::string blockingtrigger(int action);
+    std::string burstmode(int action);
+    std::string burstperiod(int action);
+    std::string bursts(int action);
+    std::string burstsl(int action);
+    std::string bustest(int action);
+    std::string cdsgain(int action);
+    std::string chipversion(int action);
+    std::string clearbit(int action);
+    std::string clearbusy(int action);
+    std::string clearroi(int action);
+    std::string clientversion(int action);
+    std::string clkdiv(int action);
+    std::string clkfreq(int action);
+    std::string clkphase(int action);
+    std::string column(int action);
+    std::string compdisabletime(int action);
+    std::string confadc(int action);
+    std::string config(int action);
+    std::string counters(int action);
+    std::string currentsource(int action);
+    std::string dac(int action);
+    std::string dacindex(int action);
+    std::string daclist(int action);
+    std::string dacname(int action);
+    std::string dacvalues(int action);
+    std::string datastream(int action);
+    std::string dbitclk(int action);
+    std::string dbitphase(int action);
+    std::string dbitpipeline(int action);
+    std::string defaultdac(int action);
+    std::string defaultpattern(int action);
+    std::string delay(int action);
+    std::string delayl(int action);
+    std::string detectorserverversion(int action);
+    std::string detsize(int action);
+    std::string diodelay(int action);
+    std::string dpulse(int action);
+    std::string dr(int action);
+    std::string drlist(int action);
+    std::string dsamples(int action);
+    std::string execcommand(int action);
+    std::string exptime(int action);
+    std::string exptime1(int action);
+    std::string exptime2(int action);
+    std::string exptime3(int action);
+    std::string exptimel(int action);
+    std::string extrastoragecells(int action);
+    std::string extsampling(int action);
+    std::string extsamplingsrc(int action);
+    std::string extsig(int action);
+    std::string fformat(int action);
+    std::string filtercells(int action);
+    std::string filterresistor(int action);
+    std::string findex(int action);
+    std::string firmwaretest(int action);
+    std::string firmwareversion(int action);
+    std::string fliprows(int action);
+    std::string flowcontrol10g(int action);
+    std::string fmaster(int action);
+    std::string fname(int action);
+    std::string foverwrite(int action);
+    std::string fpath(int action);
+    std::string framecounter(int action);
+    std::string frames(int action);
+    std::string framesl(int action);
+    std::string frametime(int action);
+    std::string free(int action);
+    std::string fwrite(int action);
+    std::string gaincaps(int action);
+    std::string gainmode(int action);
+    std::string gappixels(int action);
+    std::string gatedelay(int action);
+    std::string gatedelay1(int action);
+    std::string gatedelay2(int action);
+    std::string gatedelay3(int action);
+    std::string gates(int action);
+    std::string getbit(int action);
+    std::string hardwareversion(int action);
+    std::string highvoltage(int action);
+    std::string hostname(int action);
+    std::string im_a(int action);
+    std::string im_b(int action);
+    std::string im_c(int action);
+    std::string im_d(int action);
+    std::string im_io(int action);
+    std::string imagetest(int action);
+    std::string initialchecks(int action);
+    std::string inj_ch(int action);
+    std::string interpolation(int action);
+    std::string interruptsubframe(int action);
+    std::string kernelversion(int action);
+    std::string lastclient(int action);
+    std::string led(int action);
+    std::string lock(int action);
+    std::string master(int action);
+    std::string maxadcphaseshift(int action);
+    std::string maxclkphaseshift(int action);
+    std::string maxdbitphaseshift(int action);
+    std::string measuredperiod(int action);
+    std::string measuredsubperiod(int action);
+    std::string moduleid(int action);
+    std::string nextframenumber(int action);
+    std::string nmod(int action);
+    std::string numinterfaces(int action);
+    std::string overflow(int action);
+    std::string packageversion(int action);
+    std::string parallel(int action);
+    std::string parameters(int action);
+    std::string partialreset(int action);
+    std::string patfname(int action);
+    std::string patioctrl(int action);
+    std::string patlimits(int action);
+    std::string patloop(int action);
+    std::string patloop0(int action);
+    std::string patloop1(int action);
+    std::string patloop2(int action);
+    std::string patmask(int action);
+    std::string patnloop(int action);
+    std::string patnloop0(int action);
+    std::string patnloop1(int action);
+    std::string patnloop2(int action);
+    std::string patsetbit(int action);
+    std::string pattern(int action);
+    std::string patternstart(int action);
+    std::string patwait(int action);
+    std::string patwait0(int action);
+    std::string patwait1(int action);
+    std::string patwait2(int action);
+    std::string patwaittime(int action);
+    std::string patwaittime0(int action);
+    std::string patwaittime1(int action);
+    std::string patwaittime2(int action);
+    std::string patword(int action);
+    std::string pedestalmode(int action);
+    std::string period(int action);
+    std::string periodl(int action);
+    std::string polarity(int action);
+    std::string port(int action);
+    std::string powerchip(int action);
+    std::string powerindex(int action);
+    std::string powerlist(int action);
+    std::string powername(int action);
+    std::string powervalues(int action);
+    std::string programfpga(int action);
+    std::string pulse(int action);
+    std::string pulsechip(int action);
+    std::string pulsenmove(int action);
+    std::string pumpprobe(int action);
+    std::string quad(int action);
+    std::string ratecorr(int action);
+    std::string readnrows(int action);
+    std::string readout(int action);
+    std::string readoutspeed(int action);
+    std::string readoutspeedlist(int action);
+    std::string rebootcontroller(int action);
+    std::string reg(int action);
+    std::string resetdacs(int action);
+    std::string resetfpga(int action);
+    std::string roi(int action);
+    std::string romode(int action);
+    std::string row(int action);
+    std::string runclk(int action);
+    std::string runtime(int action);
+    std::string rx_arping(int action);
+    std::string rx_clearroi(int action);
+    std::string rx_dbitlist(int action);
+    std::string rx_dbitoffset(int action);
+    std::string rx_discardpolicy(int action);
+    std::string rx_fifodepth(int action);
+    std::string rx_frameindex(int action);
+    std::string rx_framescaught(int action);
+    std::string rx_framesperfile(int action);
+    std::string rx_hostname(int action);
+    std::string rx_jsonaddheader(int action);
+    std::string rx_jsonpara(int action);
+    std::string rx_lastclient(int action);
+    std::string rx_lock(int action);
+    std::string rx_missingpackets(int action);
+    std::string rx_padding(int action);
+    std::string rx_printconfig(int action);
+    std::string rx_realudpsocksize(int action);
+    std::string rx_roi(int action);
+    std::string rx_silent(int action);
+    std::string rx_start(int action);
+    std::string rx_status(int action);
+    std::string rx_stop(int action);
+    std::string rx_tcpport(int action);
+    std::string rx_threads(int action);
+    std::string rx_udpsocksize(int action);
+    std::string rx_version(int action);
+    std::string rx_zmqfreq(int action);
+    std::string rx_zmqhwm(int action);
+    std::string rx_zmqip(int action);
+    std::string rx_zmqport(int action);
+    std::string rx_zmqstartfnum(int action);
+    std::string rx_zmqstream(int action);
+    std::string samples(int action);
+    std::string savepattern(int action);
+    std::string scan(int action);
+    std::string scanerrmsg(int action);
+    std::string selinterface(int action);
+    std::string serialnumber(int action);
+    std::string setbit(int action);
+    std::string settings(int action);
+    std::string settingslist(int action);
+    std::string settingspath(int action);
+    std::string signalindex(int action);
+    std::string signallist(int action);
+    std::string signalname(int action);
+    std::string slowadc(int action);
+    std::string slowadcindex(int action);
+    std::string slowadclist(int action);
+    std::string slowadcname(int action);
+    std::string slowadcvalues(int action);
+    std::string start(int action);
+    std::string status(int action);
+    std::string stop(int action);
+    std::string stopport(int action);
+    std::string storagecell_delay(int action);
+    std::string storagecell_start(int action);
+    std::string subdeadtime(int action);
+    std::string subexptime(int action);
+    std::string sync(int action);
+    std::string syncclk(int action);
+    std::string temp_10ge(int action);
+    std::string temp_adc(int action);
+    std::string temp_control(int action);
+    std::string temp_dcdc(int action);
+    std::string temp_event(int action);
+    std::string temp_fpga(int action);
+    std::string temp_fpgaext(int action);
+    std::string temp_fpgafl(int action);
+    std::string temp_fpgafr(int action);
+    std::string temp_slowadc(int action);
+    std::string temp_sodl(int action);
+    std::string temp_sodr(int action);
+    std::string temp_threshold(int action);
+    std::string templist(int action);
+    std::string tempvalues(int action);
+    std::string tengiga(int action);
+    std::string threshold(int action);
+    std::string timing(int action);
+    std::string timinglist(int action);
+    std::string timingsource(int action);
+    std::string top(int action);
+    std::string transceiverenable(int action);
+    std::string trigger(int action);
+    std::string triggers(int action);
+    std::string triggersl(int action);
+    std::string trimbits(int action);
+    std::string trimen(int action);
+    std::string trimval(int action);
+    std::string tsamples(int action);
+    std::string txdelay(int action);
+    std::string txdelay_frame(int action);
+    std::string txdelay_left(int action);
+    std::string txdelay_right(int action);
+    std::string type(int action);
+    std::string udp_cleardst(int action);
+    std::string udp_dstip(int action);
+    std::string udp_dstip2(int action);
+    std::string udp_dstlist(int action);
+    std::string udp_dstmac(int action);
+    std::string udp_dstmac2(int action);
+    std::string udp_dstport(int action);
+    std::string udp_dstport2(int action);
+    std::string udp_firstdst(int action);
+    std::string udp_numdst(int action);
+    std::string udp_reconfigure(int action);
+    std::string udp_srcip(int action);
+    std::string udp_srcip2(int action);
+    std::string udp_srcmac(int action);
+    std::string udp_srcmac2(int action);
+    std::string udp_validate(int action);
+    std::string update(int action);
+    std::string updatedetectorserver(int action);
+    std::string updatekernel(int action);
+    std::string updatemode(int action);
+    std::string user(int action);
+    std::string v_a(int action);
+    std::string v_b(int action);
+    std::string v_c(int action);
+    std::string v_chip(int action);
+    std::string v_d(int action);
+    std::string v_io(int action);
+    std::string v_limit(int action);
+    std::string vchip_comp_adc(int action);
+    std::string vchip_comp_fe(int action);
+    std::string vchip_cs(int action);
+    std::string vchip_opa_1st(int action);
+    std::string vchip_opa_fd(int action);
+    std::string vchip_ref_comp_fe(int action);
+    std::string versions(int action);
+    std::string veto(int action);
+    std::string vetoalg(int action);
+    std::string vetofile(int action);
+    std::string vetophoton(int action);
+    std::string vetoref(int action);
+    std::string vetostream(int action);
+    std::string virtualFunction(int action);
+    std::string vm_a(int action);
+    std::string vm_b(int action);
+    std::string vm_c(int action);
+    std::string vm_d(int action);
+    std::string vm_io(int action);
+    std::string zmqhwm(int action);
+    std::string zmqip(int action);
+    std::string zmqport(int action);
+
+    std::vector<std::string> args;
+    std::string cmd;
+    Detector *det;
+    int det_id{-1};
+    int rx_id{-1};
+
+  private:
+    bool ReplaceIfDepreciated(std::string &command);
+    using FunctionMap = std::map<std::string, std::string (Caller::*)(int)>;
+    using StringMap = std::map<std::string, std::string>;
+    Detector *ptr; // pointer to the detector that executes the command
+
+    FunctionMap functions{
+        {"list", &Caller::list},
+
+        {"acquire", &Caller::acquire},
+        {"activate", &Caller::activate},
+        {"adcclk", &Caller::adcclk},
+        {"adcenable", &Caller::adcenable},
+        {"adcenable10g", &Caller::adcenable10g},
+        {"adcindex", &Caller::adcindex},
+        {"adcinvert", &Caller::adcinvert},
+        {"adclist", &Caller::adclist},
+        {"adcname", &Caller::adcname},
+        {"adcphase", &Caller::adcphase},
+        {"adcpipeline", &Caller::adcpipeline},
+        {"adcreg", &Caller::adcreg},
+        {"adcvpp", &Caller::adcvpp},
+        {"apulse", &Caller::apulse},
+        {"asamples", &Caller::asamples},
+        {"autocompdisable", &Caller::autocompdisable},
+        {"badchannels", &Caller::badchannels},
+        {"blockingtrigger", &Caller::blockingtrigger},
+        {"burstmode", &Caller::burstmode},
+        {"burstperiod", &Caller::burstperiod},
+        {"bursts", &Caller::bursts},
+        {"burstsl", &Caller::burstsl},
+        {"bustest", &Caller::bustest},
+        {"cdsgain", &Caller::cdsgain},
+        {"chipversion", &Caller::chipversion},
+        {"clearbit", &Caller::clearbit},
+        {"clearbusy", &Caller::clearbusy},
+        {"clearroi", &Caller::clearroi},
+        {"clientversion", &Caller::clientversion},
+        {"clkdiv", &Caller::clkdiv},
+        {"clkfreq", &Caller::clkfreq},
+        {"clkphase", &Caller::clkphase},
+        {"column", &Caller::column},
+        {"compdisabletime", &Caller::compdisabletime},
+        {"confadc", &Caller::confadc},
+        {"config", &Caller::config},
+        {"counters", &Caller::counters},
+        {"currentsource", &Caller::currentsource},
+        {"dac", &Caller::dac},
+        {"dacindex", &Caller::dacindex},
+        {"daclist", &Caller::daclist},
+        {"dacname", &Caller::dacname},
+        {"dacvalues", &Caller::dacvalues},
+        {"datastream", &Caller::datastream},
+        {"dbitclk", &Caller::dbitclk},
+        {"dbitphase", &Caller::dbitphase},
+        {"dbitpipeline", &Caller::dbitpipeline},
+        {"defaultdac", &Caller::defaultdac},
+        {"defaultpattern", &Caller::defaultpattern},
+        {"delay", &Caller::delay},
+        {"delayl", &Caller::delayl},
+        {"detectorserverversion", &Caller::detectorserverversion},
+        {"detsize", &Caller::detsize},
+        {"diodelay", &Caller::diodelay},
+        {"dpulse", &Caller::dpulse},
+        {"dr", &Caller::dr},
+        {"drlist", &Caller::drlist},
+        {"dsamples", &Caller::dsamples},
+        {"execcommand", &Caller::execcommand},
+        {"exptime", &Caller::exptime},
+        {"exptime1", &Caller::exptime1},
+        {"exptime2", &Caller::exptime2},
+        {"exptime3", &Caller::exptime3},
+        {"exptimel", &Caller::exptimel},
+        {"extrastoragecells", &Caller::extrastoragecells},
+        {"extsampling", &Caller::extsampling},
+        {"extsamplingsrc", &Caller::extsamplingsrc},
+        {"extsig", &Caller::extsig},
+        {"fformat", &Caller::fformat},
+        {"filtercells", &Caller::filtercells},
+        {"filterresistor", &Caller::filterresistor},
+        {"findex", &Caller::findex},
+        {"firmwaretest", &Caller::firmwaretest},
+        {"firmwareversion", &Caller::firmwareversion},
+        {"fliprows", &Caller::fliprows},
+        {"flowcontrol10g", &Caller::flowcontrol10g},
+        {"fmaster", &Caller::fmaster},
+        {"fname", &Caller::fname},
+        {"foverwrite", &Caller::foverwrite},
+        {"fpath", &Caller::fpath},
+        {"framecounter", &Caller::framecounter},
+        {"frames", &Caller::frames},
+        {"framesl", &Caller::framesl},
+        {"frametime", &Caller::frametime},
+        {"free", &Caller::free},
+        {"fwrite", &Caller::fwrite},
+        {"gaincaps", &Caller::gaincaps},
+        {"gainmode", &Caller::gainmode},
+        {"gappixels", &Caller::gappixels},
+        {"gatedelay", &Caller::gatedelay},
+        {"gatedelay1", &Caller::gatedelay1},
+        {"gatedelay2", &Caller::gatedelay2},
+        {"gatedelay3", &Caller::gatedelay3},
+        {"gates", &Caller::gates},
+        {"getbit", &Caller::getbit},
+        {"hardwareversion", &Caller::hardwareversion},
+        {"highvoltage", &Caller::highvoltage},
+        {"hostname", &Caller::hostname},
+        {"im_a", &Caller::im_a},
+        {"im_b", &Caller::im_b},
+        {"im_c", &Caller::im_c},
+        {"im_d", &Caller::im_d},
+        {"im_io", &Caller::im_io},
+        {"imagetest", &Caller::imagetest},
+        {"initialchecks", &Caller::initialchecks},
+        {"inj_ch", &Caller::inj_ch},
+        {"interpolation", &Caller::interpolation},
+        {"interruptsubframe", &Caller::interruptsubframe},
+        {"kernelversion", &Caller::kernelversion},
+        {"lastclient", &Caller::lastclient},
+        {"led", &Caller::led},
+        {"lock", &Caller::lock},
+        {"master", &Caller::master},
+        {"maxadcphaseshift", &Caller::maxadcphaseshift},
+        {"maxclkphaseshift", &Caller::maxclkphaseshift},
+        {"maxdbitphaseshift", &Caller::maxdbitphaseshift},
+        {"measuredperiod", &Caller::measuredperiod},
+        {"measuredsubperiod", &Caller::measuredsubperiod},
+        {"moduleid", &Caller::moduleid},
+        {"nextframenumber", &Caller::nextframenumber},
+        {"nmod", &Caller::nmod},
+        {"numinterfaces", &Caller::numinterfaces},
+        {"overflow", &Caller::overflow},
+        {"packageversion", &Caller::packageversion},
+        {"parallel", &Caller::parallel},
+        {"parameters", &Caller::parameters},
+        {"partialreset", &Caller::partialreset},
+        {"patfname", &Caller::patfname},
+        {"patioctrl", &Caller::patioctrl},
+        {"patlimits", &Caller::patlimits},
+        {"patloop", &Caller::patloop},
+        {"patloop0", &Caller::patloop0},
+        {"patloop1", &Caller::patloop1},
+        {"patloop2", &Caller::patloop2},
+        {"patmask", &Caller::patmask},
+        {"patnloop", &Caller::patnloop},
+        {"patnloop0", &Caller::patnloop0},
+        {"patnloop1", &Caller::patnloop1},
+        {"patnloop2", &Caller::patnloop2},
+        {"patsetbit", &Caller::patsetbit},
+        {"patternX", &Caller::pattern},
+        {"patternstart", &Caller::patternstart},
+        {"patwait", &Caller::patwait},
+        {"patwait0", &Caller::patwait0},
+        {"patwait1", &Caller::patwait1},
+        {"patwait2", &Caller::patwait2},
+        {"patwaittime", &Caller::patwaittime},
+        {"patwaittime0", &Caller::patwaittime0},
+        {"patwaittime1", &Caller::patwaittime1},
+        {"patwaittime2", &Caller::patwaittime2},
+        {"patword", &Caller::patword},
+        {"pedestalmode", &Caller::pedestalmode},
+        {"period", &Caller::period},
+        {"periodl", &Caller::periodl},
+        {"polarity", &Caller::polarity},
+        {"port", &Caller::port},
+        {"powerchip", &Caller::powerchip},
+        {"powerindex", &Caller::powerindex},
+        {"powerlist", &Caller::powerlist},
+        {"powername", &Caller::powername},
+        {"powervalues", &Caller::powervalues},
+        {"programfpga", &Caller::programfpga},
+        {"pulse", &Caller::pulse},
+        {"pulsechip", &Caller::pulsechip},
+        {"pulsenmove", &Caller::pulsenmove},
+        {"pumpprobe", &Caller::pumpprobe},
+        {"quad", &Caller::quad},
+        {"ratecorr", &Caller::ratecorr},
+        {"readnrows", &Caller::readnrows},
+        {"readout", &Caller::readout},
+        {"readoutspeed", &Caller::readoutspeed},
+        {"readoutspeedlist", &Caller::readoutspeedlist},
+        {"rebootcontroller", &Caller::rebootcontroller},
+        {"reg", &Caller::reg},
+        {"resetdacs", &Caller::resetdacs},
+        {"resetfpga", &Caller::resetfpga},
+        {"roi", &Caller::roi},
+        {"romode", &Caller::romode},
+        {"row", &Caller::row},
+        {"runclk", &Caller::runclk},
+        {"runtime", &Caller::runtime},
+        {"rx_arping", &Caller::rx_arping},
+        {"rx_clearroi", &Caller::rx_clearroi},
+        {"rx_dbitlist", &Caller::rx_dbitlist},
+        {"rx_dbitoffset", &Caller::rx_dbitoffset},
+        {"rx_discardpolicy", &Caller::rx_discardpolicy},
+        {"rx_fifodepth", &Caller::rx_fifodepth},
+        {"rx_frameindex", &Caller::rx_frameindex},
+        {"rx_framescaught", &Caller::rx_framescaught},
+        {"rx_framesperfile", &Caller::rx_framesperfile},
+        {"rx_hostname", &Caller::rx_hostname},
+        {"rx_jsonaddheader", &Caller::rx_jsonaddheader},
+        {"rx_jsonpara", &Caller::rx_jsonpara},
+        {"rx_lastclient", &Caller::rx_lastclient},
+        {"rx_lock", &Caller::rx_lock},
+        {"rx_missingpackets", &Caller::rx_missingpackets},
+        {"rx_padding", &Caller::rx_padding},
+        {"rx_printconfig", &Caller::rx_printconfig},
+        {"rx_realudpsocksize", &Caller::rx_realudpsocksize},
+        {"rx_roi", &Caller::rx_roi},
+        {"rx_silent", &Caller::rx_silent},
+        {"rx_start", &Caller::rx_start},
+        {"rx_status", &Caller::rx_status},
+        {"rx_stop", &Caller::rx_stop},
+        {"rx_tcpport", &Caller::rx_tcpport},
+        {"rx_threads", &Caller::rx_threads},
+        {"rx_udpsocksize", &Caller::rx_udpsocksize},
+        {"rx_version", &Caller::rx_version},
+        {"rx_zmqfreq", &Caller::rx_zmqfreq},
+        {"rx_zmqhwm", &Caller::rx_zmqhwm},
+        {"rx_zmqip", &Caller::rx_zmqip},
+        {"rx_zmqport", &Caller::rx_zmqport},
+        {"rx_zmqstartfnum", &Caller::rx_zmqstartfnum},
+        {"rx_zmqstream", &Caller::rx_zmqstream},
+        {"samples", &Caller::samples},
+        {"savepattern", &Caller::savepattern},
+        {"scan", &Caller::scan},
+        {"scanerrmsg", &Caller::scanerrmsg},
+        {"selinterface", &Caller::selinterface},
+        {"serialnumber", &Caller::serialnumber},
+        {"setbit", &Caller::setbit},
+        {"settings", &Caller::settings},
+        {"settingslist", &Caller::settingslist},
+        {"settingspath", &Caller::settingspath},
+        {"signalindex", &Caller::signalindex},
+        {"signallist", &Caller::signallist},
+        {"signalname", &Caller::signalname},
+        {"slowadc", &Caller::slowadc},
+        {"slowadcindex", &Caller::slowadcindex},
+        {"slowadclist", &Caller::slowadclist},
+        {"slowadcname", &Caller::slowadcname},
+        {"slowadcvalues", &Caller::slowadcvalues},
+        {"start", &Caller::start},
+        {"status", &Caller::status},
+        {"stop", &Caller::stop},
+        {"stopport", &Caller::stopport},
+        {"storagecell_delay", &Caller::storagecell_delay},
+        {"storagecell_start", &Caller::storagecell_start},
+        {"subdeadtime", &Caller::subdeadtime},
+        {"subexptime", &Caller::subexptime},
+        {"sync", &Caller::sync},
+        {"syncclk", &Caller::syncclk},
+        {"temp_10ge", &Caller::temp_10ge},
+        {"temp_adc", &Caller::temp_adc},
+        {"temp_control", &Caller::temp_control},
+        {"temp_dcdc", &Caller::temp_dcdc},
+        {"temp_event", &Caller::temp_event},
+        {"temp_fpga", &Caller::temp_fpga},
+        {"temp_fpgaext", &Caller::temp_fpgaext},
+        {"temp_fpgafl", &Caller::temp_fpgafl},
+        {"temp_fpgafr", &Caller::temp_fpgafr},
+        {"temp_slowadc", &Caller::temp_slowadc},
+        {"temp_sodl", &Caller::temp_sodl},
+        {"temp_sodr", &Caller::temp_sodr},
+        {"temp_threshold", &Caller::temp_threshold},
+        {"templist", &Caller::templist},
+        {"tempvalues", &Caller::tempvalues},
+        {"tengiga", &Caller::tengiga},
+        {"threshold", &Caller::threshold},
+        {"thresholdnotb", &Caller::threshold},
+        {"timing", &Caller::timing},
+        {"timinglist", &Caller::timinglist},
+        {"timingsource", &Caller::timingsource},
+        {"top", &Caller::top},
+        {"transceiverenable", &Caller::transceiverenable},
+        {"trigger", &Caller::trigger},
+        {"triggers", &Caller::triggers},
+        {"triggersl", &Caller::triggersl},
+        {"trimbits", &Caller::trimbits},
+        {"trimen", &Caller::trimen},
+        {"trimval", &Caller::trimval},
+        {"tsamples", &Caller::tsamples},
+        {"txdelay", &Caller::txdelay},
+        {"txdelay_frame", &Caller::txdelay_frame},
+        {"txdelay_left", &Caller::txdelay_left},
+        {"txdelay_right", &Caller::txdelay_right},
+        {"type", &Caller::type},
+        {"udp_cleardst", &Caller::udp_cleardst},
+        {"udp_dstip", &Caller::udp_dstip},
+        {"udp_dstip2", &Caller::udp_dstip2},
+        {"udp_dstlist", &Caller::udp_dstlist},
+        {"udp_dstmac", &Caller::udp_dstmac},
+        {"udp_dstmac2", &Caller::udp_dstmac2},
+        {"udp_dstport", &Caller::udp_dstport},
+        {"udp_dstport2", &Caller::udp_dstport2},
+        {"udp_firstdst", &Caller::udp_firstdst},
+        {"udp_numdst", &Caller::udp_numdst},
+        {"udp_reconfigure", &Caller::udp_reconfigure},
+        {"udp_srcip", &Caller::udp_srcip},
+        {"udp_srcip2", &Caller::udp_srcip2},
+        {"udp_srcmac", &Caller::udp_srcmac},
+        {"udp_srcmac2", &Caller::udp_srcmac2},
+        {"udp_validate", &Caller::udp_validate},
+        {"update", &Caller::update},
+        {"updatedetectorserver", &Caller::updatedetectorserver},
+        {"updatekernel", &Caller::updatekernel},
+        {"updatemode", &Caller::updatemode},
+        {"user", &Caller::user},
+        {"v_a", &Caller::v_a},
+        {"v_b", &Caller::v_b},
+        {"v_c", &Caller::v_c},
+        {"v_chip", &Caller::v_chip},
+        {"v_d", &Caller::v_d},
+        {"v_io", &Caller::v_io},
+        {"v_limit", &Caller::v_limit},
+        {"vchip_comp_adc", &Caller::vchip_comp_adc},
+        {"vchip_comp_fe", &Caller::vchip_comp_fe},
+        {"vchip_cs", &Caller::vchip_cs},
+        {"vchip_opa_1st", &Caller::vchip_opa_1st},
+        {"vchip_opa_fd", &Caller::vchip_opa_fd},
+        {"vchip_ref_comp_fe", &Caller::vchip_ref_comp_fe},
+        {"versions", &Caller::versions},
+        {"veto", &Caller::veto},
+        {"vetoalg", &Caller::vetoalg},
+        {"vetofile", &Caller::vetofile},
+        {"vetophoton", &Caller::vetophoton},
+        {"vetoref", &Caller::vetoref},
+        {"vetostream", &Caller::vetostream},
+        {"virtual", &Caller::virtualFunction},
+        {"vm_a", &Caller::vm_a},
+        {"vm_b", &Caller::vm_b},
+        {"vm_c", &Caller::vm_c},
+        {"vm_d", &Caller::vm_d},
+        {"vm_io", &Caller::vm_io},
+        {"zmqhwm", &Caller::zmqhwm},
+        {"zmqip", &Caller::zmqip},
+        {"zmqport", &Caller::zmqport}
+
+    };
+
+    StringMap depreciated_functions{
+
+        {"detectorversion", "firmwareversion"},
+        {"softwareversion", "detectorserverversion"},
+        {"receiverversion", "rx_version"},
+        {"detectornumber", "serialnumber"},
+        {"thisversion", "clientversion"},
+        {"detsizechan", "detsize"},
+        {"trimdir", "settingspath"},
+        {"settingsdir", "settingspath"},
+        {"flippeddatax", "fliprows"},
+        {"cycles", "triggers"},
+        {"cyclesl", "triggersl"},
+        {"clkdivider", "readoutspeed"},
+        {"speed", "readoutspeed"},
+        {"vhighvoltage", "highvoltage"},
+        {"digitest", "imagetest"},
+        {"filter", "filterresistor"},
+        {"readnlines", "readnrows"},
+        {"vtr", "vtrim"},
+        {"vrf", "vrpreamp"},
+        {"vrs", "vrshaper"},
+        {"vcall", "vcal"},
+        {"vis", "vishaper"},
+        {"vshaper", "vrshaper"},
+        {"vpreamp", "vrpreamp"},
+        {"vshaperneg", "vrshaper_n"},
+        {"viinsh", "vishaper"},
+        {"vpl", "vcal_n"},
+        {"vph", "vcal_p"},
+        {"vthreshold", "dac"},
+        {"vsvp", "dac"},
+        {"vsvn", "dac"},
+        {"vtrim", "dac"},
+        {"vrpreamp", "dac"},
+        {"vrshaper", "dac"},
+        {"vtgstv", "dac"},
+        {"vcmp_ll", "dac"},
+        {"vcmp_lr", "dac"},
+        {"vcal", "dac"},
+        {"vcmp_rl", "dac"},
+        {"vcmp_rr", "dac"},
+        {"rxb_rb", "dac"},
+        {"rxb_lb", "dac"},
+        {"vcp", "dac"},
+        {"vcn", "dac"},
+        {"vishaper", "dac"},
+        {"iodelay", "dac"},
+        {"vref_ds", "dac"},
+        {"vcascn_pb", "dac"},
+        {"vcascp_pb", "dac"},
+        {"vout_cm", "dac"},
+        {"vcasc_out", "dac"},
+        {"vin_cm", "dac"},
+        {"vref_comp", "dac"},
+        {"ib_test_c", "dac"},
+        {"vrshaper_n", "dac"},
+        {"vipre", "dac"},
+        {"vdcsh", "dac"},
+        {"vth1", "dac"},
+        {"vth2", "dac"},
+        {"vth3", "dac"},
+        {"vcal_n", "dac"},
+        {"vcal_p", "dac"},
+        {"vcassh", "dac"},
+        {"vcas", "dac"},
+        {"vicin", "dac"},
+        {"vipre_out", "dac"},
+        {"vref_h_adc", "dac"},
+        {"vb_comp_fe", "dac"},
+        {"vb_comp_adc", "dac"},
+        {"vcom_cds", "dac"},
+        {"vref_rstore", "dac"},
+        {"vb_opa_1st", "dac"},
+        {"vref_comp_fe", "dac"},
+        {"vcom_adc1", "dac"},
+        {"vref_prech", "dac"},
+        {"vref_l_adc", "dac"},
+        {"vref_cds", "dac"},
+        {"vb_cs", "dac"},
+        {"vb_opa_fd", "dac"},
+        {"vcom_adc2", "dac"},
+        {"vb_ds", "dac"},
+        {"vb_comp", "dac"},
+        {"vb_pixbuf", "dac"},
+        {"vin_com", "dac"},
+        {"vdd_prot", "dac"},
+        {"vbp_colbuf", "dac"},
+        {"vb_sda", "dac"},
+        {"vcasc_sfp", "dac"},
+        {"vipre_cds", "dac"},
+        {"ibias_sfp", "dac"},
+        {"defaultdacs", "resetdacs"},
+        {"busy", "clearbusy"},
+        {"receiver", "rx_status"},
+        {"framescaught", "rx_framescaught"},
+        {"startingfnum", "nextframenumber"},
+        {"detectorip", "udp_srcip"},
+        {"detectorip2", "udp_srcip2"},
+        {"detectormac", "udp_srcmac"},
+        {"detectormac2", "udp_srcmac2"},
+        {"rx_udpip", "udp_dstip"},
+        {"rx_udpip2", "udp_dstip2"},
+        {"rx_udpmac", "udp_dstmac"},
+        {"rx_udpmac2", "udp_dstmac2"},
+        {"rx_udpport", "udp_dstport"},
+        {"rx_udpport2", "udp_dstport2"},
+        {"flowcontrol_10g", "flowcontrol10g"},
+        {"txndelay_frame", "txdelay_frame"},
+        {"txndelay_left", "txdelay_left"},
+        {"txndelay_right", "txdelay_right"},
+        {"r_silent", "rx_silent"},
+        {"r_discardpolicy", "rx_discardpolicy"},
+        {"r_padding", "rx_padding"},
+        {"r_lock", "rx_lock"},
+        {"r_lastclient", "rx_lastclient"},
+        {"fileformat", "fformat"},
+        {"outdir", "fpath"},
+        {"index", "findex"},
+        {"enablefwrite", "fwrite"},
+        {"masterfile", "fmaster"},
+        {"overwrite", "foverwrite"},
+        {"r_framesperfile", "rx_framesperfile"},
+        {"r_readfreq", "rx_zmqfreq"},
+        {"rx_readfreq", "rx_zmqfreq"},
+        {"rx_datastream", "rx_zmqstream"},
+        {"resmat", "partialreset"},
+        {"storagecells", "extrastoragecells"},
+        {"auto_comp_disable", "autocompdisable"},
+        {"comp_disable_time", "compdisabletime"},
+        {"adc", "slowadc"},
+        {"flags", "romode"},
+        {"i_a", "im_a"},
+        {"i_b", "im_b"},
+        {"i_c", "im_c"},
+        {"i_d", "im_d"},
+        {"i_io", "im_io"},
+        {"copydetectorserver", "updatedetectorserver"},
+        {"nframes", "framecounter"},
+        {"now", "runtime"},
+        {"timestamp", "frametime"},
+        {"frameindex", "rx_frameindex"},
+
+    };
+};
+
+} // namespace sls

slsDetectorSoftware/src/CmdApp.cpp

@@ -1,22 +1,12 @@
-// SPDX-License-Identifier: LGPL-3.0-or-other
+#include "Caller.h"
-// Copyright (C) 2021 Contributors to the SLS Detector Package
-
-/*
-This file is used to generate the command line binaries
-(sls_detector_get/put/acquire/help). By defines in CMake
-we get the different files.
-
-*/
-#include "sls/Detector.h"
-
 #include "CmdParser.h"
-#include "CmdProxy.h"
+#include "inferAction.h"
-#include "sls/sls_detector_defs.h"
+#include "sls/Detector.h"
+#include "sls/logger.h"
 #include "sls/versionAPI.h"
-#include <cstring> //strcmp
+
 #include <iostream>
 int main(int argc, char *argv[]) {
-
     // To genereate sepereate binaries for put, get, acquire and help
 #ifdef PUT
     int action = slsDetectorDefs::PUT_ACTION;
@@ -33,6 +23,9 @@ int main(int argc, char *argv[]) {
 #ifdef HELP
     int action = slsDetectorDefs::HELP_ACTION;
 #endif
+#ifdef INFER
+    int action = -1;
+#endif
 
     // Check for --version in the arguments
     for (int i = 1; i < argc; ++i) {
@@ -45,14 +38,12 @@ int main(int argc, char *argv[]) {
     sls::CmdParser parser;
     parser.Parse(argc, argv);
 
-    // If we called sls_detector_acquire, add the acquire command
     if (action == slsDetectorDefs::READOUT_ACTION)
         parser.setCommand("acquire");
 
     if (parser.isHelp())
         action = slsDetectorDefs::HELP_ACTION;
     else {
-
         // Free shared memory should work also without a detector
         // if we have an option for verify in the detector constructor
         // we could avoid this but clutter the code
@@ -65,22 +56,30 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    // prevent mem size check
     if (parser.command() == "config" && action == slsDetectorDefs::PUT_ACTION) {
         sls::freeSharedMemory(parser.multi_id());
     }
 
+    sls::InferAction inferAction = sls::InferAction();
+
     try {
-        std::unique_ptr<sls::Detector> det{nullptr};
+        if (action == -1) {
-        if (action != slsDetectorDefs::HELP_ACTION) {
+            action = inferAction.infer(parser);
-            det = sls::make_unique<sls::Detector>(parser.multi_id());
+            std::string actionString =
+                (action == slsDetectorDefs::GET_ACTION) ? "GET" : "PUT";
+            std::cout << "inferred action: " << actionString << std::endl;
         }
-        sls::CmdProxy proxy(det.get());
+
-        proxy.Call(parser.command(), parser.arguments(), parser.detector_id(),
+        std::unique_ptr<sls::Detector> d{nullptr};
-                   action, std::cout, parser.receiver_id());
+        if (action != slsDetectorDefs::HELP_ACTION) {
-    } catch (const sls::RuntimeError &e) {
+            d = sls::make_unique<sls::Detector>(parser.multi_id());
+        }
+        sls::Caller c(d.get());
+
+        c.call(parser.command(), parser.arguments(), parser.detector_id(),
+               action, std::cout, parser.receiver_id());
+    } catch (sls::RuntimeError &e) {
         exit(EXIT_FAILURE);
     }
-
     exit(EXIT_SUCCESS);
 }

slsDetectorSoftware/src/CmdParser.h

@@ -20,7 +20,6 @@ reason that the header file is not exposed.
 #include <vector>
 
 namespace sls {
-
 class CmdParser {
   public:
     void Parse(int argc, const char *const argv[]);