From 07a120fc4aff5c5538ac3e5f50a56abd5b4f502f Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 23 Jul 2018 14:57:27 +0200
Subject: [PATCH] slsDetectorSoftware: users class setsettings(-1) gave
 undefined settings from slsDetector::setSettings. It has been fixed.

---
 RELEASE.txt                                     | 10 ++++++++--
 slsDetectorSoftware/slsDetector/slsDetector.cpp |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/RELEASE.txt b/RELEASE.txt
index 5bf051a16..8410cd28c 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1,4 +1,4 @@
-SLS Detector Package 3.1.4 released on 2018-07-17
+SLS Detector Package 3.1.4 released on 2018-07-25
 =================================================
 
 
@@ -10,12 +10,18 @@ This document describes the differences between 3.1.4 into 3.1.3 releases.
 
 Topics Concerning
 ==================
-	HDF5 in Receiver
+	- get settings in users class
+	- HDF5 in Receiver
 
 
 Resolved Issues
 ===============
 
+	Client
+	------
+	1.	Users class setSettings(-1) gave undefined settings. Has been fixed.
+	
+	
 	Receiver
 	--------
 	1.	HDF5 x dimension (#images). Max made unlimited. Chunked Dataset by default.
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 5f82f443a..f7ea9a49c 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -3701,6 +3701,9 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
 	std::cout<< "slsDetector setSettings "<< std::endl;
 #endif
 
+	if (isettings == -1)
+		return getSettings(imod);
+
 	//only set client shared memory variable for Eiger, settings threshold loads the module data (trimbits, dacs etc.)
 	if (thisDetector->myDetectorType == EIGER) {
 		switch(isettings) {