From f120f9c3dd0a9f04dd14eafc84d7807deef1af80 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 30 Nov 2018 16:00:27 +0100
Subject: [PATCH] users bug fix:getting id(version) for single/multi detector

---
 .../slsDetector/slsDetectorBase.h                |  8 ++++----
 .../slsDetector/slsDetectorUsers.cpp             | 16 ++++++++--------
 .../slsDetector/slsDetectorUsers.h               | 14 +++++++++-----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h
index b6c22a93d..3344aa0ec 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h
@@ -343,11 +343,11 @@ class slsDetectorBase :  public virtual slsDetectorDefs, public virtual errorDef
      \returns id
   */
   virtual int64_t getId(idMode mode, int imod=0)=0;
-  int64_t getModuleFirmwareVersion(){return getId(MODULE_FIRMWARE_VERSION,-1);};
+  int64_t getModuleFirmwareVersion(int imod=-1){return getId(MODULE_FIRMWARE_VERSION,imod);};
   int64_t getModuleSerialNumber(int imod=-1){return getId(MODULE_SERIAL_NUMBER,imod);};
-  int64_t getDetectorFirmwareVersion(){return getId(DETECTOR_FIRMWARE_VERSION,-1);};
-  int64_t getDetectorSerialNumber(){return getId(DETECTOR_SERIAL_NUMBER,-1);};
-  int64_t getDetectorSoftwareVersion(){return getId(DETECTOR_SOFTWARE_VERSION,-1);};
+  int64_t getDetectorFirmwareVersion(int imod=-1){return getId(DETECTOR_FIRMWARE_VERSION,imod);};
+  int64_t getDetectorSerialNumber(int imod=-1){return getId(DETECTOR_SERIAL_NUMBER,imod);};
+  int64_t getDetectorSoftwareVersion(int imod=-1){return getId(DETECTOR_SOFTWARE_VERSION,imod);};
   int64_t getThisSoftwareVersion(){return getId(THIS_SOFTWARE_VERSION,-1);};
 
   /**
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
index b76d9da18..b1603a297 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
@@ -267,24 +267,24 @@ string slsDetectorUsers::setClientDataStreamingInIP(string ip){
 	return myDetector->setClientDataStreamingInIP(ip);
 }
 
-int64_t slsDetectorUsers::getModuleFirmwareVersion(){
-	return myDetector->getModuleFirmwareVersion();
+int64_t slsDetectorUsers::getModuleFirmwareVersion(int imod){
+	return myDetector->getModuleFirmwareVersion(imod);
 }
 
 int64_t slsDetectorUsers::getModuleSerialNumber(int imod){
 	return myDetector->getModuleSerialNumber(imod);
 }
 
-int64_t slsDetectorUsers::getDetectorFirmwareVersion(){
-	return myDetector->getDetectorFirmwareVersion();
+int64_t slsDetectorUsers::getDetectorFirmwareVersion(int imod){
+	return myDetector->getDetectorFirmwareVersion(imod);
 }
 
-int64_t slsDetectorUsers::getDetectorSerialNumber(){
-	return myDetector->getDetectorSerialNumber();
+int64_t slsDetectorUsers::getDetectorSerialNumber(int imod){
+	return myDetector->getDetectorSerialNumber(imod);
 }
 
-int64_t slsDetectorUsers::getDetectorSoftwareVersion(){
-	return myDetector->getDetectorSoftwareVersion();
+int64_t slsDetectorUsers::getDetectorSoftwareVersion(int imod){
+	return myDetector->getDetectorSoftwareVersion(imod);
 }
 
 int64_t slsDetectorUsers::getThisSoftwareVersion(){
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
index c4ef0b333..9caabda25 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
@@ -505,12 +505,13 @@ class slsDetectorUsers
 
   /**
      get get Module Firmware Version
+     @param imod module number
      \returns id
   */
-  int64_t getModuleFirmwareVersion();
+  int64_t getModuleFirmwareVersion(int imod=-1);
 
   /**
-     get get Module Serial Number
+     get get Module Serial Number (only mythen)
      @param imod module number
      \returns id
   */
@@ -518,21 +519,24 @@ class slsDetectorUsers
 
   /**
      get get Detector Firmware Version
+     @param imod module number
      \returns id
   */
-  int64_t getDetectorFirmwareVersion();
+  int64_t getDetectorFirmwareVersion(int imod=-1);
 
   /**
      get get Detector Serial Number
+     @param imod module number
      \returns id
   */
-  int64_t getDetectorSerialNumber();
+  int64_t getDetectorSerialNumber(int imod=-1);
 
   /**
      get get Detector Software Version
+     @param imod module number
      \returns id
   */
-  int64_t getDetectorSoftwareVersion();
+  int64_t getDetectorSoftwareVersion(int imod=-1);
 
   /**
      get this Software Version