Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Analysis
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
LHCb
Analysis
Merge requests
!592
Remove usage of VP
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Remove usage of VP
cherry-pick-0b6154bd-2
into
2017-patches
Overview
1
Commits
1
Pipelines
1
Changes
1
Merged
Marco Cattaneo
requested to merge
cherry-pick-0b6154bd-2
into
2017-patches
4 years ago
Overview
1
Commits
1
Pipelines
1
Changes
1
Expand
See merge request
!590 (merged)
(cherry picked from commit
0b6154bd
)
0
0
Merge request reports
Compare
2017-patches
2017-patches (base)
and
latest version
latest version
a11820d8
1 commit,
4 years ago
1 file
+
5
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Phys/FlavourTaggingChecker/src/TaggingHelpers.cpp
+
5
−
5
Options
@@ -118,17 +118,17 @@ namespace TaggingHelpers {
// stations for the upgrade clone detection?
while
(
h1
.
end
()
!=
it
&&
h2
.
end
()
!=
jt
)
{
if
(
*
it
<
*
jt
)
{
if
(
it
->
isVelo
()
||
it
->
isVP
()
)
++
nVelo1
;
if
(
it
->
isVelo
())
++
nVelo1
;
else
if
(
it
->
isIT
()
||
it
->
isOT
())
++
nT1
;
++
it
;
}
else
if
(
*
jt
<
*
it
)
{
if
(
jt
->
isVelo
()
||
jt
->
isVP
()
)
++
nVelo2
;
if
(
jt
->
isVelo
())
++
nVelo2
;
else
if
(
jt
->
isIT
()
||
jt
->
isOT
())
++
nT2
;
++
jt
;
}
else
{
++
nCommon
;
// common LHCb ID
if
(
it
->
isVelo
()
||
it
->
isVP
()
)
{
if
(
it
->
isVelo
())
{
++
nVelo1
;
++
nVelo2
;
++
nVeloCommon
;
@@ -143,13 +143,13 @@ namespace TaggingHelpers {
}
// consume any hits potentially remaining in track 1
while
(
h1
.
end
()
!=
it
)
{
if
(
it
->
isVelo
()
||
it
->
isVP
()
)
++
nVelo1
;
if
(
it
->
isVelo
())
++
nVelo1
;
else
if
(
it
->
isIT
()
||
it
->
isOT
())
++
nT1
;
++
it
;
}
// consume any hits potentially remaining in track 2
while
(
h2
.
end
()
!=
jt
)
{
if
(
jt
->
isVelo
()
||
jt
->
isVP
()
)
++
nVelo2
;
if
(
jt
->
isVelo
())
++
nVelo2
;
else
if
(
jt
->
isIT
()
||
jt
->
isOT
())
++
nT2
;
++
jt
;
}
Loading