Merge pull request #48391 from tvami/CMSFastGenParticleCandidateProducerCleanup

cmsbuild · web-flow · commit ad902370a488 · 2025-07-03T10:37:02.000+02:00
Remove deprecated genParticleCandidates
diff --git a/CommonTools/CandAlgos/test/testCandSelectors.py b/CommonTools/CandAlgos/test/testCandSelectors.py
@@ -12,31 +12,31 @@
 
 # select the 10 particles with the larget Pt
 process.largestPtCands = EDProducer("LargestPtCandSelector",
-  src = InputTag("genParticleCandidates"),
+  src = InputTag("genParticles"),
   maxNumber = uint32( 10 )
 )
 
 # select only electrons, and save a vector of references 
 process.electronRefs = EDProducer("PdgIdCandRefVectorSelector",
-  src = InputTag("genParticleCandidates"),
+  src = InputTag("genParticles"),
   pdgId = vint32( 11 )
 )
 
 # select only electrons, and save clones
 process.electrons = EDProducer("PdgIdCandSelector",
-  src = InputTag("genParticleCandidates"),
+  src = InputTag("genParticles"),
   pdgId = vint32( 11 )
 )
 
 # select only muons, and save a vector of references 
 process.muonRefs = EDProducer("PdgIdCandRefVectorSelector",
-  src = InputTag("genParticleCandidates"),
+  src = InputTag("genParticles"),
   pdgId = vint32( 13 )
 )
 
 # select only muons, and save clones
 process.muons = EDProducer("PdgIdCandSelector",
-  src = InputTag("genParticleCandidates"),
+  src = InputTag("genParticles"),
   pdgId = vint32( 13 )
 )
 
diff --git a/GeneratorInterface/AlpgenInterface/test/test_TEMPLATE_cfg.py b/GeneratorInterface/AlpgenInterface/test/test_TEMPLATE_cfg.py
@@ -45,7 +45,6 @@
 
 #process.VtxSmeared.src = 'generator'
 #process.genParticles.src = 'VtxSmeared'
-#process.genParticleCandidates.src = 'VtxSmeared'
 
 # Needed for the SIM step.
 #process.g4SimHits.Generator.HepMCProductLabel = 'VtxSmeared'
diff --git a/PhysicsTools/HepMCCandAlgos/python/allElectronsGenParticlesMatch_cfi.py b/PhysicsTools/HepMCCandAlgos/python/allElectronsGenParticlesMatch_cfi.py
@@ -4,7 +4,7 @@
     src = cms.InputTag("allElectrons"),
     distMin = cms.double(0.15),
     matchPDGId = cms.vint32(11),
-    matched = cms.InputTag("genParticleCandidates")
+    matched = cms.InputTag("genParticles")
 )
 
 
diff --git a/PhysicsTools/HepMCCandAlgos/python/allMuonsGenParticlesMatch_cfi.py b/PhysicsTools/HepMCCandAlgos/python/allMuonsGenParticlesMatch_cfi.py
@@ -4,7 +4,7 @@
     src = cms.InputTag("allMuons"),
     distMin = cms.double(0.15),
     matchPDGId = cms.vint32(13),
-    matched = cms.InputTag("genParticleCandidates")
+    matched = cms.InputTag("genParticles")
 )
 
 
diff --git a/PhysicsTools/HepMCCandAlgos/python/allStandAloneMuonTracksGenParticlesLeptonMatch_cfi.py b/PhysicsTools/HepMCCandAlgos/python/allStandAloneMuonTracksGenParticlesLeptonMatch_cfi.py
@@ -6,7 +6,6 @@
     # poor resolution
     distMin = cms.double(0.5),
     matchPDGId = cms.vint32(13),
-    matched = cms.InputTag("genParticleCandidates")
+    matched = cms.InputTag("genParticles")
 )
 
-
diff --git a/PhysicsTools/HepMCCandAlgos/python/allSuperClustersGenParticlesLeptonMatch_cfi.py b/PhysicsTools/HepMCCandAlgos/python/allSuperClustersGenParticlesLeptonMatch_cfi.py
@@ -4,7 +4,6 @@
     src = cms.InputTag("allSuperClusters"),
     distMin = cms.double(0.15),
     matchPDGId = cms.vint32(11),
