diff --git a/Makefile b/Makefile index 60dd174495d2b4a89c2eba133d955f8a4746a25d..6fc33b4ce9637eb00322f162a4d98febd8204d88 100644 --- a/Makefile +++ b/Makefile @@ -166,7 +166,7 @@ install: all cp -p $(USERLIB) $(HOME)/cue/SRC/ana clean: - rm -f *.o *~ $(USERLIB) $(USERDICT).* + rm -f src/*.o *~ $(USERLIB) $(USERDICT).* realclean: clean rm -f *.d diff --git a/src/THcHodoscopeHit.h b/src/THcHodoscopeHit.h index 35a6632dc9c45025fde9907763052eb7c0bb699d..f8ce97b90c29cf7dc7ebda5018dd8b1029261fc0 100644 --- a/src/THcHodoscopeHit.h +++ b/src/THcHodoscopeHit.h @@ -7,7 +7,7 @@ class THcHodoscopeHit : public THcRawHit { public: - THcHodoscopeHit(Int_t plane, Int_t counter) : THcRawHit(plane, counter), + THcHodoscopeHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter), fADC_pos(-1), fADC_neg(-1), fTDC_pos(-1), fTDC_neg(-1) { } @@ -15,7 +15,7 @@ class THcHodoscopeHit : public THcRawHit { virtual ~THcHodoscopeHit() {} virtual void Clear( Option_t* opt="" ) - { fADC_pos = -1; fADC_neg = -1; fTDC_pos = -1; fTDC_neg = -1; } + { fADC_pos = -1; fADC_neg = -1; fTDC_pos = -1; fTDC_neg = -1; } void SetData(Int_t signal, Int_t data); Int_t GetData(Int_t signal); @@ -32,7 +32,7 @@ class THcHodoscopeHit : public THcRawHit { private: - ClassDef(THcHodoscopeHit, 0) // Hodoscope hit class + ClassDef(THcHodoscopeHit, 0); // Hodoscope hit class }; #endif diff --git a/src/THcRawHit.cxx b/src/THcRawHit.cxx index b9a50903c48146295b1e8ae26f3b52933800e812..daa513848a9fc78045f850b2423b62ed5a639bc5 100644 --- a/src/THcRawHit.cxx +++ b/src/THcRawHit.cxx @@ -10,18 +10,8 @@ #include "THcRawHit.h" -THcRawHit::THcRawHit() -{ - // Constructor -} - -THcRawHit::THcRawHit(Int_t plane, Int_t counter) : - fPlane(plane), fCounter(counter) -{ -} - -THcRawHit::~THcRawHit() -{} +//THcRawHit::~THcRawHit() +//{} ClassImp(THcRawHit) diff --git a/src/THcRawHit.h b/src/THcRawHit.h index 1188d2615e863c1feeea70e28793cfe26efa9e46..baec88e8815dd5db3b03a19864e285d65b394cb7 100644 --- a/src/THcRawHit.h +++ b/src/THcRawHit.h @@ -10,19 +10,17 @@ class THcRawHit : public TObject { - public: - THcRawHit(); - virtual ~THcRawHit(); +public: + THcRawHit(Int_t plane=0, Int_t counter=0) : + fPlane(plane), fCounter(counter) {}; + THcRawHit( const THcRawHit& rhs ) : TObject(rhs) {} + THcRawHit& operator=( const THcRawHit& rhs ) + { TObject::operator=(rhs); return *this; }; - THcRawHit(Int_t plane, Int_t counter); - - // THcRawHit( const THcRawHit& rhs ) : TObject(rhs) {} + virtual ~THcRawHit() {} - // THcRawHit& operator=( const THcRawHit& rhs ) - // { TObject::operator=(rhs); return *this; } - - - virtual void Clear( Option_t* opt="" )=0; + // This line causes problem + // virtual void Clear( Option_t* opt="" )=0; // virtual Bool_t operator==( const THcRawHit& ) = 0; // virtual Bool_t operator!=( const THcRawHit& ) = 0; @@ -37,9 +35,9 @@ class THcRawHit : public TObject { Int_t fPlane; Int_t fCounter; -protected: + private: - ClassDef(THcRawHit,0) + ClassDef(THcRawHit,2) // Track ID abstract base class }; #endif