still long way to go

This commit is contained in:
Dhanya Maliakal 2015-07-21 13:36:14 +02:00
parent 26a42d8f67
commit 878c12d43e
4 changed files with 503 additions and 522 deletions

View File

@ -486,10 +486,10 @@ protected:
/** structure of an eiger image header*/
typedef struct
{
//unsigned char header_before1[5];
//unsigned char header_confirm[1];
//unsigned char header_before2[14];
unsigned char header_before[20];
unsigned char header_before1[5];
unsigned char header_confirm[1];
unsigned char header_before2[14];
//unsigned char header_before[20];
unsigned char fnum[4];
unsigned char header_after[24];
} eiger_image_header;
@ -659,9 +659,6 @@ protected:
/** Receiver buffer */
char *buffer[MAX_NUM_LISTENING_THREADS];
/** Missing Packet */
char *missingPacket;
/** number of writer threads */
int numListeningThreads;

View File

@ -468,10 +468,8 @@ private:
* Called by startWriting()
* @param ithread writing thread number
* @param wbuffer writer buffer
* @param partialframe is 1 if both ports of eiger dont have same frame
* @param smaller is which port is the smaller frame number if only partial frame received
*/
void handleWithoutDataCompression(int ithread, char* wbuffer[], int partialframe = 0, int smaller = 0);
void handleWithoutDataCompression(int ithread, char* wbuffer[]);
/**
* data compression for each fifo output

View File

@ -14,7 +14,7 @@
#define BUF_SIZE (16*1024*1024) //16mb
#define SAMPLE_TIME_IN_NS 100000000//100ms
#define MAX_JOBS_PER_THREAD 1000
#define HEADER_SIZE_NUM_TOT_PACKETS 2
#define HEADER_SIZE_NUM_TOT_PACKETS 4
#define HEADER_SIZE_NUM_FRAMES 2
#define HEADER_SIZE_NUM_PACKETS 1

File diff suppressed because it is too large Load Diff