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

---
 slsDetectorCalibration/eigerHalfModuleData.h | 264 +++++++++----------
 slsDetectorCalibration/slsReceiverData.h     |   1 +
 2 files changed, 124 insertions(+), 141 deletions(-)

diff --git a/slsDetectorCalibration/eigerHalfModuleData.h b/slsDetectorCalibration/eigerHalfModuleData.h
index 56d48e6e7..a022c2920 100644
--- a/slsDetectorCalibration/eigerHalfModuleData.h
+++ b/slsDetectorCalibration/eigerHalfModuleData.h
@@ -19,12 +19,15 @@ public:
 	 */
 
 
-	eigerHalfModuleData(int dr, int np, int bsize, int dsize, bool top, double c=0): slsReceiverData<uint32_t>(xpixels, ypixels, np, bsize),
-	xtalk(c), bufferSize(bsize), actualDataSize(dsize), dynamicRange(dr), numberOfPackets(np), top(top),header_t(0), footer_t(0){
+	eigerHalfModuleData(bool t, bool l, int dr, int tg, int psize, int dsize, int npf, int x, int y, double c=0):
+		slsReceiverData<uint32_t>(x, y, npf, psize),
+		top(t), left(l),
+		dynamicRange(dr), tenGiga(tg),
+		packetSize(psize), dataSize(dsize), numberofPacketsPerFrame(npf),
+		xpixels(x),ypixels(y),
+		xtalk(c),
+		header_t(0), footer_t(0){
 
-		tenGiga = false;
-		if(actualDataSize == TEN_GIGA_PACKET_SIZE)
-			tenGiga = true;
 
 		int **dMap;
 		uint32_t **dMask;
@@ -39,149 +42,69 @@ public:
 		}
 
 		//Map
-		int totalNumberOfBytes = numberOfPackets * bufferSize;
-		int iPacket1 = 8;
-		int iPacket2 = (totalNumberOfBytes/2) + 8;
-		int iData1 = 0, iData2 = 0;
+		int totalNumberOfBytes = numberofPacketsPerFrame * packetSize;
+		int iPacket = 8;
+		int iData = 0;
 		int increment = (dynamicRange/8);
 		int ic_increment = 1;
 		if (dynamicRange == 4) {
 			increment = 1;
 			ic_increment = 2;
 		}
-		int iPort;
 
 		if(top){
 			for (int ir=0; ir<ypixels; ir++) {
 				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
-					iPort = ic / (xpixels/2);
-					if(!iPort){
-						dMap[ir][ic]  = iPacket1;
-						iPacket1 += increment;
-						iData1 += increment;
-						//increment header
-						if(iData1 >= actualDataSize){
-							iPacket1 += 16;
-							iData1 = 0;
-						}
-					}else{
-						dMap[ir][ic]  = iPacket2;
-						iPacket2 += increment;
-						iData2 += increment;
-						//increment header
-						if(iData2 >= actualDataSize){
-							iPacket2 += 16;
-							iData2 = 0;
-						}
+					dMap[ir][ic]  = iPacket;
+					iPacket += increment;
+					iData += increment;
+					//increment header
+					if(iData >= dataSize){
+						iPacket += 16;
+						iData = 0;
 					}
+
 				}
 			}
 		}
 
-
 		//bottom
 		else{
-			iData1 = 0; iData2 = 0;
-			int numbytesperlineperport;
-
+			iData = 0;
+			int numbytesperline;
 			switch(dynamicRange){
-				case 4: numbytesperlineperport = 256; break;
-				case 8:	numbytesperlineperport = 512; break;
-				case 16:numbytesperlineperport = 1024; break;
-				case 32:numbytesperlineperport = 2048; break;
-			}
-
-
-
-			iPacket1 = (totalNumberOfBytes/2) - numbytesperlineperport - 8;
-			iPacket2 = totalNumberOfBytes - numbytesperlineperport - 8;
-			if (dynamicRange == 32){
-				if(numbytesperlineperport>actualDataSize){ //1Giga
-					iPacket1 -= 16;
-					iPacket2 -= 16;
-				}else{ //10Giga
-					;//iPacket1 -= numbytesperlineperport;
-					//iPacket2 -= numbytesperlineperport;
-				}
+				case 4: numbytesperline = 256; break;
+				case 8:	numbytesperline = 512; break;
+				case 16:numbytesperline = 1024; break;
+				case 32:numbytesperline = 2048; break;
 			}
+			iPacket = totalNumberOfBytes - numbytesperline - 8;
+			if((dynamicRange == 32) && (!tenGiga))
+					iPacket -= 16;
 
 			for (int ir=0; ir<ypixels; ir++) {
 				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
-					iPort = ic / (xpixels/2);
-					if(!iPort){
-						dMap[ir][ic]  = iPacket1;
-						iPacket1 += increment;
-						iData1 += increment;
-
-						//--------------------32 bit -------------------------
-						if(dynamicRange == 32){
-							if(numbytesperlineperport>actualDataSize){ //1Giga
-								if(iData1 == numbytesperlineperport){
-									iPacket1 -= (numbytesperlineperport*2 + 16*3);//1giga
-									iData1 = 0;
-								}
-								if(iData1 == actualDataSize){
-									iPacket1 += 16;
-								}
-							}else{ //10Giga
-								if((iData1 % numbytesperlineperport)==0){
-									iPacket1 -= (numbytesperlineperport*2);
-								}
-								if(iData1 == actualDataSize){
-									iPacket1 -= 16;
-									iData1 = 0;
-								}
-							}
-						}//------------end of 32 bit -------------------------
-
-						else if((iData1 % numbytesperlineperport) == 0){
-							iPacket1 -= (numbytesperlineperport*2);
-							if(iData1 == actualDataSize){
-								iPacket1 -= 16;
-								iData1 = 0;
-							}
+					dMap[ir][ic]  = iPacket;
+					iPacket += increment;
+					iData += increment;
+					//--------------------32 bit 1giga -------------------
+					if((dynamicRange == 32) && (!tenGiga)){
+						if(iData == numbytesperline){
+							iPacket -= (numbytesperline*2 + 16*3);
+							iData = 0;
 						}
-						//------------end of other bits -------------------------
-
-					}
-					//other port
-					else{
-						dMap[ir][ic]  = iPacket2;
-						iPacket2 += increment;
-						iData2 += increment;
-
-
-						//--------------------32 bit -------------------------
-						if(dynamicRange == 32){
-							if(numbytesperlineperport>actualDataSize){ //1Giga
-								if(iData2 == numbytesperlineperport){
-									iPacket2 -= (numbytesperlineperport*2 + 16*3);
-									iData2 = 0;
-								}
-								if(iData2 == actualDataSize){
-									iPacket2 += 16;
-								}
-							}else{//10Giga
-								if((iData2 % numbytesperlineperport)==0){
-									iPacket2 -= (numbytesperlineperport*2);
-								}
-								if(iData2 == actualDataSize){
-									iPacket2 -= 16;
-									iData2 = 0;
-								}
-							}
-						}//------------end of 32 bit -------------------------
-
-						else if((iData2 % numbytesperlineperport) == 0){
-							iPacket2 -= (numbytesperlineperport*2);
-							if(iData2 == actualDataSize){
-								iPacket2 -= 16;
-								iData2 = 0;
-							}
+						if(iData == dataSize){
+							iPacket += 16;
+						}
+					}//------------end of 32 bit -------------------------
+					else if((iData % numbytesperline) == 0){
+						iPacket -= (numbytesperline*2);
+						if(iData == dataSize){
+							iPacket -= 16;
+							iData = 0;
 						}
-						//------------end of other bits -------------------------
-
 					}
+					//---------------------------------------------------
 				}
 			}
 		}
@@ -197,9 +120,6 @@ public:
 		setDataMap(dMap);
 		setDataMask(dMask);
 
-
-
-
 	};
 
 
@@ -211,7 +131,7 @@ public:
 	     \returns frame number
 	 */
 	int getFrameNumber(char *buff){
-		footer_t = (eiger_packet_footer_t*)(buff + actualDataSize + sizeof(eiger_packet_header_t));
+		footer_t = (eiger_packet_footer_t*)(buff + dataSize + sizeof(eiger_packet_header_t));
 		return ((uint32_t)(*( (uint64_t*) footer_t)));
 	};
 
@@ -224,7 +144,7 @@ public:
      	 \returns packet number
 	 */
 	int getPacketNumber(char *buff){
-		footer_t = (eiger_packet_footer_t*)(buff + actualDataSize + sizeof(eiger_packet_header_t));
+		footer_t = (eiger_packet_footer_t*)(buff + dataSize + sizeof(eiger_packet_header_t));
 		return(*( (uint16_t*) footer_t->packetnum));
 	};
 
@@ -287,10 +207,10 @@ public:
 
 			// ------check if missing packet, get to pixel at start of packet-----------------
 
-			//to get the starting of a packet, ix is divided by 512pixels because of 2 ports (except 1g 32 bit)
-			newix = ix - (ix%512);
+			//to get the starting of a packet (except 1g 32 bit)
+			newix = 0;
 			// 0.5 Lines per packet for 1g 32 bit
-			if(dynamicRange ==32 && !tenGiga)
+			if(dynamicRange == 32 && !tenGiga)
 				newix = ix - (ix%256);
 
 			//iy divided by linesperpacket depending on bitmode
@@ -300,10 +220,16 @@ public:
 				newiy = (iy - (iy%linesperpacket));
 
 			header_t = (eiger_packet_header_t*)((char*)(data +(dataMap[newiy][newix]-8)));
-			if(*( (uint16_t*) header_t->missingpacket)==0xFFFF){
+			uint16_t identifier = (uint16_t)*( (uint16_t*) header_t->missingpacket);
+
+			if(identifier==missingPacketValue){
 			  //	cprintf(RED,"missing packet\n");
 			  return -1;
 			}
+			else if(identifier==deactivatedPacketValue){
+				  //	cprintf(RED,"deactivated packet\n");
+				  return -2;
+				}
 			// -----END OF CHECK -------------------------------------------------------------
 
 
@@ -343,24 +269,80 @@ public:
 	double getXTalk() {return xtalk;}
 
 
+	//have to make the frame here itself as 1 frame will have less packets than trying to read
 
+	char *readNextFrame(ifstream &filebin, int& fnum) {
+
+		char *data=new char[packetSize*numberofPacketsPerFrame];
+		char *retval=0;
+		int np=0, nd;
+		fnum = -1;
+		int pnum=-1;
+
+
+		if (filebin.is_open()) {
+
+			while (filebin.read(data+np*packetSize,packetSize)) {
+
+				fnum = getFrameNumber(data); cout << "fnum:"<<fnum<<endl;
+				pnum = getPacketNumber(data); cout << "pnum:"<<pnum<<endl;
+
+				if (np==(numberofPacketsPerFrame-1)) {cout<<"last packet"<<endl;
+
+					fnum=getFrameNumber(data); //cout << "fnum:"<<fnum<<endl;
+					retval=findNextFrame(data,nd,packetSize*numberofPacketsPerFrame);
+					np=nd/packetSize;
+					cout << "got this mnany packets:"<<np << endl;
+
+
+					if (retval==data && np==numberofPacketsPerFrame) {
+						//      cout << "-" << endl;
+						return data;
+
+					} else if (np>numberofPacketsPerFrame) {
+						cout << "too many packets!!!!!!!!!!" << endl;
+						delete [] data;
+						return NULL;
+					} else if (retval!=NULL) {
+						//  cout << "+" << endl;;
+						for (int ip=0; ip<np; ip++)
+							memcpy(data+ip*packetSize,retval+ip*packetSize,packetSize);
+					}
+
+				} else if (np>numberofPacketsPerFrame) {
+					cout << "*******too many packets!!!!!!!!!!" << endl;
+					delete [] data;
+					return NULL;
+				} else {
+					//  cout << "." << endl;;
+					np++;
+					cout<<"np:"<<np<<endl;
+				}
+			}
+		}
+		delete [] data;
+		return NULL;
+	}
 
 
 
 
 private:
+	/** Missing Packet identifier value */
+	const static uint16_t missingPacketValue = 0xFFFF;
+	const static uint16_t deactivatedPacketValue = 0xFEFE;
 
-	double xtalk; /**<output buffer crosstalk correction parameter */
 
-	const static int xpixels = 1024;
-	const static int ypixels = 256;
-	const int bufferSize;
-	const int actualDataSize;
+	const bool top;
+	const bool left;
 	const int dynamicRange;
-	const int numberOfPackets;
-	bool top;
-	bool tenGiga;
-	static const int TEN_GIGA_PACKET_SIZE = 4096;
+	const bool tenGiga;
+	const int packetSize;
+	const int dataSize;
+	const int numberofPacketsPerFrame;
+	const int xpixels;
+	const int ypixels;
+	double xtalk; /**<output buffer crosstalk correction parameter */
 
 
 	/** structure of an eiger packet*/
diff --git a/slsDetectorCalibration/slsReceiverData.h b/slsDetectorCalibration/slsReceiverData.h
index d40cbff4b..826dd95a2 100644
--- a/slsDetectorCalibration/slsReceiverData.h
+++ b/slsDetectorCalibration/slsReceiverData.h
@@ -214,6 +214,7 @@ public:
 					} else {
 						//  cout << "." << endl;;
 						np++;
+						//cout<<"np:"<<np<<endl;
 					}
 				}
 			}

