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

added binary for moench04 and gain bits

Browse Source
This commit is contained in:
bergamaschi
2022-10-24 12:36:24 +02:00
parent 9232776577
commit 22b16de6b5
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNew.h
View File

@ -208,7 +208,7 @@ class moench03T1ReceiverDataNew : public slsDetectorData<uint16_t> {
*/
int getFrameNumber(char *buff) {
return ((sls_receiver_header *)buff)->detHeader.frameNumber;
return ((sls::defs::sls_receiver_header *)buff)->detHeader.frameNumber;
}
/**
@ -221,7 +221,7 @@ class moench03T1ReceiverDataNew : public slsDetectorData<uint16_t> {
*/
int getPacketNumber(char *buff) {
return ((sls_receiver_header *)buff)->detHeader.packetNumber;
return ((sls::defs::sls_receiver_header *)buff)->detHeader.packetNumber;
}
char *readNextFrame(std::ifstream &filebin) override {

8
slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h
View File

@ -91,12 +91,8 @@ class moench04CtbZmq10GbData : public slsDetectorData<uint16_t> {
} else {
row = 200 + i / sc_width;
}
// if (nds > 0)
dataMap[row][col] =
((nadc ) * i + iadc) * 2 + off; //+16*(ip+1);
//else
// dataMap[row][col] =
// (nadc * i + iadc) * 2 + off; //+16*(ip+1);
dataMap[row][col] =
((nadc ) * i + iadc) * 2 + off;
if (dataMap[row][col] < 0 ||
dataMap[row][col] >= aSamples * 2 * 32 + off)
cout << "Error: pointer " << dataMap[row][col]