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

making gui work temporarily for jctb

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-22 09:27:42 +01:00
parent 3a26c95c0d
commit 114c45c04a
6 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/DataProcessor.cpp
View File

@@ -416,7 +416,7 @@ void DataProcessor::ProcessAnImage(char* buf) {
if (file)
file->WriteToFile(buf, generalData->imageSize + sizeof(sls_detector_header), fnum-firstMeasurementIndex, nump);
file->WriteToFile(buf, sizeof(sls_detector_header) + generalData->imageSize, fnum-firstMeasurementIndex, nump);

13
slsReceiverSoftware/src/Listener.cpp
View File

@@ -336,6 +336,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
sls_detector_header* old_header = 0;
sls_detector_header* new_header = 0;
bool standardheader = generalData->standardheader;
uint32_t corrected_dsize = dsize - ((pperFrame * dsize) - generalData->imageSize);
//reset to -1
@@ -379,6 +380,12 @@ uint32_t Listener::ListenToAnImage(char* buf) {
else
memcpy(buf + fifohsize + dsize - 2, carryOverPacket + hsize, dsize+2);
break;
case JUNGFRAUCTB:
if (pnum == (pperFrame-1))
memcpy(buf + fifohsize + (pnum * dsize), carryOverPacket + hsize, corrected_dsize);
else
memcpy(buf + fifohsize + (pnum * dsize), carryOverPacket + hsize, dsize);
break;
default:
memcpy(buf + fifohsize + (pnum * dsize), carryOverPacket + hsize, dsize);
break;
@@ -479,6 +486,12 @@ uint32_t Listener::ListenToAnImage(char* buf) {
else
memcpy(buf + fifohsize + (pnum * dsize) - 2, listeningPacket + hsize, dsize+2);
break;
case JUNGFRAUCTB:
if (pnum == (pperFrame-1))
memcpy(buf + fifohsize + (pnum * dsize), listeningPacket + hsize, corrected_dsize);
else
memcpy(buf + fifohsize + (pnum * dsize), listeningPacket + hsize, dsize);
break;
default:
memcpy(buf + fifohsize + (pnum * dsize), listeningPacket + hsize, dsize);
break;

6
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@@ -15,7 +15,6 @@
#include <cstdlib> //system
#include <cstring> //strcpy
#include <errno.h> //eperm
#include <math.h> //ceil
using namespace std;
@@ -250,10 +249,7 @@ int UDPStandardImplementation::setNumberofSamples(const uint64_t i) {
if (numberOfSamples != i) {
numberOfSamples = i;
//side effects
uint32_t ppf = ceil(double(2 * (nroichannels ? nroichannels : DEFAULT_NROI_CHANNELS) * numberOfSamples) / double(generalData->dataSize));
generalData->SetPacketsPerFrame(ppf);
generalData->setNumberofSamples(i, nroichannels);
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL)
return FAIL;