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

formatting

Browse Source
This commit is contained in:
maliakal_d 2025-05-19 13:20:03 +02:00
parent 1665937540
commit d7c012d306
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -7,9 +7,11 @@
#define MIN_REQRD_VRSN_T_RD_API 0x181130 #define MIN_REQRD_VRSN_T_RD_API 0x181130
#define REQRD_FRMWR_VRSN 0x230705 #define REQRD_FRMWR_VRSN 0x230705
#define NUM_HARDWARE_VERSIONS (1) #define NUM_HARDWARE_VERSIONS (1)
#define HARDWARE_VERSION_NUMBERS {0x3f} #define HARDWARE_VERSION_NUMBERS \
#define HARDWARE_VERSION_NAMES {"5.1"} { 0x3f }
#define HARDWARE_VERSION_NAMES \
{ "5.1" }
#define LINKED_SERVER_NAME "ctbDetectorServer" #define LINKED_SERVER_NAME "ctbDetectorServer"

2
slsReceiverSoftware/src/DataProcessor.h
View File

@ -168,7 +168,7 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
uint32_t streamingTimerInMs; uint32_t streamingTimerInMs;
uint32_t streamingStartFnum; uint32_t streamingStartFnum;
uint32_t currentFreqCount{0}; uint32_t currentFreqCount{0};
struct timespec timerbegin{}; struct timespec timerbegin {};
bool framePadding; bool framePadding;
std::atomic<bool> startedFlag{false}; std::atomic<bool> startedFlag{false};
std::atomic<uint64_t> firstIndex{0}; std::atomic<uint64_t> firstIndex{0};

4
slsReceiverSoftware/src/GeneralData.h
View File

@ -63,8 +63,8 @@ class GeneralData {
slsDetectorDefs::frameDiscardPolicy frameDiscardMode{ slsDetectorDefs::frameDiscardPolicy frameDiscardMode{
slsDetectorDefs::NO_DISCARD}; slsDetectorDefs::NO_DISCARD};
GeneralData() {}; GeneralData(){};
virtual ~GeneralData() {}; virtual ~GeneralData(){};
// Returns the pixel depth in byte, 4 bits being 0.5 byte // Returns the pixel depth in byte, 4 bits being 0.5 byte
float GetPixelDepth() { return float(dynamicRange) / 8; } float GetPixelDepth() { return float(dynamicRange) / 8; }

4
slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
View File

@ -47,8 +47,8 @@ class GeneralDataTest : public GeneralData {
// dummy DataProcessor class for testing // dummy DataProcessor class for testing
class DataProcessorTest : public DataProcessor { class DataProcessorTest : public DataProcessor {
public: public:
DataProcessorTest() : DataProcessor(0) {}; DataProcessorTest() : DataProcessor(0){};
~DataProcessorTest() {}; ~DataProcessorTest(){};
void ArrangeDbitData(size_t &size, char *data) { void ArrangeDbitData(size_t &size, char *data) {
DataProcessor::ArrangeDbitData(size, data); DataProcessor::ArrangeDbitData(size, data);
} }

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,4 +9,4 @@
#define APIXILINXCTB "developer 0x250311" #define APIXILINXCTB "developer 0x250311"
#define APIJUNGFRAU "developer 0x250318" #define APIJUNGFRAU "developer 0x250318"
#define APIMYTHEN3 "developer 0x250409" #define APIMYTHEN3 "developer 0x250409"
#define APICTB "developer 0x250519" #define APICTB "developer 0x250519"