Skip to content

Commit

Permalink
Improved naming convention of public vs private member variables.
Browse files Browse the repository at this point in the history
  • Loading branch information
rrivera747 committed Apr 17, 2024
1 parent 4653ff1 commit 344862e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions otsdaq/FECore/FESlowControlsChannel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ FESlowControlsChannel::FESlowControlsChannel(FEVInterface* interface,

__GEN_COUTV__(sizeOfReadBytes_);
__GEN_COUTV__(interface->getUniversalDataSize());
if(sizeOfReadBytes_ > interface->getUniversalDataSize() && !interface->universalBlockReadImplementationConfirmed_)
if(sizeOfReadBytes_ > interface->getUniversalDataSize() && !interface->universalBlockReadImplementationConfirmed)
{
//check if FE supports Block Reads by using a test read (because the compiler does not allow this preferrable code attempt below...)
// if(interface->*(&FEVInterface::universalBlockRead) != (&FEVInterface::universalBlockRead))
Expand Down Expand Up @@ -197,7 +197,7 @@ FESlowControlsChannel::FESlowControlsChannel(FEVInterface* interface,
__GEN_COUT_WARN__ << "Ignoring test block read error - assuming FE not setup yet - here is the caught exception:\n" << e.what() << __E__;
}
__GEN_COUT__ << "Block read was found to be implemented!" << __E__;
interface->universalBlockReadImplementationConfirmed_ = true; //set to avoid more tests of block read functionality
interface->universalBlockReadImplementationConfirmed = true; //set to avoid more tests of block read functionality
}


Expand Down
2 changes: 1 addition & 1 deletion otsdaq/FECore/FEVInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class FEVInterface : public WorkLoop, public Configurable, public VStateMachine
const unsigned int& getUniversalAddressSize (void) { return universalAddressSize_; }
const unsigned int& getUniversalDataSize (void) { return universalDataSize_; }
virtual void universalBlockRead (char* address, char* returnValue, unsigned int numberOfBytes) { throw std::runtime_error("UNDEFINED BLOCK READ"); /* to make compiler happy, use params */ __COUTV__((void*)address); __COUTV__((void*)returnValue); __COUTV__(numberOfBytes); }
bool universalBlockReadImplementationConfirmed_ = false; //is confirmed by slow controls handling (for example) that universalBlockRead is implemented by the FE plugin
bool universalBlockReadImplementationConfirmed = false; //is confirmed by slow controls handling (for example) that universalBlockRead is implemented by the FE plugin
virtual void universalBlockWrite (char* address, char* writeValue, unsigned int numberOfBytes) { throw std::runtime_error("UNDEFINED BLOCK WRITE"); /* to make compiler happy, use params */ __COUTV__((void*)address); __COUTV__((void*)writeValue); __COUTV__(numberOfBytes); }


Expand Down

0 comments on commit 344862e

Please sign in to comment.