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
 ==================

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;
         }
     }