From d945f391424045b885c04cceeb22e34494a7df28 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 17 Sep 2020 14:39:20 +0200 Subject: [PATCH] removed unused variables --- slsReceiverSoftware/src/DataProcessor.cpp | 8 ++++---- slsReceiverSoftware/src/DataProcessor.h | 10 ++-------- slsReceiverSoftware/src/Implementation.cpp | 12 ++++++------ slsReceiverSoftware/src/Listener.cpp | 4 ++-- slsReceiverSoftware/src/Listener.h | 5 +---- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index ebfdd744b..1e7f3c0fd 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -24,16 +24,16 @@ const std::string DataProcessor::TypeName = "DataProcessor"; DataProcessor::DataProcessor(int ind, detectorType dtype, Fifo *f, fileFormat *ftype, bool fwenable, bool *mfwenable, - bool *dsEnable, uint32_t *dr, uint32_t *freq, + bool *dsEnable, uint32_t *freq, uint32_t *timer, uint32_t *sfnum, bool *fp, - bool *act, bool *depaden, bool *sm, bool *qe, + bool *act, bool *depaden, bool *sm, std::vector *cdl, int *cdo, int *cad) : ThreadObject(ind, TypeName), fifo(f), myDetectorType(dtype), dataStreamEnable(dsEnable), fileFormatType(ftype), fileWriteEnable(fwenable), masterFileWriteEnable(mfwenable), - dynamicRange(dr), streamingFrequency(freq), streamingTimerInMs(timer), + streamingFrequency(freq), streamingTimerInMs(timer), streamingStartFnum(sfnum), activated(act), - deactivatedPaddingEnable(depaden), silentMode(sm), quadEnable(qe), + deactivatedPaddingEnable(depaden), silentMode(sm), framePadding(fp), ctbDbitList(cdl), ctbDbitOffset(cdo), ctbAnalogDataBytes(cad), firstStreamerFrame(false) { LOG(logDEBUG) << "DataProcessor " << ind << " created"; diff --git a/slsReceiverSoftware/src/DataProcessor.h b/slsReceiverSoftware/src/DataProcessor.h index c9eacbac0..ae5bb6f94 100644 --- a/slsReceiverSoftware/src/DataProcessor.h +++ b/slsReceiverSoftware/src/DataProcessor.h @@ -49,9 +49,9 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject { * @param cad pointer to ctb analog databytes */ DataProcessor(int ind, detectorType dtype, Fifo *f, fileFormat *ftype, - bool fwenable, bool *mfwenable, bool *dsEnable, uint32_t *dr, + bool fwenable, bool *mfwenable, bool *dsEnable, uint32_t *freq, uint32_t *timer, uint32_t *sfnum, bool *fp, - bool *act, bool *depaden, bool *sm, bool *qe, + bool *act, bool *depaden, bool *sm, std::vector *cdl, int *cdo, int *cad); /** @@ -268,9 +268,6 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject { /** Master File Write Enable */ bool *masterFileWriteEnable; - /** Dynamic Range */ - uint32_t *dynamicRange; - /** Pointer to Streaming frequency, if 0, sending random images with a timer */ uint32_t *streamingFrequency; @@ -296,9 +293,6 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject { /** Silent Mode */ bool *silentMode; - /** quad enable */ - bool *quadEnable; - /** frame padding */ bool *framePadding; diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 0524cd125..6a8d24479 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -162,15 +162,15 @@ void Implementation::setDetectorType(const detectorType d) { auto fifo_ptr = fifo[i].get(); listener.push_back(sls::make_unique( i, myDetectorType, fifo_ptr, &status, &udpPortNum[i], ð[i], - &numberOfTotalFrames, &dynamicRange, &udpSocketBufferSize, + &numberOfTotalFrames, &udpSocketBufferSize, &actualUDPSocketBufferSize, &framesPerFile, &frameDiscardMode, &activated, &deactivatedPaddingEnable, &silentMode)); dataProcessor.push_back(sls::make_unique( i, myDetectorType, fifo_ptr, &fileFormatType, fileWriteEnable, - &masterFileWriteEnable, &dataStreamEnable, &dynamicRange, + &masterFileWriteEnable, &dataStreamEnable, &streamingFrequency, &streamingTimerInMs, &streamingStartFnum, &framePadding, &activated, &deactivatedPaddingEnable, - &silentMode, &quadEnable, &ctbDbitList, &ctbDbitOffset, + &silentMode, &ctbDbitList, &ctbDbitOffset, &ctbAnalogDataBytes)); } catch (...) { listener.clear(); @@ -841,7 +841,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) { auto fifo_ptr = fifo[i].get(); listener.push_back(sls::make_unique( i, myDetectorType, fifo_ptr, &status, &udpPortNum[i], - ð[i], &numberOfTotalFrames, &dynamicRange, + ð[i], &numberOfTotalFrames, &udpSocketBufferSize, &actualUDPSocketBufferSize, &framesPerFile, &frameDiscardMode, &activated, &deactivatedPaddingEnable, &silentMode)); @@ -850,9 +850,9 @@ void Implementation::setNumberofUDPInterfaces(const int n) { dataProcessor.push_back(sls::make_unique( i, myDetectorType, fifo_ptr, &fileFormatType, fileWriteEnable, &masterFileWriteEnable, &dataStreamEnable, - &dynamicRange, &streamingFrequency, &streamingTimerInMs, + &streamingFrequency, &streamingTimerInMs, &streamingStartFnum, &framePadding, &activated, - &deactivatedPaddingEnable, &silentMode, &quadEnable, + &deactivatedPaddingEnable, &silentMode, &ctbDbitList, &ctbDbitOffset, &ctbAnalogDataBytes)); dataProcessor[i]->SetGeneralData(generalData); } catch (...) { diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index b885d5e65..b8d32edf5 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -21,11 +21,11 @@ const std::string Listener::TypeName = "Listener"; Listener::Listener(int ind, detectorType dtype, Fifo *f, std::atomic *s, uint32_t *portno, std::string *e, - uint64_t *nf, uint32_t *dr, int64_t *us, int64_t *as, + uint64_t *nf, int64_t *us, int64_t *as, uint32_t *fpf, frameDiscardPolicy *fdp, bool *act, bool *depaden, bool *sm) : ThreadObject(ind, TypeName), fifo(f), myDetectorType(dtype), status(s), - udpPortNumber(portno), eth(e), numImages(nf), dynamicRange(dr), + udpPortNumber(portno), eth(e), numImages(nf), udpSocketBufferSize(us), actualUDPSocketBufferSize(as), framesPerFile(fpf), frameDiscardMode(fdp), activated(act), deactivatedPaddingEnable(depaden), silentMode(sm) { diff --git a/slsReceiverSoftware/src/Listener.h b/slsReceiverSoftware/src/Listener.h index aac9dc869..80d72d1f3 100644 --- a/slsReceiverSoftware/src/Listener.h +++ b/slsReceiverSoftware/src/Listener.h @@ -41,7 +41,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject { * @param sm pointer to silent mode */ Listener(int ind, detectorType dtype, Fifo *f, std::atomic *s, - uint32_t *portno, std::string *e, uint64_t *nf, uint32_t *dr, + uint32_t *portno, std::string *e, uint64_t *nf, int64_t *us, int64_t *as, uint32_t *fpf, frameDiscardPolicy *fdp, bool *act, bool *depaden, bool *sm); @@ -172,9 +172,6 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject { /** Number of Images to catch */ uint64_t *numImages; - /** Dynamic Range */ - uint32_t *dynamicRange; - /** UDP Socket Buffer Size */ int64_t *udpSocketBufferSize;