From a6d9f681d8dfd7e81613e39565f577d044c3dc5c Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 14 Oct 2016 16:07:51 +0200
Subject: [PATCH 2/2] works for missing packets and image reconstruction

---
 slsDetectorCalibration/eigerHalfModuleData.h | 246 +++++++++++++------
 slsDetectorCalibration/slsReceiverData.h     |   5 +-
 2 files changed, 178 insertions(+), 73 deletions(-)

diff --git a/slsDetectorCalibration/eigerHalfModuleData.h b/slsDetectorCalibration/eigerHalfModuleData.h
index a022c2920..c9087e8a7 100644
--- a/slsDetectorCalibration/eigerHalfModuleData.h
+++ b/slsDetectorCalibration/eigerHalfModuleData.h
@@ -23,8 +23,7 @@ public:
 		slsReceiverData<uint32_t>(x, y, npf, psize),
 		top(t), left(l),
 		dynamicRange(dr), tenGiga(tg),
-		packetSize(psize), dataSize(dsize), numberofPacketsPerFrame(npf),
-		xpixels(x),ypixels(y),
+		packetSize(psize), onepacketdataSize(dsize), numberofPacketsPerFrame(npf),
 		xtalk(c),
 		header_t(0), footer_t(0){
 
@@ -32,13 +31,13 @@ public:
 		int **dMap;
 		uint32_t **dMask;
 
-		dMap=new int*[ypixels];
-		dMask=new uint32_t*[ypixels];
+		dMap=new int*[ny];
+		dMask=new uint32_t*[ny];
 
 
-		for (int i = 0; i < ypixels; i++) {
-			dMap[i] = new int[xpixels];
-			dMask[i] = new uint32_t[xpixels];
+		for (int i = 0; i < ny; i++) {
+			dMap[i] = new int[nx];
+			dMask[i] = new uint32_t[nx];
 		}
 
 		//Map
@@ -53,13 +52,13 @@ public:
 		}
 
 		if(top){
-			for (int ir=0; ir<ypixels; ir++) {
-				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
+			for (int ir=0; ir<ny; ir++) {
+				for (int ic=0; ic<nx; ic = ic + ic_increment) {
 					dMap[ir][ic]  = iPacket;
 					iPacket += increment;
 					iData += increment;
 					//increment header
-					if(iData >= dataSize){
+					if(iData >= onepacketdataSize){
 						iPacket += 16;
 						iData = 0;
 					}
@@ -82,8 +81,8 @@ public:
 			if((dynamicRange == 32) && (!tenGiga))
 					iPacket -= 16;
 
-			for (int ir=0; ir<ypixels; ir++) {
-				for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
+			for (int ir=0; ir<ny; ir++) {
+				for (int ic=0; ic<nx; ic = ic + ic_increment) {
 					dMap[ir][ic]  = iPacket;
 					iPacket += increment;
 					iData += increment;
@@ -93,13 +92,13 @@ public:
 							iPacket -= (numbytesperline*2 + 16*3);
 							iData = 0;
 						}
-						if(iData == dataSize){
+						if(iData == onepacketdataSize){
 							iPacket += 16;
 						}
 					}//------------end of 32 bit -------------------------
 					else if((iData % numbytesperline) == 0){
 						iPacket -= (numbytesperline*2);
-						if(iData == dataSize){
+						if(iData == onepacketdataSize){
 							iPacket -= 16;
 							iData = 0;
 						}
@@ -113,8 +112,8 @@ public:
 
 
 		//Mask
-		for(int ir=0; ir<ypixels; ++ir)
-			for(int ic=0; ic<xpixels; ++ic)
+		for(int ir=0; ir<ny; ++ir)
+			for(int ic=0; ic<nx; ++ic)
 				dMask[ir][ic] = 0x0;
 
 		setDataMap(dMap);
@@ -131,7 +130,7 @@ public:
 	     \returns frame number
 	 */
 	int getFrameNumber(char *buff){
-		footer_t = (eiger_packet_footer_t*)(buff + dataSize + sizeof(eiger_packet_header_t));
+		footer_t = (eiger_packet_footer_t*)(buff + onepacketdataSize + sizeof(eiger_packet_header_t));
 		return ((uint32_t)(*( (uint64_t*) footer_t)));
 	};
 
@@ -144,7 +143,7 @@ public:
      	 \returns packet number
 	 */
 	int getPacketNumber(char *buff){
-		footer_t = (eiger_packet_footer_t*)(buff + dataSize + sizeof(eiger_packet_header_t));
+		footer_t = (eiger_packet_footer_t*)(buff + onepacketdataSize + sizeof(eiger_packet_header_t));
 		return(*( (uint16_t*) footer_t->packetnum));
 	};
 
@@ -222,14 +221,10 @@ public:
 			header_t = (eiger_packet_header_t*)((char*)(data +(dataMap[newiy][newix]-8)));
 			uint16_t identifier = (uint16_t)*( (uint16_t*) header_t->missingpacket);
 
-			if(identifier==missingPacketValue){
-			  //	cprintf(RED,"missing packet\n");
-			  return -1;
+			if(identifier==deactivatedPacketValue){
+				//	cprintf(RED,"deactivated packet\n");
+				return -2;
 			}
-			else if(identifier==deactivatedPacketValue){
-				  //	cprintf(RED,"deactivated packet\n");
-				  return -2;
-				}
 			// -----END OF CHECK -------------------------------------------------------------
 
 
@@ -268,80 +263,187 @@ public:
 	 */
 	double getXTalk() {return xtalk;}
 
+	void getChannelArray(double* data, char* buffer){
+		for(int iy = 0; iy < ny; iy++){
+			for(int ix = 0; ix < nx; ix++){
+				data[iy*nx+ix] = getValue((char*)buffer,ix,iy);
+				//cprintf(BLUE,"%d,%d :%f\n",ix,iy,value);
+			}
+		}
+	}
 
-	//have to make the frame here itself as 1 frame will have less packets than trying to read
 
-	char *readNextFrame(ifstream &filebin, int& fnum) {
+	int* decodeData(int *datain) {
 
-		char *data=new char[packetSize*numberofPacketsPerFrame];
-		char *retval=0;
-		int np=0, nd;
+		int dataBytes = numberofPacketsPerFrame * onepacketdataSize;
+		int nch = nx*ny;
+		int* dataout = new int [nch];
+		char *ptr=(char*)datain;
+		char iptr;
+
+		const int bytesize=8;
+		int ival=0;
+		int  ipos=0, ichan=0, ibyte;
+
+		switch (dynamicRange) {
+		case 4:
+			for (ibyte=0; ibyte<dataBytes; ++ibyte) {//for every byte (1 pixel = 1/2 byte)
+				iptr=ptr[ibyte]&0xff;				//???? a byte mask
+				for (ipos=0; ipos<2; ++ipos) {		//loop over the 8bit (twice)
+					ival=(iptr>>(ipos*4))&0xf;		//pick the right 4bit
+					dataout[ichan]=ival;
+					ichan++;
+				}
+			}
+			break;
+		case 8:
+			for (ichan=0; ichan<dataBytes; ++ichan) {//for every pixel (1 pixel = 1 byte)
+				ival=ptr[ichan]&0xff;				//????? a byte mask
+				dataout[ichan]=ival;
+			}
+			break;
+		case 16:
+			for (ichan=0; ichan<nch; ++ichan) { 	//for every pixel
+				ival=0;
+				for (ibyte=0; ibyte<2; ++ibyte) { 	//for each byte (concatenate 2 bytes to get 16 bit value)
+					iptr=ptr[ichan*2+ibyte];
+					ival|=((iptr<<(ibyte*bytesize))&(0xff<<(ibyte*bytesize)));
+				}
+				dataout[ichan]=ival;
+			}
+			break;
+		default:
+													//for every 32 bit (every element in datain array)
+			for (ichan=0; ichan<nch; ++ichan) { 	//for every pixel
+				ival=datain[ichan]&0xffffff;
+				dataout[ichan]=ival;
+			}
+		}
+
+
+
+		return dataout;
+
+	};
+
+
+	int* readNextFrameOnlyData(ifstream &filebin, int& fnum) {
+		int framesize = numberofPacketsPerFrame * onepacketdataSize;
+
+		int* data = new int[framesize/(sizeof(int))];
+		char *packet=new char[packetSize];
 		fnum = -1;
-		int pnum=-1;
+		int pn=-1;
+		int dataoffset = 0;
+
+		if (filebin.is_open()) {
+
+			while (filebin.read(packet,packetSize)) {
+
+				fnum = getFrameNumber(packet); //cout << "fn:"<<fn<<endl;
+				pn = getPacketNumber(packet); //cout << "pn:"<<pn<<endl;
+
+				memcpy(((char*)data)+dataoffset,packet+DATA_PACKET_HEADER_SIZE,onepacketdataSize);
+				dataoffset+=onepacketdataSize;
+				if(pn == numberofPacketsPerFrame)
+					break;
+			}
+		}
+
+		delete [] packet;
+		if(!dataoffset){
+			delete [] data;
+			return NULL;
+		}
+
+		return data;
+
+	}
+	/*
+	when u get packet form next frames
+	//to remember the position to read next frame
+	filebin.seekg (position, filebin.beg);
+	position = filebin.tellg();
+
+	*/
+
+	int *readNextFramewithMissingPackets(ifstream &filebin, int& fnum) {
+
+		int* data = new int[(numberofPacketsPerFrame * onepacketdataSize)/(sizeof(int))];
+		char *packet=new char[packetSize];
+		fnum = -1;
+		int pnum = 0;
+		int fn = -1;
+		int pn =-1;
+		int dataoffset = 0;
+		int missingpackets;
 
 
 		if (filebin.is_open()) {
 
-			while (filebin.read(data+np*packetSize,packetSize)) {
+			while (filebin.read(packet,packetSize)) {
 
-				fnum = getFrameNumber(data); cout << "fnum:"<<fnum<<endl;
-				pnum = getPacketNumber(data); cout << "pnum:"<<pnum<<endl;
+				fn = getFrameNumber(packet); //cout << "fn:"<<fn<<endl;
+				pn = getPacketNumber(packet); //cout << "pn:"<<pn<<endl;
 
-				if (np==(numberofPacketsPerFrame-1)) {cout<<"last packet"<<endl;
-
-					fnum=getFrameNumber(data); //cout << "fnum:"<<fnum<<endl;
-					retval=findNextFrame(data,nd,packetSize*numberofPacketsPerFrame);
-					np=nd/packetSize;
-					cout << "got this mnany packets:"<<np << endl;
-
-
-					if (retval==data && np==numberofPacketsPerFrame) {
-						//      cout << "-" << endl;
-						return data;
-
-					} else if (np>numberofPacketsPerFrame) {
-						cout << "too many packets!!!!!!!!!!" << endl;
-						delete [] data;
-						return NULL;
-					} else if (retval!=NULL) {
-						//  cout << "+" << endl;;
-						for (int ip=0; ip<np; ip++)
-							memcpy(data+ip*packetSize,retval+ip*packetSize,packetSize);
-					}
-
-				} else if (np>numberofPacketsPerFrame) {
-					cout << "*******too many packets!!!!!!!!!!" << endl;
-					delete [] data;
-					return NULL;
-				} else {
-					//  cout << "." << endl;;
-					np++;
-					cout<<"np:"<<np<<endl;
+				//first packet
+				if(fnum == -1){
+					fnum = fn;
 				}
+				//next frame packet
+				else if (fnum != fn){
+					//set file reading to the last frame's packet in file
+					filebin.seekg(-packetSize, ios::cur);//filebin.beg
+					break;
+				}
+
+				//missing packets
+				missingpackets = pn - pnum - 1;
+				if(missingpackets){
+					memset(((char*)data)+dataoffset,0xFF,missingpackets*onepacketdataSize);
+					dataoffset+=(missingpackets*onepacketdataSize);
+					pnum+=missingpackets;
+				}
+
+				memcpy(((char*)data)+dataoffset,packet+DATA_PACKET_HEADER_SIZE,onepacketdataSize);
+				dataoffset+=onepacketdataSize;
+				pnum++;
+				if(pnum == numberofPacketsPerFrame)
+					break;
+
 			}
 		}
-		delete [] data;
-		return NULL;
-	}
 
+		delete [] packet;
+		if(!pnum){
+			delete [] data;
+			return NULL;
+		}
+
+		//missing packets (added here to also catch end of file)
+		missingpackets = numberofPacketsPerFrame - pnum;
+		if(missingpackets){
+			memset(((char*)data)+dataoffset,0xFF,missingpackets*onepacketdataSize);
+			dataoffset+=(missingpackets*onepacketdataSize);
+		}
+
+		return data;
+	}
 
 
 
 private:
 	/** Missing Packet identifier value */
-	const static uint16_t missingPacketValue = 0xFFFF;
 	const static uint16_t deactivatedPacketValue = 0xFEFE;
 
-
+	const static int DATA_PACKET_HEADER_SIZE = 8;
 	const bool top;
 	const bool left;
 	const int dynamicRange;
 	const bool tenGiga;
 	const int packetSize;
-	const int dataSize;
+	const int onepacketdataSize;
 	const int numberofPacketsPerFrame;
-	const int xpixels;
-	const int ypixels;
 	double xtalk; /**<output buffer crosstalk correction parameter */
 
 
diff --git a/slsDetectorCalibration/slsReceiverData.h b/slsDetectorCalibration/slsReceiverData.h
index 826dd95a2..55c520425 100644
--- a/slsDetectorCalibration/slsReceiverData.h
+++ b/slsDetectorCalibration/slsReceiverData.h
@@ -222,7 +222,10 @@ public:
 			return NULL;
 		};
 
-
+		virtual int* readNextFramewithMissingPackets(ifstream &filebin, int& fnum) {return NULL;}
+		virtual void getChannelArray(double* data, char* buffer){};
+		virtual int* readNextFrameOnlyData(ifstream &filebin, int& fnum) {return NULL;};
+		virtual int* decodeData(int* datain) {return NULL;};
 
 private:
 	const int nPackets; /**<number of UDP packets constituting one frame */