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.

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

Clean BuildFiles in and after Reco area #30679

Merged
merged 2 commits into from
Jul 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions DQM/BeamMonitor/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<use name="DQMServices/Core"/>
<use name="DataFormats/Scalers"/>
<use name="DataFormats/TrackReco"/>
<use name="FWCore/Framework"/>
<use name="DataFormats/BeamSpot"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
*
*/

//#includes
#include "DataFormats/Math/interface/LorentzVector.h"
#include "DataFormats/Math/interface/deltaR.h"
#include "DataFormats/Math/interface/deltaPhi.h"
#include "CLHEP/Vector/LorentzVector.h"
#include <iostream>
#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
#include "HFRecoEcalCandidateAlgo.h"
#include "HFEGammaSLCorrector.h"
Expand Down
14 changes: 0 additions & 14 deletions RecoEgamma/EgammaIsolationAlgos/interface/EcalPFClusterIsolation.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,6 @@
// Institute: UCSD
//*****************************************************************************

//#include "FWCore/Framework/interface/Frameworkfwd.h"
//#include "FWCore/Framework/interface/stream/EDProducer.h"

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

// #include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoEcalCandidateIsolation.h"

#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateIsolation.h"

#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
#include "DataFormats/ParticleFlowReco/interface/PFClusterFwd.h"

Expand Down
11 changes: 2 additions & 9 deletions RecoEgamma/EgammaIsolationAlgos/interface/ElectronTkIsolation.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,13 @@
//=============================================================================
//*****************************************************************************

//C++ includes
#include <vector>
#include <functional>

//Root includes
#include "TObjArray.h"

//CMSSW includes
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaTrackSelector.h"

#include <string>
#include <vector>

