detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-03 19:58:40 +01:00
Code Issues Actions Packages Releases Activity

rxr sls namespace (#457)

Browse Source 
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
This commit is contained in:
Dhanya Thattil
2022-05-18 11:48:38 +02:00
committed by GitHub
parent fcc7f7aef8
commit 4259363169
88 changed files with 1200 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsReceiverSoftware/src/Fifo.h
View File

@@ -16,6 +16,8 @@
#include "sls/CircularFifo.h"
namespace sls {
class Fifo : private virtual slsDetectorDefs {
public:
@@ -94,13 +96,13 @@ class Fifo : private virtual slsDetectorDefs {
char *memory;
/** Circular Fifo pointing to addresses of bound data in memory */
sls::CircularFifo<char> *fifoBound;
CircularFifo<char> *fifoBound;
/** Circular Fifo pointing to addresses of freed data in memory */
sls::CircularFifo<char> *fifoFree;
CircularFifo<char> *fifoFree;
/** Circular Fifo pointing to addresses of to be streamed data in memory */
sls::CircularFifo<char> *fifoStream;
CircularFifo<char> *fifoStream;
/** Fifo depth set */
int fifoDepth;
@@ -108,3 +110,6 @@ class Fifo : private virtual slsDetectorDefs {
volatile int status_fifoBound;
volatile int status_fifoFree;
};
} // namespace sls