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

numImages not used in Listener anymore

Browse Source
This commit is contained in:
maliakal_d 2022-01-05 11:38:18 +01:00
parent 9101200283
commit 2dd98c6054
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/src/Implementation.cpp
View File

@ -167,9 +167,9 @@ void Implementation::setDetectorType(const detectorType d) {
auto fifo_ptr = fifo[i].get(); auto fifo_ptr = fifo[i].get();
listener.push_back(sls::make_unique<Listener>( listener.push_back(sls::make_unique<Listener>(
i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i], i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i],
&numberOfTotalFrames, &udpSocketBufferSize, &udpSocketBufferSize, &actualUDPSocketBufferSize,
&actualUDPSocketBufferSize, &framesPerFile, &frameDiscardMode, &framesPerFile, &frameDiscardMode, &activated,
&activated, &detectorDataStream[i], &silentMode)); &detectorDataStream[i], &silentMode));
dataProcessor.push_back(sls::make_unique<DataProcessor>( dataProcessor.push_back(sls::make_unique<DataProcessor>(
i, detType, fifo_ptr, &activated, &dataStreamEnable, i, detType, fifo_ptr, &activated, &dataStreamEnable,
&streamingFrequency, &streamingTimerInMs, &streamingStartFnum, &streamingFrequency, &streamingTimerInMs, &streamingStartFnum,
@ -880,10 +880,9 @@ void Implementation::setNumberofUDPInterfaces(const int n) {
auto fifo_ptr = fifo[i].get(); auto fifo_ptr = fifo[i].get();
listener.push_back(sls::make_unique<Listener>( listener.push_back(sls::make_unique<Listener>(
i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i], i, detType, fifo_ptr, &status, &udpPortNum[i], &eth[i],
&numberOfTotalFrames, &udpSocketBufferSize, &udpSocketBufferSize, &actualUDPSocketBufferSize,
&actualUDPSocketBufferSize, &framesPerFile, &framesPerFile, &frameDiscardMode, &activated,
&frameDiscardMode, &activated, &detectorDataStream[i], &detectorDataStream[i], &silentMode));
&silentMode));
listener[i]->SetGeneralData(generalData); listener[i]->SetGeneralData(generalData);
dataProcessor.push_back(sls::make_unique<DataProcessor>( dataProcessor.push_back(sls::make_unique<DataProcessor>(

6
slsReceiverSoftware/src/Listener.cpp
View File

@ -23,10 +23,10 @@ const std::string Listener::TypeName = "Listener";
Listener::Listener(int ind, detectorType dtype, Fifo *f, Listener::Listener(int ind, detectorType dtype, Fifo *f,
std::atomic<runStatus> *s, uint32_t *portno, std::string *e, std::atomic<runStatus> *s, uint32_t *portno, std::string *e,
uint64_t *nf, int *us, int *as, uint32_t *fpf, int *us, int *as, uint32_t *fpf, frameDiscardPolicy *fdp,
frameDiscardPolicy *fdp, bool *act, bool *detds, bool *sm) bool *act, bool *detds, bool *sm)
: ThreadObject(ind, TypeName), fifo(f), myDetectorType(dtype), status(s), : ThreadObject(ind, TypeName), fifo(f), myDetectorType(dtype), status(s),
udpPortNumber(portno), eth(e), numImages(nf), udpSocketBufferSize(us), udpPortNumber(portno), eth(e), udpSocketBufferSize(us),
actualUDPSocketBufferSize(as), framesPerFile(fpf), frameDiscardMode(fdp), actualUDPSocketBufferSize(as), framesPerFile(fpf), frameDiscardMode(fdp),
activated(act), detectorDataStream(detds), silentMode(sm) { activated(act), detectorDataStream(detds), silentMode(sm) {
LOG(logDEBUG) << "Listener " << ind << " created"; LOG(logDEBUG) << "Listener " << ind << " created";

9
slsReceiverSoftware/src/Listener.h
View File

@ -32,7 +32,6 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
* @param s pointer to receiver status * @param s pointer to receiver status
* @param portno pointer to udp port number * @param portno pointer to udp port number
* @param e ethernet interface * @param e ethernet interface
* @param nf pointer to number of images to catch
* @param dr pointer to dynamic range * @param dr pointer to dynamic range
* @param us pointer to udp socket buffer size * @param us pointer to udp socket buffer size
* @param as pointer to actual udp socket buffer size * @param as pointer to actual udp socket buffer size
@ -43,9 +42,8 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
* @param sm pointer to silent mode * @param sm pointer to silent mode
*/ */
Listener(int ind, detectorType dtype, Fifo *f, std::atomic<runStatus> *s, Listener(int ind, detectorType dtype, Fifo *f, std::atomic<runStatus> *s,
uint32_t *portno, std::string *e, uint64_t *nf, int *us, int *as, uint32_t *portno, std::string *e, int *us, int *as, uint32_t *fpf,
uint32_t *fpf, frameDiscardPolicy *fdp, bool *act, bool *detds, frameDiscardPolicy *fdp, bool *act, bool *detds, bool *sm);
bool *sm);
/** /**
* Destructor * Destructor
@ -171,9 +169,6 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
/** ethernet interface */ /** ethernet interface */
std::string *eth; std::string *eth;
/** Number of Images to catch */
uint64_t *numImages;
/** UDP Socket Buffer Size */ /** UDP Socket Buffer Size */
int *udpSocketBufferSize; int *udpSocketBufferSize;