diff --git a/Makefile b/Makefile
index 103db6a28a358b4f1c28a9b8f9fd2f086fe8a209..056ecb8a81ec4b010b726ca16cb9a9f1455ddc28 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SRC = src/THcInterface.cxx src/THcParmList.cxx src/THcAnalyzer.cxx \
src/THcRawHit.cxx src/THcHitList.cxx \
src/THcSignalHit.cxx \
src/THcHodoscope.cxx src/THcScintillatorPlane.cxx \
- src/THcHodoscopeHit.cxx \
+ src/THcRawHodoHit.cxx \
src/THcDC.cxx src/THcDriftChamberPlane.cxx \
src/THcDriftChamber.cxx \
src/THcRawDCHit.cxx src/THcDCHit.cxx \
diff --git a/SConscript.py b/SConscript.py
index 3eb271ca0d6a8f4c5641145c364cb9117b74eb4f..c94403f73cc3e27e558c339440e87490a6e615d6 100644
--- a/SConscript.py
+++ b/SConscript.py
@@ -13,7 +13,7 @@ roothcobj = pbaseenv.subst('$HC_SRC')+'/HallCDict.so'
hcheaders = Split("""
src/THcInterface.h src/THcParmList.h src/THcAnalyzer.h src/THcHallCSpectrometer.h
src/THcDetectorMap.h src/THcRawHit.h src/THcHitList.h src/THcSignalHit.h src/THcHodoscope.h
- src/THcScintillatorPlane.h src/THcHodoscopeHit.h src/THcDC.h src/THcDriftChamberPlane.h
+ src/THcScintillatorPlane.h src/THcRawHodoHit.h src/THcDC.h src/THcDriftChamberPlane.h
src/THcDriftChamber.h src/THcRawDCHit.h src/THcDCHit.h src/THcDCWire.h src/THcSpacePoint.h
src/THcDCLookupTTDConv.h src/THcDCTimeToDistConv.h src/THcShower.h src/THcShowerPlane.h
src/THcRawShowerHit.h src/THcAerogel.h src/THcAerogelHit.h src/THcCherenkov.h src/THcCherenkovHit.h
diff --git a/src/HallC_LinkDef.h b/src/HallC_LinkDef.h
index fed124a489fde91f48184fee53e617bc3c4d5e88..21d28e17b25e596ea426faef945995c729aa6c5f 100644
--- a/src/HallC_LinkDef.h
+++ b/src/HallC_LinkDef.h
@@ -29,7 +29,7 @@
#pragma link C++ class THcSignalHit+;
#pragma link C++ class THcHodoscope+;
#pragma link C++ class THcScintillatorPlane+;
-#pragma link C++ class THcHodoscopeHit+;
+#pragma link C++ class THcRawHodoHit+;
#pragma link C++ class THcDC+;
#pragma link C++ class THcDriftChamber+;
#pragma link C++ class THcDriftChamberPlane+;
diff --git a/src/THcAerogelHit.h b/src/THcAerogelHit.h
index 49ddd246adb84eecf18c6214fb2e12e05bb2026d..18690cd7a518c6615f5c67883d405a793553a360 100644
--- a/src/THcAerogelHit.h
+++ b/src/THcAerogelHit.h
@@ -1,9 +1,9 @@
#ifndef ROOT_THcAerogelHit
#define ROOT_THcAerogelHit
-#include "THcHodoscopeHit.h"
+#include "THcRawHodoHit.h"
-class THcAerogelHit : public THcHodoscopeHit {
+class THcAerogelHit : public THcRawHodoHit {
public:
friend class THcAerogel;
diff --git a/src/THcCherenkovHit.h b/src/THcCherenkovHit.h
index 63a0aab95b7faf61220b5709bfc5d50f7eed1919..b7dac6db4b9d9aa83e63e20669e3c76887f279f8 100644
--- a/src/THcCherenkovHit.h
+++ b/src/THcCherenkovHit.h
@@ -1,9 +1,9 @@
#ifndef ROOT_THcCherenkovHit
#define ROOT_THcCherenkovHit
-#include "THcHodoscopeHit.h"
+#include "THcRawHodoHit.h"
-class THcCherenkovHit : public THcHodoscopeHit {
+class THcCherenkovHit : public THcRawHodoHit {
public:
friend class THcCherenkov;
diff --git a/src/THcHallCSpectrometer.h b/src/THcHallCSpectrometer.h
index 0bbb5229ec79bac0fcb47e11798e7e8f36f5e1d1..5e89dfd435bb6235ded623cbfcecf150a6a6ff43 100644
--- a/src/THcHallCSpectrometer.h
+++ b/src/THcHallCSpectrometer.h
@@ -14,7 +14,7 @@
#include "TClonesArray.h"
#include "THaNonTrackingDetector.h"
#include "THcHitList.h"
-#include "THcHodoscopeHit.h"
+#include "THcRawHodoHit.h"
#include "THcScintillatorPlane.h"
#include "THcShower.h"
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index 7e7aee91d715dcb6d26b3b7afe0f855970e91f25..5c3a186c4996c24d9ee9eff2337c880a1550f95f 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -164,7 +164,7 @@ THaAnalysisObject::EStatus THcHodoscope::Init( const TDatime& date )
// --------------- To get energy from THcShower ----------------------
- InitHitList(fDetMap, "THcHodoscopeHit", 100);
+ InitHitList(fDetMap, "THcRawHodoHit", 100);
EStatus status;
// This triggers call of ReadDatabase and DefineVariables
@@ -770,7 +770,7 @@ Int_t THcHodoscope::Decode( const THaEvData& evdata )
}
#if 0
for(Int_t ihit = 0; ihit < fNRawHits ; ihit++) {
- THcHodoscopeHit* hit = (THcHodoscopeHit *) fRawHitList->At(ihit);
+ THcRawHodoHit* hit = (THcRawHodoHit *) fRawHitList->At(ihit);
cout << ihit << " : " << hit->fPlane << ":" << hit->fCounter << " : "
<< hit->fADC_pos << " " << hit->fADC_neg << " " << hit->fTDC_pos
<< " " << hit->fTDC_neg << endl;
diff --git a/src/THcHodoscope.h b/src/THcHodoscope.h
index 18bbed3ff103f6d7d93707e709a816ac68ab0933..2189bd4d547611291cb90d23901dbcffda572907 100644
--- a/src/THcHodoscope.h
+++ b/src/THcHodoscope.h
@@ -12,7 +12,7 @@
#include "TClonesArray.h"
#include "THaNonTrackingDetector.h"
#include "THcHitList.h"
-#include "THcHodoscopeHit.h"
+#include "THcRawHodoHit.h"
#include "THcScintillatorPlane.h"
#include "THcShower.h"
diff --git a/src/THcHodoscopeHit.cxx b/src/THcRawHodoHit.cxx
similarity index 83%
rename from src/THcHodoscopeHit.cxx
rename to src/THcRawHodoHit.cxx
index 3c2bf37b6953960c0847d9f0b51743bd607d7244..dc2021a921514093a133e2b80a0caf1fe7621b26 100644
--- a/src/THcHodoscopeHit.cxx
+++ b/src/THcRawHodoHit.cxx
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////
// //
-// THcHodoscopeHit //
+// THcRawHodoHit //
// //
// Class representing a single raw hit for a hodoscope paddle //
// //
@@ -13,12 +13,12 @@
#include <cstdlib>
#include <iostream>
-#include "THcHodoscopeHit.h"
+#include "THcRawHodoHit.h"
using namespace std;
-void THcHodoscopeHit::SetData(Int_t signal, Int_t data) {
+void THcRawHodoHit::SetData(Int_t signal, Int_t data) {
if(signal==0) {
fADC_pos = data;
} else if (signal==1) {
@@ -30,7 +30,7 @@ void THcHodoscopeHit::SetData(Int_t signal, Int_t data) {
}
}
-Int_t THcHodoscopeHit::GetData(Int_t signal) {
+Int_t THcRawHodoHit::GetData(Int_t signal) {
if(signal==0) {
return(fADC_pos);
} else if (signal==1) {
@@ -44,7 +44,7 @@ Int_t THcHodoscopeHit::GetData(Int_t signal) {
}
//_____________________________________________________________________________
-THcHodoscopeHit& THcHodoscopeHit::operator=( const THcHodoscopeHit& rhs )
+THcRawHodoHit& THcRawHodoHit::operator=( const THcRawHodoHit& rhs )
{
// Assignment operator.
@@ -62,5 +62,5 @@ THcHodoscopeHit& THcHodoscopeHit::operator=( const THcHodoscopeHit& rhs )
//////////////////////////////////////////////////////////////////////////
-ClassImp(THcHodoscopeHit)
+ClassImp(THcRawHodoHit)
diff --git a/src/THcHodoscopeHit.h b/src/THcRawHodoHit.h
similarity index 63%
rename from src/THcHodoscopeHit.h
rename to src/THcRawHodoHit.h
index ef88875d11635a8a696bc1ac4ffdfb6a2439e0b1..e0c56a657ea31c19082e54bea225f2ce292d8bbf 100644
--- a/src/THcHodoscopeHit.h
+++ b/src/THcRawHodoHit.h
@@ -1,19 +1,19 @@
-#ifndef ROOT_THcHodoscopeHit
-#define ROOT_THcHodoscopeHit
+#ifndef ROOT_THcRawHodoHit
+#define ROOT_THcRawHodoHit
#include "THcRawHit.h"
-class THcHodoscopeHit : public THcRawHit {
+class THcRawHodoHit : public THcRawHit {
public:
friend class THcScintillatorPlane;
- THcHodoscopeHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter),
+ THcRawHodoHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter),
fADC_pos(-1), fADC_neg(-1),
fTDC_pos(-1), fTDC_neg(-1) {
}
- THcHodoscopeHit& operator=( const THcHodoscopeHit& );
- virtual ~THcHodoscopeHit() {}
+ THcRawHodoHit& operator=( const THcRawHodoHit& );
+ virtual ~THcRawHodoHit() {}
virtual void Clear( Option_t* opt="" )
{ fADC_pos = -1; fADC_neg = -1; fTDC_pos = -1; fTDC_neg = -1; }
@@ -32,7 +32,7 @@ class THcHodoscopeHit : public THcRawHit {
private:
- ClassDef(THcHodoscopeHit, 0); // Raw Hodoscope hit
+ ClassDef(THcRawHodoHit, 0); // Raw Hodoscope hit
};
#endif
diff --git a/src/THcScintillatorPlane.cxx b/src/THcScintillatorPlane.cxx
index 6cebd36c76a5770202e170fe5ebba7d46ea45c2e..d302b92a87d4eb3962085e5ab246cb65a6a8b758 100644
--- a/src/THcScintillatorPlane.cxx
+++ b/src/THcScintillatorPlane.cxx
@@ -310,7 +310,7 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
// cout << "THcScintillatorPlane: raw htis = " << nrawhits << endl;
while(ihit < nrawhits) {
- THcHodoscopeHit* hit = (THcHodoscopeHit *) rawhits->At(ihit);
+ THcRawHodoHit* hit = (THcRawHodoHit *) rawhits->At(ihit);
if(hit->fPlane > fPlaneNum) {
break;
}
@@ -542,7 +542,7 @@ Int_t THcScintillatorPlane::AccumulatePedestals(TClonesArray* rawhits, Int_t nex
Int_t ihit = nexthit;
while(ihit < nrawhits) {
- THcHodoscopeHit* hit = (THcHodoscopeHit *) rawhits->At(ihit);
+ THcRawHodoHit* hit = (THcRawHodoHit *) rawhits->At(ihit);
if(hit->fPlane > fPlaneNum) {
break;
}