From eec7b22582bbaf7d8605039ecb70d3e7a5c4260b Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Wed, 7 Aug 2019 16:11:42 +0200
Subject: [PATCH] compiles

---
 slsDetectorSoftware/include/Detector.h |  6 +++---
 slsDetectorSoftware/src/Detector.cpp   | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h
index a363aea7e..55461e656 100644
--- a/slsDetectorSoftware/include/Detector.h
+++ b/slsDetectorSoftware/include/Detector.h
@@ -193,21 +193,21 @@ class Detector {
      * Get Detector type as an enum
      * @returns detector type
      */
-    detectorType Detector::getDetectorTypeAsEnum() const;
+    defs::detectorType getDetectorTypeAsEnum() const;
 
     /**
      * Get Detector type as an enum
      * @param pos detector position
      * @returns detector type
      */
-    Result<detectorType> getDetectorTypeAsEnum(Positions pos = {}) const;
+    Result<defs::detectorType> getDetectorTypeAsEnum(Positions pos = {}) const;
 
     /**
      * Returns detector type as a string
      * @param pos detector position
      * @returns detector type as string
      */
-    Result<std::string> getDetectorTypeAsString(Positions pos = {});
+    Result<std::string> getDetectorTypeAsString(Positions pos = {}) const;
 };
 
 } // namespace sls
\ No newline at end of file
diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp
index d2922325a..2d7b2210f 100644
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/slsDetectorSoftware/src/Detector.cpp
@@ -118,7 +118,7 @@ Result<bool> Detector::getFileOverWrite(Positions pos) const {
 
 // dhanya
 int Detector::getMultiId() const {
-    pimpl->getMultiId());
+    return pimpl->getMultiId();
 }
 
 void Detector::checkDetectorVersionCompatibility(Positions pos) const {
@@ -130,18 +130,20 @@ void Detector::checkReceiverVersionCompatibility(Positions pos) const {
 }
 
 Result<int64_t> Detector::getDetectorFirmwareVersion(Positions pos) const {
-    return pimpl->Parallel(&slsDetector::getId, DETECTOR_FIRMWARE_VERSION, pos);
+    return pimpl->Parallel(&slsDetector::getId, pos, defs::DETECTOR_FIRMWARE_VERSION);
 }
 
 Result<int64_t> Detector::getDetectorServerVersion(Positions pos) const {
-    return pimpl->Parallel(&slsDetector::getId, DETECTOR_SOFTWARE_VERSION, pos);
+    return pimpl->Parallel(&slsDetector::getId, pos, defs::DETECTOR_SOFTWARE_VERSION);
 }
 
 Result<int64_t> Detector::getDetectorSerialNumber(Positions pos) const {
-    return pimpl->Parallel(&slsDetector::getId, DETECTOR_SERIAL_NUMBER, pos);
+    return pimpl->Parallel(&slsDetector::getId, pos, defs::DETECTOR_SERIAL_NUMBER);
 }
 
-Result<int64_t> Detector::getClientSoftwareVersion() const { return APILIB; }
+Result<int64_t> Detector::getClientSoftwareVersion() const { 
+    return pimpl->getClientSoftwareVersion(); 
+}
 
 Result<int64_t> Detector::getReceiverSoftwareVersion(Positions pos) const {
     return pimpl->Parallel(&slsDetector::getReceiverSoftwareVersion, pos);
@@ -151,16 +153,15 @@ std::string Detector::getUserDetails() const {
     return pimpl->getUserDetails();
 }
 
-void Detector::setHostname(const std::vector<std::string> &name,
-                           Positions pos) {                       
+void Detector::setHostname(const std::vector<std::string> &name) {                       
     pimpl->setHostname(name);
 }
 
-detectorType Detector::getDetectorTypeAsEnum() const {
+defs::detectorType Detector::getDetectorTypeAsEnum() const {
     return pimpl->getDetectorTypeAsEnum(); 
 }
 
-Result<detectorType> Detector::getDetectorTypeAsEnum(Positions pos) const {
+Result<defs::detectorType> Detector::getDetectorTypeAsEnum(Positions pos) const {
     return pimpl->Parallel(&slsDetector::getDetectorTypeAsEnum, pos); 
 }