Skip to content
Snippets Groups Projects
Commit 5067184f authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Fixed the THcHelicity and reader

The logging mixin has been moved up the inheritance tree to the helicity reader
parent d0e1f5e4
No related branches found
No related tags found
No related merge requests found
......@@ -21,11 +21,14 @@
#include <bitset>
#include <iostream>
#include "THaHelicityDet.h"
#include "hcana/Logger.h"
using namespace std;
//_____________________________________________________________________________
THcHelicity::THcHelicity(const char* name, const char* description, THaApparatus* app)
: hcana::ConfigLogging<THaHelicityDet>(name, description, app), fnQrt(-1), fHelDelay(8),
: THaHelicityDet(name, description, app), fnQrt(-1), fHelDelay(8),
fMAXBIT(30) {
// for( Int_t i = 0; i < NHIST; ++i )
// fHisto[i] = 0;
......@@ -34,7 +37,7 @@ THcHelicity::THcHelicity(const char* name, const char* description, THaApparatus
//_____________________________________________________________________________
THcHelicity::THcHelicity()
: hcana::ConfigLogging<THaHelicityDet>(), fnQrt(-1), fHelDelay(8), fMAXBIT(30) {
: THaHelicityDet(), fnQrt(-1), fHelDelay(8), fMAXBIT(30) {
// Default constructor for ROOT I/O
// for( Int_t i = 0; i < NHIST; ++i )
......
......@@ -16,7 +16,7 @@
class TH1F;
class THcHelicityScaler;
class THcHelicity : public THcHelicityReader {
class THcHelicity : public THaHelicityDet, public THcHelicityReader {
public:
......
......@@ -23,7 +23,8 @@ using namespace std;
//____________________________________________________________________
THcHelicityReader::THcHelicityReader()
: fTITime(0), fTITime_last(0), fTITime_rollovers(0), fHaveROCs(kFALSE) {
: hcana::ConfigLogging<podd2::EmptyBase>(),
fTITime(0), fTITime_last(0), fTITime_rollovers(0), fHaveROCs(kFALSE) {
// Default constructor
}
//____________________________________________________________________
......
......@@ -17,7 +17,7 @@ class THaEvData;
class TDatime;
class TH1F;
class THcHelicityReader : public hcana::ConfigLogging<THaHelicityDet> {
class THcHelicityReader : public hcana::ConfigLogging<podd2::EmptyBase> {
public:
THcHelicityReader();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment