Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LHCb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
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
LHCb
Merge requests
!3300
RichDAQ - Decoding fixes when inactive links are present
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
RichDAQ - Decoding fixes when inactive links are present
jonrob/LHCb:RichDAQ-FixesForInactiveLinks
into
master
Overview
29
Commits
6
Pipelines
15
Changes
6
Merged
Christopher Rob Jones
requested to merge
jonrob/LHCb:RichDAQ-FixesForInactiveLinks
into
master
3 years ago
Overview
20
Commits
6
Pipelines
15
Changes
6
Expand
Addresses some issues in the decoding when there are inactive Tel40 links.
Edited
3 years ago
by
Christopher Rob Jones
0
0
Merge request reports
Compare
master
version 13
5ed427d2
3 years ago
version 12
1299c004
3 years ago
version 11
ea312335
3 years ago
version 10
668041a6
3 years ago
version 9
bf3d5af2
3 years ago
version 8
2b340feb
3 years ago
version 7
24cccc10
3 years ago
version 6
1a7b9862
3 years ago
version 5
054a8a9d
3 years ago
version 4
4da04cd8
3 years ago
version 3
07d9143c
3 years ago
version 2
28e17dcb
3 years ago
version 1
bdf789fa
3 years ago
master (base)
and
latest version
latest version
55aad680
6 commits,
3 years ago
version 13
5ed427d2
6 commits,
3 years ago
version 12
1299c004
5 commits,
3 years ago
version 11
ea312335
5 commits,
3 years ago
version 10
668041a6
3 commits,
3 years ago
version 9
bf3d5af2
2 commits,
3 years ago
version 8
2b340feb
1 commit,
3 years ago
version 7
24cccc10
1 commit,
3 years ago
version 6
1a7b9862
1 commit,
3 years ago
version 5
054a8a9d
1 commit,
3 years ago
version 4
4da04cd8
1 commit,
3 years ago
version 3
07d9143c
2 commits,
3 years ago
version 2
28e17dcb
2 commits,
3 years ago
version 1
bdf789fa
1 commit,
3 years ago
6 files
+
177
−
80
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
6
Search (e.g. *.vue) (Ctrl+P)
Kernel/LHCbKernel/include/Kernel/RichSmartID.h
+
20
−
0
Options
@@ -1160,6 +1160,26 @@ namespace LHCb {
}
}
/// Returns a 'local' EC pixel row number for each PMT corrected for the PMT rotations in the EC
[[
nodiscard
]]
constexpr
std
::
int32_t
ecGlobalPMTFrameX2
()
const
#ifdef NDEBUG
noexcept
#endif
{
assert
(
isPMT
()
);
static_assert
(
MaPMT
::
PDGlobalViewShift
%
2
==
0
);
if
(
isPMT
()
)
{
const
auto
iCol
=
panelLocalModuleColumn
();
const
auto
iLocalX
=
-
ecLocalPMTFrameX
();
return
(
isHTypePMT
()
?
(
iCol
*
MaPMT
::
PDGlobalViewShift
)
+
(
2
*
iLocalX
)
+
1
:
(
iCol
*
MaPMT
::
PDGlobalViewShift
)
-
(
(
pdNumInEC
()
%
2
)
*
(
MaPMT
::
PDGlobalViewShift
/
2
)
)
+
iLocalX
);
}
else
{
// HPD fallback
return
0
;
}
}
public
:
// messaging
Loading