diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc index 8356e04218af0..37db65b670727 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc @@ -288,7 +288,6 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& double chi2pn = 0; double ypnrange[50]; double dsum = 0.; - double dsum1 = 0.; double bl = 0.; double val_max = 0.; int samplemax = 0; @@ -435,10 +434,8 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& } // Remove pedestal //==================== - for (dsum = 0., dsum1 = 0., k = 0; k < _presample; k++) { + for (dsum = 0., k = 0; k < _presample; k++) { dsum += adc[k]; - if (k < _presample - 1) - dsum1 += adc[k]; } bl = dsum / ((double)_presample); @@ -561,10 +558,8 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& // Remove pedestal //==================== - for (dsum = 0., dsum1 = 0., k = 0; k < _presample; k++) { + for (dsum = 0., k = 0; k < _presample; k++) { dsum += adc[k]; - if (k < _presample - 1) - dsum1 += adc[k]; } bl = dsum / ((double)_presample); diff --git a/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc b/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc index 36889272ba16f..ba9a44f8024e3 100644 --- a/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc +++ b/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc @@ -124,10 +124,9 @@ void DeDxDiscriminatorLearner::algoAnalyze(const edm::Event& iEvent, const edm:: edm::Handle trackCollectionHandle; iEvent.getByToken(m_tracksTag, trackCollectionHandle); - unsigned track_index = 0; for (TrajTrackAssociationCollection::const_iterator it = trajTrackAssociationHandle->begin(); it != trajTrackAssociationHandle->end(); - ++it, track_index++) { + ++it) { const Track& track = *it->val; const Trajectory& traj = *it->key; diff --git a/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc b/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc index f5782968c9f24..4ff813fa56eb8 100644 --- a/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc @@ -306,10 +306,16 @@ void AnalyzerMinbias::analyze(const edm::Event& iEvent, const edm::EventSetup& i const edm::Handle gtObjectMapRecord = iEvent.getHandle(tok_hltL1GtMap_); if (gtObjectMapRecord.isValid()) { const std::vector& objMapVec = gtObjectMapRecord->gtObjectMap(); +#ifdef EDM_ML_DEBUG int ii(0); +#endif bool ok(false), fill(true); for (std::vector::const_iterator itMap = objMapVec.begin(); itMap != objMapVec.end(); +#ifdef EDM_ML_DEBUG ++itMap, ++ii) { +#else + ++itMap) { +#endif bool resultGt = (*itMap).algoGtlResult(); if (resultGt == 1) { ok = true; diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc index 742a9cec9ae52..6ffd1aac1ddbf 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc @@ -653,9 +653,8 @@ void IsolatedGenParticles::analyze(const edm::Event &iEvent, const edm::EventSet } } - unsigned int indx; HepMC::GenEvent::particle_const_iterator p; - for (p = myGenEvent->particles_begin(), indx = 0; p != myGenEvent->particles_end(); ++p, ++indx) { + for (p = myGenEvent->particles_begin(); p != myGenEvent->particles_end(); ++p) { int pdgId = ((*p)->pdg_id()); int ix = particleCode(pdgId); if (ix >= 0) { @@ -770,9 +769,8 @@ void IsolatedGenParticles::analyze(const edm::Event &iEvent, const edm::EventSet } } // loop over gen particles - unsigned int indx; reco::GenParticleCollection::const_iterator p; - for (p = genParticles->begin(), indx = 0; p != genParticles->end(); ++p, ++indx) { + for (p = genParticles->begin(); p != genParticles->end(); ++p) { int pdgId = (p->pdgId()); int ix = particleCode(pdgId); if (ix >= 0) { diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc index 5ae0ae1fb3e00..25bbf0bbb6dab 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc @@ -407,9 +407,8 @@ void StudyCaloGen::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } - unsigned int indx; HepMC::GenEvent::particle_const_iterator p; - for (p = myGenEvent->particles_begin(), indx = 0; p != myGenEvent->particles_end(); ++p, ++indx) { + for (p = myGenEvent->particles_begin(); p != myGenEvent->particles_end(); ++p) { int pdgId = ((*p)->pdg_id()); int ix = particleCode(pdgId); if (ix >= 0) { @@ -524,9 +523,8 @@ void StudyCaloGen::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } // loop over gen particles - unsigned int indx; reco::GenParticleCollection::const_iterator p; - for (p = genParticles->begin(), indx = 0; p != genParticles->end(); ++p, ++indx) { + for (p = genParticles->begin(); p != genParticles->end(); ++p) { int pdgId = (p->pdgId()); int ix = particleCode(pdgId); if (ix >= 0) { diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc b/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc index cd6d6eadbe412..51eff046fcfd7 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc @@ -1083,10 +1083,9 @@ int StudyCaloResponse::trackPID(const reco::Track* pTrack, const edm::Handle& genParticles) { int id(0); if (genParticles.isValid()) { - unsigned int indx; reco::GenParticleCollection::const_iterator p; double mindR(999.9); - for (p = genParticles->begin(), indx = 0; p != genParticles->end(); ++p, ++indx) { + for (p = genParticles->begin(); p != genParticles->end(); ++p) { int pdgId = std::abs(p->pdgId()); int idx = (pdgId == 11) ? 1 : ((pdgId == 211) ? 2 : ((pdgId == 321) ? 3 : ((pdgId == 2212) ? 4 : 0))); if (idx > 0) { diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index f87e29c24fee9..9927232849559 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -31,12 +31,12 @@ 'run2_data_promptlike_hi' : '140X_dataRun2_PromptLike_HI_v1', # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu 'run2_hlt_relval' : '140X_dataRun2_HLT_relval_v1', - # GlobalTag for Run3 HLT: identical the online GT 160X_dataRun3_HLT_v1 but with snapshot at 2026-02-23 14:53:19 (UTC) - 'run3_hlt' : '160X_dataRun3_HLT_frozen260223_v1', - # GlobalTag for Run3 data relvals (express GT): same as 160X_dataRun3_Express_v1 but with snapshot at 2026-02-23 14:53:19 (UTC) - 'run3_data_express' : '160X_dataRun3_Express_frozen260223_v1', - # GlobalTag for Run3 data relvals (prompt GT): same as 160X_dataRun3_Prompt_v1 but with snapshot at 2026-02-23 14:53:19 (UTC) - 'run3_data_prompt' : '160X_dataRun3_Prompt_frozen260223_v1', + # GlobalTag for Run3 HLT: identical the online GT 161X_dataRun3_HLT_v1 but with snapshot at 2026-05-20 10:10:39 (UTC) + 'run3_hlt' : '161X_dataRun3_HLT_frozen260520_v1', + # GlobalTag for Run3 data relvals (express GT): same as 161X_dataRun3_Express_v1 but with snapshot at 2026-05-20 10:12:15 (UTC) + 'run3_data_express' : '161X_dataRun3_Express_frozen260520_v1', + # GlobalTag for Run3 data relvals (prompt GT): same as 161X_dataRun3_Prompt_v1 but with snapshot at 2026-05-20 10:14:30 (UTC) + 'run3_data_prompt' : '161X_dataRun3_Prompt_frozen260520_v1', # GlobalTag for Run3 offline data reprocessing - snapshot at 2026-03-30 15:14:30 (UTC) 'run3_data' : '150X_dataRun3_v8', # GlobalTag for Run3 offline data reprocessing with Prompt GT, currently for 2022FG - snapshot at 2024-05-31 08:53:25 (UTC) @@ -98,7 +98,7 @@ # GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2024, Strip tracker in DECO mode 'phase1_2024_cosmics_design' : '140X_mcRun3_2024cosmics_design_deco_v11', # GlobalTag for MC production with realistic conditions for Phase1 2024 detector for Heavy Ion - 'phase1_2024_realistic_hi' : '141X_mcRun3_2024_realistic_HI_v14', + 'phase1_2024_realistic_hi' : '141X_mcRun3_2024_realistic_HI_v17', # GlobalTag for MC production with realistic conditions for Phase1 2024 detector for ppRef5TeV 'phase1_2024_realistic_ppRef5TeV' : '141X_mcRun3_2024_realistic_ppRef5TeV_v7', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2025 diff --git a/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc b/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc index 92ca88a113066..80cceba8c9424 100644 --- a/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc +++ b/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc @@ -49,8 +49,7 @@ void CalibrationAlgorithm::extract(const std::vector& histos) { // Extract histograms std::vector::const_iterator ihis = histos.begin(); - unsigned int cnt = 0; - for (; ihis != histos.end(); ihis++, cnt++) { + for (; ihis != histos.end(); ihis++) { // Check for NULL pointer if (!(*ihis)) { continue; diff --git a/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc b/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc index ea4d4939cb510..180c42fbe428f 100644 --- a/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc +++ b/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc @@ -51,8 +51,7 @@ void CalibrationScanAlgorithm::extract(const std::vector& histos) { // Extract histograms std::vector::const_iterator ihis = histos.begin(); - unsigned int cnt = 0; - for (; ihis != histos.end(); ihis++, cnt++) { + for (; ihis != histos.end(); ihis++) { // Check for NULL pointer if (!(*ihis)) { continue; diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc index 7f417c3c0c3a7..8ab0b68fb1f63 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc @@ -424,10 +424,8 @@ void SiStripFEDMonitorPlugin::getMajority(const std::vectoreventItemsManager()->begin(); i != m_context->eventItemsManager()->end(); - ++i, ++vi) { + ++i) { FWDisplayProperties prop = (*i)->defaultDisplayProperties(); int col = rand() % 17; // randomize in first row of palette diff --git a/Fireworks/Core/src/FWModelChangeManager.cc b/Fireworks/Core/src/FWModelChangeManager.cc index 0b19a447468d8..e9d2928cb202b 100644 --- a/Fireworks/Core/src/FWModelChangeManager.cc +++ b/Fireworks/Core/src/FWModelChangeManager.cc @@ -85,9 +85,8 @@ void FWModelChangeManager::endChanges() { //makes sure that 'changeSignalsAreDone is called if changeSignalsAreComing_ is sent bool guard(false); if (0 == --m_depth) { - unsigned int index = 0; for (std::set::iterator itChanges = m_itemChanges.begin(); itChanges != m_itemChanges.end(); - ++itChanges, ++index) { + ++itChanges) { if (!guard) { // std::shared_ptr done(this, &sendChangeSignalsAreDone); guard = true; @@ -109,7 +108,7 @@ void FWModelChangeManager::endChanges() { } m_itemChanges.clear(); - for (size_t ci = 0, ce = m_changes.size(), si = 0; ci != ce; ++ci, ++si) { + for (size_t ci = 0, ce = m_changes.size(); ci != ce; ++ci) { FWModelIds& changes = m_changes[ci]; if (not changes.empty()) { if (!guard) { diff --git a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc index 6f85bf1b82c77..da8dcc2e1cfce 100644 --- a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc +++ b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc @@ -75,10 +75,9 @@ void FWPFCandidateWithHitsProxyBuilder::build(const FWEventItem* iItem, if (candidates == nullptr) return; - Int_t idx = 0; initPFRecHitsCollections(); for (reco::PFCandidateCollection::const_iterator it = candidates->begin(), itEnd = candidates->end(); it != itEnd; - ++it, ++idx) { + ++it) { TEveCompound* comp = createCompound(); setupAddElement(comp, product); // printf("products size %d/%d \n", (int)iItem->size(), product->NumChildren()); diff --git a/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc b/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc index 86b24497d87d8..95ff1de4309ca 100644 --- a/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc +++ b/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc @@ -126,9 +126,8 @@ void HGCalCellUVTester::beginRun(edm::Run const &iRun, edm::EventSetup const &iS edm::LogVerbatim("HGCalGeom") << "\nHGCalCellUVTester:: nCells " << nCells << " and placement index between " << indexMin << " and " << indexMax << "\n\n"; auto start_t = std::chrono::high_resolution_clock::now(); - unsigned int kk(0); std::unordered_map::const_iterator itr = hgpar_->waferInfoMap_.begin(); - for (; itr != hgpar_->waferInfoMap_.end(); ++itr, ++kk) { + for (; itr != hgpar_->waferInfoMap_.end(); ++itr) { //for (auto itr = hgpar_->waferInfoMap_.begin(); itr != hgpar_->waferInfoMap_.end(); ++itr){ if ((itr->second).part != HGCalTypes::WaferFull) { int indx = itr->first; diff --git a/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc b/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc index 46fb49aca828b..45c50c25b6655 100644 --- a/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc +++ b/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc @@ -103,8 +103,7 @@ void HGCalGeometryCheck::beginRun(const edm::Run&, const edm::EventSetup& iSetup sprintf(name, "RZ_%s", nameDetectors_[ih].c_str()); sprintf(title, "R vs Z for %s", nameDetectors_[ih].c_str()); h_RZ_.emplace_back(fs->make(name, title, nbinZ_, zmin_, zmax_, nbinR_, rmin_, rmax_)); - unsigned int k(0); - for (int lay = layerF; lay <= layerL; ++lay, ++k) { + for (int lay = layerF; lay <= layerL; ++lay) { sprintf(name, "Mod_%s_L%d", nameDetectors_[ih].c_str(), lay); sprintf(title, "Modules in layer %d in %s", lay, nameDetectors_[ih].c_str()); h_Mod_.emplace_back(fs->make(name, title, 200, -50, 50)); diff --git a/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc b/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc index f08db74cd18f8..6e062c934a1bf 100644 --- a/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc +++ b/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc @@ -60,8 +60,7 @@ void HcalGeometryDump::analyze(const edm::Event& /*iEvent*/, const edm::EventSet } edm::LogVerbatim("HCalGeom") << detIds.size() << " valid Ids for subdetector " << subdet; std::sort(detIds.begin(), detIds.end()); - int counter = 0; - for (std::vector::const_iterator i = detIds.begin(); i != detIds.end(); ++i, ++counter) { + for (std::vector::const_iterator i = detIds.begin(); i != detIds.end(); ++i) { HcalDetId hid = HcalDetId(*i); auto cell = caloGeom->getGeometry(*i); edm::LogVerbatim("HCalGeom") << hid << "\tCaloCellGeometry " << cell->getPosition() << "\tHcalGeometry " diff --git a/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc b/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc index 6fb14c10ec386..47ebdc44b49db 100644 --- a/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc +++ b/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc @@ -61,9 +61,8 @@ void HLTL1MuonSelector::produce(edm::StreamID, edm::Event& iEvent, const edm::Ev LogTrace(metname) << "Number of muons " << muColl->size() << endl; L1MuonParticleCollection::const_iterator it; - L1MuonParticleRef::key_type l1ParticleIndex = 0; - for (it = muColl->begin(); it != muColl->end(); ++it, ++l1ParticleIndex) { + for (it = muColl->begin(); it != muColl->end(); ++it) { const L1MuGMTExtendedCand muonCand = (*it).gmtMuonCand(); unsigned int quality = 0; bool valid_charge = false; diff --git a/HeterogeneousCore/CUDAServices/plugins/CUDAService.cc b/HeterogeneousCore/CUDAServices/plugins/CUDAService.cc index 381fdfd10abae..ca13d95bcf347 100644 --- a/HeterogeneousCore/CUDAServices/plugins/CUDAService.cc +++ b/HeterogeneousCore/CUDAServices/plugins/CUDAService.cc @@ -1,3 +1,4 @@ +#include #include #include #include @@ -199,10 +200,18 @@ CUDAService::CUDAService(edm::ParameterSet const& config) : verbose_(config.getU computeCapabilities_.reserve(numberOfDevices_); // NVIDIA system driver version, e.g. 470.57.02 + // The NVML interface is not available on gaming GPUs. Just report "unknown" in that case. char systemDriverVersion[NVML_SYSTEM_DRIVER_VERSION_BUFFER_SIZE]; - nvmlCheck(nvmlInitWithFlags(NVML_INIT_FLAG_NO_GPUS | NVML_INIT_FLAG_NO_ATTACH)); - nvmlCheck(nvmlSystemGetDriverVersion(systemDriverVersion, sizeof(systemDriverVersion))); - nvmlCheck(nvmlShutdown()); + nvmlReturn_t result = nvmlInitWithFlags(NVML_INIT_FLAG_NO_GPUS | NVML_INIT_FLAG_NO_ATTACH); + if (NVML_SUCCESS != result) { + edm::LogWarning("CUDAService") << "NVML library not available, cannot query NVIDIA driver version:\n" + << nvmlErrorString(result) << "\nReporting NVIDIA driver version as \"unknown\"."; + std::strncpy(systemDriverVersion, "unknown", sizeof(systemDriverVersion) - 1); + systemDriverVersion[sizeof(systemDriverVersion) - 1] = '\0'; + } else { + nvmlCheck(nvmlSystemGetDriverVersion(systemDriverVersion, sizeof(systemDriverVersion))); + nvmlCheck(nvmlShutdown()); + } // CUDA driver version, e.g. 11.4 // the full version, like 11.4.1 or 11.4.100, is not reported diff --git a/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackRekeyer.cc b/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackRekeyer.cc new file mode 100644 index 0000000000000..922fc1db60ec4 --- /dev/null +++ b/PhysicsTools/PatAlgos/plugins/PATIsolatedTrackRekeyer.cc @@ -0,0 +1,94 @@ +#include "FWCore/Framework/interface/stream/EDProducer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "DataFormats/Candidate/interface/Candidate.h" +#include "DataFormats/PatCandidates/interface/IsolatedTrack.h" +#include "DataFormats/Common/interface/RefToPtr.h" +#include "CommonTools/Utils/interface/StringCutObjectSelector.h" + +#include "DataFormats/Common/interface/Association.h" + +#include "DataFormats/PatCandidates/interface/Muon.h" +#include "DataFormats/PatCandidates/interface/PackedCandidate.h" + +#include "DataFormats/Candidate/interface/CandidateFwd.h" +#include "DataFormats/PatCandidates/interface/PackedCandidate.h" + +#include + +class PATIsolatedTrackRekeyer : public edm::stream::EDProducer<> { +private: + using IsoTracksC = std::vector; + using PackedCandsC = pat::PackedCandidateCollection; + + edm::EDGetTokenT input_tracks_token_; + edm::EDGetTokenT packed_cands_token_; + edm::EDGetTokenT lost_cands_token_; + +public: + PATIsolatedTrackRekeyer(edm::ParameterSet const& params) + : input_tracks_token_{consumes(params.getParameter("src"))}, + packed_cands_token_{consumes(params.getParameter("packedCands"))}, + lost_cands_token_{consumes(params.getParameter("lostTrackCands"))} { + produces(); + } + + ~PATIsolatedTrackRekeyer() override = default; + + void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override { + auto out_tracks = std::make_unique>(); + + edm::Handle> input_tracks; + iEvent.getByToken(input_tracks_token_, input_tracks); + + edm::Handle packed_cands; + iEvent.getByToken(packed_cands_token_, packed_cands); + + edm::Handle lost_cands; + iEvent.getByToken(lost_cands_token_, lost_cands); + + for (const auto& track : *input_tracks) { + // copy original pat object and append to vector + + auto const cand_ref = edm::Ref(packed_cands, track.packedCandRef().key()); + auto const near_ref = track.nearestPFPackedCandRef().isNonnull() + ? edm::Ref(packed_cands, track.packedCandRef().key()) + : track.nearestPFPackedCandRef(); + auto const lost_ref = track.nearestLostTrackPackedCandRef().isNonnull() + ? edm::Ref(lost_cands, track.packedCandRef().key()) + : track.nearestLostTrackPackedCandRef(); + + out_tracks->emplace_back((pat::IsolatedTrack(track.pfIsolationDR03(), + track.miniPFIsolation(), + track.matchedCaloJetEmEnergy(), + track.matchedCaloJetHadEnergy(), + track.pfLepOverlap(), + track.pfNeutralSum(), + track.p4(), + track.charge(), + track.pdgId(), + track.dz(), + track.dxy(), + track.dzError(), + track.dxyError(), + track.hitPattern(), + track.dEdxStrip(), + track.dEdxPixel(), + track.fromPV(), + track.trackQuality(), + track.crossedEcalStatus(), + track.crossedHcalStatus(), + track.deltaEta(), + track.deltaPhi(), + cand_ref, + near_ref, + lost_ref))); + } + + iEvent.put(std::move(out_tracks)); + } +}; + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(PATIsolatedTrackRekeyer); diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAODFromMiniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAODFromMiniAOD_tools.py index 8cc541c27efd5..2fb5a761d1a94 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAODFromMiniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAODFromMiniAOD_tools.py @@ -455,6 +455,16 @@ def _fixPNetInputCollection(process): ) + addToProcessAndTask("isolatedTracks", cms.EDProducer("PATIsolatedTrackRekeyer", + src = cms.InputTag("isolatedTracks", processName=cms.InputTag.skipCurrentProcess()), + packedCands = cms.InputTag("packedPFCandidates",processName=cms.InputTag.currentProcess()), + lostTrackCands = cms.InputTag("lostTracks",processName=cms.InputTag.skipCurrentProcess()), + + ), + process, task + ) + + _modified_run2_task = task.copyAndExclude([getattr(process,thisone) for thisone in ['slimmedDisplacedMuons']]) from PhysicsTools.PatAlgos.patRefitVertexProducer_cfi import patRefitVertexProducer process.offlineSlimmedPrimaryVerticesWithBS = patRefitVertexProducer.clone( @@ -485,7 +495,8 @@ def _fixPNetInputCollection(process): 'slimmedLowPtElectrons', 'slimmedKshortVertices', 'slimmedLambdaVertices', - 'slimmedSecondaryVertices']: + 'slimmedSecondaryVertices', + 'isolatedTracks']: new_collection_to_keep += '_*' if not '_' in new_collection_to_keep else '' mini_output.outputCommands += [ f'drop *_{new_collection_to_keep}_*', diff --git a/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc b/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc index 14cf3d5dcef97..84282bc194247 100644 --- a/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc +++ b/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc @@ -55,13 +55,12 @@ int main(int argc, char* argv[]) { // ---------------------------------------------------------------------- // loop the events - unsigned int iEvent = 0; fwlite::Event ev(inFile); TStopwatch timer; timer.Start(); unsigned int nEventsAnalyzed = 0; - for (ev.toBegin(); !ev.atEnd(); ++ev, ++iEvent) { + for (ev.toBegin(); !ev.atEnd(); ++ev) { edm::EventBase const& event = ev; // Handle to the jet collection diff --git a/RecoHGCal/TICL/interface/TracksterInferenceByCNN.h b/RecoHGCal/TICL/interface/TracksterInferenceByCNN.h index c9d21219f698e..4c53694c86d52 100644 --- a/RecoHGCal/TICL/interface/TracksterInferenceByCNN.h +++ b/RecoHGCal/TICL/interface/TracksterInferenceByCNN.h @@ -3,14 +3,11 @@ #include "RecoHGCal/TICL/interface/TICLONNXGlobalCache.h" #include "RecoHGCal/TICL/interface/TracksterInferenceAlgoBase.h" +#include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h" #include #include -namespace reco { - class CaloCluster; -} - namespace hgcal { class RecHitTools; } diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc index d80c44a7889a8..41fa6304ffd72 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc @@ -118,8 +118,7 @@ void TSGFromPropagation::trackerSeeds(const TrackCand& staMuon, if (alltm.size() > 5) alltm.erase(alltm.begin() + 5, alltm.end()); - int i = 0; - for (std::vector::const_iterator itm = alltm.begin(); itm != alltm.end(); itm++, i++) { + for (std::vector::const_iterator itm = alltm.begin(); itm != alltm.end(); itm++) { TrajectoryStateOnSurface updatedTSOS = updator()->update(itm->predictedState(), *(itm->recHit())); if (updatedTSOS.isValid() && passSelection(updatedTSOS)) { edm::OwnVector container; diff --git a/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc b/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc index 84081c33e0d38..23afc70d87157 100644 --- a/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc +++ b/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc @@ -195,9 +195,7 @@ void MuonTrajectoryCleaner::clean(TrajectoryContainer& trajC, seedToSeedsMap = std::make_unique(seedsHandle, seedsHandle); } - int seedcnt(0); - - for (map >::iterator itmap = seedmap.begin(); itmap != seedmap.end(); ++itmap, ++seedcnt) { + for (map >::iterator itmap = seedmap.begin(); itmap != seedmap.end(); ++itmap) { edm::RefToBase tmpSeedRef1 = trajC[(*itmap).first]->seedRef(); edm::Ref tmpL2SeedRef1 = tmpSeedRef1.castTo >(); diff --git a/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc b/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc index 7ca1c90ddd13f..8b9d92c5deebf 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc @@ -106,16 +106,20 @@ void PhotonConversionTrajectorySeedProducerFromSingleLegAlgo::loopOnTracks() { return; } - size_t idx = 0; _countSeedTracks = 0; #ifdef debugTSPFSLA + size_t idx = 0; size_t sel = 0; ss.str(""); #endif for (reco::TrackCollection::const_iterator tr = trackCollectionH->begin(); tr != trackCollectionH->end(); +#ifdef debugTSPFSLA tr++, idx++) { +#else + tr++) { +#endif if (rejectTrack(*tr)) continue; std::vector selectedPriVtxCompatibleWithTrack; diff --git a/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h b/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h index 0914757823fde..9f2329380f806 100644 --- a/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h +++ b/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h @@ -229,15 +229,13 @@ void TemplatedInclusiveVertexFinder::produce(edm::Event &ev } BeamSpot bs(pv.position(), 0.0, 0.0, 0.0, 0.0, cov, BeamSpot::Unknown); - int i = 0; #ifdef VTXDEBUG - std::cout << "CLUSTERS " << clusters.size() << std::endl; #endif for (std::vector::iterator cluster = clusters.begin(); cluster != clusters.end(); - ++cluster, ++i) { + ++cluster) { if (cluster->tracks.size() < 2 || cluster->tracks.size() > maxNTracks) continue; std::vector vertices; diff --git a/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc b/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc index 9f22c3605ef37..1845c5bb4239b 100644 --- a/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc +++ b/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc @@ -116,9 +116,12 @@ std::vector TracksClusteringFromDisp } std::vector clusters; +#ifdef VTXDEBUG int i = 0; - for (std::vector::const_iterator s = seeds.begin(); s != seeds.end(); ++s, ++i) { +#endif + for (std::vector::const_iterator s = seeds.begin(); s != seeds.end(); ++s) { #ifdef VTXDEBUG + i++; std::cout << "Seed N. " << i << std::endl; #endif // VTXDEBUG std::pair, GlobalPoint> ntracks = nearTracks(*s, selectedTracks, pv); diff --git a/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc b/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc index 7aac9811b0db2..9b6020d167244 100644 --- a/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc +++ b/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc @@ -200,7 +200,10 @@ void XtalDedxAnalysis::analyzeHits(std::vector &hits, } // Type of the secondary (coming directly from a generator level track) - int nvtx = 0, k1 = 0; + int nvtx = 0; +#ifdef EDM_ML_DEBUG + int k1 = 0; +#endif edm::SimVertexContainer::const_iterator simVtxItr; for (simVtxItr = SimVtx->begin(); simVtxItr != SimVtx->end(); simVtxItr++) nvtx++; @@ -210,8 +213,9 @@ void XtalDedxAnalysis::analyzeHits(std::vector &hits, ntrk++; edm::LogVerbatim("CherenkovAnalysis") << "XtalDedxAnalysis: " << ntrk << " tracks and " << nvtx << " vertices"; #endif - for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++, ++k1) { + for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++) { #ifdef EDM_ML_DEBUG + k1++; edm::LogVerbatim("CherenkovAnalysis") << "Track " << k1 << " PDGId " << simTrkItr->type() << " Vertex ID " << simTrkItr->vertIndex() << " Generator " << simTrkItr->noGenpart(); #endif @@ -221,9 +225,13 @@ void XtalDedxAnalysis::analyzeHits(std::vector &hits, simVtxItr = SimVtx->begin(); for (int iv = 0; iv < vertIndex; iv++) simVtxItr++; - int parent = simVtxItr->parentIndex(), k2 = 0; - for (edm::SimTrackContainer::const_iterator trkItr = SimTk->begin(); trkItr != SimTk->end(); trkItr++, ++k2) { + int parent = simVtxItr->parentIndex(); +#ifdef EDM_ML_DEBUG + int k2 = 0; +#endif + for (edm::SimTrackContainer::const_iterator trkItr = SimTk->begin(); trkItr != SimTk->end(); trkItr++) { #ifdef EDM_ML_DEBUG + k2++; edm::LogVerbatim("CherenkovAnalysis") << "XtalDedxAnalysis::Track " << k2 << " ID " << trkItr->trackId() << " (" << parent << ") Generator " << trkItr->noGenpart(); #endif diff --git a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc index 965e52568443b..ead099f998571 100644 --- a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc +++ b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc @@ -159,12 +159,15 @@ void DreamSD::initMap(const std::string &sd) { edm::LogVerbatim("EcalSim") << "DreamSD: Length Table for ReadOutName = " << sd << ":"; #endif DimensionMap::const_iterator ite = xtalLMap_.begin(); +#ifdef EDM_ML_DEBUG int i = 0; - for (; ite != xtalLMap_.end(); ite++, i++) { +#endif + for (; ite != xtalLMap_.end(); ite++) { G4String name = "Unknown"; if (ite->first != nullptr) name = (ite->first)->GetName(); #ifdef EDM_ML_DEBUG + i++; edm::LogVerbatim("EcalSim") << " " << i << " " << ite->first << " " << name << " L = " << ite->second.first << " W = " << ite->second.second; #endif diff --git a/SimMuon/MCTruth/src/DTHitAssociator.cc b/SimMuon/MCTruth/src/DTHitAssociator.cc index f58062c08f70a..5de2848b891c6 100644 --- a/SimMuon/MCTruth/src/DTHitAssociator.cc +++ b/SimMuon/MCTruth/src/DTHitAssociator.cc @@ -157,10 +157,9 @@ void DTHitAssociator::initEvent(const edm::Event &iEvent, const edm::EventSetup if (mapOfSimHit.end() != mapOfSimHit.begin()) { LogTrace("DTHitAssociator") << "\n *** Dump DT PSimHit's ***"; - int jwire = 0; int ihit = 0; - for (SimHitMap::const_iterator mapIT = mapOfSimHit.begin(); mapIT != mapOfSimHit.end(); ++mapIT, jwire++) { + for (SimHitMap::const_iterator mapIT = mapOfSimHit.begin(); mapIT != mapOfSimHit.end(); ++mapIT) { DTWireId wireid = (*mapIT).first; for (vector::const_iterator hitIT = mapOfSimHit[wireid].begin(); hitIT != mapOfSimHit[wireid].end(); @@ -177,10 +176,9 @@ void DTHitAssociator::initEvent(const edm::Event &iEvent, const edm::EventSetup } if (mapOfDigi.end() != mapOfDigi.begin()) { - int jwire = 0; int ihit = 0; - for (DigiMap::const_iterator mapIT = mapOfDigi.begin(); mapIT != mapOfDigi.end(); ++mapIT, jwire++) { + for (DigiMap::const_iterator mapIT = mapOfDigi.begin(); mapIT != mapOfDigi.end(); ++mapIT) { LogTrace("DTHitAssociator") << "\n *** Dump DT digis ***"; DTWireId wireid = (*mapIT).first; diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc index 62aec7038909f..810c2613ceb08 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc @@ -1630,9 +1630,7 @@ void SiPixelDigitizerAlgorithm::induce_signal(std::vector::const_iterat void SiPixelDigitizerAlgorithm::fillSimHitMaps(std::vector simHits, const unsigned int tofBin) { // store here the SimHit map for later - int printnum = 0; - for (std::vector::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd; - ++it, ++printnum) { + for (std::vector::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd; ++it) { unsigned int detID = (*it).detUnitId(); unsigned int subdetID = DetId(detID).subdetId(); subDetTofBin theSubDetTofBin = std::make_pair(subdetID, tofBin); diff --git a/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc b/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc index c1169c2455018..187906ceabde2 100644 --- a/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc +++ b/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc @@ -96,9 +96,7 @@ void TrackMergeremb::merg_and_put(edm::Event &iEvent, edm::Handle track_col_in; iEvent.getByToken(akt_collection, track_col_in); - size_t sedref_it = 0; - for (typename TrackCollectionemb::const_iterator it = track_col_in->begin(); it != track_col_in->end(); - ++it, ++sedref_it) { + for (typename TrackCollectionemb::const_iterator it = track_col_in->begin(); it != track_col_in->end(); ++it) { outTracks->push_back(typename T1::value_type(*it)); } diff --git a/Validation/MuonIsolation/src/MuIsoValidation.cc b/Validation/MuonIsolation/src/MuIsoValidation.cc index 3efa8454e23fd..67f10ee1cbcae 100644 --- a/Validation/MuonIsolation/src/MuIsoValidation.cc +++ b/Validation/MuonIsolation/src/MuIsoValidation.cc @@ -326,8 +326,7 @@ void MuIsoValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& i h_nMuons->Fill(theMuonData); //Fill historgams concerning muon isolation - uint iMuon = 0; - for (MuonIterator muon = muonsHandle->begin(); muon != muonsHandle->end(); ++muon, ++iMuon) { + for (MuonIterator muon = muonsHandle->begin(); muon != muonsHandle->end(); ++muon) { ++nIncMuons; if (requireCombinedMuon) { if (muon->combinedMuon().isNull()) diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc index b865c5c444f5d..fbb37ff11546a 100644 --- a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc +++ b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc @@ -907,9 +907,8 @@ unsigned int Phase2TrackerValidateDigi::getSimTrackId(const edm::DetSetVector link_detset = (*simLinks)[detId]; // Loop over DigiSimLink in this det unit - int iSimLink = 0; for (edm::DetSet::const_iterator it = link_detset.data.begin(); it != link_detset.data.end(); - it++, iSimLink++) { + it++) { if (channel == it->channel()) { simTrkId = it->SimTrackId(); break;