From e45b89695ba4dbabb3b5d63829ad244bfdcd3267 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Tue, 11 Oct 2016 12:35:49 +0200
Subject: [PATCH] somewhere

---
 slsReceiverSoftware/include/receiver_defs.h    |  8 +++-----
 .../src/UDPStandardImplementation.cpp          | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h
index d0cd07320..8ecd46ba9 100755
--- a/slsReceiverSoftware/include/receiver_defs.h
+++ b/slsReceiverSoftware/include/receiver_defs.h
@@ -171,7 +171,6 @@ typedef struct {
 #define EIGER_MAX_PORTS 					2
 #define EIGER_HEADER_PACKET_LENGTH			48
 
-#define EIGER_HEADER_SIZE					8
 
 #define EIGER_FIFO_SIZE						100
 /*#define EIGER_ALIGNED_FRAME_SIZE			65536*/
@@ -182,7 +181,7 @@ typedef struct {
 #define EIGER_ONE_GIGA_ONE_DATA_SIZE		1024
 #define EIGER_TEN_GIGA_ONE_PACKET_SIZE		4112
 #define EIGER_TEN_GIGA_ONE_DATA_SIZE		4096
-#define EIGER_PACKET_HEADER_SIZE			8
+#define EIGER_DATA_PACKET_HEADER_SIZE		8
 //#define EIGER_BUFFER_SIZE_CONSTANT			(EIGER_ONE_PACKET_SIZE*EIGER_PACKETS_PER_FRAME_COSTANT)//1040*16*2//*bit mode
 //#define EIGER_DATA_BYTES_CONSTANT 			(EIGER_ONE_DATA_SIZE*EIGER_PACKETS_PER_FRAME_COSTANT)	//1024*16*2//*bit mode
 
@@ -190,9 +189,8 @@ typedef struct {
 #define EIGER_FRAME_INDEX_OFFSET			0
 #define EIGER_PACKET_INDEX_MASK				0x0
 
-#define EIGER_IMAGE_HEADER_SIZE				48
-
-#define EIGER_PIXELS_IN_ONE_ROW				(256*4)
+//for each thread
+#define EIGER_PIXELS_IN_ONE_ROW				(256*2)
 #define EIGER_PIXELS_IN_ONE_COL				(256)
 
 
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index 2180bf2a0..667892f95 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -671,7 +671,7 @@ int UDPStandardImplementation::setTenGigaEnable(const bool b){
 			oneDataSize		= EIGER_ONE_GIGA_ONE_DATA_SIZE;
 		}
 		bufferSize			= onePacketSize * packetsPerFrame;
-		footerOffset		= EIGER_PACKET_HEADER_SIZE + oneDataSize;
+		footerOffset		= EIGER_DATA_PACKET_HEADER_SIZE + oneDataSize;
 		FILE_LOG(logDEBUG) << dec <<
 				"packetsPerFrame:" << packetsPerFrame <<
 				"\nonePacketSize:" << onePacketSize <<
@@ -803,7 +803,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d){
 		maxFramesPerFile	= EIGER_MAX_FRAMES_PER_FILE;
 		fifoSize			= EIGER_FIFO_SIZE;
 		fifoDepth			= EIGER_FIFO_SIZE;
-		footerOffset		= EIGER_PACKET_HEADER_SIZE + oneDataSize;
+		footerOffset		= EIGER_DATA_PACKET_HEADER_SIZE + oneDataSize;
 		break;
 	case JUNGFRAUCTB:
 		packetsPerFrame		= JCTB_PACKETS_PER_FRAME;
@@ -1682,7 +1682,7 @@ void UDPStandardImplementation::startDataCallback(){
 	int headersize=0;
 	switch(myDetectorType){
 	case EIGER:
-		headersize = EIGER_HEADER_SIZE; break;
+		headersize = EIGER_DATA_PACKET_HEADER_SIZE; break;
 	default:
 		headersize = 0; break;
 	}
@@ -2884,13 +2884,23 @@ void UDPStandardImplementation::updateFileHeader(int ithread){
 	while((unsigned int)length!=strlen(fileHeader[ithread])){
 		length = strlen(fileHeader[ithread]);
 		sprintf(fileHeader[ithread],"\nHeader\t\t %d bytes\n"
+				"Top\t\t %d\n"
+				"Left\t\t %d\n"
 				"Dynamic Range\t %d\n"
+				"Ten Giga\t %d\n"
 				"Packet\t\t %d bytes\n"
+				"Data\t\t %d bytes\n"
 				"x\t\t %d pixels\n"
 				"y\t\t %d pixels\n"
 				"Timestamp\t %s\n\n"
 				"%s",
-				length,dynamicRange,onePacketSize,xpix,ypix,ctime(&t),
+				length,
+				(bottomEnable?0:1),(ithread?0:1),
+				dynamicRange,tengigaEnable,
+				onePacketSize,oneDataSize,
+				xpix,ypix,
+
+				ctime(&t),
 				packetheader);
 	}