detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 18:30:05 +02:00
Code Issues Actions Packages Releases Activity

somewhere

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-11 12:35:49 +02:00
parent 47516cafde
commit e45b89695b
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/include/receiver_defs.h
View File

@ -171,7 +171,6 @@ typedef struct {
#define EIGER_MAX_PORTS 2 #define EIGER_MAX_PORTS 2
#define EIGER_HEADER_PACKET_LENGTH 48 #define EIGER_HEADER_PACKET_LENGTH 48
#define EIGER_HEADER_SIZE 8
#define EIGER_FIFO_SIZE 100 #define EIGER_FIFO_SIZE 100
/*#define EIGER_ALIGNED_FRAME_SIZE 65536*/ /*#define EIGER_ALIGNED_FRAME_SIZE 65536*/
@ -182,7 +181,7 @@ typedef struct {
#define EIGER_ONE_GIGA_ONE_DATA_SIZE 1024 #define EIGER_ONE_GIGA_ONE_DATA_SIZE 1024
#define EIGER_TEN_GIGA_ONE_PACKET_SIZE 4112 #define EIGER_TEN_GIGA_ONE_PACKET_SIZE 4112
#define EIGER_TEN_GIGA_ONE_DATA_SIZE 4096 #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_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 //#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_FRAME_INDEX_OFFSET 0
#define EIGER_PACKET_INDEX_MASK 0x0 #define EIGER_PACKET_INDEX_MASK 0x0
#define EIGER_IMAGE_HEADER_SIZE 48 //for each thread
#define EIGER_PIXELS_IN_ONE_ROW (256*2)
#define EIGER_PIXELS_IN_ONE_ROW (256*4)
#define EIGER_PIXELS_IN_ONE_COL (256) #define EIGER_PIXELS_IN_ONE_COL (256)

18
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -671,7 +671,7 @@ int UDPStandardImplementation::setTenGigaEnable(const bool b){
oneDataSize = EIGER_ONE_GIGA_ONE_DATA_SIZE; oneDataSize = EIGER_ONE_GIGA_ONE_DATA_SIZE;
} }
bufferSize = onePacketSize * packetsPerFrame; bufferSize = onePacketSize * packetsPerFrame;
footerOffset = EIGER_PACKET_HEADER_SIZE + oneDataSize; footerOffset = EIGER_DATA_PACKET_HEADER_SIZE + oneDataSize;
FILE_LOG(logDEBUG) << dec << FILE_LOG(logDEBUG) << dec <<
"packetsPerFrame:" << packetsPerFrame << "packetsPerFrame:" << packetsPerFrame <<
"\nonePacketSize:" << onePacketSize << "\nonePacketSize:" << onePacketSize <<
@ -803,7 +803,7 @@ int UDPStandardImplementation::setDetectorType(const detectorType d){
maxFramesPerFile = EIGER_MAX_FRAMES_PER_FILE; maxFramesPerFile = EIGER_MAX_FRAMES_PER_FILE;
fifoSize = EIGER_FIFO_SIZE; fifoSize = EIGER_FIFO_SIZE;
fifoDepth = EIGER_FIFO_SIZE; fifoDepth = EIGER_FIFO_SIZE;
footerOffset = EIGER_PACKET_HEADER_SIZE + oneDataSize; footerOffset = EIGER_DATA_PACKET_HEADER_SIZE + oneDataSize;
break; break;
case JUNGFRAUCTB: case JUNGFRAUCTB:
packetsPerFrame = JCTB_PACKETS_PER_FRAME; packetsPerFrame = JCTB_PACKETS_PER_FRAME;
@ -1682,7 +1682,7 @@ void UDPStandardImplementation::startDataCallback(){
int headersize=0; int headersize=0;
switch(myDetectorType){ switch(myDetectorType){
case EIGER: case EIGER:
headersize = EIGER_HEADER_SIZE; break; headersize = EIGER_DATA_PACKET_HEADER_SIZE; break;
default: default:
headersize = 0; break; headersize = 0; break;
} }
@ -2884,13 +2884,23 @@ void UDPStandardImplementation::updateFileHeader(int ithread){
while((unsigned int)length!=strlen(fileHeader[ithread])){ while((unsigned int)length!=strlen(fileHeader[ithread])){
length = strlen(fileHeader[ithread]); length = strlen(fileHeader[ithread]);
sprintf(fileHeader[ithread],"\nHeader\t\t %d bytes\n" sprintf(fileHeader[ithread],"\nHeader\t\t %d bytes\n"
"Top\t\t %d\n"
"Left\t\t %d\n"
"Dynamic Range\t %d\n" "Dynamic Range\t %d\n"
"Ten Giga\t %d\n"
"Packet\t\t %d bytes\n" "Packet\t\t %d bytes\n"
"Data\t\t %d bytes\n"
"x\t\t %d pixels\n" "x\t\t %d pixels\n"
"y\t\t %d pixels\n" "y\t\t %d pixels\n"
"Timestamp\t %s\n\n" "Timestamp\t %s\n\n"
"%s", "%s",
length,dynamicRange,onePacketSize,xpix,ypix,ctime(&t), length,
(bottomEnable?0:1),(ithread?0:1),
dynamicRange,tengigaEnable,
onePacketSize,oneDataSize,
xpix,ypix,
ctime(&t),
packetheader); packetheader);
} }