-    matched = cms.InputTag("genParticleCandidates")
+    matched = cms.InputTag("genParticles")
 )
 
-
diff --git a/PhysicsTools/HepMCCandAlgos/python/allTracksGenParticlesLeptonMatch_cfi.py b/PhysicsTools/HepMCCandAlgos/python/allTracksGenParticlesLeptonMatch_cfi.py
@@ -4,7 +4,7 @@
     src = cms.InputTag("allTracks"),
     distMin = cms.double(0.15),
     matchPDGId = cms.vint32(11, 13),
-    matched = cms.InputTag("genParticleCandidates")
+    matched = cms.InputTag("genParticles")
 )
 
 
diff --git a/PhysicsTools/HepMCCandAlgos/python/allTracksGenParticlesMatch_cfi.py b/PhysicsTools/HepMCCandAlgos/python/allTracksGenParticlesMatch_cfi.py
@@ -4,7 +4,7 @@
     src = cms.InputTag("allTracks"),
     distMin = cms.double(0.15),
     matchPDGId = cms.vint32(),
-    matched = cms.InputTag("genParticleCandidates")
+    matched = cms.InputTag("genParticles")
 )
 
 
diff --git a/PhysicsTools/HepMCCandAlgos/python/genParticleCandidates2GenParticles_cfi.py b/PhysicsTools/HepMCCandAlgos/python/genParticleCandidates2GenParticles_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 genParticles = cms.EDProducer("GenParticleCandidate2GenParticleProducer",
-    src = cms.InputTag("genParticleCandidates")
+    src = cms.InputTag("genParticles")
 )
 
 
diff --git a/PhysicsTools/HepMCCandAlgos/python/genParticleCandidatesFast_cfi.py b/PhysicsTools/HepMCCandAlgos/python/genParticleCandidatesFast_cfi.py
diff --git a/PhysicsTools/HepMCCandAlgos/python/genParticleCandidates_cfi.py b/PhysicsTools/HepMCCandAlgos/python/genParticleCandidates_cfi.py
diff --git a/RecoJets/JetAnalyzers/src/myFastSimVal.cc b/RecoJets/JetAnalyzers/src/myFastSimVal.cc
@@ -1861,7 +1861,7 @@ void myFastSimVal::analyze(const Event& evt, const EventSetup& es) {
   // ******************************************
 
   Handle<CandidateCollection> genParticles;
-  evt.getByLabel("genParticleCandidates", genParticles);
+  evt.getByLabel("genParticles", genParticles);
 
   // *********************
   // Partons (Z')
diff --git a/RecoJets/JetProducers/src/JetMatchingTools.cc b/RecoJets/JetProducers/src/JetMatchingTools.cc
@@ -57,7 +57,7 @@ JetMatchingTools::JetMatchingTools(const edm::Event& fEvent, edm::ConsumesCollec
   input_pcalohits_hcal_token_ = iC.mayConsume<edm::PCaloHitContainer>(edm::InputTag("g4SimHits:HcalHits"));
   input_simtrack_token_ = iC.mayConsume<edm::SimTrackContainer>(edm::InputTag("g4SimHits"));
   input_simvertex_token_ = iC.mayConsume<edm::SimVertexContainer>(edm::InputTag("g4SimHits"));
-  input_cands_token_ = iC.mayConsume<reco::CandidateCollection>(edm::InputTag("genParticleCandidates"));
+  input_cands_token_ = iC.mayConsume<reco::CandidateCollection>(edm::InputTag("genParticles"));
 }
 
 JetMatchingTools::~JetMatchingTools() {}
diff --git a/RecoMET/Configuration/python/GenMETParticles_cff.py b/RecoMET/Configuration/python/GenMETParticles_cff.py
@@ -10,8 +10,6 @@
 #
 # F.R. Mar. 22, 2007 IMPORTANT: this configuration assumes that some
 #                    GenParticle collections are made via GenJet's configuration
-from PhysicsTools.HepMCCandAlgos.genParticleCandidatesFast_cfi import *
-#from SimGeneral.HepPDTESSource.pythiapdt_cfi import *
 from RecoJets.Configuration.GenJetParticles_cff import *
 
 genCandidatesForMET = cms.EDProducer(
diff --git a/RecoMuon/MuonIdentification/test/TestMuonIdProducerCosmics_cfg.py b/RecoMuon/MuonIdentification/test/TestMuonIdProducerCosmics_cfg.py
@@ -50,7 +50,7 @@
 process.out = cms.OutputModule("PoolOutputModule",
     fileName = cms.untracked.string('/tmp/muonid_1.24.root'),
     outputCommands = cms.untracked.vstring("drop *",
-        "keep *_genParticleCandidates_*_*",
+        "keep *_genParticles_*_*",
 	"keep recoTracks_*_*_*",
 	"keep recoTrackExtras_*_*_*",
 	"keep recoMuons_*_*_*",
diff --git a/RecoMuon/MuonIdentification/test/TestMuonIdProducer_cfg.py b/RecoMuon/MuonIdentification/test/TestMuonIdProducer_cfg.py
@@ -79,7 +79,7 @@
 process.out = cms.OutputModule("PoolOutputModule",
     fileName = cms.untracked.string('/eos/cms/store/user/dmytro/tmp/RelValZMM_13+CMSSW_9_1_0_pre2-PU25ns_90X_upgrade2017_realistic_v20-v1+muonid_3sigma_arbitrated.root'),
     outputCommands = cms.untracked.vstring("drop *",
-        "keep *_genParticleCandidates_*_*",
+        "keep *_genParticles_*_*",
         "keep recoGenParticles_genParticles_*_*",
 	"keep recoTracks_*_*_*",
 	"keep recoTrackExtras_*_*_*",

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`src = cms.InputTag("allElectrons"),`
`5`	`5`	`distMin = cms.double(0.15),`
`6`	`6`	`matchPDGId = cms.vint32(11),`
`7`		`- matched = cms.InputTag("genParticleCandidates")`
	`7`	`+ matched = cms.InputTag("genParticles")`
`8`	`8`	`)`
`9`	`9`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`src = cms.InputTag("allMuons"),`
`5`	`5`	`distMin = cms.double(0.15),`
`6`	`6`	`matchPDGId = cms.vint32(13),`
`7`		`- matched = cms.InputTag("genParticleCandidates")`
	`7`	`+ matched = cms.InputTag("genParticles")`
`8`	`8`	`)`
`9`	`9`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`# poor resolution`
`7`	`7`	`distMin = cms.double(0.5),`
`8`	`8`	`matchPDGId = cms.vint32(13),`
`9`		`- matched = cms.InputTag("genParticleCandidates")`
	`9`	`+ matched = cms.InputTag("genParticles")`
`10`	`10`	`)`
`11`	`11`
`12`		`-`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`src = cms.InputTag("allSuperClusters"),`
`5`	`5`	`distMin = cms.double(0.15),`
`6`	`6`	`matchPDGId = cms.vint32(11),`
`7`		`- matched = cms.InputTag("genParticleCandidates")`
	`7`	`+ matched = cms.InputTag("genParticles")`
`8`	`8`	`)`
`9`	`9`
`10`		`-`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`src = cms.InputTag("allTracks"),`
`5`	`5`	`distMin = cms.double(0.15),`
`6`	`6`	`matchPDGId = cms.vint32(11, 13),`
`7`		`- matched = cms.InputTag("genParticleCandidates")`
	`7`	`+ matched = cms.InputTag("genParticles")`
`8`	`8`	`)`
`9`	`9`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import FWCore.ParameterSet.Config as cms`
`2`	`2`
`3`	`3`	`genParticles = cms.EDProducer("GenParticleCandidate2GenParticleProducer",`
`4`		`- src = cms.InputTag("genParticleCandidates")`
	`4`	`+ src = cms.InputTag("genParticles")`
`5`	`5`	`)`
`6`	`6`
`7`	`7`