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

Jump to bottom

Clean BuildFiles in reco plugins #30535

Merged
merged 2 commits into from Jul 14, 2020
Merged

Clean BuildFiles in reco plugins #30535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4ac53
clean BuildFiles in reco
guitargeek Jun 17, 2020
dbff213
implement review comments
guitargeek Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.cc
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "RecoVertex/BeamSpotProducer/interface/BeamSpotOnlineProducer.h"
#include "DataFormats/BeamSpot/interface/BeamSpot.h"
#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"

Expand Down
1 change: 0 additions & 1 deletion RecoBTag/CTagging/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,4 @@
<library file="*.cc" name="RecoBTagCTaggingPlugins">
<use name="DataFormats/BTauReco"/>
<use name="RecoBTag/CTagging"/>
<use name="RecoBTau/JetTagComputer"/>
<use name="FWCore/Framework"/>
Expand Down
4 changes: 0 additions & 4 deletions RecoBTag/Combined/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,14 +2,10 @@
<library file="*.cc" name="RecoBTagCombinedPlugins">
<use name="lwtnn"/>
<use name="boost"/>
<use name="PhysicsTools/UtilAlgos"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="RecoBTag/SecondaryVertex"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/BTauReco"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/TrackReco"/>
<use name="FWCore/ParameterSet"/>
<use name="RecoBTau/JetTagComputer"/>
<use name="RecoBTag/Combined"/>
Expand Down
1 change: 0 additions & 1 deletion RecoBTag/FeatureTools/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,6 @@
<use name="FWCore/Framework"/>
<library file="*.cc" name="RecoBTagFeatureToolsPlugins">
<use name="DataFormats/BTauReco"/>
<use name="DataFormats/Common"/>
<use name="RecoBTag/FeatureTools"/>
<use name="DataFormats/PatCandidates"/>
<use name="RecoBTag/TrackProbability"/>
Expand Down
6 changes: 0 additions & 6 deletions RecoBTag/PerformanceDB/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,16 +2,10 @@
</export>
<library name="RecoBTagPerformanceDBplugins" file="*.cc">
<use name="CondFormats/PhysicsToolsObjects"/>
<use name="CondFormats/BTauObjects"/>
<use name="RecoBTag/Records"/>
<use name="RecoBTag/PerformanceDB"/>
<use name="CondFormats/DataRecord"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="CondCore/DBOutputService"/>
<use name="PhysicsTools/CondLiteIO"/>
<use name="PhysicsTools/UtilAlgos"/>
</library>
4 changes: 0 additions & 4 deletions RecoBTag/PixelCluster/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,9 +1,6 @@
<library file="*.cc" name="RecoBTagPixelClusterPlugins">
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ParameterSet"/>
<use name="PhysicsTools/UtilAlgos"/>
<use name="CommonTools/UtilAlgos"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/SiPixelCluster"/>
<use name="DataFormats/SiPixelDetId"/>
Expand All @@ -12,6 +9,5 @@
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="Geometry/Records"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/CommonTopologies"/>
<flags EDM_PLUGIN="1"/>
</library>
1 change: 0 additions & 1 deletion RecoBTag/SecondaryVertex/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
<use name="RecoBTag/SecondaryVertex"/>
<use name="boost"/>
<library file="TemplatedSecondaryVertexProducer.cc BVertexFilter.cc BtoCharmDecayVertexMerger.cc BoostedDoubleSVProducer.cc" name="RecoBTagSecondaryVertexProducer">
<use name="DataFormats/BeamSpot"/>
<use name="TrackingTools/Records"/>
<use name="TrackingTools/TransientTrack"/>
<use name="RecoVertex/ConfigurableVertexReco"/>
Expand Down
7 changes: 0 additions & 7 deletions RecoBTag/SoftLepton/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -3,29 +3,22 @@
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="DataFormats/EgammaReco"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/GsfTrackReco"/>
<use name="DataFormats/HcalRecHit"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/VertexReco"/>
<use name="DataFormats/PatCandidates"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="RecoBTag/SoftLepton"/>
<use name="RecoBTau/JetTagComputer"/>
<use name="RecoCaloTools/Selectors"/>
<use name="TrackingTools/IPTools"/>
<use name="TrackingTools/Records"/>
<use name="TrackingTools/TrackAssociator"/>
<use name="TrackingTools/TransientTrack"/>
<use name="RecoEcal/EgammaCoreTools"/>
<use name="CommonTools/Egamma"/>
<use name="boost_regex"/>
<use name="rootmath"/>
Expand Down
1 change: 0 additions & 1 deletion RecoBTau/JetTagComputer/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -5,6 +5,5 @@
<use name="DataFormats/TrackReco"/>
<use name="FWCore/ParameterSet"/>
<use name="RecoBTau/JetTagComputer"/>
<use name="RecoBTag/Combined"/>
<flags EDM_PLUGIN="1"/>
</library>
4 changes: 0 additions & 4 deletions RecoEcal/EgammaClusterProducers/test/BuildFile.xml
View file
Open in desktop
@@ -1,14 +1,10 @@
<library name="RecoEcalPFSuperClusterTreeMaker" file="PFSuperClusterTreeMaker.cc">
<use name="DataFormats/Common"/>
<use name="DataFormats/EgammaReco"/>
<use name="DataFormats/GsfTrackReco"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/ParticleFlowReco"/>
<use name="CommonTools/UtilAlgos"/>
<use name="RecoEcal/EgammaCoreTools"/>
<use name="RecoParticleFlow/PFClusterTools"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<flags EDM_PLUGIN="1"/>
</library>
1 change: 0 additions & 1 deletion RecoEgamma/EgammaElectronProducers/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -3,6 +3,5 @@
<use name="FWCore/ParameterSet"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/EgammaCandidates"/>
<flags EDM_PLUGIN="1"/>
</library>
3 changes: 0 additions & 3 deletions RecoEgamma/EgammaTools/test/BuildFile.xml
View file
Open in desktop
@@ -1,10 +1,7 @@
<library name="RecoEGammaGBRWrapperMaker" file="GBRWrapperMaker.cc">
<use name="FWCore/Framework"/>
<use name="PhysicsTools/MVAComputer"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EgammaObjects"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="RecoEgamma/EgammaTools"/>
<flags EDM_PLUGIN="1"/>
</library>
1 change: 0 additions & 1 deletion RecoEgamma/PhotonIdentification/BuildFile.xml
View file
Open in desktop
@@ -1,4 +1,3 @@
<use name="CommonTools/Egamma"/>
<use name="FWCore/Framework"/>
<use name="DataFormats/HcalRecHit"/>
<use name="DataFormats/EgammaReco"/>
Expand Down
4 changes: 0 additions & 4 deletions RecoHI/HiEgammaAlgos/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,15 +4,11 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/ServiceRegistry"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/BTauReco"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="RecoHI/HiEgammaAlgos"/>
<use name="RecoLocalCalo/EcalRecAlgos"/>
<use name="RecoEcal/EgammaCoreTools"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/EcalObjects"/>
<use name="FWCore/MessageLogger"/>
<use name="DataFormats/EgammaReco"/>
<use name="root"/>
Expand Down
2 changes: 0 additions & 2 deletions RecoHI/HiEgammaAlgos/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -3,8 +3,6 @@
<library name="RecoHIHiEgammaAlgos_testAnalyzers" file="patTest/*.cc">
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="DataFormats/BTauReco"/>
<use name="PhysicsTools/PatUtils"/>
<use name="PhysicsTools/PatAlgos"/>
<use name="CommonTools/UtilAlgos"/>
<use name="DataFormats/PatCandidates"/>
Expand Down
2 changes: 1 addition & 1 deletion RecoHI/HiTracking/test/BuildFile.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<use name="root"/>
<use name="CommonTools/UtilAlgos"/>
<use name="DataFormats/SiPixelDetId"/>
<use name="DataFormats/TrackerRecHit2D"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="DataFormats/TrackReco"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was added recently in #30020 .
Looking at RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc
I suspect that there in #30020 DataFormats/TrackReco somehow came though an include of DataFormats/VertexReco, which is actually not used.
To be safe(er), please edit RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc to get rid of DataFormats/VertexReco includes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks!

