From 0f160b3418c352d92d8d96053f9c54f03d3193e0 Mon Sep 17 00:00:00 2001
From: Vardan Tadevosyan <tadevosn@jlab.org>
Date: Wed, 6 Jan 2016 19:56:25 +0400
Subject: [PATCH] Move shower hit and cluster classes from THcShower.h header
file into THcShowerHitClass.h file.
---
src/THcShower.h | 123 +------------------------------------
src/THcShowerArray.h | 3 +
src/THcShowerHitCluster.h | 125 ++++++++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+), 122 deletions(-)
create mode 100644 src/THcShowerHitCluster.h
diff --git a/src/THcShower.h b/src/THcShower.h
index df673cc..5419ec2 100644
--- a/src/THcShower.h
+++ b/src/THcShower.h
@@ -12,130 +12,9 @@
#include "THcHitList.h"
#include "THcShowerPlane.h"
#include "THcShowerArray.h"
+#include "THcShowerHitCluster.h"
#include "TMath.h"
-
-// HMS calorimeter hits, version 2
-
-#include <set>
-#include <iterator>
-#include <iostream>
-#include <memory>
-
-using namespace std;
-
-class THcShowerHit { //HMS calorimeter hit class
-
-private:
- Int_t fCol, fRow; //hit colomn and row
- Double_t fX, fZ; //hit X (vert.) and Z (along spect.axis) coordinates
- Double_t fE; //hit mean energy deposition
- Double_t fEpos; //hit energy deposition from positive PMT
- Double_t fEneg; //hit energy deposition from negative PMT
-
-public:
-
- THcShowerHit() { //default constructor
- fCol=fRow=0;
- fX=fZ=0.;
- fE=0.;
- fEpos=0.;
- fEneg=0.;
- }
-
- THcShowerHit(Int_t hRow, Int_t hCol, Double_t hX, Double_t hZ,
- Double_t hE, Double_t hEpos, Double_t hEneg) {
- fRow=hRow;
- fCol=hCol;
- fX=hX;
- fZ=hZ;
- fE=hE;
- fEpos=hEpos;
- fEneg=hEneg;
- }
-
- ~THcShowerHit() {
- // cout << " hit destructed" << endl;
- }
-
- Int_t hitColumn() {
- return fCol;
- }
-
- Int_t hitRow() {
- return fRow;
- }
-
- Double_t hitX() {
- return fX;
- }
-
- Double_t hitZ() {
- return fZ;
- }
-
- Double_t hitE() {
- return fE;
- }
-
- Double_t hitEpos() {
- return fEpos;
- }
-
- Double_t hitEneg() {
- return fEneg;
- }
-
- // Decide if a hit is neighbouring the current hit.
- // Two hits are neighbours if share a side or a corner,
- // or in the same row but separated by no more than a block.
- //
- bool isNeighbour(THcShowerHit* hit1) { //Is hit1 neighbouring this hit?
- Int_t dRow = fRow-(*hit1).fRow;
- Int_t dCol = fCol-(*hit1).fCol;
- return (TMath::Abs(dRow)<2 && TMath::Abs(dCol)<2) ||
- (dRow==0 && TMath::Abs(dCol)<3);
- }
-
- //Print out hit information
- //
- void show() {
- cout << "row=" << fRow << " column=" << fCol
- << " x=" << fX << " z=" << fZ
- << " E=" << fE << " Epos=" << fEpos << " Eneg=" << fEneg << endl;
- }
-
- // Define < operator in order to fill in set of hits in a sorted manner.
- //
- bool operator<(THcShowerHit rhs) const {
- if (fCol != rhs.fCol)
- return fCol < rhs.fCol;
- else
- return fRow < rhs.fRow;
- }
-
-};
-
-
-//____________________________________________________________________________
-
-// Container (collection) of hits and its iterator.
-//
-typedef set<THcShowerHit*> THcShowerHitSet;
-typedef THcShowerHitSet::iterator THcShowerHitIt;
-
-typedef THcShowerHitSet THcShowerCluster;
-typedef THcShowerCluster::iterator THcShowerClusterIt;
-
-//______________________________________________________________________________
-
-//Alias for container of clusters and for its iterator
-//
-typedef vector<THcShowerCluster*> THcShowerClusterList;
-typedef THcShowerClusterList::iterator THcShowerClusterListIt;
-
-//______________________________________________________________________________
-
class THcShower : public THaNonTrackingDetector, public THcHitList {
public:
diff --git a/src/THcShowerArray.h b/src/THcShowerArray.h
index b6f88f3..2f6b471 100644
--- a/src/THcShowerArray.h
+++ b/src/THcShowerArray.h
@@ -18,6 +18,7 @@
#include "THaSubDetector.h"
#include "TClonesArray.h"
+#include "THcShowerHitCluster.h"
#include <iostream>
@@ -118,6 +119,8 @@ protected:
Double_t* fE; // [fNelem] energy depositions in the blocks.
Double_t fEarray; // Total Energy deposition in the array.
+ THcShowerClusterList* fClusterList; // List of hit clusters
+
virtual Int_t ReadDatabase( const TDatime& date );
virtual Int_t DefineVariables( EMode mode = kDefine );
ClassDef(THcShowerArray,0); // Fly;s Eye calorimeter array
diff --git a/src/THcShowerHitCluster.h b/src/THcShowerHitCluster.h
new file mode 100644
index 0000000..57769da
--- /dev/null
+++ b/src/THcShowerHitCluster.h
@@ -0,0 +1,125 @@
+#ifndef ROOT_THcShowerHitCluster
+#define ROOT_THcShowerHitCluster
+
+// HMS calorimeter hits, version 2
+
+#include <set>
+#include <iterator>
+#include <iostream>
+#include <memory>
+
+using namespace std;
+
+class THcShowerHit { //HMS calorimeter hit class
+
+private:
+ Int_t fCol, fRow; //hit colomn and row
+ Double_t fX, fZ; //hit X (vert.) and Z (along spect.axis) coordinates
+ Double_t fE; //hit mean energy deposition
+ Double_t fEpos; //hit energy deposition from positive PMT
+ Double_t fEneg; //hit energy deposition from negative PMT
+
+public:
+
+ THcShowerHit() { //default constructor
+ fCol=fRow=0;
+ fX=fZ=0.;
+ fE=0.;
+ fEpos=0.;
+ fEneg=0.;
+ }
+
+ THcShowerHit(Int_t hRow, Int_t hCol, Double_t hX, Double_t hZ,
+ Double_t hE, Double_t hEpos, Double_t hEneg) {
+ fRow=hRow;
+ fCol=hCol;
+ fX=hX;
+ fZ=hZ;
+ fE=hE;
+ fEpos=hEpos;
+ fEneg=hEneg;
+ }
+
+ ~THcShowerHit() {
+ // cout << " hit destructed" << endl;
+ }
+
+ Int_t hitColumn() {
+ return fCol;
+ }
+
+ Int_t hitRow() {
+ return fRow;
+ }
+
+ Double_t hitX() {
+ return fX;
+ }
+
+ Double_t hitZ() {
+ return fZ;
+ }
+
+ Double_t hitE() {
+ return fE;
+ }
+
+ Double_t hitEpos() {
+ return fEpos;
+ }
+
+ Double_t hitEneg() {
+ return fEneg;
+ }
+
+ // Decide if a hit is neighbouring the current hit.
+ // Two hits are neighbours if share a side or a corner,
+ // or in the same row but separated by no more than a block.
+ //
+ bool isNeighbour(THcShowerHit* hit1) { //Is hit1 neighbouring this hit?
+ Int_t dRow = fRow-(*hit1).fRow;
+ Int_t dCol = fCol-(*hit1).fCol;
+ return (TMath::Abs(dRow)<2 && TMath::Abs(dCol)<2) ||
+ (dRow==0 && TMath::Abs(dCol)<3);
+ }
+
+ //Print out hit information
+ //
+ void show() {
+ cout << "row=" << fRow << " column=" << fCol
+ << " x=" << fX << " z=" << fZ
+ << " E=" << fE << " Epos=" << fEpos << " Eneg=" << fEneg << endl;
+ }
+
+ // Define < operator in order to fill in set of hits in a sorted manner.
+ //
+ bool operator<(THcShowerHit rhs) const {
+ if (fCol != rhs.fCol)
+ return fCol < rhs.fCol;
+ else
+ return fRow < rhs.fRow;
+ }
+
+};
+
+
+//____________________________________________________________________________
+
+// Container (collection) of hits and its iterator.
+//
+typedef set<THcShowerHit*> THcShowerHitSet;
+typedef THcShowerHitSet::iterator THcShowerHitIt;
+
+typedef THcShowerHitSet THcShowerCluster;
+typedef THcShowerCluster::iterator THcShowerClusterIt;
+
+//______________________________________________________________________________
+
+//Alias for container of clusters and for its iterator
+//
+typedef vector<THcShowerCluster*> THcShowerClusterList;
+typedef THcShowerClusterList::iterator THcShowerClusterListIt;
+
+//______________________________________________________________________________
+
+#endif
--
GitLab