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

Some defs for JCTB receiver

Browse Source
This commit is contained in:
bergamaschi 2016-02-11 17:09:54 +01:00
parent a9958e3791
commit bd91aea713
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/circularFifo.h
View File

@ -78,7 +78,6 @@ int CircularFifo<Element>::getSemValue()
template<typename Element> template<typename Element>
bool CircularFifo<Element>::push(Element*& item_) bool CircularFifo<Element>::push(Element*& item_)
{ {
int nextTail = increment(tail); int nextTail = increment(tail);
if(nextTail != head) if(nextTail != head)
{ {
@ -87,7 +86,6 @@ bool CircularFifo<Element>::push(Element*& item_)
sem_post(&free_mutex); sem_post(&free_mutex);
return true; return true;
} }
// queue was full // queue was full
return false; return false;
} }

6
slsReceiverSoftware/include/receiver_defs.h
View File

@ -90,7 +90,7 @@
#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 //<<<<<<< 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)
@ -99,7 +99,7 @@
#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_PACKETS_PER_FRAME 50
#define JCTB_ONE_PACKET_SIZE 8214 #define JCTB_ONE_PACKET_SIZE 8214
#define JCTB_BUFFER_SIZE (MOENCH_ONE_PACKET_SIZE*MOENCH_PACKETS_PER_FRAME) #define JCTB_BUFFER_SIZE (MOENCH_ONE_PACKET_SIZE*MOENCH_PACKETS_PER_FRAME)
@ -108,7 +108,7 @@
#define JCTB_FRAME_INDEX_MASK 0xFFFFFF00 #define JCTB_FRAME_INDEX_MASK 0xFFFFFF00
#define JCTB_FRAME_INDEX_OFFSET 8 #define JCTB_FRAME_INDEX_OFFSET 8
#define JCTB_PACKET_INDEX_MASK 0xFF #define JCTB_PACKET_INDEX_MASK 0xFF
>>>>>>> 8bad1d33fcf4601752bb6722a9eca00aa2cd4ed2 //>>>>>>> 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