From 08d4ca4a81c960b9ca00676c067eee2a2217c58f Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Mon, 25 Jan 2016 10:56:28 -0500
Subject: [PATCH] Rename THcShowerHitCluster to THcShowerHit This is to
match the class name defined in those files Also add THcShowerHit to
the Makefile
---
Makefile | 1 +
SConscript.py | 2 +-
src/HallC_LinkDef.h | 2 ++
src/SConscript.py | 2 +-
src/THcShower.h | 2 +-
src/THcShowerArray.h | 2 +-
src/{THcShowerHitCluster.cxx => THcShowerHit.cxx} | 2 +-
src/{THcShowerHitCluster.h => THcShowerHit.h} | 4 ++--
8 files changed, 10 insertions(+), 7 deletions(-)
rename src/{THcShowerHitCluster.cxx => THcShowerHit.cxx} (97%)
rename src/{THcShowerHitCluster.h => THcShowerHit.h} (96%)
diff --git a/Makefile b/Makefile
index e69a57f..666fdac 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ SRC = src/THcInterface.cxx src/THcParmList.cxx src/THcAnalyzer.cxx \
src/THcSpacePoint.cxx src/THcDCTrack.cxx \
src/THcShower.cxx src/THcShowerPlane.cxx \
src/THcShowerArray.cxx \
+ src/THcShowerHit.cxx \
src/THcRawShowerHit.cxx \
src/THcAerogel.cxx src/THcAerogelHit.cxx \
src/THcCherenkov.cxx src/THcCherenkovHit.cxx \
diff --git a/SConscript.py b/SConscript.py
index baae720..fa43727 100644
--- a/SConscript.py
+++ b/SConscript.py
@@ -17,7 +17,7 @@ hcheaders = Split("""
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/THcShowerArray.h src/THcShowerHitCluster.h
+ src/THcShowerArray.h src/THcShowerHit.h
src/THcRawShowerHit.h src/THcAerogel.h src/THcAerogelHit.h src/THcCherenkov.h src/THcCherenkovHit.h
src/THcGlobals.h src/THcDCTrack.h src/THcFormula.h
src/THcRaster.h src/THcRasteredBeam.h src/THcRasterRawHit.h src/THcScalerEvtHandler.h
diff --git a/src/HallC_LinkDef.h b/src/HallC_LinkDef.h
index d1efa4f..25a875f 100644
--- a/src/HallC_LinkDef.h
+++ b/src/HallC_LinkDef.h
@@ -44,6 +44,8 @@
#pragma link C++ class THcShower+;
#pragma link C++ class THcShowerPlane+;
#pragma link C++ class THcShowerArray+;
+
+#pragma link C++ class THcShowerHit+;
#pragma link C++ class THcRawShowerHit+;
#pragma link C++ class THcAerogel+;
#pragma link C++ class THcAerogelHit+;
diff --git a/src/SConscript.py b/src/SConscript.py
index 58134e9..d811643 100644
--- a/src/SConscript.py
+++ b/src/SConscript.py
@@ -21,7 +21,7 @@ THcDCWire.cxx \
THcSpacePoint.cxx THcDCTrack.cxx \
THcDCLookupTTDConv.cxx THcDCTimeToDistConv.cxx \
THcShower.cxx THcShowerPlane.cxx THcShowerArray.cxx \
-THcRawShowerHit.cxx THcShowerHitCluster.cxx
+THcRawShowerHit.cxx THcShowerHit.cxx
THcAerogel.cxx THcAerogelHit.cxx \
THcCherenkov.cxx THcCherenkovHit.cxx \
THcFormula.cxx \
diff --git a/src/THcShower.h b/src/THcShower.h
index b1573e3..185ee9b 100644
--- a/src/THcShower.h
+++ b/src/THcShower.h
@@ -12,7 +12,7 @@
#include "THcHitList.h"
#include "THcShowerPlane.h"
#include "THcShowerArray.h"
-#include "THcShowerHitCluster.h"
+#include "THcShowerHit.h"
#include "TMath.h"
class THcShower : public THaNonTrackingDetector, public THcHitList {
diff --git a/src/THcShowerArray.h b/src/THcShowerArray.h
index 0b9f81c..699793c 100644
--- a/src/THcShowerArray.h
+++ b/src/THcShowerArray.h
@@ -19,7 +19,7 @@
#include "THaSubDetector.h"
#include "THaTrack.h"
#include "TClonesArray.h"
-#include "THcShowerHitCluster.h"
+#include "THcShowerHit.h"
#include <iostream>
diff --git a/src/THcShowerHitCluster.cxx b/src/THcShowerHit.cxx
similarity index 97%
rename from src/THcShowerHitCluster.cxx
rename to src/THcShowerHit.cxx
index f805f79..7d46f05 100644
--- a/src/THcShowerHitCluster.cxx
+++ b/src/THcShowerHit.cxx
@@ -1,4 +1,4 @@
-#include "THcShowerHitCluster.h"
+#include "THcShowerHit.h"
//ClassImp(THcShowerHit)
diff --git a/src/THcShowerHitCluster.h b/src/THcShowerHit.h
similarity index 96%
rename from src/THcShowerHitCluster.h
rename to src/THcShowerHit.h
index 081aba7..4df3a7f 100644
--- a/src/THcShowerHitCluster.h
+++ b/src/THcShowerHit.h
@@ -1,5 +1,5 @@
-#ifndef ROOT_THcShowerHitCluster
-#define ROOT_THcShowerHitCluster
+#ifndef ROOT_THcShowerHit
+#define ROOT_THcShowerHit
// HMS calorimeter hits, version 2
--
GitLab