detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 18:45:27 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d
2019-08-21 13:23:38 +02:00
parent 5eaea5fb8d b4c207fc4e
commit 5c393e6204
6 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/src/Listener.cpp
View File

@@ -20,7 +20,7 @@
const std::string Listener::TypeName = "Listener";
Listener::Listener(int ind, detectorType dtype, Fifo* f, runStatus* s,
Listener::Listener(int ind, detectorType dtype, Fifo* f, std::atomic<runStatus>* s,
uint32_t* portno, char* e, uint64_t* nf, uint32_t* dr,
int64_t* us, int64_t* as, uint32_t* fpf,
frameDiscardPolicy* fdp, bool* act, bool* depaden, bool* sm) :
@@ -475,9 +475,6 @@ uint32_t Listener::ListenToAnImage(char* buf) {
}
//until last packet isHeaderEmpty to account for gotthard short frame, else never entering this loop)
while ( numpackets < pperFrame) {
//listen to new packet