diff --git a/src/THcConfigEvtHandler.cxx b/src/THcConfigEvtHandler.cxx index 085dc3b4b5189b4fcb74e4d87b78f3fcefba1f5b..6816b3d7de06da3414d096f366f9f54a5add18bc 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 c366acb02a6cbdce479490b07dc2405238fe570d..1f0866b1d4fd4b57d4ea80858c64197314ae6f58 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 a5e14f5bf60b03476c5c0e89c9076d67713b773d..51d25aecbce85b1d338a65afbbdde97d097010a9 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 ff31ce188e858f20247b909369dbc2cf37dec568..83963453514fb4260625866b30f9989591480386 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: