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
Commits
a7ef271d
Commit
a7ef271d
authored
2 years ago
by
Christopher Rob Jones
Browse files
Options
Downloads
Plain Diff
Merge branch 'rich-remove-pd-assert' into 'master'
Rich remove pd assert See merge request
!3706
parents
79905754
f95a9c8f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3706
Rich remove pd assert
Pipeline
#4284844
passed
2 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Rich/RichDetectors/include/RichDetectors/RichPDPanel.h
+2
-2
2 additions, 2 deletions
Rich/RichDetectors/include/RichDetectors/RichPDPanel.h
Rich/RichFutureUtils/src/RichSmartIDs.cpp
+2
-0
2 additions, 0 deletions
Rich/RichFutureUtils/src/RichSmartIDs.cpp
with
4 additions
and
2 deletions
Rich/RichDetectors/include/RichDetectors/RichPDPanel.h
+
2
−
2
View file @
a7ef271d
...
...
@@ -156,7 +156,7 @@ namespace Rich::Detector {
if
(
pdID
.
pdIsSet
()
)
{
const
auto
localModNum
=
panelLocalModNum
(
pdID
);
// Note, whilst comissioning dd4hep, but still using old DetDesc MC samples with
// different PMTs, we cannot apply assers here by instead must using runtime size checks.
// different PMTs, we cannot apply asser
t
s here by instead must using runtime size checks.
// to be reverted once dd4hep is fully comissioned and DetDesc completely dropped.
// assert( localModNum < m_PDs.size() );
if
(
localModNum
<
pdModules
().
size
()
)
{
...
...
@@ -171,13 +171,13 @@ namespace Rich::Detector {
}
}
}
// assert( dePD ); // cannot do this as long as 'classic' PMT support is required (see above).
return
dePD
;
}
/// Check if a given PD ID is a 'large' H-Type PMT
inline
bool
isLargePD
(
const
LHCb
::
RichSmartID
pdID
)
const
noexcept
{
const
auto
pd
=
dePD
(
pdID
);
assert
(
pd
);
return
(
pd
?
pd
->
isHType
()
:
false
);
}
...
...
This diff is collapsed.
Click to expand it.
Rich/RichFutureUtils/src/RichSmartIDs.cpp
+
2
−
0
View file @
a7ef271d
...
...
@@ -64,6 +64,8 @@ RichSmartIDs::globalPositions( const Rich::PDPixelCluster::Vector& clusters, //
// loop over the cluster info
for
(
const
auto
&
clus
:
clusters
)
{
// should never get a cluster with no asscoicated DePD object.
assert
(
clus
.
dePD
()
);
// If new PD, or SIMD data is full, save and reset.
if
(
(
lastPD
!=
clus
.
dePD
()
||
index
>=
SIMDFP
::
Size
)
&&
lastPD
)
{
saveInfo
();
}
// Fill info
...
...
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