fixes to cluster finder

* jungfrau: change adc output clock phase from 180 to 120 for v1.0 boards for reliable readout of adc #2

* formatting

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.2)
+set(PROJECT_VERSION 8.0.1)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 

RELEASE.txt

@@ -1,7 +1,7 @@
-SLS Detector Package Bug Fix Release 8.0.2 released on 18.09.2024
-=================================================================
+SLS Detector Package Major Release 8.0.1 released on 16.01.2024
+===============================================================
 
-This document describes the differences between v8.0.2 and v8.0.1
+This document describes the differences between v8.0.1 and v8.0.0
 
 
 
@@ -24,101 +24,20 @@ This document describes the differences between v8.0.2 and v8.0.1
     -----------
 
 
-    *   Rapidjson compilation with gcc 14
-        Fixed a compile issue with gcc 14. Same fix in later commits to rapidjson.
+    *   Fixed compilation error when building without zmq-devel installed
+        and removed dependency on zeromq in conda build. 
 
 
-    Client
-    ------
+    *   Fixed libzmq compilation error to build the package as a submodule.
 
 
-    *   getenv("HOME") returning nullptr
-        When this happens, especially for systemd, it segfaults. Protection 
-        provided by using empty string in this case.
+    Calibration
+    -----------
 
 
-    *   [Mythen3] Bad channel list for multi module
-        Exception thrown when loading multi module bad channel file skipping 
-        modules in between. Fixed.
+    *   [Moench] Fixed Moench calibration
 
 
-    *   [Gotthard2] Stopping a blocking acquisition
-        A check added in v8.0.0 to catch slaves that might be in waiting forever
-        also catches Gotthard2 25um slaves that might only be in waiting 
-        temporarily. This is fixed with a 50ms sleep before checking again 
-        (upto 1s). 
-
-
-    *   [Moench] Acquire finished processing call back
-        New executable 'sls_detector_acquire_zmq' added to listen to all zmq 
-        packets from post processor or external process to signal end of post 
-        processing. Post processor refactoring of zmq socket creation added.
-
-
-    Gui / Callback
-    --------------
-
-
-    *   [Gotthard2] Stopping a blocking acquisition
-        From the previous issue, call back for acquisition finished status gives 
-        error for inconsistent states. Again, a check every 50ms upto 1s is 
-        added to let go the temporarily waiting slave.
-
-
-    *   Different file paths
-        Fixes file path resetting when different modules have different fpath set.
-
-
-    Receiver
-    --------
-
-
-    *   HDF5 fill value
-        Fix the fill value to accomodate all datatypes.
-
-   
-    Firmware
-    --------
-
-
-    *   [Moench] Overflow with exptime of 0
-        Fixed overflow when subtracting 1 clock cycle from exptime.
-
-
-    On-board Detector Server
-    ------------------------
-
-
-    *   [Moench] Few changes in Server:
-        - Max shifts of adc clock changed from 240 to 200. 
-
-        - Fixed overflow when subtracting 2 clock cycles from exptime of 0ms.
-
-        - Default readout speed to half speed from quarter.
-
-        - Change default ADC phase to 150 for full readout speed.
-
-        - Change default vipre_cds dac from 800 to 1280.
-
-
-    *   [Mythen3] Change Clk divider from 10 (100MHz) to 20 (50MHz) at startup.
-
-
-    *   [Jungfrau] Fix for HW v1.0 boards for unreliable ADC 2
-        Issues sometimes seen on some HW v 1.0 boards are fixed with phase 
-        relationship of 120 degrees. HW v2.0 boards are not affected.
-        
-
-    Documentation
-    -------------
-
-
-    *   Updated troubleshooting documentaion to check links and disable firewall
-
-
-    *   Excluded non UTF-8 encoded libzmq documents due to machine dependent 
-        compilation issues.
-
 
 
 2  On-board Detector Server Compatibility
@@ -126,11 +45,11 @@ This document describes the differences between v8.0.2 and v8.0.1
 
 
     Eiger       8.0.0
-    Jungfrau    8.0.2
-    Mythen3     8.0.2
+    Jungfrau    8.0.0
+    Mythen3     8.0.0
     Gotthard2   8.0.0
     Gotthard    8.0.0
-    Moench      8.0.2
+    Moench      8.0.0
     Ctb         8.0.0
     
 
@@ -139,6 +58,8 @@ This document describes the differences between v8.0.2 and v8.0.1
 
     From v6.1.0 (without tftp):
         Using command 'updatedetectorserver'
+    From 5.0.0 (with tftp):
+        Using command 'copydetectorserver'
 
     Instructions available at
         https://slsdetectorgroup.github.io/devdoc/serverupgrade.html
@@ -162,8 +83,7 @@ This document describes the differences between v8.0.2 and v8.0.1
     Gotthard    08.02.2018 (50um and 25um Master)
                 09.02.2018 (25 um Slave) 
 
-    Moench      26.10.2023 (v0.3.2)                 (updated in 8.0.2, 
-                                                    under development)
+    Moench      10.07.2023 (v0.3.2)                 (updated in 8.0.0, under development)
 
     Ctb         28.08.2023 (v1.2)                   (updated in 8.0.0)
 
@@ -184,10 +104,10 @@ This document describes the differences between v8.0.2 and v8.0.1
 
     Except Eiger, 
         upgrade 
-            using command 'programfpga' or
+            Using command 'programfpga' or
 
         udpate both server and firmware simultaneously
-            using command 'update'
+            Using command 'update'
 
 
     Instructions available at

docs/Doxyfile.in

@@ -890,7 +890,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */docs/* */tests/* */python/* */manual */slsDetectorServers/* */libs/* */integrationTests *README* */slsDetectorGui/* */ctbGui/* */slsDetectorCalibration/* *TobiSchluter*
+EXCLUDE_PATTERNS       = */docs/* */tests/* */python/* */manual */slsDetectorServers/* */libs/* */integrationTests *README* */slsDetectorGui/* */ctbGui/* */slsDetectorCalibration/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp

@@ -181,7 +181,7 @@ int main(int argc, char *argv[]) {
 #endif
     
 #ifndef MOENCH04
-    moench03v2Data *decoder = new moench03v2Data(100);
+    moench03v2Data *decoder = new moench03v2Data(nrows/2);
     cout << "MOENCH03!" << endl;
 #endif
 
@@ -383,7 +383,7 @@ int main(int argc, char *argv[]) {
        runmax--;
        flist.close();
        cout << "Found " << runmax << " files " << endl;
-       flist.open (fformat, std::ifstream::in);
+       flist.open (args["flist"].c_str(), std::ifstream::in);
     } 
 
     for (int irun = runmin; irun <= runmax; irun++) {

slsDetectorGui/src/qTabMeasurement.cpp

@@ -839,7 +839,7 @@ void qTabMeasurement::UpdateProgress() {
 int qTabMeasurement::VerifyOutputDirectoryError() {
     try {
         auto retval = det->getFilePath();
-        for (int i = 0; i < static_cast<int>(retval.size()); ++i) {
+        for (size_t i = 0; i < retval.size(); i++) {
             det->setFilePath(retval[i], {i});
         }
         return slsDetectorDefs::OK;

slsSupportLib/include/sls/versionAPI.h

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 /** API versions */
-#define RELEASE      "8.0.2"
+#define RELEASE      "8.0.1"
+#define APIRECEIVER  "8.0.0 0x231108"
 #define APICTB       "8.0.0 0x231109"
 #define APIGOTTHARD  "8.0.0 0x231109"
 #define APIGOTTHARD2 "8.0.0 0x231109"
 #define APIEIGER     "8.0.0 0x231109"
-#define APIJUNGFRAU  "8.0.2 0x240827"
-#define APIMOENCH    "8.0.2 0x240827"
-#define APIMYTHEN3   "8.0.2 0x240827"
-#define APILIB       "8.0.2 0x240916"
-#define APIRECEIVER  "8.0.2 0x240916"
+#define APILIB       "8.0.1 0x240112"
+#define APIMOENCH    "8.0.2 0x240703"
+#define APIMYTHEN3   "8.0.2 0x240715"
+#define APIJUNGFRAU  "8.0.2 0x240822"