From c2b885f2306f368a92c411332607d0fa0253282c Mon Sep 17 00:00:00 2001
From: Maliakal Dhanya <dhanya.maliakal@psi.ch>
Date: Tue, 9 Sep 2014 17:01:43 +0200
Subject: [PATCH 1/7] version

---
 slsReceiverSoftware/gitInfo.txt                | 8 ++++----
 slsReceiverSoftware/includes/gitInfoReceiver.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt
index cf5def048..355fd1524 100644
--- a/slsReceiverSoftware/gitInfo.txt
+++ b/slsReceiverSoftware/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsReceiverSoftware 
 URL: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git 
 Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git 
-Repsitory UUID: 1c259aeba8b068b9f6e550d63a9a3a14bd7d3ab7 
-Revision: 6 
+Repsitory UUID: d2553484f575ec21e35c0a782cc307f9e0115554 
+Revision: 16 
 Branch: master 
 Last Changed Author: Maliakal_Dhanya 
-Last Changed Rev: 6 
-Last Changed Date: 2014-06-03 12:06:57 +0200
+Last Changed Rev: 16 
+Last Changed Date: 2014-07-31 12:13:15 +0200
diff --git a/slsReceiverSoftware/includes/gitInfoReceiver.h b/slsReceiverSoftware/includes/gitInfoReceiver.h
index 05f3c2ab6..586f715b0 100644
--- a/slsReceiverSoftware/includes/gitInfoReceiver.h
+++ b/slsReceiverSoftware/includes/gitInfoReceiver.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "1c259aeba8b068b9f6e550d63a9a3a14bd7d3ab7"
-//#define SVNREV 0x6
+#define SVNREPUUID "d2553484f575ec21e35c0a782cc307f9e0115554"
+//#define SVNREV 0x16
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Maliakal_Dhanya"
-#define SVNREV 0x6
-#define SVNDATE 0x20140603
+#define SVNREV 0x16
+#define SVNDATE 0x20140731
 //

From 5cfe7b433832f1510eb6776a172b77caeb2d87bc Mon Sep 17 00:00:00 2001
From: Maliakal Dhanya <dhanya.maliakal@psi.ch>
Date: Tue, 16 Sep 2014 16:29:36 +0200
Subject: [PATCH 2/7] 32 bit image, and 32 bit mode frame number for eiger
 fixed, startframeindex included in readframe for all det in tcpip class

---
 .../MySocketTCP/genericSocket.h               | 12 +++++++++
 .../slsReceiver/slsReceiverBase.h             |  3 ++-
 .../slsReceiver/slsReceiverTCPIPInterface.cpp | 27 ++++++++++---------
 .../slsReceiver/slsReceiverUDPFunctions.cpp   | 27 ++++++++++++++-----
 .../slsReceiver/slsReceiverUDPFunctions.h     |  4 +--
 5 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/slsReceiverSoftware/MySocketTCP/genericSocket.h b/slsReceiverSoftware/MySocketTCP/genericSocket.h
index bb899f35b..a798a0fef 100644
--- a/slsReceiverSoftware/MySocketTCP/genericSocket.h
+++ b/slsReceiverSoftware/MySocketTCP/genericSocket.h
@@ -61,6 +61,8 @@ class sockaddr_in;
 
 #endif
 
+#include <stdlib.h>  /******exit */
+
 #include <unistd.h>
 #include <string.h>
 #include <iostream>
