From fafa34499d639c7f0f4b02d49c328f80d92dd9aa Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <zviwood@gmail.com>
Date: Sun, 22 Apr 2012 22:53:17 -0400
Subject: [PATCH] Trying to fix ThcRawHit so it can be used in TClonesArray
---
src/THcHitList.h | 1 +
src/THcHodoscope.cxx | 2 +-
src/THcRawHit.cxx | 5 +++++
src/THcRawHit.h | 18 ++++++++----------
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/THcHitList.h b/src/THcHitList.h
index 449527d..be90264 100644
--- a/src/THcHitList.h
+++ b/src/THcHitList.h
@@ -5,6 +5,7 @@
#include "THaDetMap.h"
#include "THaEvData.h"
#include "TClonesArray.h"
+#include "TObject.h"
using namespace std;
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index f6c123d..336309c 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -70,7 +70,7 @@ THaAnalysisObject::EStatus THcHodoscope::Init( const TDatime& date )
// Will need to determine which apparatus it belongs to and use the
// appropriate detector ID in the FillMap call
if( gHcDetectorMap->FillMap(fDetMap, "HSCIN") < 0 ) {
- Error( Here(here), "Error filling detectormap for %s.",
+ Error( Here(here), "Error filling detectormap for %s.",
"detectorname");
return kInitError;
}
diff --git a/src/THcRawHit.cxx b/src/THcRawHit.cxx
index b1352ba..b9a5090 100644
--- a/src/THcRawHit.cxx
+++ b/src/THcRawHit.cxx
@@ -15,6 +15,11 @@ THcRawHit::THcRawHit()
// Constructor
}
+THcRawHit::THcRawHit(Int_t plane, Int_t counter) :
+ fPlane(plane), fCounter(counter)
+{
+}
+
THcRawHit::~THcRawHit()
{}
diff --git a/src/THcRawHit.h b/src/THcRawHit.h
index c85dfae..1188d26 100644
--- a/src/THcRawHit.h
+++ b/src/THcRawHit.h
@@ -10,19 +10,17 @@
class THcRawHit : public TObject {
-public:
-
- THcRawHit(Int_t plane, Int_t counter) :
- fPlane(plane), fCounter(counter) {}
-
+ public:
THcRawHit();
+ virtual ~THcRawHit();
+
+ THcRawHit(Int_t plane, Int_t counter);
- THcRawHit( const THcRawHit& rhs ) : TObject(rhs) {}
+ // THcRawHit( const THcRawHit& rhs ) : TObject(rhs) {}
- THcRawHit& operator=( const THcRawHit& rhs )
- { TObject::operator=(rhs); return *this; }
+ // THcRawHit& operator=( const THcRawHit& rhs )
+ // { TObject::operator=(rhs); return *this; }
- virtual ~THcRawHit();
virtual void Clear( Option_t* opt="" )=0;
@@ -41,7 +39,7 @@ public:
protected:
- ClassDef(THcRawHit,0) // Track ID abstract base class
+ ClassDef(THcRawHit,0)
};
#endif
--
GitLab