Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3-gex126A Try to resolve compilation warnings in RecoParticleFlow/PFProducer #37399

Merged
merged 6 commits into from
Apr 25, 2022
Merged

Run3-gex126A Try to resolve compilation warnings in RecoParticleFlow/PFProducer #37399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6340241
Try to resolve compilation warnings in RecoParticleFlow/PFProducer
Mar 29, 2022
c0c6474
Code check
Mar 29, 2022
5df4766
Delete unused files
Apr 14, 2022
e0c0ddd
Remove reference of deleted files from Builfile
Apr 14, 2022
1cc6b5f
Remove reference to deleted code
Apr 15, 2022
af84bf6
Take Andreas comments
Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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")
Expand Down
12 changes: 1 addition & 11 deletions RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -120,7 +111,6 @@
process.recoPFJets+
process.recoPFMET+
process.PFTau+
process.pfEGAlgoNewSCTree+
process.pfElectronSCTree+
process.pfPhotonSCTree+
process.pfMustacheSCTree)
Expand Down
43 changes: 0 additions & 43 deletions RecoParticleFlow/PFProducer/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand All @@ -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>
258 changes: 0 additions & 258 deletions RecoParticleFlow/PFProducer/test/PFBlockComparator.cc
View file
Open in desktop

This file was deleted.

Loading