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

ctb rxr: changing to old header (like moench)

Browse Source
This commit is contained in:
maliakal_d
2019-08-21 11:13:17 +02:00
parent 156ce0df00
commit 422a928be4
4 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/Listener.cpp
View File

@ -348,8 +348,8 @@ void Listener::StopListening(char* buf) {
uint32_t Listener::ListenToAnImage(char* buf) {
int rc = 0;
uint64_t fnum = 0, bid = 0;
uint32_t pnum = 0, snum = 0;
uint64_t fnum = 0;
uint32_t pnum = 0;
uint32_t numpackets = 0;
uint32_t dsize = generalData->dataSize;
uint32_t hsize = generalData->headerSizeinPacket; //(includes empty header)
@ -402,8 +402,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
}
// -------------------old header -----------------------------------------------------------------------------
else {
generalData->GetHeaderInfo(index, &carryOverPacket[0],
*dynamicRange, oddStartingPacket, fnum, pnum, snum, bid);
generalData->GetHeaderInfo(index, &carryOverPacket[0], oddStartingPacket, fnum, pnum);
}
//------------------------------------------------------------------------------------------------------------
if (fnum != currentFrameIndex) {
@ -525,8 +524,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
oddStartingPacket = generalData->SetOddStartingPacket(index, &listeningPacket[0]);
}
generalData->GetHeaderInfo(index, &listeningPacket[0],
*dynamicRange, oddStartingPacket, fnum, pnum, snum, bid);
generalData->GetHeaderInfo(index, &listeningPacket[0], oddStartingPacket, fnum, pnum);
}
//------------------------------------------------------------------------------------------------------------