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

fixing the standard header pointers for it to work

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-05-08 12:33:31 +02:00
parent a1fc93b398
commit 6d7fb07a4c
4 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -294,7 +294,7 @@ void DataProcessor::StopProcessing(char* buf) {
#endif
}
/** buf includes only the standard header */
void DataProcessor::ProcessAnImage(char* buf) {
numFramesCaught++;
numTotalFramesCaught++;
@ -302,12 +302,12 @@ void DataProcessor::ProcessAnImage(char* buf) {
sls_detector_header* header = (sls_detector_header*) (buf);
uint64_t fnum = header->frameNumber;
#ifdef VERBOSE
if (!index) cprintf(BLUE,"DataProcessing %d: fnum:%lld\n", index, (long long int)fnum);
if (!index) cprintf(BLUE,"DataProcessing %d: fnum:%lu\n", index, fnum);
#endif
if (!measurementStartedFlag) {
#ifdef VERBOSE
if (!index) cprintf(BLUE,"DataProcessing %d: fnum:%lld\n", index, (long long int)fnum);
if (!index) cprintf(BLUE,"DataProcessing %d: fnum:%lu\n", index, fnum);
#endif
RecordFirstIndices(fnum);
}

19
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -215,18 +215,18 @@ void DataStreamer::StopProcessing(char* buf) {
#endif
}
/** buf includes only the standard header */
void DataStreamer::ProcessAnImage(char* buf) {
sls_detector_header* header = (sls_detector_header*) (buf);
uint64_t fnum = header->frameNumber;
#ifdef VERBOSE
if (!index) cprintf(MAGENTA,"DataStreamer %d: fnum:%lld\n", index, (long long int)fnum);
if (!index) cprintf(MAGENTA,"DataStreamer %d: fnum:%lu\n", index,fnum);
#endif
if (!measurementStartedFlag) {
#ifdef VERBOSE
if (!index) cprintf(MAGENTA,"DataStreamer %d: fnum:%lld\n", index, (long long int)fnum);
if (!index) cprintf(MAGENTA,"DataStreamer %d: fnum:%lu\n", index, fnum);
#endif
RecordFirstIndices(fnum);
//restart timer
@ -293,15 +293,18 @@ bool DataStreamer::CheckCount() {
int DataStreamer::SendHeader(sls_detector_header* header, bool dummy) {
if (dummy)
return zmqSocket->SendHeaderData(index, dummy,SLS_DETECTOR_JSON_HEADER_VERSION);
uint64_t frameIndex = header->frameNumber - firstMeasurementIndex;
uint64_t acquisitionIndex = header->frameNumber - firstAcquisitionIndex;
return zmqSocket->SendHeaderData(SLS_DETECTOR_JSON_HEADER_VERSION, *dynamicRange,
return zmqSocket->SendHeaderData(index, dummy, SLS_DETECTOR_JSON_HEADER_VERSION, *dynamicRange,
generalData->nPixelsX_Streamer, generalData->nPixelsY_Streamer,
acquisitionIndex, frameIndex, fileNametoStream, dummy,
acquisitionIndex, frameIndex, fileNametoStream,
header->frameNumber, header->expLength, header->packetNumber, header->bunchId, header->timestamp,
header->modId, header->xCoord, header->yCoord, header->zCoord, header->debug, header->roundRNumber,
header->modId, header->xCoord, header->yCoord, header->zCoord,
header->debug, header->roundRNumber,
header->detType, header->version
);
);
}

19
slsReceiverSoftware/src/Listener.cpp
View File

@ -293,7 +293,7 @@ void Listener::StopListening(char* buf) {
}
/* buf includes the header */
uint32_t Listener::ListenToAnImage(char* buf) {
uint32_t rc = 0;
uint64_t fnum = 0, bid = 0;
@ -322,7 +322,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
memcpy(buf + generalData->fifoBufferHeaderSize + (pnum * dsize), carryOverPacket + generalData->headerSizeinPacket, dsize);
//writer header
if(isHeaderEmpty) {
sls_detector_header* header = (sls_detector_header*) (buf);
sls_detector_header* header = (sls_detector_header*) (buf + FIFO_HEADER_NUMBYTES);
memset(header, 0, sizeof(sls_detector_header));
header->frameNumber = fnum;
if (generalData->myDetectorType == EIGER && *dynamicRange == 32)
@ -331,16 +331,9 @@ uint32_t Listener::ListenToAnImage(char* buf) {
if (generalData->myDetectorType == JUNGFRAU)
header->bunchId = bid;
/*header->xCoord = index; given by det packet, also for ycoord, zcoord */
/*header->detType = (uint8_t) generalData->myDetectorType; given by det packet */
header->detType = (uint8_t) generalData->myDetectorType; /*given by det packet */
header->version = (uint8_t) SLS_DETECTOR_HEADER_VERSION;
#ifdef VERBOSE
if(!ithread)
cprintf(BLUE,
"framenumber:%llu\tsubfnum:%u\tpnum:%u\tbunchid:%llu\txcoord:%u\tdettype:%u\tversion:%u\n",
header->frameNumber, header->expLength, header->packetNumber,
header->bunchId, header->xCoord, header->detType, header->version);
#endif
isHeaderEmpty = false;
}
expectpnum = pnum+1; //for jungfrau
@ -366,7 +359,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
lastCaughtFrameIndex = fnum;
#ifdef VERBOSE
if (!index)
cprintf(GREEN,"Listening %d: fnum:%lld, pnum:%d\n", index, (long long int)fnum, pnum);
cprintf(GREEN,"Listening %d: fnum:%lu, pnum:%d\n", index,fnum, pnum);
#endif
if (!measurementStartedFlag)
RecordFirstIndices(fnum);
@ -393,7 +386,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
//copy packet
memcpy(buf + generalData->fifoBufferHeaderSize + (pnum * dsize), listeningPacket + generalData->headerSizeinPacket, dsize);
if(isHeaderEmpty) {
sls_detector_header* header = (sls_detector_header*) (buf);
sls_detector_header* header = (sls_detector_header*) (buf + FIFO_HEADER_NUMBYTES);
memset(header, 0, sizeof(sls_detector_header));
header->frameNumber = fnum;
if (generalData->myDetectorType == EIGER && *dynamicRange == 32)
@ -402,7 +395,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
if (generalData->myDetectorType == JUNGFRAU)
header->bunchId = bid;
/*header->xCoord = index; given by det packet, also for ycoord, zcoord */
/*header->detType = (uint8_t) generalData->myDetectorType; given by det packet */
header->detType = (uint8_t) generalData->myDetectorType; /*given by det packet */
header->version = (uint8_t) SLS_DETECTOR_HEADER_VERSION;
isHeaderEmpty = false;
}