<library file="*.cc" name="RecoHIHiTrackingTest">
<flags EDM_PLUGIN="1"/>
</library>
40 changes: 7 additions & 33 deletions RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc
View file
Open in desktop
@@ -1,20 +1,13 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "CommonTools/UtilAlgos/interface/TFileService.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"

#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/Event.h"

#include "DataFormats/VertexReco/interface/Vertex.h"
#include "DataFormats/VertexReco/interface/VertexFwd.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
Expand All @@ -36,18 +29,9 @@
// ROOT includes
#include <TH1.h>

namespace edm {
class Run;
class Event;
class EventSetup;
} // namespace edm

class TrackerGeometry;

class HIPixelClusterVtxAnalyzer : public edm::EDAnalyzer {
public:
explicit HIPixelClusterVtxAnalyzer(const edm::ParameterSet &ps);
~HIPixelClusterVtxAnalyzer();

private:
struct VertexHit {
Expand Down Expand Up @@ -83,11 +67,6 @@ HIPixelClusterVtxAnalyzer::HIPixelClusterVtxAnalyzer(const edm::ParameterSet &ps
// Constructor
}

/*****************************************************************************/
HIPixelClusterVtxAnalyzer::~HIPixelClusterVtxAnalyzer() {
// Destructor
}

/*****************************************************************************/
void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSetup &es) {
if (counter > maxHists_)
Expand All @@ -102,9 +81,6 @@ void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSe
minZ_,
maxZ_);

// new vertex collection
auto vertices = std::make_unique<reco::VertexCollection>();

// get pixel rechits
edm::Handle<SiPixelRecHitCollection> hRecHits;
try {
Expand All @@ -121,19 +97,17 @@ void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSe

// loop over pixel rechits
std::vector<VertexHit> vhits;
for (SiPixelRecHitCollection::DataContainer::const_iterator hit = hits->data().begin(), end = hits->data().end();
hit != end;
++hit) {
if (!hit->isValid())
for (auto const &hit : hits->data()) {
if (!hit.isValid())
continue;
DetId id(hit->geographicalId());
DetId id(hit.geographicalId());
if (id.subdetId() != int(PixelSubdetector::PixelBarrel))
continue;
const PixelGeomDetUnit *pgdu = static_cast<const PixelGeomDetUnit *>(tgeo->idToDet(id));
if (1) {
const RectangularPixelTopology *pixTopo =
static_cast<const RectangularPixelTopology *>(&(pgdu->specificTopology()));
std::vector<SiPixelCluster::Pixel> pixels(hit->cluster()->pixels());
std::vector<SiPixelCluster::Pixel> pixels(hit.cluster()->pixels());
bool pixelOnEdge = false;
for (std::vector<SiPixelCluster::Pixel>::const_iterator pixel = pixels.begin(); pixel != pixels.end();
++pixel) {
Expand All @@ -148,12 +122,12 @@ void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSe
continue;
}

LocalPoint lpos = LocalPoint(hit->localPosition().x(), hit->localPosition().y(), hit->localPosition().z());
LocalPoint lpos = LocalPoint(hit.localPosition().x(), hit.localPosition().y(), hit.localPosition().z());
GlobalPoint gpos = pgdu->toGlobal(lpos);
VertexHit vh;
vh.z = gpos.z();
vh.r = gpos.perp();
vh.w = hit->cluster()->sizeY();
vh.w = hit.cluster()->sizeY();
vhits.push_back(vh);
}

Expand Down
3 changes: 0 additions & 3 deletions RecoJets/FFTJetProducers/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -11,10 +11,7 @@
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/VertexReco"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/WrappedStdDictionaries"/>
<use name="DataFormats/BeamSpot"/>
<use name="RecoJets/JetAlgorithms"/>
<use name="RecoJets/JetProducers"/>
<use name="RecoJets/FFTJetAlgorithms"/>
<use name="RecoJets/FFTJetProducers"/>
Expand Down
1 change: 0 additions & 1 deletion RecoJets/JetAssociationProducers/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
<use name="FWCore/Utilities"/>
<library file="*.cc" name="JetAssociationAlgorithmsTests">
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/VertexReco"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/TrackingRecHit"/>
<use name="DataFormats/TrackerRecHit2D"/>
Expand Down
1 change: 0 additions & 1 deletion RecoJets/JetPlusTracks/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@
<use name="DataFormats/TrackReco"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="boost"/>
<flags EDM_PLUGIN="1"/>
</library>
1 change: 0 additions & 1 deletion RecoJets/JetProducers/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -11,7 +11,6 @@
<use name="Geometry/Records"/>
<use name="CommonTools/UtilAlgos"/>
<use name="CondFormats/JetMETObjects"/>
<use name="PhysicsTools/UtilAlgos"/>
<use name="JetMETCorrections/Objects"/>
<use name="fastjet"/>
<use name="fastjet-contrib"/>
Expand Down
4 changes: 0 additions & 4 deletions RecoLocalCalo/CastorReco/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,9 +4,5 @@
<use name="RecoLocalCalo/CastorReco"/>
<use name="FWCore/Framework"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/RecoCandidate"/>
<use name="Geometry/Records"/>
<use name="Geometry/CaloGeometry"/>
<use name="boost"/>
</library>
1 change: 0 additions & 1 deletion RecoLocalCalo/EcalRecAlgos/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="DataFormats/DetId"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/EcalRecHit"/>
<use name="RecoLocalCalo/EcalRecAlgos"/>
Expand Down
2 changes: 0 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/BuildFile.xml
View file
Open in desktop
@@ -1,9 +1,7 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="CondFormats/SiPixelObjects"/>
<use name="CalibTracker/SiPixelESProducers"/>
<use name="DataFormats/TrackerCommon"/>
<use name="DataFormats/SiPixelCluster"/>
<use name="DataFormats/TrackerRecHit2D"/>
<use name="CondFormats/SiPixelTransient"/>
<use name="RecoLocalTracker/ClusterParameterEstimator"/>
Expand Down
1 change: 0 additions & 1 deletion RecoLocalTracker/SubCollectionProducers/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@
<use name="FWCore/Framework"/>
<use name="CommonTools/UtilAlgos"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="DataFormats/TrackerCommon"/>
<flags EDM_PLUGIN="1"/>
</library>