From e3dba3c9386088c705d6ab976fd2d75bcec84d1a Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 23 Aug 2019 18:57:50 +0200 Subject: [PATCH 1/4] Fix gcc9 warnings in Reco --- .../TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc | 2 +- RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc | 1 + RecoJets/JetProducers/src/JetSpecific.cc | 1 + RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc | 1 + RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc b/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc index e50c5a0e420ec..12cbdf86460f9 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc +++ b/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc @@ -191,5 +191,5 @@ float TotemTimingRecHitProducerAlgorithm::constantFractionDiscriminator(const st (dataProcessed[indexOfThresholdCrossing - 1] - dataProcessed[indexOfThresholdCrossing]) * (threshold - dataProcessed[indexOfThresholdCrossing]) + time[indexOfThresholdCrossing] - : TotemTimingRecHit::NO_T_AVAILABLE; + : (int)TotemTimingRecHit::NO_T_AVAILABLE; } diff --git a/RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc b/RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc index 878d43b541943..1c44bfed10b5d 100644 --- a/RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc +++ b/RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc @@ -198,6 +198,7 @@ InputGenJetsParticleSelector::ResonanceState InputGenJetsParticleSelector::fromR return kDirect; if (!isExcludedFromResonance(id)) break; + [[fallthrough]]; case kIndirect: return kIndirect; } diff --git a/RecoJets/JetProducers/src/JetSpecific.cc b/RecoJets/JetProducers/src/JetSpecific.cc index 5d233c750f313..046782e44fd92 100644 --- a/RecoJets/JetProducers/src/JetSpecific.cc +++ b/RecoJets/JetProducers/src/JetSpecific.cc @@ -397,6 +397,7 @@ bool reco::makeSpecific(std::vector const& mcparticles, GenJ case 13: // muon genJetSpecific->m_MuonEnergy += e; ++(genJetSpecific->m_MuonMultiplicity); + [[fallthrough]]; case 211: //pi+- case 321: //K case 2212: //p diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc b/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc index f2a60916890ea..1220845b51193 100644 --- a/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc +++ b/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc @@ -293,6 +293,7 @@ void CSCXonStrip_MatchGatti::findXOnStrip(const CSCDetId& id, noise_level = noise_level_ME1b; xt_asymmetry = xt_asymmetry_ME1b; const_syst = const_syst_ME1b; + [[fallthrough]]; case 3: noise_level = noise_level_ME12; diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc index 91c01b63ec0c3..f40f35cda104a 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc @@ -426,6 +426,7 @@ void TSGForRoadSearch::makeSeeds_4(const reco::Track &muon, std::vector Date: Sat, 24 Aug 2019 13:25:40 +0200 Subject: [PATCH 2/4] Change int to float in enum type cast --- .../TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc b/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc index 12cbdf86460f9..377e440d1b6aa 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc +++ b/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc @@ -191,5 +191,5 @@ float TotemTimingRecHitProducerAlgorithm::constantFractionDiscriminator(const st (dataProcessed[indexOfThresholdCrossing - 1] - dataProcessed[indexOfThresholdCrossing]) * (threshold - dataProcessed[indexOfThresholdCrossing]) + time[indexOfThresholdCrossing] - : (int)TotemTimingRecHit::NO_T_AVAILABLE; + : (float)TotemTimingRecHit::NO_T_AVAILABLE; } From c30880f08855f30a483528b610027d0428b59e7c Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Mon, 2 Sep 2019 15:19:23 +0200 Subject: [PATCH 3/4] Add breaks as discussed in the comments --- RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc | 2 +- RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc b/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc index 1220845b51193..888c6c60ce035 100644 --- a/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc +++ b/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc @@ -293,7 +293,7 @@ void CSCXonStrip_MatchGatti::findXOnStrip(const CSCDetId& id, noise_level = noise_level_ME1b; xt_asymmetry = xt_asymmetry_ME1b; const_syst = const_syst_ME1b; - [[fallthrough]]; + break; case 3: noise_level = noise_level_ME12; diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc index f40f35cda104a..80ff0d3f843aa 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc @@ -426,7 +426,7 @@ void TSGForRoadSearch::makeSeeds_4(const reco::Track &muon, std::vector Date: Tue, 10 Sep 2019 16:28:14 +0200 Subject: [PATCH 4/4] Remove fallthrough and add break as suggested in comments --- RecoJets/JetProducers/src/JetSpecific.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoJets/JetProducers/src/JetSpecific.cc b/RecoJets/JetProducers/src/JetSpecific.cc index 046782e44fd92..358c5c22b332d 100644 --- a/RecoJets/JetProducers/src/JetSpecific.cc +++ b/RecoJets/JetProducers/src/JetSpecific.cc @@ -397,7 +397,7 @@ bool reco::makeSpecific(std::vector const& mcparticles, GenJ case 13: // muon genJetSpecific->m_MuonEnergy += e; ++(genJetSpecific->m_MuonMultiplicity); - [[fallthrough]]; + break; case 211: //pi+- case 321: //K case 2212: //p