Merge branch 'main-rc' into b3.1.2

RELEASE.txt

@@ -1,31 +1,26 @@
-SLS Detector Package 3.1.1 released on 2018-03-20
+SLS Detector Package 3.1.2 released on 2018-06-12
 =================================================
 
 
 
 INTRODUCTION
 
-This document describes the differences between 3.1.0 into 3.1.0 releases.
+This document describes the differences between 3.1.2 into 3.1.1 releases.
 
 
 Topics Concerning
 ==================
-	Jungfrau adcphase
+	Memory Leak in Client API
-	Eiger in 10 GbE mode
 
 
 Resolved Issues
 ===============
 
-	Detector Server and Client
+	Client
-	--------------------------
+	------
-	1. 	(Jungfrau) Bug fix: Same adc phase given to the PLL will still shift
+	1. 	Memory Leak for every multi threading command in client
-		adc by one step. One can now give same adc phase repeatedly.
+		when using API in multi detector mode. This is fixed now.
 	
-		Updated Command Line Manual for adcphase and clkdivider.
+
-		
-	2.	(Eiger) Bug Fix: This bug was introduced in 3.1.0 release.
-		In 10GbE mode, if "detectorip" is before "tengiga", the detector still
-		used the 1G IP (DHCP IP). This is fixed in this release.
 
 

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: b389402d647e939342dbb2c9317c688c0eb6b105 
+Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 
-Revision: 452 
+Revision: 453 
-Branch: 3.1.0-rc 
+Branch: 3.1.2 
-Last Changed Author: Erik_Frojdh 
+Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3458 
+Last Changed Rev: 3474 
-Last Changed Date: 2018-03-09 10:55:40.000000002 +0100 ./src/qTabSettings.cpp
+Last Changed Date: 2018-06-12 12:15:02.000000002 +0200 ./src/qTabSettings.cpp

slsDetectorGui/include/gitInfoGui.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105"
+#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0"
-#define GITAUTH "Erik_Frojdh"
+#define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3458
+#define GITREV 0x3474
-#define GITDATE 0x20180309
+#define GITDATE 0x20180612
-#define GITBRANCH "3.1.0-rc"
+#define GITBRANCH "3.1.2"

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: 85aa47b8353bb84f52c435a967a03ddf46af5dd1 
+Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 
-Revision: 1716 
+Revision: 1719 
-Branch: 3.1.1-rc 
+Branch: 3.1.2 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3465 
+Last Changed Rev: 3474 
-Last Changed Date: 2018-03-19 18:13:27.000000002 +0100 ./threadFiles/ThreadPool.o
+Last Changed Date: 2018-06-12 12:23:39.000000002 +0200 ./threadFiles/ThreadPool.o

slsDetectorSoftware/slsDetector/gitInfoLib.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "85aa47b8353bb84f52c435a967a03ddf46af5dd1"
+#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3465
+#define GITREV 0x3474
-#define GITDATE 0x20180319
+#define GITDATE 0x20180612
-#define GITBRANCH "3.1.1-rc"
+#define GITBRANCH "3.1.2"

slsDetectorSoftware/slsDetector/slsDetector.cpp

@@ -270,7 +270,10 @@ slsDetector::~slsDetector(){
   else
     printf("Shared memory %d detached\n", shmId);
 #endif
-delete thisReceiver;
+  if(controlSocket) delete controlSocket;
+  if(stopSocket) delete stopSocket;
+  if(dataSocket) delete dataSocket;
+if(thisReceiver)    delete thisReceiver;
 };
 
 slsDetector::slsDetector(int pos, char *name, int id, int cport,multiSlsDetector *p) : slsDetectorUtils(),

slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp

@@ -15,9 +15,7 @@ receiverInterface::receiverInterface(MySocketTCP *socket):dataSocket(socket){}
 
 
 
-receiverInterface::~receiverInterface(){
+receiverInterface::~receiverInterface(){}
-	delete dataSocket;
-}
 
 
 

slsDetectorSoftware/threadFiles/Task.h

@@ -110,7 +110,7 @@ class SuperTask:  public virtual slsDetectorDefs {
 public:
 	SuperTask():
 		m1(0),m2(0),m3(0),m4(0),m5(0),m6(0),m7(0),m8(0),m9(0),m10(0),m11(0),m12(0),m13(0),m14(0),m15(0),m16(0),m17(0),m18(0){};
-	~SuperTask(){};
+	virtual ~SuperTask(){};
 protected:
 	/** Function signature defined
 	 * First argument is Return type, the remaining are arguments
@@ -159,7 +159,32 @@ public:
 	Task(func4_t <int,				int,int,detectorSettings,int>* t): 		SuperTask(),fnum(17){m17 = t;};
 	Task(func4_t <dacs_t,			dacs_t,dacIndex,int,int>* t):       	SuperTask(),fnum(18){m18 = t;};
 
-	~Task(){}
+	virtual ~Task(){
+        switch(fnum) {
+        case 1: delete m1;  break;
+        case 2: delete m2;  break;
+        case 3: delete m3;  break;
+        case 4: delete m4;  break;
+        case 5: delete m5;  break;
+        case 6: delete m6;  break;
+        case 7: delete m7;  break;
+        case 8: delete m8;  break;
+        case 9: delete m9;  break;
+        case 10: delete m10;  break;
+        case 11: delete m11;  break;
+        case 12: delete m12;  break;
+        case 13: delete m13;  break;
+        case 14: delete m14;  break;
+        case 15: delete m15;  break;
+        case 16: delete m16;  break;
+        case 17: delete m17;  break;
+        case 18: delete m18;  break;
+        default:
+            cprintf(RED, "Error: Task not defined. Abort!\n");
+            break;
+        }
+
+	};
 
 	void operator()(){
 		switch(fnum) {

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: b389402d647e939342dbb2c9317c688c0eb6b105 
+Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 
-Revision: 708 
+Revision: 709 
-Branch: 3.1.0-rc 
+Branch: 3.1.2 
-Last Changed Author: Erik_Frojdh 
+Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3458 
+Last Changed Rev: 3474 
-Last Changed Date: 2018-03-09 12:23:14.000000002 +0100 ./src/Listener.cpp
+Last Changed Date: 2018-06-12 12:15:03.000000002 +0200 ./src/UDPStandardImplementation.cpp

slsReceiverSoftware/include/gitInfoReceiver.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105"
+#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0"
-#define GITAUTH "Erik_Frojdh"
+#define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3458
+#define GITREV 0x3474
-#define GITDATE 0x20180309
+#define GITDATE 0x20180612
-#define GITBRANCH "3.1.0-rc"
+#define GITBRANCH "3.1.2"