Skip to content
Snippets Groups Projects
Commit a7ef271d authored by Christopher Rob Jones's avatar Christopher Rob Jones
Browse files

Merge branch 'rich-remove-pd-assert' into 'master'

Rich remove pd assert

See merge request !3706
parents 79905754 f95a9c8f
No related branches found
No related tags found
1 merge request!3706Rich remove pd assert
Pipeline #4284844 passed
......@@ -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 asserts 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 );
}
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment