M3vtrim min (#454)

* Remove the vtrim min 600 check when setting threshold energy. vth1-3:200 - 2400, others 0-2800

* compile fix

RELEASE.txt

@@ -62,13 +62,13 @@ This document describes the differences between v7.0.0 and v6.x.x
 - m3 polarity, interpolation (enables all counters when enabled), pump probe, analog pulsing, digital pulsing
 - updatedetectorserver - removes old server current binary pointing to for blackfin
 - removing copydetectorserver using tftp 
->>>>>>> developer
 - registerCallBackRawDataReady and registerCallBackRawDataModifyReady now gives a sls_receiver_header* instead of a char*, and uint32_t to size_t
 - registerCallBackStartAcquisition gave incorrect imagesize (+120 bytes). corrected.
 - registerCallBackStartAcquisition parameter is a const string reference
 - m3 (runnig config second time with tengiga 0, dr !=32, counters !=0x7) calculated incorrect image size expected
 - fixed row column indexing (mainly for multi module Jungfrau 2 interfaces )
 - eiger gui row indices not flipped anymore (fix in config)
+- m3 (settings dac check disabled temporarily?)
 
 2. Resolved Issues
 ==================

slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c

@@ -1411,6 +1411,9 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
 }
 
 void validateSettings() {
+    LOG(logWARNING, ("Not validating dac settings temporarily"));
+    return;
+    
     // if any special dac value is changed individually => undefined
     const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
     int *specialDacValues[] = {defaultDacValue_standard, defaultDacValue_fast,

slsDetectorSoftware/src/DetectorImpl.cpp

@@ -1173,31 +1173,40 @@ int DetectorImpl::acquire() {
     return OK;
 }
 
-void DetectorImpl::startAcquisition(bool blocking, Positions pos) {
+void DetectorImpl::startAcquisition(bool blocking, std::vector<int> positions) {
     if (shm()->detType == defs::MYTHEN3 && size() > 1) {
         std::vector<int> master;
         std::vector<int> slaves;
-        auto is_master = Parallel(&Module::isMaster, pos);
+        if (positions.empty() ||
-        // could be all slaves in pos
+            (positions.size() == 1 && positions[0] == -1)) {
-        slaves.reserve(pos.size()); 
+            positions.resize(modules.size());
-        for (size_t i = 0; i != pos.size(); ++i) {
+            std::iota(begin(positions), end(positions), 0);
+        }
+        // could be all slaves in positions
+        slaves.reserve(positions.size()); 
+        auto is_master = Parallel(&Module::isMaster, positions);
+        for (size_t i : positions) {
             if (is_master[i]) 
                 master.push_back(i);
             else
                 slaves.push_back(i);
         }
 
-        Parallel(&Module::startAcquisition, slaves);
+        if (!slaves.empty()) {
-        if (blocking) {
+            Parallel(&Module::startAcquisition, slaves);
-            Parallel(&Module::startAndReadAll, master);
+        }
-        } else {
+        if (!master.empty()) {
-            Parallel(&Module::startAcquisition, master);
+            if (blocking) {
+                Parallel(&Module::startAndReadAll, master);
+            } else {
+                Parallel(&Module::startAcquisition, master);
+            }
         }
     } else {
         if (blocking) {
-            Parallel(&Module::startAndReadAll, pos);
+            Parallel(&Module::startAndReadAll, positions);
         } else {
-            Parallel(&Module::startAcquisition, pos);
+            Parallel(&Module::startAcquisition, positions);
         }
     }
 }

slsDetectorSoftware/src/DetectorImpl.h

@@ -279,7 +279,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
     int acquire();
 
     /** also takes care of master and slave for multi module mythen */
-    void startAcquisition(bool blocking, Positions pos);
+    void startAcquisition(bool blocking, std::vector<int> positions);
 
     /**
      * Combines data from all readouts and gives it to the gui

slsDetectorSoftware/src/Module.cpp

@@ -407,12 +407,18 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
 
     // check dacs
     out_of_range = false;
-    for (auto dac : {M_VTRIM, M_VTH1, M_VTH2, M_VTH3}) {
+    for (int i = 0; i != myMod.ndac; ++i) {
-        if (myMod.dacs[dac] < 600) {
+        int dacMin = 0;
-            myMod.dacs[dac] = 600;
+        int dacMax = 2800;
+        if (i == M_VTH1 || i == M_VTH2 || i == M_VTH3) {
+            dacMin = 200;
+            dacMax = 2400;
+        }
+        if (myMod.dacs[i] < dacMin) {
+            myMod.dacs[i] = dacMin;
             out_of_range = true;
-        } else if (myMod.dacs[dac] > 2400) {
+        } else if (myMod.dacs[i] > dacMax) {
-            myMod.dacs[dac] = 2400;
+            myMod.dacs[i] = dacMax;
             out_of_range = true;
         }
     }

slsSupportLib/include/sls/versionAPI.h

@@ -10,6 +10,6 @@
 #define APIGOTTHARD 0x220428
 #define APIGOTTHARD2 0x220428
 #define APIJUNGFRAU 0x220428
-#define APIMYTHEN3 0x220428
 #define APIMOENCH 0x220427
 #define APIEIGER 0x220428
+#define APIMYTHEN3 0x220510