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
Container Registry
Model registry
Operate
Environments
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
jlab
hallc
analyzer_software
hcana
Commits
929443f2
Commit
929443f2
authored
11 years ago
by
Mark Jones
Committed by
Stephen A. Wood
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bug fix and debugging message improvements.
parent
846ecda5
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/THcDC.cxx
+9
-5
9 additions, 5 deletions
src/THcDC.cxx
with
9 additions
and
5 deletions
src/THcDC.cxx
+
9
−
5
View file @
929443f2
...
@@ -596,6 +596,7 @@ void THcDC::LinkStubs()
...
@@ -596,6 +596,7 @@ void THcDC::LinkStubs()
THcDCTrack
*
theDCTrack
=
new
(
(
*
fDCTracks
)[
fNDCTracks
++
])
THcDCTrack
(
fNPlanes
);
THcDCTrack
*
theDCTrack
=
new
(
(
*
fDCTracks
)[
fNDCTracks
++
])
THcDCTrack
(
fNPlanes
);
theDCTrack
->
AddSpacePoint
(
isp1
);
theDCTrack
->
AddSpacePoint
(
isp1
);
theDCTrack
->
AddSpacePoint
(
isp2
);
theDCTrack
->
AddSpacePoint
(
isp2
);
if
(
fDebugDC
)
cout
<<
" # sp pts combined = "
<<
theDCTrack
->
GetNSpacePoints
()
<<
endl
;
if
(
fDebugDC
)
cout
<<
" combine sp = "
<<
isp1
<<
" and "
<<
isp2
<<
endl
;
if
(
fDebugDC
)
cout
<<
" combine sp = "
<<
isp1
<<
" and "
<<
isp2
<<
endl
;
// Now save the X, Y and XP for the two stubs
// Now save the X, Y and XP for the two stubs
// in arrays hx_sp1, hy_sp1, hy_sp1, ... hxp_sp2
// in arrays hx_sp1, hy_sp1, hy_sp1, ... hxp_sp2
...
@@ -619,7 +620,7 @@ void THcDC::LinkStubs()
...
@@ -619,7 +620,7 @@ void THcDC::LinkStubs()
Int_t
spoint
=
0
;
Int_t
spoint
=
0
;
Int_t
duppoint
=
0
;
Int_t
duppoint
=
0
;
if
(
fDebugDC
)
cout
<<
"checking abother sp pt in cham = "
<<
itrack
+
1
<<
"
track
= "
<<
theDCTrack
->
GetNSpacePoints
()
<<
endl
;
if
(
fDebugDC
)
cout
<<
"checking abother sp pt in cham
track
= "
<<
itrack
+
1
<<
"
with # sp pts
= "
<<
theDCTrack
->
GetNSpacePoints
()
<<
endl
;
for
(
Int_t
isp
=
0
;
isp
<
theDCTrack
->
GetNSpacePoints
();
isp
++
)
{
for
(
Int_t
isp
=
0
;
isp
<
theDCTrack
->
GetNSpacePoints
();
isp
++
)
{
if
(
fDebugDC
)
cout
<<
"looping of previous track = "
<<
isp
+
1
<<
endl
;
if
(
fDebugDC
)
cout
<<
"looping of previous track = "
<<
isp
+
1
<<
endl
;
if
(
fSp
[
isp2
]
->
fNChamber
==
if
(
fSp
[
isp2
]
->
fNChamber
==
...
@@ -640,15 +641,17 @@ void THcDC::LinkStubs()
...
@@ -640,15 +641,17 @@ void THcDC::LinkStubs()
// in this track create a new track with all the
// in this track create a new track with all the
// same space points except spoint
// same space points except spoint
if
(
fNDCTracks
<
MAXTRACKS
)
{
if
(
fNDCTracks
<
MAXTRACKS
)
{
if
(
fDebugDC
)
cout
<<
"found another track = "
<<
nt
racks
_fp
<<
endl
;
if
(
fDebugDC
)
cout
<<
"found another track
, presently # of tracks
= "
<<
fNDCT
racks
<<
endl
;
stub_tracks
[
sptracks
++
]
=
fNDCTracks
;
stub_tracks
[
sptracks
++
]
=
fNDCTracks
;
THcDCTrack
*
newDCTrack
=
new
(
(
*
fDCTracks
)[
fNDCTracks
++
])
THcDCTrack
(
fNPlanes
);
THcDCTrack
*
newDCTrack
=
new
(
(
*
fDCTracks
)[
fNDCTracks
++
])
THcDCTrack
(
fNPlanes
);
if
(
fDebugDC
)
cout
<<
"loop over theDCtrack # of sp tps = "
<<
theDCTrack
->
GetNSpacePoints
()
<<
endl
;
for
(
Int_t
isp
=
0
;
isp
<
theDCTrack
->
GetNSpacePoints
();
isp
++
)
{
for
(
Int_t
isp
=
0
;
isp
<
theDCTrack
->
GetNSpacePoints
();
isp
++
)
{
if
(
isp
!=
spoint
)
{
if
(
isp
!=
spoint
)
{
newDCTrack
->
AddSpacePoint
(
theDCTrack
->
GetSpacePointID
(
isp
));
newDCTrack
->
AddSpacePoint
(
theDCTrack
->
GetSpacePointID
(
isp
));
}
else
{
}
else
{
newDCTrack
->
AddSpacePoint
(
theDCTrack
->
GetSpacePointID
(
isp2
));
newDCTrack
->
AddSpacePoint
(
theDCTrack
->
GetSpacePointID
(
isp2
));
}
// End check for dup on copy
}
// End check for dup on copy
if
(
fDebugDC
)
cout
<<
"newDCtrack # of sp tps = "
<<
newDCTrack
->
GetNSpacePoints
()
<<
endl
;
}
// End copy of track
}
// End copy of track
}
else
{
}
else
{
if
(
fDebugDC
)
cout
<<
"EPIC FAIL 2: Too many tracks found in THcDC::LinkStubs"
<<
endl
;
if
(
fDebugDC
)
cout
<<
"EPIC FAIL 2: Too many tracks found in THcDC::LinkStubs"
<<
endl
;
...
@@ -683,7 +686,8 @@ void THcDC::LinkStubs()
...
@@ -683,7 +686,8 @@ void THcDC::LinkStubs()
// Looks like it adds all hits for all space points to every track
// Looks like it adds all hits for all space points to every track
for
(
Int_t
itrack
=
0
;
itrack
<
fNDCTracks
;
itrack
++
)
{
for
(
Int_t
itrack
=
0
;
itrack
<
fNDCTracks
;
itrack
++
)
{
THcDCTrack
*
theDCTrack
=
static_cast
<
THcDCTrack
*>
(
fDCTracks
->
At
(
itrack
));
THcDCTrack
*
theDCTrack
=
static_cast
<
THcDCTrack
*>
(
fDCTracks
->
At
(
itrack
));
theDCTrack
->
Clear
();
theDCTrack
->
ClearHits
();
if
(
fDebugDC
)
cout
<<
" Looping thru track add hits track = "
<<
itrack
+
1
<<
" with "
<<
theDCTrack
->
GetNSpacePoints
()
<<
" space points "
<<
endl
;
// Hit list in the track should have been cleared when created.
// Hit list in the track should have been cleared when created.
for
(
Int_t
isp
=
0
;
isp
<
theDCTrack
->
GetNSpacePoints
();
isp
++
)
{
for
(
Int_t
isp
=
0
;
isp
<
theDCTrack
->
GetNSpacePoints
();
isp
++
)
{
Int_t
spind
=
theDCTrack
->
GetSpacePointID
(
isp
);
Int_t
spind
=
theDCTrack
->
GetSpacePointID
(
isp
);
...
@@ -695,7 +699,7 @@ void THcDC::LinkStubs()
...
@@ -695,7 +699,7 @@ void THcDC::LinkStubs()
}
}
///
///
///
///
if
(
fDebugDC
)
cout
<<
" End Linkstubs Found "
<<
nt
racks
_fp
<<
" tracks"
<<
endl
;
if
(
fDebugDC
)
cout
<<
" End Linkstubs Found "
<<
fNDCT
racks
<<
" tracks"
<<
endl
;
}
}
// Primary track fitting routine
// Primary track fitting routine
...
@@ -725,7 +729,7 @@ void THcDC::TrackFit()
...
@@ -725,7 +729,7 @@ void THcDC::TrackFit()
// Double_t chi2 = dummychi2;
// Double_t chi2 = dummychi2;
// Int_t htrack_fit_num = itrack;
// Int_t htrack_fit_num = itrack;
THcDCTrack
*
theDCTrack
=
static_cast
<
THcDCTrack
*>
(
fDCTracks
->
At
(
itrack
));
THcDCTrack
*
theDCTrack
=
static_cast
<
THcDCTrack
*>
(
fDCTracks
->
At
(
itrack
));
cout
<<
" Looping t
r
hu track = "
<<
itrack
+
1
<<
" Hits = "
<<
theDCTrack
->
GetNHits
()
<<
endl
;
cout
<<
" Looping th
r
u track = "
<<
itrack
+
1
<<
" Hits = "
<<
theDCTrack
->
GetNHits
()
<<
endl
;
theDCTrack
->
SetNFree
(
theDCTrack
->
GetNHits
()
-
NUM_FPRAY
);
theDCTrack
->
SetNFree
(
theDCTrack
->
GetNHits
()
-
NUM_FPRAY
);
Double_t
chi2
=
dummychi2
;
Double_t
chi2
=
dummychi2
;
if
(
theDCTrack
->
GetNFree
()
>
0
)
{
if
(
theDCTrack
->
GetNFree
()
>
0
)
{
...
...
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