Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Lbcom
Manage
Activity
Members
Labels
Plan
Issues
2
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
Lbcom
Merge requests
!557
Adapt to changes to RICH DAQ parameters
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Adapt to changes to RICH DAQ parameters
jonrob/Lbcom:rich-adapt-param-change
into
master
Overview
1
Commits
1
Pipelines
2
Changes
1
Merged
Christopher Rob Jones
requested to merge
jonrob/Lbcom:rich-adapt-param-change
into
master
3 years ago
Overview
1
Commits
1
Pipelines
2
Changes
1
Expand
Adapts to changes in
LHCb!3061 (merged)
0
0
Merge request reports
Compare
master
version 1
43cea3b9
3 years ago
master (base)
and
latest version
latest version
165fe45c
1 commit,
3 years ago
version 1
43cea3b9
1 commit,
3 years ago
1 file
+
3
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Rich/RichFutureAlgorithms/src/RichSmartIDClustering.cpp
+
3
−
2
Options
@@ -91,7 +91,8 @@ namespace Rich::Future {
// checks
if
(
!
m_usedDets
[
rich
]
)
{
info
()
<<
"Pixels for "
<<
rich
<<
" are disabled"
<<
endmsg
;
}
// cached data
m_runClusterSplit
[
rich
]
=
(
m_minClusSize
[
rich
]
>
1
||
m_maxClusSize
[
rich
]
<
Rich
::
DAQ
::
PMT
::
NumPixels
);
m_runClusterSplit
[
rich
]
=
(
m_minClusSize
[
rich
]
>
1
||
m_maxClusSize
[
rich
]
<
LHCb
::
RichSmartID
::
MaPMT
::
TotalPixels
);
}
}
);
}
@@ -135,7 +136,7 @@ namespace Rich::Future {
/// Maximum cluster size
Gaudi
::
Property
<
DetectorArray
<
unsigned
int
>>
m_maxClusSize
{
this
,
"MaxClusterSize"
,
{
Rich
::
DAQ
::
PMT
::
NumPixels
,
Rich
::
DAQ
::
PMT
::
Num
Pixels
}};
this
,
"MaxClusterSize"
,
{
LHCb
::
RichSmartID
::
MaPMT
::
TotalPixels
,
LHCb
::
RichSmartID
::
MaPMT
::
Total
Pixels
}};
/// Allow pixels to be clustered across diagonals
Gaudi
::
Property
<
DetectorArray
<
bool
>>
m_allowDiags
{
this
,
"AllowDiagonalsInClusters"
,
{
false
,
false
}};
Loading