Skip to content
Snippets Groups Projects

Fix for implicit == operands swap in C++20

Merged Marco Clemencic requested to merge run2/fixes-for-lcg104 into run2-patches
2 files
+ 10
10
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -154,10 +154,10 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
/**
* Comparing here the number of LHCb IDs v.s. the number of MCParticle clusters.
*/
std::vector<int> usedVeloIDs;
std::vector<int> usedOTIDs;
std::vector<int> usedITIDs;
std::vector<int> usedTTIDs;
std::vector<unsigned int> usedVeloIDs;
std::vector<unsigned int> usedOTIDs;
std::vector<unsigned int> usedITIDs;
std::vector<unsigned int> usedTTIDs;
for ( const auto& lhcbID : lhcbIDs ) {
if ( lhcbID.isOT() ) {
@@ -169,7 +169,7 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
if ( it != otChannelIdList.end() ) {
if ( m_checkUniqueness &&
std::find( usedOTIDs.begin(), usedOTIDs.end(), measuredOTChannelID ) == usedOTIDs.end() ) {
std::find( usedOTIDs.begin(), usedOTIDs.end(), measuredOTChannelID.channelID() ) == usedOTIDs.end() ) {
usedOTIDs.push_back( measuredOTChannelID );
nFoundUniqueOT++;
}
@@ -187,7 +187,7 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
if ( it != itClusterList.end() ) {
if ( m_checkUniqueness &&
std::find( usedITIDs.begin(), usedITIDs.end(), measuredITChannelID ) == usedITIDs.end() ) {
std::find( usedITIDs.begin(), usedITIDs.end(), measuredITChannelID.channelID() ) == usedITIDs.end() ) {
usedITIDs.push_back( measuredITChannelID );
nFoundUniqueIT++;
}
@@ -205,7 +205,7 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
if ( it != itClusterList.end() ) {
if ( m_checkUniqueness &&
std::find( usedTTIDs.begin(), usedTTIDs.end(), measuredTTChannelID ) == usedTTIDs.end() ) {
std::find( usedTTIDs.begin(), usedTTIDs.end(), measuredTTChannelID.channelID() ) == usedTTIDs.end() ) {
usedTTIDs.push_back( measuredTTChannelID );
nFoundUniqueTT++;
}
@@ -222,8 +222,8 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
} );
if ( it != veloClusterList.end() ) {
if ( m_checkUniqueness &&
std::find( usedVeloIDs.begin(), usedVeloIDs.end(), measuredVeloChannelID ) == usedVeloIDs.end() ) {
if ( m_checkUniqueness && std::find( usedVeloIDs.begin(), usedVeloIDs.end(),
measuredVeloChannelID.channelID() ) == usedVeloIDs.end() ) {
usedVeloIDs.push_back( measuredVeloChannelID );
nFoundUniqueVelo++;
}
Loading