Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
atlas
athena
Commits
c07fe06a
Commit
c07fe06a
authored
2 weeks ago
by
Shaun Roe
Committed by
Adam Edward Barton
2 weeks ago
Browse files
Options
Downloads
Patches
Plain Diff
main-coverity-FPGATrackSimAlgorithms
main-coverity-FPGATrackSimAlgorithms
parent
505670d3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!78393
main-coverity-FPGATrackSimAlgorithms
,
!76343
Draft: MooTrackBuilder: Recalibrate NSW hits in refine method
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/src/FPGATrackSimNNPathfinderExtensionTool.cxx
+11
-12
11 additions, 12 deletions
...mAlgorithms/src/FPGATrackSimNNPathfinderExtensionTool.cxx
with
11 additions
and
12 deletions
Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/src/FPGATrackSimNNPathfinderExtensionTool.cxx
+
11
−
12
View file @
c07fe06a
// Copyright (C) 2002-202
4
CERN for the benefit of the ATLAS collaboration
// Copyright (C) 2002-202
5
CERN for the benefit of the ATLAS collaboration
/**
...
...
@@ -341,7 +341,7 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::extendTracks(const std::vector
double
predz
=
predhit
[
2
];
if
(
abs
(
hitr
-
predr
)
<
m_windowR
.
value
()
&&
abs
(
hitz
-
predz
)
<
m_windowZ
.
value
())
{
std
::
vector
<
std
::
shared_ptr
<
const
FPGATrackSimHit
>>
h
its
{
hit
};
std
::
vector
<
std
::
shared_ptr
<
const
FPGATrackSimHit
>>
theseH
its
{
hit
};
hitsInWindow
=
hitsInWindow
+
1
;
// If the hit is a space point, skip the next layer, as it will be duplicated space point and we have already taken care of that in the adding of the hits
...
...
@@ -355,9 +355,8 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::extendTracks(const std::vector
if
(
hit
->
getHitType
()
==
HitType
::
spacepoint
)
{
skipSPInNextLayer
=
true
;
// find the hit in the next layer
if
(
!
findHitinNextStripLayer
(
hit
,
m_phits_atLayer
[
slice
][
layerToCheck
],
h
its
))
if
(
!
findHitinNextStripLayer
(
hit
,
m_phits_atLayer
[
slice
][
layerToCheck
],
theseH
its
))
{
ATH_MSG_WARNING
(
"For a SP in layer "
<<
layer
<<
" Couldn't find a matching strip SP in layer "
<<
layerToCheck
);
}
...
...
@@ -372,13 +371,13 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::extendTracks(const std::vector
if
(
isFineIDInStrip
(
fineID
))
guessedSecondHitPtr
->
setDetType
(
SiliconTech
::
strip
);
else
guessedSecondHitPtr
->
setDetType
(
SiliconTech
::
pixel
);
h
its
.
push_back
(
guessedSecondHitPtr
);
theseH
its
.
push_back
(
guessedSecondHitPtr
);
}
}
// We got a hit, lets make a road
FPGATrackSimRoad
newroad
;
if
(
!
addHitToRoad
(
newroad
,
currentRoad
,
std
::
move
(
h
its
)))
if
(
!
addHitToRoad
(
newroad
,
currentRoad
,
std
::
move
(
theseH
its
)))
{
ATH_MSG_WARNING
(
"Failed to make a new road"
);
continue
;
...
...
@@ -418,14 +417,14 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::extendTracks(const std::vector
}
else
{
std
::
vector
<
std
::
shared_ptr
<
const
FPGATrackSimHit
>>
h
its
;
std
::
vector
<
std
::
shared_ptr
<
const
FPGATrackSimHit
>>
theseH
its
;
// first make the fake hit that we will add
if
(
!
getFakeHit
(
currentRoad
,
slice
,
predhit
,
fineID
,
h
its
))
{
if
(
!
getFakeHit
(
currentRoad
,
slice
,
predhit
,
fineID
,
theseH
its
))
{
ATH_MSG_WARNING
(
"Failed adding a guessed hit in extrapolation"
);
continue
;
}
if
((
isFineIDInPixel
(
fineID
)
&&
h
its
.
size
()
!=
1
)
||
(
isFineIDInStrip
(
fineID
)
&&
h
its
.
size
()
!=
2
))
if
((
isFineIDInPixel
(
fineID
)
&&
theseH
its
.
size
()
!=
1
)
||
(
isFineIDInStrip
(
fineID
)
&&
theseH
its
.
size
()
!=
2
))
{
continue
;
}
...
...
@@ -433,7 +432,7 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::extendTracks(const std::vector
// add the hit to the road
FPGATrackSimRoad
newroad
;
if
(
!
addHitToRoad
(
newroad
,
currentRoad
,
std
::
move
(
h
its
)))
{
if
(
!
addHitToRoad
(
newroad
,
currentRoad
,
std
::
move
(
theseH
its
)))
{
ATH_MSG_WARNING
(
"Failed making a new road with fake hit"
);
continue
;
}
...
...
@@ -624,7 +623,7 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::addHitToRoad(FPGATrackSimRoad&
}
these_hits
[
hit
->
getLayer
()].
push_back
(
hit
);
}
const
auto
nTheseHits
=
these_hits
.
size
();
newroad
.
setHits
(
std
::
move
(
these_hits
));
// Update the bitmasks depending on whether this was real or not
...
...
@@ -633,7 +632,7 @@ StatusCode FPGATrackSimNNPathfinderExtensionTool::addHitToRoad(FPGATrackSimRoad&
for
(
auto
&
hit
:
hits
)
{
if
(
hit
->
getLayer
()
>
t
hese
_h
its
.
size
()
)
if
(
hit
->
getLayer
()
>
nT
hese
H
its
)
{
ATH_MSG_WARNING
(
"Adding a hit with layer: "
<<
hit
->
getLayer
()
<<
" which is beyond the total size of the layers"
);
continue
;
...
...
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