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

Rxclassmembers (#503)

Browse Source 
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* remove pointer in callback for sls_receiver_header pointer

* rx same name arguments in constructors

* rx: same name arguments in constructor

* rx: removing the '_' suffix in class data members

* merge fix

* merge fix

* review fix refactoring
This commit is contained in:
Dhanya Thattil
2022-07-25 14:02:11 +02:00
committed by GitHub
parent d132ad8d02
commit 9ac8dab8af
22 changed files with 349 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsReceiverSoftware/src/GeneralData.h
View File

@ -21,7 +21,7 @@ namespace sls {
class GeneralData {
public:
slsDetectorDefs::detectorType myDetectorType{slsDetectorDefs::GENERIC};
slsDetectorDefs::detectorType detType{slsDetectorDefs::GENERIC};
uint32_t nPixelsX{0};
uint32_t nPixelsY{0};
uint32_t headerSizeinPacket{0};
@ -161,7 +161,7 @@ class GotthardData : public GeneralData {
public:
GotthardData() {
myDetectorType = slsDetectorDefs::GOTTHARD;
detType = slsDetectorDefs::GOTTHARD;
nPixelsY = 1;
headerSizeinPacket = 6;
maxFramesPerFile = MAX_FRAMES_PER_FILE;
@ -290,7 +290,7 @@ class EigerData : public GeneralData {
public:
EigerData() {
myDetectorType = slsDetectorDefs::EIGER;
detType = slsDetectorDefs::EIGER;
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
maxFramesPerFile = EIGER_MAX_FRAMES_PER_FILE;
numUDPInterfaces = 2;
@ -326,7 +326,7 @@ class JungfrauData : public GeneralData {
public:
JungfrauData() {
myDetectorType = slsDetectorDefs::JUNGFRAU;
detType = slsDetectorDefs::JUNGFRAU;
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
dataSize = 8192;
packetSize = headerSizeinPacket + dataSize;
@ -359,7 +359,7 @@ class Mythen3Data : public GeneralData {
public:
Mythen3Data() {
myDetectorType = slsDetectorDefs::MYTHEN3;
detType = slsDetectorDefs::MYTHEN3;
nPixelsY = 1;
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
maxFramesPerFile = MYTHEN3_MAX_FRAMES_PER_FILE;
@ -427,7 +427,7 @@ class Mythen3Data : public GeneralData {
class Gotthard2Data : public GeneralData {
public:
Gotthard2Data() {
myDetectorType = slsDetectorDefs::GOTTHARD2;
detType = slsDetectorDefs::GOTTHARD2;
nPixelsX = 128 * 10;
nPixelsY = 1;
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
@ -482,7 +482,7 @@ class ChipTestBoardData : public GeneralData {
public:
/** Constructor */
ChipTestBoardData() {
myDetectorType = slsDetectorDefs::CHIPTESTBOARD;
detType = slsDetectorDefs::CHIPTESTBOARD;
nPixelsY = 1; // number of samples
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
frameIndexMask = 0xFFFFFF; // 10g
@ -572,7 +572,7 @@ class MoenchData : public GeneralData {
public:
MoenchData() {
myDetectorType = slsDetectorDefs::MOENCH;
detType = slsDetectorDefs::MOENCH;
headerSizeinPacket = sizeof(slsDetectorDefs::sls_detector_header);
frameIndexMask = 0xFFFFFF;
maxFramesPerFile = MOENCH_MAX_FRAMES_PER_FILE;