3.1.3: Bug fix: jungfrau server: delay after trigger always set to 5 …

…seconds

RELEASE.txt

@@ -1,25 +1,25 @@
-SLS Detector Package 3.1.2 released on 2018-06-12
+SLS Detector Package 3.1.3 released on 2018-06-28
 =================================================
 
 
 
 INTRODUCTION
 
-This document describes the differences between 3.1.2 into 3.1.1 releases.
+This document describes the differences between 3.1.3 into 3.1.2 releases.
 
 
 Topics Concerning
 ==================
-	Memory Leak in Client API
+	Using delay after trigger for Jungfrau
 
 
 Resolved Issues
 ===============
 
-	Client
-	------
-	1. 	Memory Leak for every multi threading command in client
-		when using API in multi detector mode. This is fixed now.
+	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.
 
 
 

slsDetectorGui/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin [email protected]:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin [email protected]:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 
-Revision: 453 
-Branch: 3.1.2 
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 454 
+Branch: 3.1.3 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3474 
-Last Changed Date: 2018-06-12 12:15:02.000000002 +0200 ./src/qTabSettings.cpp
+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 "[email protected]:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3474
-#define GITDATE 0x20180612
-#define GITBRANCH "3.1.2"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"

slsDetectorSoftware/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware 
 URL: origin [email protected]:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin [email protected]:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 
-Revision: 1719 
-Branch: 3.1.2 
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 1720 
+Branch: 3.1.3 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3474 
-Last Changed Date: 2018-06-12 12:23:39.000000002 +0200 ./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 [email protected]:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin [email protected]: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 "[email protected]: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 "[email protected]:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3474
-#define GITDATE 0x20180612
-#define GITBRANCH "3.1.2"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"

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 JUNGFRAUD
+	if (ind == DELAY_AFTER_TRIGGER) {
+		ret = FAIL;
+		sprintf(mess,"Timer Left Index (%d) is not implemented for this release.\n", (int)ind);
+		cprintf(RED, "%s", mess);
+	} else {
+#endif
+
+		switch(ind) {
 #ifdef MYTHEND
-	case PROBES_NUMBER:
+		case PROBES_NUMBER:
 #endif
-	case FRAME_NUMBER:
-	case ACQUISITION_TIME:
-	case FRAME_PERIOD:
-	case DELAY_AFTER_TRIGGER:
+		case FRAME_NUMBER:
+		case ACQUISITION_TIME:
+		case FRAME_PERIOD:
+		case DELAY_AFTER_TRIGGER:
 #ifndef JUNGFRAUD
-	case GATES_NUMBER:
+		case GATES_NUMBER:
 #endif
-	case CYCLES_NUMBER:
-	case PROGRESS:
-	case ACTUAL_TIME:
-	case MEASUREMENT_TIME:
+		case CYCLES_NUMBER:
+		case PROGRESS:
+		case ACTUAL_TIME:
+		case MEASUREMENT_TIME:
 #ifdef JUNGFRAUD
-	case FRAMES_FROM_START:
-	case FRAMES_FROM_START_PG:
+		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;
-	}
+			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);
+		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;

slsReceiverSoftware/gitInfo.txt

@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsReceiverSoftware 
 URL: origin [email protected]:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin [email protected]:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 
-Revision: 709 
-Branch: 3.1.2 
+Repsitory UUID: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd 
+Revision: 710 
+Branch: 3.1.3 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3474 
-Last Changed Date: 2018-06-12 12:15:03.000000002 +0200 ./src/UDPStandardImplementation.cpp
+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 "[email protected]:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0"
+#define GITREPUUID "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3474
-#define GITDATE 0x20180612
-#define GITBRANCH "3.1.2"
+#define GITREV 0x3475
+#define GITDATE 0x20180628
+#define GITBRANCH "3.1.3"