Merge pull request #37399 from bsunanda/Run3-gex126A

Run3-gex126A Try to resolve compilation warnings in RecoParticleFlow/PFProducer
cms-sw · Apr 25, 2022 · 652b30f · 652b30f
2 parents 186a756 + af84bf6
commit 652b30f
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 1,202 deletions.
diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py
@@ -4,7 +4,7 @@
 process.load("Configuration.StandardSequences.Reconstruction_cff")
 process.load("Configuration.StandardSequences.MagneticField_38T_cff")
 #process.load("Configuration.StandardSequences.MagneticField_4T_cff")
-process.load("Configuration.StandardSequences.Geometry_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff')
 #from Configuration.AlCa.autoCond import autoCond
 #process.GlobalTag.globaltag = autoCond['mc']
@@ -81,7 +81,7 @@
                                  process.recoGenMET+
                                  process.particleFlowSimParticle)
 
-process.load("RecoParticleFlow.PFProducer.particleFlowCandidateChecker_cfi")
+#process.load("RecoParticleFlow.PFProducer.particleFlowCandidateChecker_cfi")
 #process.particleFlowCandidateChecker.pfCandidatesReco = cms.InputTag("particleFlow","","REPROD")
 #process.particleFlowCandidateChecker.pfCandidatesReReco = cms.InputTag("particleFlow","","REPROD2")
 #process.particleFlowCandidateChecker.pfJetsReco = cms.InputTag("ak5PFJets","","REPROD")

diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py
@@ -10,7 +10,7 @@
 process.load("Configuration.StandardSequences.Reconstruction_cff")
 process.load("Configuration.StandardSequences.MagneticField_38T_cff")
 #process.load("Configuration.StandardSequences.MagneticField_4T_cff")
-process.load("Configuration.StandardSequences.Geometry_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff')
 from Configuration.AlCa.autoCond import autoCond
 process.GlobalTag.globaltag = autoCond['startup']
@@ -54,15 +54,6 @@
     fileName=cms.string(outfile_name)
     )
 
-process.pfEGAlgoNewSCTree = cms.EDAnalyzer(
-    "PFEGCandidateTreeMaker",
-    doGen = cms.untracked.bool(True),
-    genSrc = cms.InputTag("genParticles"),
-    primaryVertices = cms.InputTag("offlinePrimaryVertices"),
-    pfEGammaCandSrc = cms.InputTag('particleFlowEGamma'),
-    pfCandSrc = cms.InputTag('particleFlow')
-    )
-
 process.pfElectronSCTree = cms.EDAnalyzer(
     "PFSuperClusterTreeMaker",
     doGen = cms.untracked.bool(True),
@@ -120,7 +111,6 @@
                                 process.recoPFJets+
                                 process.recoPFMET+
                                 process.PFTau+
-                                process.pfEGAlgoNewSCTree+
                                 process.pfElectronSCTree+
                                 process.pfPhotonSCTree+
                                 process.pfMustacheSCTree)

diff --git a/RecoParticleFlow/PFProducer/test/BuildFile.xml b/RecoParticleFlow/PFProducer/test/BuildFile.xml
@@ -1,18 +1,3 @@
-<library name="RecoParticleFlowPFBlockComparator" file="PFBlockComparator.cc">
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GsfTrackReco"/>
-  <use name="DataFormats/ParticleFlowCandidate"/>
-  <use name="DataFormats/ParticleFlowReco"/>
-  <use name="SimDataFormats/GeneratorProducts"/>
-  <use name="RecoParticleFlow/PFProducer"/>
-  <use name="CommonTools/UtilAlgos"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
-  <use name="FWCore/ParameterSet"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
-
 <library name="RecoParticleFlowEgGEDPhotonAnalyzer" file="EgGEDPhotonAnalyzer.cc">
   <use name="DataFormats/Common"/>
   <use name="DataFormats/EgammaReco"/>
@@ -55,18 +40,6 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<library name="RecoParticleFlowPFEGammaCandidateChecker" file="PFEGammaCandidateChecker.cc">
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GsfTrackReco"/>
-  <use name="DataFormats/ParticleFlowCandidate"/>
-  <use name="DataFormats/ParticleFlowReco"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
-  <use name="FWCore/ParameterSet"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
-
 <library name="RecoParticleFlowPFIsoReader" file="PFIsoReader.cc">
   <use name="DataFormats/Common"/>
   <use name="DataFormats/EgammaReco"/>
@@ -78,19 +51,3 @@
   <use name="FWCore/ParameterSet"/>
   <flags EDM_PLUGIN="1"/>
 </library>
-
-<library name="RecoParticleFlowComparePFCandidateEGTreeMaker" file="PFEGCandidateTreeMaker.cc">
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GsfTrackReco"/>
-  <use name="DataFormats/ParticleFlowCandidate"/>
-  <use name="DataFormats/ParticleFlowReco"/>
-  <use name="root"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="CommonTools/UtilAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoParticleFlow/PFClusterTools"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
diff --git a/RecoParticleFlow/PFProducer/test/PFBlockComparator.cc b/RecoParticleFlow/PFProducer/test/PFBlockComparator.cc