detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

unresolved conflict

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-02-25 14:13:42 +01:00
parent bda8b69e05
commit d4b388f434
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/include/receiver_defs.h
View File

@ -151,7 +151,6 @@ typedef struct {
#define JCTB_FIFO_SIZE 2500 //cannot be less than max jobs per thread = 1000 #define JCTB_FIFO_SIZE 2500 //cannot be less than max jobs per thread = 1000
/*#define MOENCH_ALIGNED_FRAME_SIZE 65536*/ /*#define MOENCH_ALIGNED_FRAME_SIZE 65536*/
//<<<<<<< HEAD
#define JCTB_PACKETS_PER_FRAME 1 #define JCTB_PACKETS_PER_FRAME 1
#define JCTB_ONE_PACKET_SIZE 8224 #define JCTB_ONE_PACKET_SIZE 8224
#define JCTB_BUFFER_SIZE (JCTB_ONE_PACKET_SIZE*40) #define JCTB_BUFFER_SIZE (JCTB_ONE_PACKET_SIZE*40)
@ -160,16 +159,7 @@ typedef struct {
#define JCTB_FRAME_INDEX_MASK 0xFFFFFFFF #define JCTB_FRAME_INDEX_MASK 0xFFFFFFFF
#define JCTB_FRAME_INDEX_OFFSET 6+8 #define JCTB_FRAME_INDEX_OFFSET 6+8
#define JCTB_PACKET_INDEX_MASK 0xFFFFFFFF #define JCTB_PACKET_INDEX_MASK 0xFFFFFFFF
//=======
#define JCTB_PACKETS_PER_FRAME 50
#define JCTB_ONE_PACKET_SIZE 8214
#define JCTB_BUFFER_SIZE (MOENCH_ONE_PACKET_SIZE*MOENCH_PACKETS_PER_FRAME)
#define JCTB_DATA_BYTES (JCTB_BUFFER_PER_FRAME)
#define JCTB_FRAME_INDEX_MASK 0xFFFFFF00
#define JCTB_FRAME_INDEX_OFFSET 8
#define JCTB_PACKET_INDEX_MASK 0xFF
//>>>>>>> 8bad1d33fcf4601752bb6722a9eca00aa2cd4ed2
#define JCTB_BYTES_PER_ADC (2) #define JCTB_BYTES_PER_ADC (2)
#define JCTB_PIXELS_IN_ONE_ROW 32 #define JCTB_PIXELS_IN_ONE_ROW 32