Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hcana
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Whitney Armstrong
hcana
Commits
deb78c72
Commit
deb78c72
authored
11 years ago
by
Stephen A. Wood
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/THcShower.cxx
+4
-4
4 additions, 4 deletions
src/THcShower.cxx
src/THcShowerCluster.h
+6
-6
6 additions, 6 deletions
src/THcShowerCluster.h
src/THcShowerHit.h
+6
-6
6 additions, 6 deletions
src/THcShowerHit.h
src/THcShowerPlane.cxx
+2
-2
2 additions, 2 deletions
src/THcShowerPlane.cxx
with
18 additions
and
18 deletions
src/THcShower.cxx
+
4
−
4
View file @
deb78c72
...
...
@@ -574,7 +574,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& ) //tracks
//
fNhits
=
HitList
.
size
();
cout
<<
"Total hits: "
<<
fNhits
<<
endl
;
for
(
unsigned
in
t
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
in
t
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
in
t
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
in
t
i
=
0
;
i
!=
fNclust
;
i
++
)
{
for
(
UInt_
t
i
=
0
;
i
!=
fNclust
;
i
++
)
{
THcShowerCluster
*
cluster
=
(
*
ClusterList
).
ListedCluster
(
i
);
...
...
This diff is collapsed.
Click to expand it.
src/THcShowerCluster.h
+
6
−
6
View file @
deb78c72
...
...
@@ -34,13 +34,13 @@ class THcShowerCluster : THcShowerHitList {
//Pointer to the hit #i in the cluster hit list
//
THcShowerHit
*
ClusteredHit
(
unsigned
in
t
i
)
{
THcShowerHit
*
ClusteredHit
(
UInt_
t
i
)
{
return
*
(
THcShowerHitList
::
begin
()
+
i
);
}
//Print out a hit in the cluster
//
void
showHit
(
unsigned
in
t
num
)
{
void
showHit
(
UInt_
t
num
)
{
(
*
(
THcShowerHitList
::
begin
()
+
num
))
->
show
();
}
...
...
@@ -97,7 +97,7 @@ class THcShowerCluster : THcShowerHitList {
//Cluster size.
//
unsigned
in
t
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
in
t
i
)
{
THcShowerCluster
*
ListedCluster
(
UInt_
t
i
)
{
return
*
(
THcShClusterList
::
begin
()
+
i
);
}
//Cluster list size.
//
unsigned
in
t
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
in
t
k
=
0
;
k
!=
(
*
cluster
).
clSize
();
k
++
)
{
for
(
UInt_
t
k
=
0
;
k
!=
(
*
cluster
).
clSize
();
k
++
)
{
if
((
**
i
).
isNeighbour
((
*
cluster
).
ClusteredHit
(
k
)))
{
...
...
This diff is collapsed.
Click to expand it.
src/THcShowerHit.h
+
6
−
6
View file @
deb78c72
...
...
@@ -12,7 +12,7 @@ using namespace std;
class
THcShowerHit
{
//HMS calorimeter hit class
private:
unsigned
in
t
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
in
t
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
in
t
hitColumn
()
{
UInt_
t
hitColumn
()
{
return
fCol
;
}
unsigned
in
t
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?
in
t
dRow
=
fRow
-
(
*
hit1
).
fRow
;
in
t
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
;
}
...
...
This diff is collapsed.
Click to expand it.
src/THcShowerPlane.cxx
+
2
−
2
View file @
deb78c72
...
...
@@ -271,7 +271,7 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
THcShower
*
fParent
;
fParent
=
(
THcShower
*
)
GetParent
();
d
ouble
thresh_pos
=
fPosThresh
[
hit
->
fCounter
-
1
];
D
ouble
_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
);
}
d
ouble
thresh_neg
=
fNegThresh
[
hit
->
fCounter
-
1
];
D
ouble
_t
thresh_neg
=
fNegThresh
[
hit
->
fCounter
-
1
];
if
(
hit
->
fADC_neg
>
thresh_neg
)
{
THcSignalHit
*
sighit
=
(
THcSignalHit
*
)
fNegADCHits
->
ConstructedAt
(
nNegADCHits
++
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment