Merge branch 'main-rc' into b3.1.5

RELEASE.txt

@@ -1,49 +1,31 @@
-SLS Detector Package 3.1.4 released on 2018-08-17
+SLS Detector Package 3.1.5 released on 2018-11-30
 =================================================
 
 
 
 INTRODUCTION
 
-This document describes the differences between 3.1.4 into 3.1.3 releases.
+This document describes the differences between 3.1.5 and 3.1.4 releases.
 
 
 Topics Concerning
 ==================
-	- get settings in users class
+    - Gotthard adc channel shifted by one
-	- HDF5 in Receiver
+    - users class: get version, status, resetframescaught
-	- gotthard timer accuracy
 
 
 Resolved Issues
 ===============
     
-	Client
-	------
-	1.	Users class setSettings(-1) gave undefined settings. Has been fixed.
-	
-	2. 	Users class timers give more precise values now.
-	
-	3.	When deleting slsDetector object, Stop socket deletion includes a close on 
-		default file descriptor zero (which it didn't open, just set for flag).
-		This is fixed with temporary solution, to connect stop socket at checkOnline
-		to set file descriptor to the right one. Later releases will use exception
-		to handle constructor error flags.
-
-	
     Detector Server
     ---------------
-	1.	(Gotthard) Timers converted from time in nanoseconds to number of cycles
+    1.  (Gotthard) The adc channel is shifted by one due to an incorrect ADC pipeline
-		is made more precise now. Clock value changed from 32.1E+6 to 32.007729E+6. 
+        register. This is fixed now.
         
 
-	Receiver
+    Client
-	--------	
+    ------
-	1.	Jungfrau Single Module Master files did not link to the HDF5 data file properly.
+    1.  Users class: Get versions gave -1. Has been fixed for single and multi modules.
-		This is fixed now.
-		
-	2.	Relative linking is used in the HDF5, instead of absolute now.
-	
     	
 	
 New Features
@@ -51,22 +33,5 @@ New Features
 
     Client
     ------
-	1.	Timers can be set/retrieved individually. It has been introduced because
+    1.  Users class: Added "stopped" to detector status list, resetframescaught in
-		Gotthard 25um can have different delays for master and slave modules.
+        receiver function.
-
-	Receiver
-	--------
-	1.	HDF5 x dimension (#images). Max made unlimited. Chunked Dataset by default.
-		
-		When receiver gets an image more than #frames, the HDF5 dataset will 
-		extend itself in the x dimension by another #frames. So, one can do
-		(in Jungfrau, Gotthard, NOT Eiger)
-		sls_detector_put resetframescaught 0
-		sls_detector_put receiver start
-		sls_detector_put status start
-		sls_detector_put status start
-		...
-		sls_detector_put receiver stop
-		
-	
-		

slsDetectorGui/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 1b92b01a466aa1986b8198700274af75477a1e54 
+Repsitory UUID: e094e41d89d91e341bc6cf272b4570145a82446b 
-Revision: 455 
+Revision: 456 
-Branch: 3.1.4 
+Branch: 3.1.5 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3492 
+Last Changed Rev: 3498 
-Last Changed Date: 2018-08-17 16:36:24.000000002 +0200 ./src/qTabSettings.cpp
+Last Changed Date: 2018-11-30 11:03:38.000000002 +0100 ./src/qTabSettings.cpp

slsDetectorGui/include/gitInfoGui.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "1b92b01a466aa1986b8198700274af75477a1e54"
+#define GITREPUUID "e094e41d89d91e341bc6cf272b4570145a82446b"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3492
+#define GITREV 0x3498
-#define GITDATE 0x20180817
+#define GITDATE 0x20181130
-#define GITBRANCH "3.1.4"
+#define GITBRANCH "3.1.5"

slsDetectorSoftware/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 1b92b01a466aa1986b8198700274af75477a1e54 
+Repsitory UUID: e094e41d89d91e341bc6cf272b4570145a82446b 
-Revision: 1726 
+Revision: 1730 
-Branch: 3.1.4 
+Branch: 3.1.5 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3492 
+Last Changed Rev: 3498 
-Last Changed Date: 2018-08-17 17:57:11.000000002 +0200 ./threadFiles/ThreadPool.o
+Last Changed Date: 2018-11-30 15:26:47.000000002 +0100 ./threadFiles/ThreadPool.o

slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: d69d69e8928f90b053a0e5ffccb9cfc4e9c5f960 
+Repsitory UUID: 287efde54ae1e0ac2613728af3dd638e86a46d6b 
-Revision: 225 
+Revision: 226 
-Branch: 3.1.4-rc 
+Branch: 3.1.5-rc 
-Last Changed Author: Dhanya_Thattil 
+Last Changed Author: GitHub_GitHub 
-Last Changed Rev: 3483 
+Last Changed Rev: 3494 
-Last Changed Date: 2018-07-25 14:56:37.000000002 +0200 ./firmware_funcs.c
+Last Changed Date: 2018-11-30 11:16:03.000000002 +0100 ./server_defs.h

slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "d69d69e8928f90b053a0e5ffccb9cfc4e9c5f960"
+#define GITREPUUID "287efde54ae1e0ac2613728af3dd638e86a46d6b"
-#define GITAUTH "Dhanya_Thattil"
+#define GITAUTH "GitHub_GitHub"
-#define GITREV 0x3483
+#define GITREV 0x3494
-#define GITDATE 0x20180725
+#define GITDATE 0x20181130
-#define GITBRANCH "3.1.4-rc"
+#define GITBRANCH "3.1.5-rc"

slsDetectorSoftware/gotthardDetectorServer/server_defs.h

@@ -42,7 +42,7 @@
 #define TOKEN_RESTART_DELAY		0x88000000
 #define TOKEN_RESTART_DELAY_ROI         0x1b000000
 #define TOKEN_TIMING_REV1               0x1f16
-#define TOKEN_TIMING_REV2               0x1f0f
+#define TOKEN_TIMING_REV2               0x1f10
 
 #define DEFAULT_PHASE_SHIFT			120
 #define DEFAULT_IP_PACKETSIZE		0x0522

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp

@@ -4501,7 +4501,16 @@ int64_t multiSlsDetector::getId(idMode mode, int imod) {
     }
   }
 
-  return -1;
+  ret = -100; int64_t ret1;
+    for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
+        if (detectors[idet]){
+            ret1=detectors[idet]->getId(mode, imod);
+            if(ret==-100)
+                ret=ret1;
+            else if (ret!=ret1)
+                ret=-1;
+    }
+ return ret;
 
 }
 

