From 0f59907b3ea44703e5721a7e7adb3bd824efbc9e Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 11 Dec 2018 12:01:58 -0600
Subject: [PATCH] Added logging.
---
src/THcConfigEvtHandler.cxx | 7 +------
src/THcConfigEvtHandler.h | 8 ++------
src/THcHelicity.cxx | 4 ++--
src/THcHelicity.h | 3 ++-
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/THcConfigEvtHandler.cxx b/src/THcConfigEvtHandler.cxx
index 085dc3b..6816b3d 100644
--- a/src/THcConfigEvtHandler.cxx
+++ b/src/THcConfigEvtHandler.cxx
@@ -38,13 +38,8 @@
using namespace std;
THcConfigEvtHandler::THcConfigEvtHandler(const char *name, const char* description)
- : THaEvtTypeHandler(name,description)
+ : hcana::ConfigLogging<THaEvtTypeHandler>(name,description)
{
- //Create and return a shared_ptr to a multithreaded console logger.
- _logger = spdlog::get("config");
- if(!_logger) {
- _logger = spdlog::stdout_color_mt("config");
- }
}
THcConfigEvtHandler::~THcConfigEvtHandler()
diff --git a/src/THcConfigEvtHandler.h b/src/THcConfigEvtHandler.h
index c366acb..1f0866b 100644
--- a/src/THcConfigEvtHandler.h
+++ b/src/THcConfigEvtHandler.h
@@ -15,13 +15,9 @@
#include <vector>
#include <map>
-#include "spdlog/spdlog.h"
-#include "spdlog/sinks/stdout_color_sinks.h" //support for stdout logging
-#include "spdlog/sinks/basic_file_sink.h" // support for basic file logging
+#include "Logger.h"
-class THcConfigEvtHandler : public THaEvtTypeHandler {
-private:
- std::shared_ptr<spdlog::logger> _logger;
+class THcConfigEvtHandler : public hcana::ConfigLogging<THaEvtTypeHandler> {
public:
diff --git a/src/THcHelicity.cxx b/src/THcHelicity.cxx
index a5e14f5..51d25ae 100644
--- a/src/THcHelicity.cxx
+++ b/src/THcHelicity.cxx
@@ -26,7 +26,7 @@ using namespace std;
//_____________________________________________________________________________
THcHelicity::THcHelicity( const char* name, const char* description,
THaApparatus* app ):
- THaHelicityDet( name, description, app ),
+ hcana::ConfigLogging<THaHelicityDet>( name, description, app ),
fnQrt(-1), fHelDelay(8), fMAXBIT(30)
{
// for( Int_t i = 0; i < NHIST; ++i )
@@ -37,7 +37,7 @@ THcHelicity::THcHelicity( const char* name, const char* description,
//_____________________________________________________________________________
THcHelicity::THcHelicity()
- : fnQrt(-1), fHelDelay(8), fMAXBIT(30)
+ : hcana::ConfigLogging<THaHelicityDet>(),fnQrt(-1), fHelDelay(8), fMAXBIT(30)
{
// Default constructor for ROOT I/O
diff --git a/src/THcHelicity.h b/src/THcHelicity.h
index ff31ce1..8396345 100644
--- a/src/THcHelicity.h
+++ b/src/THcHelicity.h
@@ -11,10 +11,11 @@
#include "THaHelicityDet.h"
#include "THcHelicityReader.h"
+#include "Logger.h"
class TH1F;
-class THcHelicity : public THaHelicityDet, public THcHelicityReader {
+class THcHelicity : public hcana::ConfigLogging<THaHelicityDet>, public THcHelicityReader {
public:
--
GitLab