Skip to content
Snippets Groups Projects
Commit deb78c72 authored by Stephen A. Wood's avatar Stephen A. Wood
Browse files

Replace int by Int_t, unsigned int by UInt_t and double by Double_t in shower code.

parent d71f4a45
No related branches found
No related tags found
No related merge requests found
......@@ -574,7 +574,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& ) //tracks
//
fNhits = HitList.size();
cout << "Total hits: " << fNhits << endl;
for (unsigned int i=0; i!=fNhits; i++) {
for (UInt_t i=0; i!=fNhits; i++) {
cout << "unclustered hit " << i << ": ";
(*(HitList.begin()+i))->show();
}
......@@ -587,7 +587,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& ) //tracks
fNclust = (*ClusterList).NbClusters();
cout << "Cluster_list size: " << fNclust << endl;
for (unsigned int i=0; i!=fNclust; i++) {
for (UInt_t i=0; i!=fNclust; i++) {
THcShowerCluster* cluster = (*ClusterList).ListedCluster(i);
......@@ -599,7 +599,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& ) //tracks
<< " size=" << (*cluster).clSize()
<< endl;
for (unsigned int j=0; j!=(*cluster).clSize(); j++) {
for (UInt_t j=0; j!=(*cluster).clSize(); j++) {
THcShowerHit* hit = (*cluster).ClusteredHit(j);
cout << " hit #" << j << ": "; (*hit).show();
}
......@@ -614,7 +614,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& ) //tracks
THcShowerCluster* MaxCluster;
for (unsigned int i=0; i!=fNclust; i++) {
for (UInt_t i=0; i!=fNclust; i++) {
THcShowerCluster* cluster = (*ClusterList).ListedCluster(i);
......
......@@ -34,13 +34,13 @@ class THcShowerCluster : THcShowerHitList {
//Pointer to the hit #i in the cluster hit list
//
THcShowerHit* ClusteredHit(unsigned int i) {
THcShowerHit* ClusteredHit(UInt_t i) {
return * (THcShowerHitList::begin()+i);
}
//Print out a hit in the cluster
//
void showHit(unsigned int num) {
void showHit(UInt_t num) {
(*(THcShowerHitList::begin()+num))->show();
}
......@@ -97,7 +97,7 @@ class THcShowerCluster : THcShowerHitList {
//Cluster size.
//
unsigned int clSize() {
UInt_t clSize() {
return THcShowerHitList::size();
}
......@@ -139,13 +139,13 @@ class THcShowerClusterList : private THcShClusterList {
//Pointer to the cluster #i in the cluster list
//
THcShowerCluster* ListedCluster(unsigned int i) {
THcShowerCluster* ListedCluster(UInt_t i) {
return *(THcShClusterList::begin()+i);
}
//Cluster list size.
//
unsigned int NbClusters() {
UInt_t NbClusters() {
return THcShClusterList::size();
}
......@@ -170,7 +170,7 @@ void ClusterHits(THcShowerHitList HitList) {
for (THcShowerHitIt i=HitList.begin(); i!=HitList.end(); i++) {
for (unsigned int k=0; k!=(*cluster).clSize(); k++) {
for (UInt_t k=0; k!=(*cluster).clSize(); k++) {
if ((**i).isNeighbour((*cluster).ClusteredHit(k))) {
......
......@@ -12,7 +12,7 @@ using namespace std;
class THcShowerHit { //HMS calorimeter hit class
private:
unsigned int fCol, fRow; //hit colomn and row
UInt_t fCol, fRow; //hit colomn and row
float fX, fZ; //hit X (vert.) and Z (along spect.axis) coordinates
float fE; //hit energy deposition
......@@ -24,7 +24,7 @@ class THcShowerHit { //HMS calorimeter hit class
fE=0.;
}
THcShowerHit(unsigned int hRow, unsigned int hCol, float hX, float hZ,
THcShowerHit(UInt_t hRow, UInt_t hCol, float hX, float hZ,
float hE) {
fRow=hRow;
fCol=hCol;
......@@ -37,11 +37,11 @@ class THcShowerHit { //HMS calorimeter hit class
// cout << " hit destructed" << endl;
}
unsigned int hitColumn() {
UInt_t hitColumn() {
return fCol;
}
unsigned int hitRow() {
UInt_t hitRow() {
return fRow;
}
......@@ -58,8 +58,8 @@ class THcShowerHit { //HMS calorimeter hit class
}
bool isNeighbour(THcShowerHit* hit1) { //Is hit1 neighbouring this hit?
int dRow = fRow-(*hit1).fRow;
int dCol = fCol-(*hit1).fCol;
Int_t dRow = fRow-(*hit1).fRow;
Int_t dCol = fCol-(*hit1).fCol;
return TMath::Abs(dRow)<2 && TMath::Abs(dCol)<2;
}
......
......@@ -271,7 +271,7 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
THcShower* fParent;
fParent = (THcShower*) GetParent();
double thresh_pos = fPosThresh[hit->fCounter -1];
Double_t thresh_pos = fPosThresh[hit->fCounter -1];
if(hit->fADC_pos > thresh_pos) {
THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
......@@ -281,7 +281,7 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
fParent->GetGain(hit->fCounter-1,fLayerNum-1,0);
}
double thresh_neg = fNegThresh[hit->fCounter -1];
Double_t thresh_neg = fNegThresh[hit->fCounter -1];
if(hit->fADC_neg > thresh_neg) {
THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment