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

fixed new header for eiger

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-28 16:53:01 +02:00
parent 81d68bebc6
commit f4857355b6
7 changed files with 20 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/src/Listener.cpp
View File

@ -61,11 +61,8 @@ Listener::Listener(detectorType dtype, Fifo*& f, runStatus* s, uint32_t* portno,
switch(myDetectorType){
case JUNGFRAU:
standardheader = true;
#ifndef EIGER_NEWHEADER
#else
case EIGER:
#endif
standardheader = true;
break;
default:
standardheader = false;
@ -381,10 +378,6 @@ 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;
@ -475,10 +468,6 @@ 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;

2
slsReceiverSoftware/src/main.cpp
View File

@ -13,7 +13,7 @@
#include "logger.h"
using namespace std;
slsReceiverUsers *receiver;
slsReceiverUsers *receiver;
void deleteReceiver(slsReceiverUsers* r){
if(r){delete r;r=0;}