Merge branch 'main-rc' into b3.1.3

RELEASE.txt

@@ -1,31 +1,26 @@
-SLS Detector Package 3.1.1 released on 2018-03-20
+SLS Detector Package 3.1.3 released on 2018-06-28
 =================================================
 
 
 
 INTRODUCTION
 
-This document describes the differences between 3.1.0 into 3.1.0 releases.
+This document describes the differences between 3.1.3 into 3.1.2 releases.
 
 
 Topics Concerning
 ==================
-	Jungfrau adcphase
-	Eiger in 10 GbE mode
+	Using delay after trigger for Jungfrau
 
 
 Resolved Issues
 ===============
 
-	Detector Server and Client
-	--------------------------
-	1. 	(Jungfrau) Bug fix: Same adc phase given to the PLL will still shift
-		adc by one step. One can now give same adc phase repeatedly.
+	Detector Server
+	---------------
+	1.	Delay after trigger was always set to 5 seconds. This is fixed now.
+	3.	Get delay left after trigger is not available for this version.
 	
-		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.
+
 
 

serverBin/jungfrauDetectorServerv3.1.1.0

@@ -1 +0,0 @@
-../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.1.0

serverBin/jungfrauDetectorServerv3.1.3.0

@@ -0,0 +1 @@
+../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.3.0

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 
-Revision: 452 
-Branch: 3.1.0-rc 
-Last Changed Author: Erik_Frojdh 
-Last Changed Rev: 3458 
-Last Changed Date: 2018-03-09 10:55:40.000000002 +0100 ./src/qTabSettings.cpp
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 454 
+Branch: 3.1.3 
+Last Changed Author: Dhanya_Thattil 
+Last Changed Rev: 3475 
+Last Changed Date: 2018-06-28 14:19:33.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 GITAUTH "Erik_Frojdh"
-#define GITREV 0x3458
-#define GITDATE 0x20180309
-#define GITBRANCH "3.1.0-rc"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
+#define GITAUTH "Dhanya_Thattil"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"

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 
-Revision: 1716 
-Branch: 3.1.1-rc 
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 1720 
+Branch: 3.1.3 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3465 
-Last Changed Date: 2018-03-19 18:13:27.000000002 +0100 ./threadFiles/ThreadPool.o
+Last Changed Rev: 3475 
+Last Changed Date: 2018-06-28 15:27:02.000000002 +0200 ./threadFiles/ThreadPool.o

slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h

@@ -75,8 +75,8 @@
 #define TIME_FROM_START_MSB_REG   		(0x11 << 11)
 
 /* Get Delay 64 bit register */
-#define GET_DELAY_LSB_REG     			(0x12 << 11)
-#define GET_DELAY_MSB_REG     			(0x13 << 11)
+#define GET_DELAY_LSB_REG     			(0x12 << 11) 		// different kind of delay
+#define GET_DELAY_MSB_REG     			(0x13 << 11)		// different kind of delay
 
 /* Get Cycles 64 bit register */
 #define GET_CYCLES_LSB_REG    			(0x14 << 11)
@@ -321,8 +321,8 @@
 
 
 /* Set Delay 64 bit register */
-#define SET_DELAY_LSB_REG     			(0x60 << 11)
-#define SET_DELAY_MSB_REG     			(0x61 << 11)
+#define SET_DELAY_LSB_REG     			(0x60 << 11)  // different kind of delay
+#define SET_DELAY_MSB_REG     			(0x61 << 11)  // different kind of delay
 
 /* Set Cycles 64 bit register */
 #define SET_CYCLES_LSB_REG    			(0x62 << 11)

slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 85aa47b8353bb84f52c435a967a03ddf46af5dd1 
-Revision: 118 
-Branch: 3.1.1-rc 
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 119 
+Branch: 3.1.3 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3465 
-Last Changed Date: 2018-03-19 17:26:38.000000002 +0100 ./RegisterDefs.h
+Last Changed Rev: 3475 
+Last Changed Date: 2018-06-28 15:11:57.000000002 +0200 ./RegisterDefs.h

slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "85aa47b8353bb84f52c435a967a03ddf46af5dd1"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3465
-#define GITDATE 0x20180319
-#define GITBRANCH "3.1.1-rc"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"

slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -155,18 +155,21 @@ int testBus() {
 	printf("\nTesting Bus...\n");
 
 	int ret = OK;
-	u_int32_t addr = SET_DELAY_LSB_REG;
+	u_int32_t addr = SET_TRIGGER_DELAY_LSB_REG;
 	int times = 1000 * 1000;
 	int i = 0;
 
 	for (i = 0; i < times; ++i) {
 		bus_w(addr, i * 100);
-		if (i * 100 != bus_r(SET_DELAY_LSB_REG)) {
-			cprintf(RED,"ERROR: Mismatch! Wrote 0x%x, read 0x%x\n", i * 100, bus_r(SET_DELAY_LSB_REG));
+		if (i * 100 != bus_r(addr)) {
+			cprintf(RED,"ERROR: Mismatch! Wrote 0x%x, read 0x%x\n",
+					i * 100, bus_r(addr));
 			ret = FAIL;
 		}
 	}
 
+	bus_w(addr, 0);
+
 	if (ret == OK)
 		printf("Successfully tested bus %d times\n", times);
 	return ret;
@@ -697,12 +700,12 @@ int64_t getTimeLeft(enum timerIndex ind){
 		retval = get64BitReg(GET_PERIOD_LSB_REG, GET_PERIOD_MSB_REG) / (1E-3 * CLK_SYNC);
 		printf("Getting period left: %lldns\n", (long long int)retval);
 		break;
-
+/*
 	case DELAY_AFTER_TRIGGER:
-		retval = get64BitReg(GET_DELAY_LSB_REG, GET_DELAY_MSB_REG) / (1E-3 * CLK_SYNC);
+		retval = get64BitReg(xxx) / (1E-3 * CLK_SYNC);
 		printf("Getting delay left: %lldns\n", (long long int)retval);
 		break;
-
+*/
 	case CYCLES_NUMBER:
 		retval = get64BitReg(GET_CYCLES_LSB_REG, GET_CYCLES_MSB_REG);
 		printf("Getting number of cycles left: %lld\n", (long long int)retval);

slsDetectorSoftware/slsDetector/gitInfoLib.h

@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "85aa47b8353bb84f52c435a967a03ddf46af5dd1"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3465
-#define GITDATE 0x20180319
-#define GITBRANCH "3.1.1-rc"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"

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/slsDetectorServer/slsDetectorServer_funcs.c

@@ -2627,36 +2627,50 @@ int get_time_left(int file_des) {
 	printf("getting time left on timer %d \n",ind);
 #endif
 #ifdef SLS_DETECTOR_FUNCTION_LIST
-	switch(ind) {
-#ifdef MYTHEND
-	case PROBES_NUMBER:
-#endif
-	case FRAME_NUMBER:
-	case ACQUISITION_TIME:
-	case FRAME_PERIOD:
-	case DELAY_AFTER_TRIGGER:
-#ifndef JUNGFRAUD
-	case GATES_NUMBER:
-#endif
-	case CYCLES_NUMBER:
-	case PROGRESS:
-	case ACTUAL_TIME:
-	case MEASUREMENT_TIME:
+
 #ifdef JUNGFRAUD
-	case FRAMES_FROM_START:
-	case FRAMES_FROM_START_PG:
-#endif
-		retval=getTimeLeft(ind);
-		break;
-	default:
+	if (ind == DELAY_AFTER_TRIGGER) {
 		ret = FAIL;
-		sprintf(mess,"Timer Left Index (%d) is not implemented for this detector\n", (int)ind);
+		sprintf(mess,"Timer Left Index (%d) is not implemented for this release.\n", (int)ind);
 		cprintf(RED, "%s", mess);
-		break;
-	}
-#ifdef VERBOSE
-	printf("Time left on timer %d is %lld\n",ind, retval);
+	} else {
 #endif
+
+		switch(ind) {
+#ifdef MYTHEND
+		case PROBES_NUMBER:
+#endif
+		case FRAME_NUMBER:
+		case ACQUISITION_TIME:
+		case FRAME_PERIOD:
+		case DELAY_AFTER_TRIGGER:
+#ifndef JUNGFRAUD
+		case GATES_NUMBER:
+#endif
+		case CYCLES_NUMBER:
+		case PROGRESS:
+		case ACTUAL_TIME:
+		case MEASUREMENT_TIME:
+#ifdef JUNGFRAUD
+		case FRAMES_FROM_START:
+		case FRAMES_FROM_START_PG:
+#endif
+			retval=getTimeLeft(ind);
+			break;
+		default:
+			ret = FAIL;
+			sprintf(mess,"Timer Left Index (%d) is not implemented for this detector\n", (int)ind);
+			cprintf(RED, "%s", mess);
+			break;
+		}
+#ifdef VERBOSE
+		printf("Time left on timer %d is %lld\n",ind, retval);
+#endif
+
+#ifdef JUNGFRAUD
+	}	// end of if (ind == DELAY_AFTER_TRIGGER)
+#endif
+
 #endif
 	if (ret==OK && differentClients)
 		ret=FORCE_UPDATE;

slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp

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

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 
-Revision: 708 
-Branch: 3.1.0-rc 
-Last Changed Author: Erik_Frojdh 
-Last Changed Rev: 3458 
-Last Changed Date: 2018-03-09 12:23:14.000000002 +0100 ./src/Listener.cpp
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 710 
+Branch: 3.1.3 
+Last Changed Author: Dhanya_Thattil 
+Last Changed Rev: 3475 
+Last Changed Date: 2018-06-28 14:19:34.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 GITAUTH "Erik_Frojdh"
-#define GITREV 0x3458
-#define GITDATE 0x20180309
-#define GITBRANCH "3.1.0-rc"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
+#define GITAUTH "Dhanya_Thattil"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"