Merge pull request #2 from DUNE-DAQ/fgrotsch/code_cleanup

Fgrotsch/code cleanup
DUNE-DAQ · Oct 21, 2021 · f7eb392 · f7eb392
2 parents f637549 + 69e2564
commit f7eb392
Show file tree

Hide file tree

Showing 25 changed files with 2,519 additions and 2,313 deletions.
diff --git a/include/dune-raw-data/Overlays/anlTypes.hh b/include/dune-raw-data/Overlays/anlTypes.hh
diff --git a/plugins/SSPCardReader.cpp b/plugins/SSPCardReader.cpp
@@ -1,18 +1,21 @@
 /**
- * @file SSPCardReader.cc SSPCardReader DAQModule implementation
+ * @file SSPCardReader.cpp SSPCardReader DAQModule implementation
  *
  * This is part of the DUNE DAQ Application Framework, copyright 2020.
  * Licensing/copyright details are in the COPYING file that you should have
  * received with this code.
  */
+#ifndef SSPMODULES_PLUGINS_SSPCARDREADER_CPP_
+#define SSPMODULES_PLUGINS_SSPCARDREADER_CPP_
+
+#include "logging/Logging.hpp"
+
 #include "sspmodules/sspcardreader/Nljs.hpp"
 
 //#include "CreateElink.hpp"
 #include "SSPCardReader.hpp"
 //#include "SspIssues.hpp"
 
-#include "logging/Logging.hpp"
-
 //#include "flxcard/FlxException.h"
 
 #include <chrono>
@@ -81,25 +84,25 @@ SSPCardReader::init(const data_t& args)
     } else {
       TLOG_DEBUG(TLVL_WORK_STEPS) << ": SSPCardReader output queue is " << qi.inst;
     }
-  };
+  }
 
   TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << "SSPCardReader init complete.";
   // Set function for the SSPCardWrapper's block processor.
-  //m_card_wrapper->set_block_addr_handler(m_block_router);
+  // m_card_wrapper->set_block_addr_handler(m_block_router);
 }
 
 void
 SSPCardReader::do_configure(const data_t& args)
 {
-  
+
   TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << "SSPCardReader do_configure called.";
   if (!m_configured) {
     TLOG_DEBUG(TLVL_WORK_STEPS) << ": SSPCardReader not yet configured so digging in.";
     m_cfg = args.get<dunedaq::sspmodules::sspcardreader::Conf>();
     m_card_id = m_cfg.card_id;
     m_card_wrapper->configure(args);
     TLOG_DEBUG(TLVL_WORK_STEPS) << ": SSPCardReader do_configure coming back from SSPCardWrapper configure.";
-    m_configured=true;
+    m_configured = true;
   } else {
     TLOG_DEBUG(TLVL_WORK_STEPS) << ": SSPCardReader is already configured so not going to configure again.";
   }
@@ -113,7 +116,6 @@ SSPCardReader::do_start(const data_t& args)
   TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << "SSPCardReader do_start called.";
   m_card_wrapper->start(args);
   TLOG_DEBUG(TLVL_ENTER_EXIT_METHODS) << "SSPCardReader do_start complete.";
-
 }
 
 void
@@ -126,10 +128,11 @@ SSPCardReader::do_stop(const data_t& args)
 
 void
 SSPCardReader::get_info(opmonlib::InfoCollector& /*ci*/, int /*level*/)
-{
-}
+{}
 
 } // namespace sspmodules
 } // namespace dunedaq
 
 DEFINE_DUNE_DAQ_MODULE(dunedaq::sspmodules::SSPCardReader)
+
+#endif // SSPMODULES_PLUGINS_SSPCARDREADER_CPP_
diff --git a/plugins/SSPCardReader.hpp b/plugins/SSPCardReader.hpp
@@ -57,7 +57,7 @@ class SSPCardReader : public dunedaq::appfwk::DAQModule
   using module_conf_t = dunedaq::sspmodules::sspcardreader::Conf;
 
   // Constants
-  //static constexpr int s_elink_multiplier = 64;
+  // static constexpr int s_elink_multiplier = 64;
 
   // Commands
   void do_configure(const data_t& args);
@@ -72,7 +72,6 @@ class SSPCardReader : public dunedaq::appfwk::DAQModule
 
   // SSP Cards
   std::unique_ptr<SSPCardWrapper> m_card_wrapper;
-
 };
 
 } // namespace dunedaq::sspmodules