@@ -558,6 +560,16 @@ enum communicationProtocol{
 	 break;
        case UDP:
 	 if (socketDescriptor<0) return -1;
+
+/*
+	 cout <<"******listening inside genericsocket"<<endl;
+	 for(int i=0;i<10000;i++){
+		 nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,5000, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
+		cout<<i<<":"<<nsent<<"\t\t";
+	 }
+	exit(-1);
+*/
+
 	 //if length given, listens to length, else listens for packetsize till length is reached
 	 if(length){
 		 while(length>0){
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverBase.h b/slsReceiverSoftware/slsReceiver/slsReceiverBase.h
index 007bf4a97..97d21bec4 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverBase.h
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverBase.h
@@ -273,8 +273,9 @@ public:
 	 * @param c pointer to current file name
 	 * @param raw address of pointer, pointing to current frame to send to gui
 	 * @param fnum frame number for eiger as it is not in the packet
+	 * @param fstartind is the start index of the acquisition
 	 */
-	virtual void readFrame(char* c,char** raw, uint32_t &fnum) = 0;
+	virtual void readFrame(char* c,char** raw, uint32_t &fnum, uint32_t &fstartind ) = 0;
 
 	/** set status to transmitting and
 	 * when fifo is empty later, sets status to run_finished
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
index cc143efc4..2ebfd3826 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
@@ -1000,8 +1000,8 @@ int	slsReceiverTCPIPInterface::moench_read_frame(){
 
 	else{
 		ret = OK;
-		startIndex=receiverBase->getStartFrameIndex();
-		receiverBase->readFrame(fName,&raw,index);
+		/*startIndex=receiverBase->getStartFrameIndex();*/
+		receiverBase->readFrame(fName,&raw,index,startIndex);
 
 		/**send garbage with -1 index to try again*/
 		if (raw == NULL){
@@ -1170,8 +1170,8 @@ int	slsReceiverTCPIPInterface::gotthard_read_frame(){
 		cout<<"haven't caught any frame yet"<<endl;
 	}else{
 		ret = OK;
-		startIndex=receiverBase->getStartFrameIndex();
-		receiverBase->readFrame(fName,&raw,index);
+		/*startIndex=receiverBase->getStartFrameIndex();*/
+		receiverBase->readFrame(fName,&raw,index,startIndex);
 
 		/**send garbage with -1 index to try again*/
 		if (raw == NULL){
@@ -1302,13 +1302,9 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 	char* raw 		= new char[frameSize];
 	char* origVal 	= new char[frameSize];
 	char* retval 	= new char[dataSize];
-
+	uint32_t startIndex=0;
 	strcpy(mess,"Could not read frame\n");
 
-/*	typedef struct{
-		unsigned char num1[4];
-		unsigned char num2[4];
-	} eiger_packet_header;*/
 
 	// execute action if the arguments correctly arrived
 #ifdef SLS_RECEIVER_UDP_FUNCTIONS
@@ -1326,7 +1322,7 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 	else{
 		ret = OK;
 		/** read a frame */
-		receiverBase->readFrame(fName,&raw, index);
+		receiverBase->readFrame(fName,&raw,index,startIndex);
 #ifdef VERBOSE
 		cout << "index:" << dec << index << endl;
 #endif
@@ -1373,16 +1369,21 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 						memcpy(retval+retindex ,origVal+c1 ,numbytesperlineperport);
 						retindex += numbytesperlineperport;
 						c1 += numbytesperlineperport;
+						if(repeat == 2) c1 += 16;
 					}
 					for(irepeat=0;irepeat<repeat;irepeat++){//only for 32 bit mode, take 2 packets from same port
+
 						memcpy(retval+retindex ,origVal+c2 ,numbytesperlineperport);
 						retindex += numbytesperlineperport;
 						c2 += numbytesperlineperport;
+						if(repeat == 2) c2 += 16;
 					}
 					ibytesperpacket += numbytesperlineperport;
 				}
-				c1 += 16;
-				c2 += 16;
+				if(repeat == 1) {
+					c1 += 16;
+					c2 += 16;
+				}
 			}
 
 
@@ -1404,7 +1405,7 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 			for(i=0;i<(1024*(16*dynamicrange)*2)/4;i++)
 				                (*(((uint32_t*)retval)+i)) = htonl((uint32_t)(*(((uint32_t*)retval)+i)));
 			*/
-			arg = index-1;
+			arg = index-startIndex;
 		}
 	}
 
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
index 3cc4fef38..ac73e78c0 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
@@ -26,6 +26,8 @@
 #include <iostream>
 using namespace std;
 
+#define EIGER_32BIT_INITIAL_CONSTANT 0x17c
+
 
 
 
@@ -785,7 +787,7 @@ void slsReceiverUDPFunctions::setupFifoStructure(){
 
 /** acquisition functions */
 
-void slsReceiverUDPFunctions::readFrame(char* c,char** raw, uint32_t &fnum){
+void slsReceiverUDPFunctions::readFrame(char* c,char** raw, uint32_t &fnum, uint32_t &fstartind){
 	//point to gui data
 	if (guiData == NULL)
 		guiData = latestData;
@@ -793,7 +795,7 @@ void slsReceiverUDPFunctions::readFrame(char* c,char** raw, uint32_t &fnum){
 	//copy data and filename
 	strcpy(c,guiFileName);
 	fnum = guiFrameNumber;
-
+	fstartind = getStartFrameIndex();
 
 	//could not get gui data
 	if(!guiDataReady){
@@ -1506,9 +1508,13 @@ int slsReceiverUDPFunctions::startListening(){
 			//normal listening
 			else if(!carryonBufferSize){
 
+			/*	if(!ithread){*/
 				rc = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS, maxBufferSize);
 				expected = maxBufferSize;
-
+				/*}else{
+					while(1) usleep(100000000);
+				}
+*/
 			}
 			//the remaining packets from previous buffer
 			else{
@@ -1726,7 +1732,10 @@ int loop;
 			//for progress
 			if(myDetectorType == EIGER){
 				tempframenum = htonl(*(unsigned int*)((eiger_image_header *)((char*)(wbuf[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->fnum);
-				tempframenum += (startFrameIndex-1); //eiger frame numbers start at 1, so need to -1
+				if(dynamicRange != 32)
+					tempframenum += (startFrameIndex-1); //eiger frame numbers start at 1, so need to -1
+				else
+					tempframenum = ((tempframenum / EIGER_32BIT_INITIAL_CONSTANT) + startFrameIndex)-1;//eiger 32 bit mode is a multiple of 17c. +startframeindex for scans
 			}else if ((myDetectorType == GOTTHARD) && (shortFrame == -1))
 				tempframenum = (((((uint32_t)(*((uint32_t*)(wbuf[ithread] + HEADER_SIZE_NUM_TOT_PACKETS))))+1)& (frameIndexMask)) >> frameIndexOffset);
 			else
@@ -1751,6 +1760,7 @@ int loop;
 
 				if (cbAction < DO_EVERYTHING){
 					for(i=0;i<numListeningThreads;++i)
+						/* for eiger 32 bit mode, currframenum like gotthard, does not start from 0 or 1 */
 						rawDataReadyCallBack(currframenum, wbuf[i], numpackets * onePacketSize, sfilefd, guiData,pRawDataReady);
 				}else if (numpackets > 0){
 					for(i=0;i<numListeningThreads;++i)
@@ -1871,8 +1881,13 @@ void slsReceiverUDPFunctions::startFrameIndices(int ithread){
 		cout << "startAcquisitionIndex:" << startAcquisitionIndex<<endl;
 	}
 	//for scans, cuz currfraenum resets
-	else if (myDetectorType == EIGER)
-		startFrameIndex += currframenum;
+	else if (myDetectorType == EIGER){
+		if(dynamicRange == 32)
+			startFrameIndex = (currframenum + 1);// to be added later for scans
+		else
+			startFrameIndex += currframenum;
+
+	}
 
 
 	cout << "startFrameIndex:" << startFrameIndex<<endl;
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
index 347a14358..c955ee1c4 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
@@ -286,8 +286,9 @@ public:
 	 * @param c pointer to current file name
 	 * @param raw address of pointer, pointing to current frame to send to gui
 	 * @param fnum frame number for eiger as it is not in the packet
+	 * @param fstartind is the start index of the acquisition
 	 */
-	void readFrame(char* c,char** raw, uint32_t &fnum);
+	void readFrame(char* c,char** raw, uint32_t &fnum, uint32_t &fstartind);
 
 	/**
 	 * Closes all files
@@ -468,7 +469,6 @@ private:
 		unsigned char  header_after[24];
 	} eiger_image_header;
 
-
 	/** structure of an eiger image header*/
 	typedef struct
 	{

From 665401669e3f749aef5f1a67b6e187d2bbbb7b64 Mon Sep 17 00:00:00 2001
From: Maliakal Dhanya <dhanya.maliakal@psi.ch>
Date: Fri, 26 Sep 2014 11:19:26 +0200
Subject: [PATCH 3/7] udpport2 module

---
 .../slsReceiver/slsReceiverBase.h               |  5 +++++
 .../slsReceiver/slsReceiverTCPIPInterface.cpp   |  7 ++++---
 .../slsReceiver/slsReceiverUDPFunctions.cpp     | 17 +++++++++++++----
 .../slsReceiver/slsReceiverUDPFunctions.h       |  5 +++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverBase.h b/slsReceiverSoftware/slsReceiver/slsReceiverBase.h
index 97d21bec4..41408f7e7 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverBase.h
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverBase.h
@@ -232,6 +232,11 @@ public:
 	 */
 	virtual void setUDPPortNo(int p) = 0;
 
+	/**
+	 * Set UDP Port Number
+	 */
+	virtual void setUDPPortNo2(int p) = 0;
+
 	/**
 	 * Set Ethernet Interface or IP to listen to
 	 */
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
index 2ebfd3826..ef854bc59 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
@@ -613,10 +613,10 @@ int slsReceiverTCPIPInterface::setup_udp(){
 	ret=OK;
 	strcpy(mess,"could not set up udp connection");
 	char retval[MAX_STR_LENGTH]="";
-	char args[2][MAX_STR_LENGTH];
+	char args[3][MAX_STR_LENGTH];
 
 	string temp;
-	int udpport;
+	int udpport,udpport2;
 	char eth[MAX_STR_LENGTH];
 
 
@@ -641,8 +641,9 @@ int slsReceiverTCPIPInterface::setup_udp(){
 		else{
 			//set up udp port
 			 sscanf(args[1],"%d",&udpport);
+			 sscanf(args[2],"%d",&udpport2);
 			 receiverBase->setUDPPortNo(udpport);
-
+			 receiverBase->setUDPPortNo2(udpport2);
 			 //setup udpip
 			 //get ethernet interface or IP to listen to
 			 temp = genericSocket::ipToName(args[0]);
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
index ac73e78c0..388272b6b 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
@@ -443,9 +443,16 @@ void slsReceiverUDPFunctions::setEthernetInterface(char* c){
 
 
 void slsReceiverUDPFunctions::setUDPPortNo(int p){
-	for(int i=0;i<numListeningThreads;i++){
-		server_port[i] = p+i;
-	}
+	//for(int i=0;i<numListeningThreads;i++){
+		server_port[0] = p;
+	//}
+}
+
+
+void slsReceiverUDPFunctions::setUDPPortNo2(int p){
+	//for(int i=0;i<numListeningThreads;i++){
+		server_port[1] = p;
+	//}
 }
 
 
@@ -904,7 +911,9 @@ int slsReceiverUDPFunctions::createUDPSockets(){
 	int iret;
 	for(int i=0;i<numListeningThreads;i++){
 		iret = udpSocket[i]->getErrorStatus();
-		if(iret){
+		if(!iret)
+			cout << "UDP port opened at port " << server_port[i] << endl;
+		else{
 #ifdef VERBOSE
 			cout << "Could not create UDP socket on port " << server_port[i]  << " error:" << iret << endl;
 #endif
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
index c955ee1c4..20c5d7633 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
@@ -213,6 +213,11 @@ public:
 	 */
 	void setUDPPortNo(int p);
 
+	/**
+	 * Set UDP Port Number2
+	 */
+	void setUDPPortNo2(int p);
+
 	/*
 	 * Returns number of frames to receive
 	 * This is the number of frames to expect to receiver from the detector.

From e94e678f7ddf5cd4eb8d38c0818bca585148e1de Mon Sep 17 00:00:00 2001
From: Maliakal Dhanya <dhanya.maliakal@psi.ch>
Date: Tue, 14 Oct 2014 15:42:32 +0200
Subject: [PATCH 4/7] receiver bottom module included, and image reconstruction
 works for all bit modes, receiver still for a half module each, although two
 of them combined to make one module image

---
 .../slsReceiver/slsReceiver.cpp               |  32 ++++-
 .../slsReceiver/slsReceiverTCPIPInterface.cpp | 118 +++++++++++++-----
 .../slsReceiver/slsReceiverTCPIPInterface.h   |   6 +-
 .../slsReceiver/slsReceiverUDPFunctions.cpp   |  40 +++---
 .../slsReceiver/slsReceiverUDPFunctions.h     |   5 +-
 5 files changed, 146 insertions(+), 55 deletions(-)

diff --git a/slsReceiverSoftware/slsReceiver/slsReceiver.cpp b/slsReceiverSoftware/slsReceiver/slsReceiver.cpp
index cd5ab551d..f044f7b7f 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiver.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiver.cpp
@@ -18,9 +18,8 @@ using namespace std;
 slsReceiver::slsReceiver(int argc, char *argv[], int &success){
 	//creating base receiver
 	cout << "SLS Receiver" << endl;
-	receiverBase = new slsReceiverUDPFunctions();
 	int tcpip_port_no=-1;
-
+	bool bottom = false;
 
 	
 	ifstream infile;
@@ -116,6 +115,31 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success){
 					}
 				}
 			}
+
+			//mode top:bottom
+			else if(!strcasecmp(argv[iarg],"-mode")){
+				if(iarg+1==argc){
+					cout << "no mode given after -mode in command line. Exiting." << endl;
+					success=FAIL;
+				}else{
+					if(!strcasecmp(argv[iarg+1],"bottom")){
+						cout<<"mode: bottom"<<endl;
+						bottom = true;
+						iarg++;
+					}else if(!strcasecmp(argv[iarg+1],"top")){
+						cout<<"mode: top"<<endl;
+						iarg++;
+					}
+					else{
+						cout << "could not decode port in command line. \n\nExiting." << endl;
+						success=FAIL;
+					}
+				}
+			}
+
+
+
+
 			else{
 				cout << "Unknown argument:" << argv[iarg] << endl;
 				success=FAIL;
@@ -130,9 +154,9 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success){
 		cout << "rx_tcpport:\t TCP Communication Port with the client. Default:1954. " << endl << endl;
 	}
 
-
+	receiverBase = new slsReceiverUDPFunctions(bottom);
 	if (success==OK)
-	  tcpipInterface = new slsReceiverTCPIPInterface(success,receiverBase, tcpip_port_no);
+	  tcpipInterface = new slsReceiverTCPIPInterface(success,receiverBase, tcpip_port_no, bottom);
 	  //tcp ip interface
 
 
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
index ef854bc59..a3e4e9790 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.cpp
@@ -17,6 +17,9 @@
 #include <sstream>
 #include <fstream>
 #include <stdlib.h>
+#include <byteswap.h> //linux5
+#define be64toh(x) __bswap_64 (x) //linux5
+//#include <endian.h> //linux6
 using namespace std;
 
 
@@ -28,7 +31,7 @@ slsReceiverTCPIPInterface::~slsReceiverTCPIPInterface() {
 }
 
 
-slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int &success, slsReceiverBase* rbase, int pn):
+slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int &success, slsReceiverBase* rbase, int pn, bool bot):
 		myDetectorType(GOTTHARD),
 		receiverBase(rbase),
 		ret(OK),
@@ -38,7 +41,8 @@ slsReceiverTCPIPInterface::slsReceiverTCPIPInterface(int &success, slsReceiverBa
 		dynamicrange(16),
 		socket(NULL),
 		killTCPServerThread(0),
-		tenGigaEnable(0), portNumber(DEFAULT_PORTNO+2){
+		tenGigaEnable(0), portNumber(DEFAULT_PORTNO+2),
+		bottom(bot){
 
   int port_no=portNumber;
 
@@ -1336,7 +1340,7 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 		}
 
 		/**proper frame*/
-		else{
+		else{//cout<<"**** got proper frame ******"<<endl;
 
 			memcpy(origVal,raw,frameSize);
 			raw=NULL;
@@ -1344,12 +1348,11 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 			int c1=8;//first port
 			int c2=(frameSize/2) + 8; //second port
 			int retindex=0;
-			int irow,ibytesperpacket,irepeat;
-			int repeat=1;
+			int irow,ibytesperpacket;
 			int linesperpacket = (16/dynamicrange)* 1;// 16:1 line, 8:2 lines, 4:4 lines, 32: 0.5
 			int numbytesperlineperport=(EIGER_PIXELS_IN_ONE_ROW/EIGER_MAX_PORTS)*dynamicrange/8;//16:1024,8:512,4:256,32:2048
 			int datapacketlength = EIGER_ONE_GIGA_ONE_DATA_SIZE;
-
+			int total_num_bytes = 1040*(16*dynamicrange)*2;
 
 			if(tenGigaEnable){
 				linesperpacket = (16/dynamicrange)* 4;// 16:4 line, 8:8 lines, 4:16 lines, 32: 2
@@ -1357,55 +1360,106 @@ int	slsReceiverTCPIPInterface::eiger_read_frame(){
 			}
 			//if 1GbE, one line is split into two packets for 32 bit mode, so its special
 			else if(dynamicrange == 32){
-				repeat=2;
 				numbytesperlineperport = 1024;
 				linesperpacket = 1; //we repeat this twice anyway for 32 bit
 			}
 
+			if(!bottom){
 
-			for(irow=0;irow<EIGER_PIXELS_IN_ONE_COL/linesperpacket;++irow){
-				ibytesperpacket=0;
-				while(ibytesperpacket<datapacketlength){
-					for(irepeat=0;irepeat<repeat;irepeat++){//only for 32 bit mode, take 2 packets from same port
+				for(irow=0;irow<EIGER_PIXELS_IN_ONE_COL/linesperpacket;++irow){
+					ibytesperpacket=0;
+					while(ibytesperpacket<datapacketlength){
+						//first port
 						memcpy(retval+retindex ,origVal+c1 ,numbytesperlineperport);
 						retindex += numbytesperlineperport;
 						c1 += numbytesperlineperport;
-						if(repeat == 2) c1 += 16;
-					}
-					for(irepeat=0;irepeat<repeat;irepeat++){//only for 32 bit mode, take 2 packets from same port
-
+						if(dynamicrange == 32){
+							c1 += 16;
+							memcpy(retval+retindex ,origVal+c1 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							c1 += numbytesperlineperport;
+							c1 += 16;
+						}
+						//second port
 						memcpy(retval+retindex ,origVal+c2 ,numbytesperlineperport);
 						retindex += numbytesperlineperport;
 						c2 += numbytesperlineperport;
-						if(repeat == 2) c2 += 16;
+						if(dynamicrange == 32){
+							c2 += 16;
+							memcpy(retval+retindex ,origVal+c2 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							c2 += numbytesperlineperport;
+							c2 += 16;
+						}
+						ibytesperpacket += numbytesperlineperport;
+					}
+					if(dynamicrange != 32) {
+						c1 += 16;
+						c2 += 16;
 					}
-					ibytesperpacket += numbytesperlineperport;
-				}
-				if(repeat == 1) {
-					c1 += 16;
-					c2 += 16;
 				}
+
 			}
 
+			//bottom half module
+			else{
+				c1 = (frameSize/2) - numbytesperlineperport - 8 ;
+				c2 = total_num_bytes - numbytesperlineperport - 8;
 
-			int64_t temp;
+				for(irow=0;irow<EIGER_PIXELS_IN_ONE_COL/linesperpacket;++irow){
+					ibytesperpacket=0;
+					while(ibytesperpacket<datapacketlength){
+						if(dynamicrange == 32){
+							//first port first chip
+							c1 -= (numbytesperlineperport + 16);
+							memcpy(retval+retindex ,origVal+c1 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							//first port second chip
+							c1 += (numbytesperlineperport+16);
+							memcpy(retval+retindex ,origVal+c1 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							c1 -= (numbytesperlineperport*2+32);//1024*2+16*2
+							//second port first chip
+							c2 -= (numbytesperlineperport + 16);
+							memcpy(retval+retindex ,origVal+c2 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							//second port second chip
+							c2 += (numbytesperlineperport + 16);
+							memcpy(retval+retindex ,origVal+c2 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							c2 -= (numbytesperlineperport*2+32);
+						}else{
+							//first port
+							memcpy(retval+retindex ,origVal+c1 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							c1 -= numbytesperlineperport;
+							//second port
+							memcpy(retval+retindex ,origVal+c2 ,numbytesperlineperport);
+							retindex += numbytesperlineperport;
+							c2 -= numbytesperlineperport;
+						}
+						ibytesperpacket += numbytesperlineperport;
+					}
+					if(dynamicrange != 32) {
+						c1 -= 16;
+						c2 -= 16;
+					}
+				}
+
+			}
+
+			//64 bit htonl cuz of endianness
 			for(i=0;i<(1024*(16*dynamicrange)*2)/8;i++){
+				(*(((uint64_t*)retval)+i)) = be64toh(((uint64_t)(*(((uint64_t*)retval)+i))));
+			 /*
+			  int64_t temp;
 			  temp = ((uint64_t)(*(((uint64_t*)retval)+i)));
 			  temp = ((temp << 8) & 0xFF00FF00FF00FF00ULL ) | ((temp >> 8) & 0x00FF00FF00FF00FFULL );
 			  temp = ((temp << 16) & 0xFFFF0000FFFF0000ULL ) | ((temp >> 16) & 0x0000FFFF0000FFFFULL );
 			  temp =  (temp << 32) | ((temp >> 32) & 0xFFFFFFFFULL);
 			  (*(((uint64_t*)retval)+i)) = temp;
+			  */
 			}
-/*
-				 ( (((val) >> 56) & 0x00000000000000FF) | (((val) >> 40) & 0x000000000000FF00) | \
-				   (((val) >> 24) & 0x0000000000FF0000) | (((val) >>  8) & 0x00000000FF000000) | \
-				   (((val) <<  8) & 0x000000FF00000000) | (((val) << 24) & 0x0000FF0000000000) | \
-				   (((val) << 40) & 0x00FF000000000000) | (((val) << 56) & 0xFF00000000000000) )
-			*/
-			/*
-			for(i=0;i<(1024*(16*dynamicrange)*2)/4;i++)
-				                (*(((uint32_t*)retval)+i)) = htonl((uint32_t)(*(((uint32_t*)retval)+i)));
-			*/
 			arg = index-startIndex;
 		}
 	}
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h
index 423d0949a..ccd27c255 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverTCPIPInterface.h
@@ -26,8 +26,9 @@ public:
 	 * @param succecc socket creation was successfull
 	 * @param rbase pointer to the receiver base
 	 * @param pn port number (defaults to default port number)
+	 * @param bot mode is bottom if true, else its a top half module
 	 */
-  slsReceiverTCPIPInterface(int &success, slsReceiverBase* rbase, int pn=-1);
+  slsReceiverTCPIPInterface(int &success, slsReceiverBase* rbase, int pn=-1, bool bot=false);
 
 	/**
 	 * Sets the port number to listen to. 
@@ -272,6 +273,9 @@ private:
 	/** port number */
 	int portNumber;
 
+	/** true if bottom half module for eiger */
+	bool bottom;
+
 
 protected:
 	/** Socket */
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
index 388272b6b..aa9458377 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
@@ -31,13 +31,14 @@ using namespace std;
 
 
 
-slsReceiverUDPFunctions::slsReceiverUDPFunctions():
+slsReceiverUDPFunctions::slsReceiverUDPFunctions(bool bot):
 		thread_started(0),
 		eth(NULL),
 		latestData(NULL),
 		guiFileName(NULL),
 		guiFrameNumber(0),
-		tengigaEnable(0){
+		tengigaEnable(0),
+		bottom(bot){
 	for(int i=0;i<MAX_NUM_LISTENING_THREADS;i++){
 		udpSocket[i] = NULL;
 		server_port[i] = DEFAULT_UDP_PORTNO+i;
@@ -443,16 +444,12 @@ void slsReceiverUDPFunctions::setEthernetInterface(char* c){
 
 
 void slsReceiverUDPFunctions::setUDPPortNo(int p){
-	//for(int i=0;i<numListeningThreads;i++){
-		server_port[0] = p;
-	//}
+	server_port[0] = p;
 }
 
 
 void slsReceiverUDPFunctions::setUDPPortNo2(int p){
-	//for(int i=0;i<numListeningThreads;i++){
-		server_port[1] = p;
-	//}
+	server_port[1] = p;
 }
 
 
@@ -885,6 +882,15 @@ void slsReceiverUDPFunctions::copyFrameToGui(char* startbuf[], uint32_t fnum, ch
 
 int slsReceiverUDPFunctions::createUDPSockets(){
 
+	int port[2];
+	port[0] = server_port[0];
+	port[1] = server_port[1];
+
+	/** eiger specific */
+	if(bottom){
+		port[0] = server_port[1];
+		port[1] = server_port[0];
+	}
 
 	//if eth is mistaken with ip address
 	if (strchr(eth,'.')!=NULL)
@@ -897,14 +903,14 @@ int slsReceiverUDPFunctions::createUDPSockets(){
 		cout<<"warning:eth is empty.listening to all"<<endl;
 
 		for(int i=0;i<numListeningThreads;i++)
-			udpSocket[i] = new genericSocket(server_port[i],genericSocket::UDP,bufferSize);
+			udpSocket[i] = new genericSocket(port[i],genericSocket::UDP,bufferSize);
 	}
 	//normal socket
 	else{
 		cout<<"eth:"<<eth<<endl;
 
 		for(int i=0;i<numListeningThreads;i++)
-			udpSocket[i] = new genericSocket(server_port[i],genericSocket::UDP,bufferSize,eth);
+			udpSocket[i] = new genericSocket(port[i],genericSocket::UDP,bufferSize,eth);
 	}
 
 	//error
@@ -912,10 +918,10 @@ int slsReceiverUDPFunctions::createUDPSockets(){
 	for(int i=0;i<numListeningThreads;i++){
 		iret = udpSocket[i]->getErrorStatus();
 		if(!iret)
-			cout << "UDP port opened at port " << server_port[i] << endl;
+			cout << "UDP port opened at port " << port[i] << endl;
 		else{
 #ifdef VERBOSE
-			cout << "Could not create UDP socket on port " << server_port[i]  << " error:" << iret << endl;
+			cout << "Could not create UDP socket on port " << port[i]  << " error:" << iret << endl;
 #endif
 			return FAIL;
 		}
@@ -1351,7 +1357,7 @@ int slsReceiverUDPFunctions::startReceiver(char message[]){
 		cout << endl << message << endl;
 		return FAIL;
 	}
-	cout << "UDP socket(s) created successfully. 1st  port " << server_port[0] << endl;
+	cout << "UDP socket(s) created successfully." << endl;
 
 
 	if(setupWriter() == FAIL){
@@ -1540,9 +1546,9 @@ int slsReceiverUDPFunctions::startListening(){
 				expected = maxBufferSize - carryonBufferSize;
 			}
 
-#ifdef VERYDEBUG
+//#ifdef VERYDEBUG
 			cout << ithread << " *** rc:" << dec << rc << ". expected:" << dec << expected << endl;
-#endif
+//#endif
 
 
 
@@ -1954,9 +1960,9 @@ int i;
 #endif
 				pthread_mutex_unlock(&(status_mutex));
 
-#ifdef VERYDEBUG
+//#ifdef VERYDEBUG
 				cout << ithread << ": Frames listened to " << dec << ((totalListeningFrameCount[ithread]*numListeningThreads)/packetsPerFrame) << endl;
-#endif
+//#endif
 
 				//waiting for all listening threads to be done, to print final count of frames listened to
 				if(ithread == 0){
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
index 20c5d7633..d0efecfc3 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.h
@@ -40,7 +40,7 @@ public:
 	/**
 	 * Constructor
 	 */
-	slsReceiverUDPFunctions();
+	slsReceiverUDPFunctions(bool bot);
 
 	/**
 	 * Destructor
@@ -768,6 +768,9 @@ private:
 	 * 2 we open, close, write file, callback does not do anything */
 	int cbAction;
 
+	/** true if bottom half module for eiger */
+	bool bottom;
+
 
 public:
 

From f2dddd88cd1973d9d8e29921153d9c7be2e3d173 Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Wed, 15 Oct 2014 09:22:17 +0200
Subject: [PATCH 5/7] JUNGFRAU detector type added

---
 slsReceiverSoftware/includes/sls_receiver_defs.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/slsReceiverSoftware/includes/sls_receiver_defs.h b/slsReceiverSoftware/includes/sls_receiver_defs.h
index 70fc6ece8..2381621c0 100755
--- a/slsReceiverSoftware/includes/sls_receiver_defs.h
+++ b/slsReceiverSoftware/includes/sls_receiver_defs.h
@@ -55,7 +55,9 @@ public:
 		GOTTHARD, /**< gotthard */
 		PICASSO, /**< picasso */
 		AGIPD, /**< agipd */
-		MOENCH /**< moench */
+		MOENCH, /**< moench */
+		JUNGFRAU, /**< jungfrau */
+		JUNGFRAUCTB /**< jungfrauCTBversion */
 	};
 
 

From b85490b528faa7e0f1db0a1b7a3936c26c254b12 Mon Sep 17 00:00:00 2001
From: Maliakal Dhanya <dhanya.maliakal@psi.ch>
Date: Thu, 16 Oct 2014 14:14:20 +0200
Subject: [PATCH 6/7] the version given to esrf

---
 slsReceiverSoftware/gitInfo.txt                    | 10 +++++-----
 slsReceiverSoftware/includes/gitInfoReceiver.h     | 10 +++++-----
 .../slsReceiver/slsReceiverUDPFunctions.cpp        | 14 ++++++++------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt
index 355fd1524..410c414c3 100644
--- a/slsReceiverSoftware/gitInfo.txt
+++ b/slsReceiverSoftware/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsReceiverSoftware 
 URL: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git 
 Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git 
-Repsitory UUID: d2553484f575ec21e35c0a782cc307f9e0115554 
-Revision: 16 
+Repsitory UUID: e019a6ce7d96d4ac9cb5762b7137245aedb4d5b8 
+Revision: 22 
 Branch: master 
-Last Changed Author: Maliakal_Dhanya 
-Last Changed Rev: 16 
-Last Changed Date: 2014-07-31 12:13:15 +0200
+Last Changed Author: Anna_Bergamaschi 
+Last Changed Rev: 22 
+Last Changed Date: 2014-10-15 09:22:40 +0200
diff --git a/slsReceiverSoftware/includes/gitInfoReceiver.h b/slsReceiverSoftware/includes/gitInfoReceiver.h
index 586f715b0..967f26e15 100644
--- a/slsReceiverSoftware/includes/gitInfoReceiver.h
+++ b/slsReceiverSoftware/includes/gitInfoReceiver.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_receiver_software.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "d2553484f575ec21e35c0a782cc307f9e0115554"
-//#define SVNREV 0x16
+#define SVNREPUUID "e019a6ce7d96d4ac9cb5762b7137245aedb4d5b8"
+//#define SVNREV 0x22
 //#define SVNKIND ""
 //#define SVNSCHED ""
-#define SVNAUTH "Maliakal_Dhanya"
-#define SVNREV 0x16
-#define SVNDATE 0x20140731
+#define SVNAUTH "Anna_Bergamaschi"
+#define SVNREV 0x22
+#define SVNDATE 0x20141015
 //
diff --git a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
index aa9458377..4be1529b4 100644
--- a/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
+++ b/slsReceiverSoftware/slsReceiver/slsReceiverUDPFunctions.cpp
@@ -1551,19 +1551,21 @@ int slsReceiverUDPFunctions::startListening(){
 //#endif
 
 
-
-
 			//start indices for each start of scan/acquisition - eiger does it before
-			if((!measurementStarted) && (rc > 0) && (!ithread))
-				startFrameIndices(ithread);
+				if((!measurementStarted) && (rc > 0) && (!ithread))
+					startFrameIndices(ithread);
+
 
 			//problem in receiving or end of acquisition
 			if((rc < expected)||(rc <= 0)){
 				stopListening(ithread,rc,packetcount,total);
 				continue;
 			}
-
-
+/*
+			//start indices for each start of scan/acquisition - eiger does it before
+			if((!measurementStarted) && (rc > 0) && (!ithread))
+				startFrameIndices(ithread);
+*/
 
 			//reset
 			packetcount = (packetsPerFrame/numListeningThreads) * numJobsPerThread;

From 72ba2ae90151d7315314e11dc376c66c8818c68a Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Mon, 27 Oct 2014 12:01:29 +0100
Subject: [PATCH 7/7] offset added to receiver funcs

---
 slsReceiverSoftware/includes/sls_receiver_defs.h  | 4 +++-
 slsReceiverSoftware/includes/sls_receiver_funcs.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/slsReceiverSoftware/includes/sls_receiver_defs.h b/slsReceiverSoftware/includes/sls_receiver_defs.h
index 2381621c0..f21579ae9 100755
--- a/slsReceiverSoftware/includes/sls_receiver_defs.h
+++ b/slsReceiverSoftware/includes/sls_receiver_defs.h
@@ -87,7 +87,9 @@ public:
 		MEASUREMENT_TIME,  /**< Time of the measurement from the detector (fifo) */
 
 		PROGRESS, /**< fraction of measurement elapsed - only get! */
-		MEASUREMENTS_NUMBER
+		MEASUREMENTS_NUMBER,
+		FRAMES_FROM_START,
+		FRAMES_FROM_START_PG
 	};
 
 
diff --git a/slsReceiverSoftware/includes/sls_receiver_funcs.h b/slsReceiverSoftware/includes/sls_receiver_funcs.h
index bb7655481..7f3842576 100644
--- a/slsReceiverSoftware/includes/sls_receiver_funcs.h
+++ b/slsReceiverSoftware/includes/sls_receiver_funcs.h
@@ -8,7 +8,7 @@
 
 enum {
 	//General functions
-	F_EXEC_RECEIVER_COMMAND=0, 		/**< command is executed */
+	F_EXEC_RECEIVER_COMMAND=128, 		/**< command is executed */
 	F_EXIT_RECEIVER, 				/**< turn off receiver server */
 	F_LOCK_RECEIVER, 				/**< Locks/Unlocks server communication to the given client */
 	F_GET_LAST_RECEIVER_CLIENT_IP,  /**< returns the IP of the client last connected to the receiver */