diff --git a/podd b/podd index 0397e92a6812595dcb4ff6a13ec665987e26ca1d..fe3e7463fe6e531dd790cf5ea103a368e4b17b7a 160000 --- a/podd +++ b/podd @@ -1 +1 @@ -Subproject commit 0397e92a6812595dcb4ff6a13ec665987e26ca1d +Subproject commit fe3e7463fe6e531dd790cf5ea103a368e4b17b7a diff --git a/src/THcHitList.cxx b/src/THcHitList.cxx index 44c79232f6ca44bea097c80ee47a1ecb1748444d..8c2649aba8120b8a4cc2945e6cdd8d934288e575 100644 --- a/src/THcHitList.cxx +++ b/src/THcHitList.cxx @@ -2,7 +2,7 @@ ////////////////////////////////////////////////////////////////////////// // -// THcDetectorBase +// THcHitList // // Add hitlist to the Hall A detector base // May not need to inherit from THaDetectorBase since we may end up @@ -10,16 +10,14 @@ // ////////////////////////////////////////////////////////////////////////// -#include "THcDetectorBase.h" +#include "THcHitList.h" #include "THaEvData.h" #include "THaDetMap.h" #include "TClonesArray.h" using namespace std; -THcDetectorBase::THcDetectorBase( const char* name, - const char* description ) : - THaDetectorBase(name, description) +THcHitList::THcHitList() { // Normal constructor. @@ -27,14 +25,14 @@ THcDetectorBase::THcDetectorBase( const char* name, } -THcDetectorBase::THcDetectorBase() : THaDetectorBase() { +THcHitList::THcHitList() { } -THcDetectorBase::~THcDetectorBase() { +THcHitList::~THcHitList() { // Destructor } -void THcDetectorBase::InitHitlist(const char *hitclass, Int_t maxhits) { +void THcHitList::InitHitlist(const char *hitclass, Int_t maxhits) { // Probably called by ReadDatabase fRawHitList = new TClonesArray(hitclass, maxhits); fRawHitClass = fRawHitList->GetClass(); @@ -46,7 +44,7 @@ void THcDetectorBase::InitHitlist(const char *hitclass, Int_t maxhits) { } -Int_t THcDetectorBase::Decode( const THaEvData& evdata ) { +Int_t THcHitList::DecodeToHitList( const THaEvData& evdata ) { THcRawHit* rawhit; fRawHitList->Clear("C"); fNRawHits = 0; @@ -98,4 +96,4 @@ Int_t THcDetectorBase::Decode( const THaEvData& evdata ) { return fNRawHits; // Does anything care what is returned } -ClassImp(THcDetectorBase) +ClassImp(THcHitList) diff --git a/src/THcHitList.h b/src/THcHitList.h index 740f7c13f3bf9ac6a958dc01947f738ed98018b8..2df44d64cb2bca43a7f99b9d571818cfa97b5283 100644 --- a/src/THcHitList.h +++ b/src/THcHitList.h @@ -1,7 +1,6 @@ -#ifndef ROOT_THcDetectorBase -#define ROOT_THcDetectorBase +#ifndef ROOT_THcHitList +#define ROOT_THcHitList -#include "THaDetectorBase.h" #include "THcRawHit.h" #include "TClonesArray.h" @@ -10,20 +9,20 @@ using namespace std; ////////////////////////////////////////////////////////////////////////// // -// THcDetectorBase +// THcHitList // ////////////////////////////////////////////////////////////////////////// //class THaDetMap; -class THcDetectorBase : public THaDetectorBase { +class THcHitList { public: - virtual ~THcDetectorBase(); + virtual ~THcHitList(); - THcDetectorBase(); // only for ROOT I/O - THcDetectorBase( const char* name, const char* description ); + THcHitList(); // only for ROOT I/O + THcHitList( const char* name, const char* description ); virtual Int_t Decode( const THaEvData& ); @@ -40,6 +39,6 @@ class THcDetectorBase : public THaDetectorBase { protected: - ClassDef(THcDetectorBase,0) + ClassDef(THcHitList,0) }; #endif