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

removed unused variable numberofJobs in receiver implementation

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-17 11:39:27 +02:00
parent 42c4e3e1a1
commit 5c2ff84c0e
2 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/slsReceiverImplementation.h
View File

@ -768,8 +768,6 @@ private:
//*** receiver parameters *** //*** receiver parameters ***
/** Number of Threads */ /** Number of Threads */
int numThreads; int numThreads;
/** Number of Jobs */
int numberofJobs;
/** Number of channels in roi for jungfrauctb */ /** Number of channels in roi for jungfrauctb */
uint32_t nroichannels; uint32_t nroichannels;
/** Maximum Number of Listening Threads/ UDP Ports */ /** Maximum Number of Listening Threads/ UDP Ports */

27
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -69,7 +69,6 @@ void slsReceiverImplementation::InitializeMembers() {
//*** receiver parameters *** //*** receiver parameters ***
numThreads = 1; numThreads = 1;
numberofJobs = 1;
nroichannels = 0; nroichannels = 0;
status = IDLE; status = IDLE;
activated = true; activated = true;
@ -463,8 +462,6 @@ int slsReceiverImplementation::setGapPixelsEnable(const bool b) {
generalData->SetGapPixelsEnable(b, dynamicRange); generalData->SetGapPixelsEnable(b, dynamicRange);
for (const auto& it : dataProcessor) for (const auto& it : dataProcessor)
it->SetPixelDimension(); it->SetPixelDimension();
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL) if (SetupFifoStructure() == FAIL)
return FAIL; return FAIL;
} }
@ -633,12 +630,9 @@ int slsReceiverImplementation::setROI(const std::vector<slsDetectorDefs::ROI> i)
generalData->SetROI(i); generalData->SetROI(i);
framesPerFile = generalData->maxFramesPerFile; framesPerFile = generalData->maxFramesPerFile;
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL) if (SetupFifoStructure() == FAIL)
return FAIL; return FAIL;
for (const auto& it : listener) for (const auto& it : listener)
it->SetGeneralData(generalData); it->SetGeneralData(generalData);
for (const auto& it : dataProcessor) for (const auto& it : dataProcessor)
@ -784,7 +778,6 @@ int slsReceiverImplementation::setNumberofSamples(const uint64_t i) {
numberOfSamples = i; numberOfSamples = i;
generalData->setNumberofSamples(i, nroichannels); generalData->setNumberofSamples(i, nroichannels);
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL) if (SetupFifoStructure() == FAIL)
return FAIL; return FAIL;
} }
@ -797,15 +790,11 @@ int slsReceiverImplementation::setNumberofSamples(const uint64_t i) {
int slsReceiverImplementation::setDynamicRange(const uint32_t i) { int slsReceiverImplementation::setDynamicRange(const uint32_t i) {
if (dynamicRange != i) { if (dynamicRange != i) {
dynamicRange = i; dynamicRange = i;
//side effects
generalData->SetDynamicRange(i,tengigaEnable); generalData->SetDynamicRange(i,tengigaEnable);
generalData->SetGapPixelsEnable(gapPixelsEnable, dynamicRange); generalData->SetGapPixelsEnable(gapPixelsEnable, dynamicRange);
// to update npixelsx, npixelsy in file writer // to update npixelsx, npixelsy in file writer
for (const auto& it : dataProcessor) for (const auto& it : dataProcessor)
it->SetPixelDimension(); it->SetPixelDimension();
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL) if (SetupFifoStructure() == FAIL)
return FAIL; return FAIL;
} }
@ -819,8 +808,6 @@ int slsReceiverImplementation::setTenGigaEnable(const bool b) {
tengigaEnable = b; tengigaEnable = b;
//side effects //side effects
generalData->SetTenGigaEnable(b,dynamicRange); generalData->SetTenGigaEnable(b,dynamicRange);
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL) if (SetupFifoStructure() == FAIL)
return FAIL; return FAIL;
} }
@ -832,8 +819,6 @@ int slsReceiverImplementation::setTenGigaEnable(const bool b) {
int slsReceiverImplementation::setFifoDepth(const uint32_t i) { int slsReceiverImplementation::setFifoDepth(const uint32_t i) {
if (fifoDepth != i) { if (fifoDepth != i) {
fifoDepth = i; fifoDepth = i;
numberofJobs = -1; //changes to imagesize has to be noted to recreate fifo structure
if (SetupFifoStructure() == FAIL) if (SetupFifoStructure() == FAIL)
return FAIL; return FAIL;
} }
@ -908,11 +893,7 @@ int slsReceiverImplementation::setDetectorType(const detectorType d) {
udpSocketBufferSize = generalData->defaultUdpSocketBufferSize; udpSocketBufferSize = generalData->defaultUdpSocketBufferSize;
framesPerFile = generalData->maxFramesPerFile; framesPerFile = generalData->maxFramesPerFile;
//local network parameters
SetLocalNetworkParameters(); SetLocalNetworkParameters();
//create fifo structure
numberofJobs = -1;
if (SetupFifoStructure() == FAIL) { if (SetupFifoStructure() == FAIL) {
FILE_LOG(logERROR) << "Could not allocate memory for fifo structure"; FILE_LOG(logERROR) << "Could not allocate memory for fifo structure";
return FAIL; return FAIL;
@ -1007,7 +988,7 @@ int slsReceiverImplementation::startReceiver(char *c) {
//callbacks //callbacks
if (startAcquisitionCallBack) { if (startAcquisitionCallBack) {
startAcquisitionCallBack(filePath, fileName, fileIndex, startAcquisitionCallBack(filePath, fileName, fileIndex,
(generalData->imageSize) * numberofJobs + (generalData->fifoBufferHeaderSize), pStartAcquisition); (generalData->imageSize) + (generalData->fifoBufferHeaderSize), pStartAcquisition);
if (rawDataReadyCallBack != NULL) { if (rawDataReadyCallBack != NULL) {
FILE_LOG(logINFO) << "Data Write has been defined externally"; FILE_LOG(logINFO) << "Data Write has been defined externally";
} }
@ -1260,15 +1241,13 @@ void slsReceiverImplementation::SetThreadPriorities() {
int slsReceiverImplementation::SetupFifoStructure() { int slsReceiverImplementation::SetupFifoStructure() {
numberofJobs = 1;
fifo.clear(); fifo.clear();
for ( int i = 0; i < numThreads; ++i ) { for ( int i = 0; i < numThreads; ++i ) {
//create fifo structure //create fifo structure
try { try {
fifo.push_back(sls::make_unique<Fifo>(i, fifo.push_back(sls::make_unique<Fifo>(i,
(generalData->imageSize) * numberofJobs + (generalData->fifoBufferHeaderSize), (generalData->imageSize) + (generalData->fifoBufferHeaderSize),
fifoDepth)); fifoDepth));
} catch (...) { } catch (...) {
cprintf(RED,"Error: Could not allocate memory for fifo structure of index %d\n", i); cprintf(RED,"Error: Could not allocate memory for fifo structure of index %d\n", i);
@ -1281,7 +1260,7 @@ int slsReceiverImplementation::SetupFifoStructure() {
if(dataStreamer.size())dataStreamer[i]->SetFifo(fifo[i].get()); if(dataStreamer.size())dataStreamer[i]->SetFifo(fifo[i].get());
} }
FILE_LOG(logINFO) << "Memory Allocated Per Fifo: " << ( ((generalData->imageSize) * numberofJobs + (generalData->fifoBufferHeaderSize)) * fifoDepth) << " bytes" ; FILE_LOG(logINFO) << "Memory Allocated Per Fifo: " << ( ((generalData->imageSize) + (generalData->fifoBufferHeaderSize)) * fifoDepth) << " bytes" ;
FILE_LOG(logINFO) << numThreads << " Fifo structure(s) reconstructed"; FILE_LOG(logINFO) << numThreads << " Fifo structure(s) reconstructed";
return OK; return OK;
} }