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

changes

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-27 14:57:43 +02:00
parent 697fc5b85e
commit e6f1a90ed7
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/src/Listener.cpp
View File

@ -62,6 +62,10 @@ Listener::Listener(detectorType dtype, Fifo*& f, runStatus* s, uint32_t* portno,
switch(myDetectorType){
case JUNGFRAU:
standardheader = true;
#ifndef EIGER_NEWHEADER
#else
case EIGER:
#endif
break;
default:
standardheader = false;
@ -377,8 +381,10 @@ uint32_t Listener::ListenToAnImage(char* buf) {
else {
memset(new_header, 0, sizeof(sls_detector_header));
new_header->frameNumber = fnum;
#ifndef EIGER_NEWHEADER
if (generalData->myDetectorType == EIGER && *dynamicRange == 32)
new_header->expLength = snum;
#endif
new_header->packetNumber = pperFrame;
/*new_header->xCoord = index; given by det packet, also for ycoord, zcoord */
new_header->detType = (uint8_t) generalData->myDetectorType;
@ -469,8 +475,10 @@ uint32_t Listener::ListenToAnImage(char* buf) {
else {
memset(new_header, 0, sizeof(sls_detector_header));
new_header->frameNumber = fnum;
#ifndef EIGER_NEWHEADER
if (generalData->myDetectorType == EIGER && *dynamicRange == 32)
new_header->expLength = snum;
#endif
new_header->packetNumber = pperFrame;
/*new_header->xCoord = index; given by det packet, also for ycoord, zcoord */
new_header->detType = (uint8_t) generalData->myDetectorType;