creating a separate receiver

slsDetectorSoftware/slsDetector/slsDetectorBase.h

@@ -48,6 +48,7 @@
 
 
 #include "sls_detector_defs.h"
+#include "sls_receiver_defs.h"
 #include "slsDetectorUsers.h"
 #include "error_defs.h"
 
@@ -65,7 +66,7 @@ using namespace std;
 */
 
 //public virtual slsDetectorUsers,
-class slsDetectorBase :  public virtual slsDetectorDefs, public virtual errorDefs  {
+class slsDetectorBase :  public virtual slsDetectorDefs, public virtual errorDefs {
 
  public:
 
@@ -327,6 +328,20 @@ class slsDetectorBase :  public virtual slsDetectorDefs, public virtual errorDef
   virtual int* readFrame()=0;
 
 
+  /**
+     get detector ids/versions for module=0
+     \param mode which id/version has to be read
+     \param imod module number for module serial number
+     \returns id
+  */
+  virtual int64_t getId(idMode mode, int imod=0)=0;
+  int64_t getModuleFirmwareVersion(){return getId(MODULE_FIRMWARE_VERSION,-1);};
+  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 getThisSoftwareVersion(){return getId(THIS_SOFTWARE_VERSION,-1);};
+
   /**
      start detector acquisition
      \returns OK/FAIL

slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp

@@ -239,6 +239,31 @@ int slsDetectorUsers::setReceiverMode(int n){
 
 
 
+int64_t slsDetectorUsers::getModuleFirmwareVersion(){
+	return myDetector->getModuleFirmwareVersion();
+}
+
+int64_t slsDetectorUsers::getModuleSerialNumber(int imod){
+	return myDetector->getModuleSerialNumber(imod);
+}
+
+int64_t slsDetectorUsers::getDetectorFirmwareVersion(){
+	return myDetector->getDetectorFirmwareVersion();
+}
+
+int64_t slsDetectorUsers::getDetectorSerialNumber(){
+	return myDetector->getDetectorSerialNumber();
+}
+
+int64_t slsDetectorUsers::getDetectorSoftwareVersion(){
+	return myDetector->getDetectorSoftwareVersion();
+}
+
+int64_t slsDetectorUsers::getThisSoftwareVersion(){
+	return myDetector->getThisSoftwareVersion();
+}
+
+
 
 
 void slsDetectorUsers::registerDataCallback(int( *userCallback)(detectorData*, int, void*), void *pArg){

slsDetectorSoftware/slsDetector/slsDetectorUsers.h

@@ -450,7 +450,42 @@ class slsDetectorUsers
   
   virtual void finalizeDataset(double *a, double *v, double *e, int &np); 
 
+  /**
+     get get Module Firmware Version
+     \returns id
+  */
+  int64_t getModuleFirmwareVersion();
 
+  /**
+     get get Module Serial Number
+     @param imod module number
+     \returns id
+  */
+  int64_t getModuleSerialNumber(int imod=-1);
+
+  /**
+     get get Detector Firmware Version
+     \returns id
+  */
+  int64_t getDetectorFirmwareVersion();
+
+  /**
+     get get Detector Serial Number
+     \returns id
+  */
+  int64_t getDetectorSerialNumber();
+
+  /**
+     get get Detector Software Version
+     \returns id
+  */
+  int64_t getDetectorSoftwareVersion();
+
+  /**
+     get this Software Version
+     \returns id
+  */
+  int64_t getThisSoftwareVersion();
 
   /**
      @short register calbback for accessing detector final data

slsDetectorSoftware/slsDetector/slsDetectorUtils.h

@@ -42,7 +42,7 @@ using namespace std;
 
 #define DEFAULT_HOSTNAME  "localhost"
 #define DEFAULT_SHM_KEY  5678
-#define THIS_REVISION "$Rev$"
+#define THIS_REVISION "$Rev: 822 $"
 
 //test
 
@@ -188,14 +188,6 @@ class slsDetectorUtils :  public slsDetectorActions, public postProcessing {
   */
   virtual int setPort(portType t, int i=-1)=0; 
 
-  /**
-     get detector ids/versions for module=0
-     \param mode which id/version has to be read
-     \param imod module number for module serial number
-     \returns id
-  */
-  virtual int64_t getId(idMode mode, int imod=0)=0;
-
   /**
      checks if the detector(s) are online/offline
      \returns hostname if offline