From 6ee5b553bf3b72db1236c421f2d72f9d828f953c Mon Sep 17 00:00:00 2001 From: "Stephen A. Wood" <saw@jlab.org> Date: Fri, 16 Mar 2012 14:53:46 -0400 Subject: [PATCH] Checkin of partial progress. --- Makefile | 2 +- src/HallC_LinkDef.h | 2 ++ src/THcHodoscopeHit.h | 4 ++-- src/THcRawHit.h | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b1e3f05..6c2be6e 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SRC = src/THcInterface.cxx src/THcParmList.cxx src/THcAnalyzer.cxx \ - src/THcHodoscopeHit.cxx + src/THcHodoscopeHit.cxx src/THcRawHit.cxx src/THcRawHitList.cxx # Name of your package. # The shared library that will be built will get the name lib$(PACKAGE).so diff --git a/src/HallC_LinkDef.h b/src/HallC_LinkDef.h index 0de1263..6e9bfe6 100644 --- a/src/HallC_LinkDef.h +++ b/src/HallC_LinkDef.h @@ -9,6 +9,8 @@ #pragma link C++ class THcInterface+; #pragma link C++ class THcParmList+; #pragma link C++ class THcAnalyzer+; +#pragma link C++ class THcRawHit+; #pragma link C++ class THcHodoscopeHit+; +#pragma link C++ class THcRawHitList+; #endif diff --git a/src/THcHodoscopeHit.h b/src/THcHodoscopeHit.h index c296ce5..c49ad21 100644 --- a/src/THcHodoscopeHit.h +++ b/src/THcHodoscopeHit.h @@ -10,8 +10,8 @@ class THcHodoscopeHit : public THcRawHit { public: - THcHodoscopeHit(Int_t plane, Int_t counter) : - fPlane(plane), fCounter(counter), fADC_pos(-1), fADC_neg(-1), + THcHodoscopeHit(Int_t plane, Int_t counter) : THcRawHit(plane, counter) + fADC_pos(-1), fADC_neg(-1), fTDC_pos(-1), fTDC_neg(-1) {} virtual ~THcHodoscopeHit() {} diff --git a/src/THcRawHit.h b/src/THcRawHit.h index 01cd491..020fc3c 100644 --- a/src/THcRawHit.h +++ b/src/THcRawHit.h @@ -13,8 +13,10 @@ class THaVDCUVTrack; class THcRawHit : public TObject { public: - THcRawHit() {} - THcRawHit( const THcRawHit& rhs ) : TObject(rhs) {} + THcRawHit(Int_t plane, Int_t counter) : + fPlane(plane), fCounter(counter) {} + + THcRawHit( const THcRawHit& rhs ) : TObject(rhs) {} THcRawHit& operator=( const THcRawHit& rhs ) { TObject::operator=(rhs); return *this; } -- GitLab