slsDetectorSoftware/slsDetector/gitInfoLib.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "1b92b01a466aa1986b8198700274af75477a1e54"
+#define GITREPUUID "e094e41d89d91e341bc6cf272b4570145a82446b"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3492
+#define GITREV 0x3498
-#define GITDATE 0x20180817
+#define GITDATE 0x20181130
-#define GITBRANCH "3.1.4"
+#define GITBRANCH "3.1.5"

slsDetectorSoftware/slsDetector/slsDetectorBase.h

@@ -345,11 +345,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 getDetectorFirmwareVersion(int imod=-1){return getId(DETECTOR_FIRMWARE_VERSION,imod);};
-  int64_t getDetectorSerialNumber(){return getId(DETECTOR_SERIAL_NUMBER,-1);};
+  int64_t getDetectorSerialNumber(int imod=-1){return getId(DETECTOR_SERIAL_NUMBER,imod);};
-  int64_t getDetectorSoftwareVersion(){return getId(DETECTOR_SOFTWARE_VERSION,-1);};
+  int64_t getDetectorSoftwareVersion(int imod=-1){return getId(DETECTOR_SOFTWARE_VERSION,imod);};
   int64_t getThisSoftwareVersion(){return getId(THIS_SOFTWARE_VERSION,-1);};
 
   /**
@@ -817,6 +817,7 @@ virtual int enableDataStreamingFromReceiver(int enable=-1)=0;
     case RUNNING:      return string("running");\
     case TRANSMITTING:      return string("data");	\
     case  RUN_FINISHED:      return string("finished");	\
+    case STOPPED:           return string("stopped");\
     default:       return string("idle");		\
     }};
 

slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp

@@ -258,24 +258,24 @@ int slsDetectorUsers::setClientDataStreamingInPort(int i){
 	return myDetector->setClientDataStreamingInPort(i);
 }
 
-int64_t slsDetectorUsers::getModuleFirmwareVersion(){
+int64_t slsDetectorUsers::getModuleFirmwareVersion(int imod){
-	return myDetector->getModuleFirmwareVersion();
+	return myDetector->getModuleFirmwareVersion(imod);
 }
 
 int64_t slsDetectorUsers::getModuleSerialNumber(int imod){
 	return myDetector->getModuleSerialNumber(imod);
 }
 
-int64_t slsDetectorUsers::getDetectorFirmwareVersion(){
+int64_t slsDetectorUsers::getDetectorFirmwareVersion(int imod){
-	return myDetector->getDetectorFirmwareVersion();
+	return myDetector->getDetectorFirmwareVersion(imod);
 }
 
-int64_t slsDetectorUsers::getDetectorSerialNumber(){
+int64_t slsDetectorUsers::getDetectorSerialNumber(int imod){
-	return myDetector->getDetectorSerialNumber();
+	return myDetector->getDetectorSerialNumber(imod);
 }
 
-int64_t slsDetectorUsers::getDetectorSoftwareVersion(){
+int64_t slsDetectorUsers::getDetectorSoftwareVersion(int imod){
-	return myDetector->getDetectorSoftwareVersion();
+	return myDetector->getDetectorSoftwareVersion(imod);
 }
 
 int64_t slsDetectorUsers::getThisSoftwareVersion(){
@@ -389,3 +389,7 @@ int slsDetectorUsers::setReceiverSilentMode(int i) {
 int slsDetectorUsers::setHighVoltage(int i) {
 	return myDetector->setHighVoltage(i);
 }
+
+int slsDetectorUsers::resetFramesCaughtInReceiver() {
+    return myDetector->resetFramesCaught();
+}

slsDetectorSoftware/slsDetector/slsDetectorUsers.h

@@ -483,12 +483,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 (mythen only)
      @param imod module number
      \returns id
   */
@@ -496,21 +497,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
@@ -659,6 +663,13 @@ class slsDetectorUsers
     */
    int setHighVoltage(int i);
 
+   /**
+    * reset frames caught in receiver
+    * should be called before startReceiver()
+    * @returns OK or FAIL
+    */
+int resetFramesCaughtInReceiver();
+
   /************************************************************************
 
                            STATIC FUNCTIONS
@@ -677,6 +688,7 @@ class slsDetectorUsers
     case 3:      return string("finished");				\
     case 4:      return string("data");					\
     case 5:      return string("running");				\
+    case 6:      return string("stopped");             \
     default:       return string("unknown");				\
     }};
 

slsReceiverSoftware/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsReceiverSoftware 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 1b92b01a466aa1986b8198700274af75477a1e54 
+Repsitory UUID: e094e41d89d91e341bc6cf272b4570145a82446b 
-Revision: 715 
+Revision: 716 
-Branch: 3.1.4 
+Branch: 3.1.5 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3492 
+Last Changed Rev: 3498 
-Last Changed Date: 2018-08-17 16:36:25.000000002 +0200 ./src/utilities.cpp
+Last Changed Date: 2018-11-30 11:03:41.000000002 +0100 ./src/utilities.cpp

slsReceiverSoftware/include/gitInfoReceiver.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "1b92b01a466aa1986b8198700274af75477a1e54"
+#define GITREPUUID "e094e41d89d91e341bc6cf272b4570145a82446b"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3492
+#define GITREV 0x3498
-#define GITDATE 0x20180817
+#define GITDATE 0x20181130
-#define GITBRANCH "3.1.4"
+#define GITBRANCH "3.1.5"