From e1de2f72ba83c0b6661ab1cc1acbe67f744c2126 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 4 Aug 2020 17:40:17 +0200 Subject: [PATCH] partial clean2 --- slsReceiverSoftware/src/ClientInterface.cpp | 44 --------------------- slsReceiverSoftware/src/Implementation.cpp | 25 +----------- slsReceiverSoftware/src/Implementation.h | 2 +- 3 files changed, 3 insertions(+), 68 deletions(-) diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index 161cf9684..3083fd74b 100644 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/slsReceiverSoftware/src/ClientInterface.cpp @@ -527,8 +527,6 @@ int ClientInterface::set_num_frames(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting num frames to " << value; impl()->setNumberOfFrames(value); - int64_t retval = impl()->getNumberOfFrames(); - validate(value, retval, "set number of frames", DEC); return socket.Send(OK); } @@ -539,10 +537,7 @@ int ClientInterface::set_num_triggers(Interface &socket) { std::to_string(value)); } verifyIdle(socket); - LOG(logDEBUG1) << "Setting num triggers to " << value; impl()->setNumberOfTriggers(value); - int64_t retval = impl()->getNumberOfTriggers(); - validate(value, retval, "set number of triggers", DEC); return socket.Send(OK); } @@ -552,10 +547,7 @@ int ClientInterface::set_num_bursts(Interface &socket) { throw RuntimeError("Invalid number of bursts " + std::to_string(value)); } verifyIdle(socket); - LOG(logDEBUG1) << "Setting num bursts to " << value; impl()->setNumberOfBursts(value); - int64_t retval = impl()->getNumberOfBursts(); - validate(value, retval, "set number of bursts", DEC); return socket.Send(OK); } @@ -568,8 +560,6 @@ int ClientInterface::set_num_add_storage_cells(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting num additional storage cells to " << value; impl()->setNumberOfAdditionalStorageCells(value); - int retval = impl()->getNumberOfAdditionalStorageCells(); - validate(value, retval, "set number of additional storage cells", DEC); return socket.Send(OK); } @@ -581,8 +571,6 @@ int ClientInterface::set_timing_mode(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting timing mode to " << value; impl()->setTimingMode(static_cast(value)); - int retval = impl()->getTimingMode(); - validate(value, retval, "set timing mode", DEC); return socket.Send(OK); } @@ -594,8 +582,6 @@ int ClientInterface::set_burst_mode(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting burst mode to " << value; impl()->setBurstMode(static_cast(value)); - int retval = impl()->getBurstMode(); - validate(value, retval, "set burst mode", DEC); return socket.Send(OK); } @@ -752,11 +738,7 @@ int ClientInterface::set_streaming_frequency(Interface &socket) { std::to_string(index)); } verifyIdle(socket); - LOG(logDEBUG1) << "Setting streaming frequency: " << index; impl()->setStreamingFrequency(index); - - int retval = impl()->getStreamingFrequency(); - validate(index, retval, "set streaming frequency", DEC); return socket.Send(OK); } @@ -839,12 +821,7 @@ int ClientInterface::set_file_index(Interface &socket) { throw RuntimeError("Invalid file index: " + std::to_string(index)); } verifyIdle(socket); - LOG(logDEBUG1) << "Setting file index: " << index; impl()->setFileIndex(index); - - int64_t retval = impl()->getFileIndex(); - validate(index, retval, "set file index", DEC); - LOG(logDEBUG1) << "file index:" << retval; return socket.Send(OK); } @@ -885,10 +862,6 @@ int ClientInterface::set_file_write(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting File write enable:" << enable; impl()->setFileWriteEnable(enable); - - int retval = impl()->getFileWriteEnable(); - validate(enable, retval, "set file write enable", DEC); - LOG(logDEBUG1) << "file write enable:" << retval; return socket.Send(OK); } @@ -1081,12 +1054,7 @@ int ClientInterface::set_streaming_port(Interface &socket) { throw RuntimeError("Invalid zmq port " + std::to_string(port)); } verifyIdle(socket); - LOG(logDEBUG1) << "Setting streaming port:" << port; impl()->setStreamingPort(port); - - int retval = impl()->getStreamingPort(); - validate(port, retval, "set streaming port", DEC); - LOG(logDEBUG1) << "streaming port:" << retval; return socket.Send(OK); } @@ -1131,10 +1099,6 @@ int ClientInterface::set_silent_mode(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting silent mode:" << value; impl()->setSilentMode(value); - - auto retval = static_cast(impl()->getSilentMode()); - validate(value, retval, "set silent mode", DEC); - LOG(logDEBUG1) << "silent mode:" << retval; return socket.Send(OK); } @@ -1221,10 +1185,6 @@ int ClientInterface::set_frames_per_file(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting frames per file: " << index; impl()->setFramesPerFile(index); - - auto retval = static_cast(impl()->getFramesPerFile()); - validate(index, retval, "set frames per file", DEC); - LOG(logDEBUG1) << "frames per file:" << retval; return socket.Send(OK); } @@ -1307,10 +1267,6 @@ int ClientInterface::set_deactivated_padding_enable(Interface &socket) { verifyIdle(socket); LOG(logDEBUG1) << "Setting deactivated padding enable: " << enable; impl()->setDeactivatedPadding(enable > 0); - - auto retval = static_cast(impl()->getDeactivatedPadding()); - validate(enable, retval, "set deactivated padding enable", DEC); - LOG(logDEBUG1) << "Deactivated Padding Enable: " << retval; return socket.Send(OK); } diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index b3aa5305c..9f23f2ea5 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -393,21 +393,16 @@ std::string Implementation::getDetectorHostname() const { } void Implementation::setDetectorHostname(const std::string &c) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; - if (!c.empty()) detHostname = c; LOG(logINFO) << "Detector Hostname: " << detHostname; } bool Implementation::getSilentMode() const { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; return silentMode; } void Implementation::setSilentMode(const bool i) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; - silentMode = i; LOG(logINFO) << "Silent Mode: " << i; } @@ -538,8 +533,6 @@ uint64_t Implementation::getFileIndex() const { } void Implementation::setFileIndex(const uint64_t i) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; - fileIndex = i; LOG(logINFO) << "File Index: " << fileIndex; } @@ -583,21 +576,16 @@ bool Implementation::getOverwriteEnable() const { } void Implementation::setOverwriteEnable(const bool b) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; - overwriteEnable = b; LOG(logINFO) << "Overwrite Enable: " << (overwriteEnable ? "enabled" : "disabled"); } uint32_t Implementation::getFramesPerFile() const { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; return framesPerFile; } void Implementation::setFramesPerFile(const uint32_t i) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; - framesPerFile = i; LOG(logINFO) << "Frames per file: " << framesPerFile; } @@ -1242,9 +1230,7 @@ uint32_t Implementation::getStreamingFrequency() const { } void Implementation::setStreamingFrequency(const uint32_t freq) { - if (streamingFrequency != freq) { - streamingFrequency = freq; - } + streamingFrequency = freq; LOG(logINFO) << "Streaming Frequency: " << streamingFrequency; } @@ -1276,7 +1262,6 @@ uint32_t Implementation::getStreamingPort() const { void Implementation::setStreamingPort(const uint32_t i) { streamingPort = i; - LOG(logINFO) << "Streaming Port: " << streamingPort; } @@ -1435,7 +1420,6 @@ slsDetectorDefs::timingMode Implementation::getTimingMode() const { } void Implementation::setTimingMode(const slsDetectorDefs::timingMode i) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; timingMode = i; LOG(logINFO) << "Timing Mode: " << timingMode; updateTotalNumberOfFrames(); @@ -1447,7 +1431,6 @@ slsDetectorDefs::burstMode Implementation::getBurstMode() const { } void Implementation::setBurstMode(const slsDetectorDefs::burstMode i) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; burstMode = i; LOG(logINFO) << "Burst Mode: " << burstMode; updateTotalNumberOfFrames(); @@ -1768,12 +1751,10 @@ void Implementation::setQuad(const bool b) { } bool Implementation::getActivate() const { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; return activated; } bool Implementation::setActivate(bool enable) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; activated = enable; LOG(logINFO) << "Activation: " << (activated ? "enabled" : "disabled"); return activated; @@ -1784,12 +1765,10 @@ bool Implementation::getDeactivatedPadding() const { return deactivatedPaddingEnable; } -bool Implementation::setDeactivatedPadding(bool enable) { - LOG(logDEBUG3) << __SHORT_AT__ << " called"; +void Implementation::setDeactivatedPadding(bool enable) { deactivatedPaddingEnable = enable; LOG(logINFO) << "Deactivated Padding Enable: " << (deactivatedPaddingEnable ? "enabled" : "disabled"); - return deactivatedPaddingEnable; } int Implementation::getReadNLines() const { diff --git a/slsReceiverSoftware/src/Implementation.h b/slsReceiverSoftware/src/Implementation.h index 629732001..8042e95a1 100644 --- a/slsReceiverSoftware/src/Implementation.h +++ b/slsReceiverSoftware/src/Implementation.h @@ -208,7 +208,7 @@ class Implementation : private virtual slsDetectorDefs { bool setActivate(const bool enable); bool getDeactivatedPadding() const; /* [Eiger] */ - bool setDeactivatedPadding(const bool enable); + void setDeactivatedPadding(const bool enable); int getReadNLines() const; /* [Eiger] */ void setReadNLines(const int value);