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

7.0.3.rc2 (#866) (#867)

Browse Source 
*7.0.3.rc2
* moench: handling bug in post processing from receiver when partial_frames policy and empty frame happens, only json header without data is sent
This commit is contained in:
maliakal_d
2023-11-14 11:29:57 +01:00
parent 4b414bfddb
commit cfbe3c86cc
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNew.h
View File

@ -42,7 +42,7 @@ class moench03T1ReceiverDataNew : public slsDetectorData<uint16_t> {
int sc_width;
int sc_height;
const int nSamples;
int headerSize;
double ghost[200][25];
// Single point of definition if we need to customize
@ -62,7 +62,7 @@ class moench03T1ReceiverDataNew : public slsDetectorData<uint16_t> {
moench03T1ReceiverDataNew(int ns = 5000)
: slsDetectorData<uint16_t>(400, 400, ns * 2 * 32 + sizeof(header)),
nSamples(ns) {
headerSize=112;
int nadc = 32;
int sc_width = 25;
int sc_height = 200;
@ -250,13 +250,22 @@ class moench03T1ReceiverDataNew : public slsDetectorData<uint16_t> {
virtual char *readNextFrame(std::ifstream &filebin, int &ff, int &np,
char *data) {
np = 0;
if (filebin.is_open()) {
if (filebin.read(data, dataSize)) {
ff = getFrameNumber(data);
np = getPacketNumber(data);
return data;
}
}
if (filebin.is_open()) {
if (filebin.read(data, headerSize)) {
ff = getFrameNumber(data);
np = getPacketNumber(data);
if (np>0)
filebin.read(data+headerSize, dataSize-headerSize);
return data;
}
/* if (filebin.read(data, dataSize)) { */
/* ff = getFrameNumber(data); */
/* np = getPacketNumber(data); */
/* return data; */
/* } */
}
return nullptr;
}