class ElectronTkIsolation {
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,10 @@
#ifndef PFBlockBasedIsolation_H
#define PFBlockBasedIsolation_H

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "DataFormats/VertexReco/interface/VertexFwd.h"
#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
#include "DataFormats/ParticleFlowCandidate/interface/PileUpPFCandidate.h"
#include "DataFormats/ParticleFlowCandidate/interface/PileUpPFCandidateFwd.h"

#include "DataFormats/EgammaCandidates/interface/Photon.h"
#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"

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

namespace reco {
class PFBlockElementCluster;
Expand Down
6 changes: 2 additions & 4 deletions RecoEgamma/EgammaIsolationAlgos/interface/PhotonTkIsolation.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@

//C++ includes
#include <string>
#

//CMSSW includes
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/Candidate/interface/Candidate.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaTrackSelector.h"

class PhotonTkIsolation {
public:
Expand Down
2 changes: 0 additions & 2 deletions RecoEgamma/EgammaIsolationAlgos/plugins/module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ DEFINE_EDM_PLUGIN(IsoDepositExtractorFactory, egammaisolation::EgammaRecHitExtra
#include "EgammaPhotonTkIsolationProducer.h"
#include "EgammaPhotonTkNumIsolationProducer.h"
#include "EgammaTowerIsolationProducer.h"
//#include "EgammaDetIdCollectionProducer.h"
#include "GamIsoDetIdCollectionProducer.h"
#include "EleIsoDetIdCollectionProducer.h"
#include "ParticleBasedIsoProducer.h"
Expand All @@ -34,7 +33,6 @@ DEFINE_FWK_MODULE(EgammaPhotonTkIsolationProducer);
DEFINE_FWK_MODULE(EgammaPhotonTkNumIsolationProducer);
DEFINE_FWK_MODULE(EgammaTowerIsolationProducer);
DEFINE_FWK_MODULE(EgammaEcalRecHitIsolationProducer);
//DEFINE_FWK_MODULE(EgammaDetIdCollectionProducer);
DEFINE_FWK_MODULE(EleIsoDetIdCollectionProducer);
DEFINE_FWK_MODULE(GamIsoDetIdCollectionProducer);
DEFINE_FWK_MODULE(EgammaIsoHcalDetIdCollectionProducer);
Expand Down
14 changes: 1 addition & 13 deletions RecoEgamma/EgammaIsolationAlgos/src/ElectronTkIsolation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,11 @@
// Institute: IIHE-VUB
//=============================================================================
//*****************************************************************************
//C++ includes
#include <vector>
#include <functional>
//ROOT includes
#include <Math/VectorUtil.h>

//CMSSW includes
#include "RecoEgamma/EgammaIsolationAlgos/interface/ElectronTkIsolation.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "TrackingTools/PatternTools/interface/Trajectory.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"

using namespace ROOT::Math::VectorUtil;
#include <Math/VectorUtil.h>

ElectronTkIsolation::ElectronTkIsolation(double extRadius,
double intRadiusBarrel,
Expand Down Expand Up @@ -58,7 +47,6 @@ std::pair<int, double> ElectronTkIsolation::getIso(const reco::Track* tmpTrack)
int counter = 0;
double ptSum = 0.;
//Take the electron track
//reco::GsfTrackRef tmpTrack = electron->gsfTrack() ;
math::XYZVector tmpElectronMomentumAtVtx = (*tmpTrack).momentum();
double tmpElectronEtaAtVertex = (*tmpTrack).eta();

Expand Down
14 changes: 2 additions & 12 deletions RecoEgamma/EgammaIsolationAlgos/src/PFBlockBasedIsolation.cc
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
#include "RecoEgamma/EgammaIsolationAlgos/interface/PFBlockBasedIsolation.h"
#include <cmath>
#include "DataFormats/Math/interface/deltaR.h"

#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
#include "DataFormats/Common/interface/RefToPtr.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h"
#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
#include "TrackingTools/IPTools/interface/IPTools.h"
#include "DataFormats/Math/interface/deltaR.h"
#include "DataFormats/ParticleFlowReco/interface/PFBlockFwd.h"
#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
#include "DataFormats/ParticleFlowReco/interface/PFBlockElementCluster.h"

#include <cmath>

//--------------------------------------------------------------------------------------------------

PFBlockBasedIsolation::PFBlockBasedIsolation() {
Expand Down
19 changes: 1 addition & 18 deletions RecoEgamma/EgammaIsolationAlgos/src/PhotonTkIsolation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,9 @@
// Institute: IIHE-VUB
//=============================================================================
//*****************************************************************************
//C++ includes
#include <vector>
#include <functional>

//ROOT includes
#include <Math/VectorUtil.h>

//CMSSW includes
#include "RecoEgamma/EgammaIsolationAlgos/interface/PhotonTkIsolation.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "TrackingTools/PatternTools/interface/Trajectory.h"
#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
#include "DataFormats/RecoCandidate/interface/RecoCandidate.h"
#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "DataFormats/Candidate/interface/Particle.h"
#include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaTrackSelector.h"

PhotonTkIsolation::PhotonTkIsolation(float extRadius,
float intRadiusBarrel,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
#include "FWCore/Framework/interface/ESHandle.h"
#include "DataFormats/EgammaCandidates/interface/PhotonCore.h"
#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
//#include "RecoEgamma/EgammaTools/interface/HoECalculator.h"
//#include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
//#include "RecoEgamma/PhotonIdentification/interface/PhotonIsolationCalculator.h"

// GEDPhotonCoreProducer inherits from EDProducer, so it can be a module:
class GEDPhotonCoreProducer : public edm::stream::EDProducer<> {
Expand Down
2 changes: 0 additions & 2 deletions RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

//#include "DataFormats/TrackReco/src/classes.h"

#include "CommonTools/Statistics/interface/ChiSquaredProbability.h"

ConversionTrackMerger::ConversionTrackMerger(edm::ParameterSet const& conf) : conf_(conf) {
Expand Down
2 changes: 0 additions & 2 deletions RecoEgamma/EgammaTools/plugins/EGEnergyAnalyzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "TFile.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
//#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
//#include "CondCore/DBCommon/interface/CoralServiceManager.h"

#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand Down
2 changes: 0 additions & 2 deletions RecoEgamma/EgammaTools/test/GBRWrapperMaker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#include "TFile.h"
#include "CondFormats/EgammaObjects/interface/GBRForestD.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
//#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
//#include "CondCore/DBCommon/interface/CoralServiceManager.h"

#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand Down
1 change: 0 additions & 1 deletion RecoEgamma/Examples/plugins/SealModule.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//#include "FWCore/PluginManager/interface/ModuleDef.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/ModuleFactory.h"
#include "FWCore/Utilities/interface/typelookup.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/EgammaCandidates/interface/Conversion.h"
#include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
//#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
//
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
Expand Down
1 change: 0 additions & 1 deletion RecoEgamma/Examples/plugins/SimplePi0DiscAnalyzer.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#include "DataFormats/EgammaCandidates/interface/Conversion.h"
#include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
//#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/CaloRecHit/interface/CaloCluster.h"

#include "DataFormats/EgammaCandidates/interface/PhotonPi0DiscriminatorAssociation.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "RecoEgamma/EgammaIsolationAlgos/interface/PhotonTkIsolation.h"
#include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaEcalIsolation.h"
#include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaTowerIsolation.h"
//#include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"

#include "Geometry/CaloTopology/interface/CaloTopology.h"
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
Expand Down
1 change: 0 additions & 1 deletion RecoLocalTracker/SiStripClusterizer/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<use name="CondFormats/SiStripObjects"/>
<use name="CalibFormats/SiStripObjects"/>
<use name="CalibTracker/Records"/>
<use name="EventFilter/SiStripRawToDigi"/>
<use name="RecoLocalTracker/Records"/>
<export>
<lib name="1"/>
Expand Down
1 change: 1 addition & 0 deletions RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<library name="RecoLocalTrackerSiStripClusterizerPlugins" file="*.cc">
<use name="EventFilter/SiStripRawToDigi"/>
<use name="RecoLocalTracker/SiStripClusterizer"/>
<use name="RecoLocalTracker/SiStripZeroSuppression"/>
<flags EDM_PLUGIN="1"/>
Expand Down
1 change: 0 additions & 1 deletion RecoTracker/TkSeedGenerator/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<use name="Geometry/CommonDetUnit"/>
<use name="DataFormats/TrajectorySeed"/>
<use name="DataFormats/TrackerRecHit2D"/>
<use name="DataFormats/L1TrackTrigger"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

this better be moved to RecoTracker/TkSeedGenerator/plugins/BuildFile.xml due to direct use in
RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc

<use name="Geometry/TrackerGeometryBuilder"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/Engine"/>
Expand Down
1 change: 1 addition & 0 deletions RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<use name="CommonTools/RecoAlgos"/>
<use name="DataFormats/L1TrackTrigger"/>
<use name="RecoTracker/TkSeedGenerator"/>
<use name="RecoTracker/TkTrackingRegions"/>
<use name="RecoPixelVertexing/PixelTriplets"/>
Expand Down
1 change: 0 additions & 1 deletion RecoVertex/BeamSpotProducer/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/BeamSpotObjects"/>
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Scalers"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/VertexReco"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ ________________________________________________________________**/
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
//#include "FWCore/Framework/interface/IOVSyncValue.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand Down
1 change: 1 addition & 0 deletions RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<library file="BeamSpotOnlineProducer.cc" name="BeamSpotOnlineProducer">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/L1GlobalTrigger"/>
<use name="DataFormats/Scalers"/>
</library>

<library file="BeamSpotAnalyzer.cc" name="BeamSpotAnalyzer">
Expand Down
10 changes: 4 additions & 6 deletions SLHCUpgradeSimulations/Geometry/test/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
<use name="FWCore/Framework"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/StdDictionaries"/>
<use name="FWCore/ParameterSet"/>
<use name="SimTracker/Common"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="SimTracker/TrackerHitAssociation"/>
<use name="RecoLocalTracker/SiPixelRecHits"/>
</library>

<library file="ModuleInfo_Phase2.cc" name="ModuleInfo_Phase2">
Expand All @@ -18,7 +17,6 @@
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="Geometry/TrackerNumberingBuilder"/>
<use name="Geometry/CommonDetUnit"/>
<use name="CondFormats/Alignment"/>
</library>

<library file="Phase2PixelNtuple.cc" name="Phase2PixelNtuple">
Expand All @@ -30,9 +28,9 @@
<use name="CommonTools/UtilAlgos"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/StdDictionaries"/>
<use name="SimTracker/TrackerHitAssociation"/>
<use name="RecoLocalTracker/SiPixelRecHits"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
</library>

<bin name="testPhase2PixelNtuple" file="testPhase2PixelNtuple.cpp">
Expand Down
2 changes: 0 additions & 2 deletions SimCalorimetry/CastorSim/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<flags EDM_PLUGIN="1"/>
<use name="SimCalorimetry/CastorSim"/>
<use name="DataFormats/HcalDetId"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="SimDataFormats/CrossingFrame"/>
<use name="SimGeneral/MixingModule"/>
<use name="Geometry/HcalTowerAlgo"/>
</library>
1 change: 0 additions & 1 deletion SimCalorimetry/CastorSim/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<environment>
<use name="SimCalorimetry/CastorSim"/>
<use name="CalibCalorimetry/HcalTPGAlgos"/>
<bin file="CastorDigitizerTest.cpp">
</bin>

Expand Down
4 changes: 0 additions & 4 deletions SimCalorimetry/EcalSelectiveReadoutAlgos/test/BuildFile.xml

This file was deleted.

1 change: 0 additions & 1 deletion SimCalorimetry/EcalSimAlgos/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<environment>
<use name="SimCalorimetry/EcalSimAlgos"/>
<use name="SimCalorimetry/CaloSimAlgos"/>
<use name="SimDataFormats/RandomEngine"/>
<use name="rootgraphics"/>
<bin file="testEcalShape.cpp">
</bin>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ParameterSet"/>
<use name="SimDataFormats/Associations"/>
<use name="RecoLocalCalo/HGCalRecAlgos"/>
Expand Down
Loading