cms-sw · cmsbuild · Apr 1, 2020 · Mar 12, 2020
diff --git a/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml
@@ -4,6 +4,7 @@
 <use   name="FWCore/ParameterSet"/>
 <use   name="clhep"/>
 <use   name="Geometry/CaloTopology"/>
+<use   name="Geometry/EcalAlgo"/>
 <use   name="Geometry/HcalTowerAlgo"/>
 <use   name="Geometry/Records"/>
 <use   name="DataFormats/TrackReco"/>
@@ -16,6 +17,5 @@
 <use   name="CalibFormats/HcalObjects"/>
 <use   name="Geometry/EcalMapping"/>
 <use   name="Geometry/CaloGeometry"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
 <use   name="CalibTracker/Records"/>
 <flags   EDM_PLUGIN="1"/>
diff --git a/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml
@@ -3,7 +3,6 @@
 <use   name="FWCore/ParameterSet"/>
 <use   name="HLTrigger/HLTcore"/>
 <use   name="Calibration/IsolatedParticles"/>
-<use   name="DataFormats/EgammaReco"/>
 <use   name="DataFormats/JetReco"/>
 <use   name="rootphysics"/>
 <library   file="*.cc" name="CalibrationHcalAlCaRecoProducersPlugins">

diff --git a/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml
@@ -2,15 +2,11 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="DQMServices/Core"/>
-<use   name="DQMServices/Components"/>
 
-<use   name="CondCore/Utilities"/>
 <use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/PluginManager"/>
 <use name="CondFormats/Luminosity"/>
 <use name="CoralBase"/>
 <use   name="CondCore/DBOutputService"/>
-<use name="CondCore/ESSources"/>
 
 <use   name="DataFormats/Luminosity"/>
 <use name="CondFormats/DataRecord"/>

diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
@@ -4,7 +4,6 @@
 
 <use   name="CondCore/Utilities"/> 
 <use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="CondFormats/BeamSpotObjects"/>
 <use   name="CondFormats/DataRecord"/>
 <use   name="CondCore/DBOutputService"/>

diff --git a/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.cc b/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.cc
@@ -1,6 +1,5 @@
 #include "PFCandWithSuperClusterExtractor.h"
 
-#include "RecoMuon/MuonIsolation/interface/Range.h"
 #include "DataFormats/RecoCandidate/interface/IsoDepositDirection.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/CommonTools/RecoUtils/plugins/BuildFile.xml b/CommonTools/RecoUtils/plugins/BuildFile.xml
@@ -1,27 +1,10 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="CommonTools/RecoUtils"/>
 <use name="DataFormats/BeamSpot"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
-<use name="DataFormats/VertexReco"/>
 <use name="DataFormats/EgammaCandidates"/>
-<use name="DataFormats/RecoCandidate"/>
-<use name="DataFormats/ParticleFlowCandidate"/>
-<use name="DataFormats/ParticleFlowReco"/>
-#<use name="DQMServices/Core"/>
-<use name="MagneticField/Records"/>
-<use name="MagneticField/Engine"/>
-<use name="SimDataFormats/TrackingAnalysis"/>
-#<use name="SimDataFormats/PileupSummaryInfo"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="SimTracker/TrackAssociation"/>
-#<use name="SimTracker/Records"/>
-<use name="TrackingTools/TransientTrack"/>
-<use name="TrackingTools/IPTools"/>
 <library   file="*.cc" name="PFPUAssoMapPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc
@@ -18,7 +18,7 @@
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/DetId/interface/DetId.h"
 
-#include "Alignment/CommonAlignment/interface/Utilities.h"
+#include "CondFormats/Alignment/interface/Definitions.h"
 
 // needed for the tracker map
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"

diff --git a/DataFormats/MuonReco/test/BuildFile.xml b/DataFormats/MuonReco/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="DataFormats/MuonReco"/>
 <bin   name="testDataFormatsMuonReco" file="testMuon.cc,testRunner.cpp">
   <use   name="cppunit"/>
 </bin>
diff --git a/DataFormats/VertexReco/test/BuildFile.xml b/DataFormats/VertexReco/test/BuildFile.xml
@@ -1,9 +1,4 @@
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/TrackReco"/>
 <use   name="clhep"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
 <use   name="DataFormats/VertexReco"/>
 <use   name="root"/>
 <bin   name="testDataFormatsVertexReco" file="testVertex.cc,testRunner.cpp">

diff --git a/Geometry/CaloEventSetup/BuildFile.xml b/Geometry/CaloEventSetup/BuildFile.xml
@@ -0,0 +1,3 @@
+<use   name="Geometry/Records"/>
+<export>
+</export>
diff --git a/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.cc b/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.cc
@@ -13,7 +13,6 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 
-#include "RecoMuon/MuonIsolation/interface/Range.h"
 #include "DataFormats/RecoCandidate/interface/IsoDepositDirection.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 
@@ -25,7 +24,6 @@
 
 using namespace edm;
 using namespace reco;
-using namespace muonisolation;
 
 /// constructor with config
 CandIsoDepositProducer::CandIsoDepositProducer(const ParameterSet &par)

diff --git a/PhysicsTools/IsolationAlgos/plugins/CandViewExtractor.cc b/PhysicsTools/IsolationAlgos/plugins/CandViewExtractor.cc
@@ -1,6 +1,5 @@
 #include "CandViewExtractor.h"
 
-#include "RecoMuon/MuonIsolation/interface/Range.h"
 #include "DataFormats/RecoCandidate/interface/IsoDepositDirection.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/TrackReco/interface/Track.h"

diff --git a/PhysicsTools/PatAlgos/plugins/PATJetProducer.h b/PhysicsTools/PatAlgos/plugins/PATJetProducer.h
@@ -33,8 +33,6 @@
 #include "PhysicsTools/PatAlgos/interface/EfficiencyLoader.h"
 #include "PhysicsTools/PatAlgos/interface/KinResolutionsLoader.h"
 
-#include "RecoJets/JetProducers/interface/JetIDHelper.h"
-
 #include "DataFormats/PatCandidates/interface/UserData.h"
 #include "PhysicsTools/PatAlgos/interface/PATUserDataHelper.h"
 

diff --git a/RecoBTag/Combined/plugins/BuildFile.xml b/RecoBTag/Combined/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <library file="*.cc" name="RecoBTagCombinedPlugins">
   <use   name="lwtnn"/>
   <use   name="boost"/>

diff --git a/RecoBTag/FeatureTools/plugins/BuildFile.xml b/RecoBTag/FeatureTools/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <library file="*.cc" name="RecoBTagFeatureToolsPlugins">
   <use name="DataFormats/BTauReco"/>
   <use name="DataFormats/Common"/>

diff --git a/RecoBTag/ImpactParameter/plugins/BuildFile.xml b/RecoBTag/ImpactParameter/plugins/BuildFile.xml
@@ -12,7 +12,6 @@
 <use   name="RecoVertex/GhostTrackFitter"/>
 <use   name="RecoBTau/JetTagComputer"/>
 <use   name="RecoBTag/TrackProbability"/>
-<use   name="RecoBTag/XMLCalibration"/>
 <use   name="boost"/>
 <library   file="*.cc" name="RecoBTagImpactParameterPlugins">
   <flags   EDM_PLUGIN="1"/>

diff --git a/RecoBTag/ImpactParameter/test/BuildFile.xml b/RecoBTag/ImpactParameter/test/BuildFile.xml
@@ -1,14 +1,12 @@
 
 <use   name="clhep"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="DataFormats/Math"/>
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/GeometryVector"/>
 <library   file="IPAnalyzer.cc" name="IPAnalyzer">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoBTag/MXNet/plugins/BuildFile.xml b/RecoBTag/MXNet/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <library file="*.cc" name="RecoBTagMXNetPlugins">
   <use name="DataFormats/BTauReco"/>
   <use name="PhysicsTools/MXNet"/>

diff --git a/RecoBTag/ONNXRuntime/plugins/BuildFile.xml b/RecoBTag/ONNXRuntime/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <library file="*.cc" name="RecoBTagONNXRuntimePlugins">
   <use name="DataFormats/BTauReco"/>
   <use name="PhysicsTools/ONNXRuntime"/>

diff --git a/RecoBTag/PerformanceDB/bin/BuildFile.xml b/RecoBTag/PerformanceDB/bin/BuildFile.xml
@@ -1,8 +1,4 @@
 <use   name="CondFormats/PhysicsToolsObjects"/>
-<use   name="RecoBTag/Records"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="RecoBTag/PerformanceDB"/>
 <use   name="PhysicsTools/CondLiteIO"/>
 <use   name="PhysicsTools/FWLite"/>

diff --git a/RecoBTag/PerformanceDB/test/BuildFile.xml b/RecoBTag/PerformanceDB/test/BuildFile.xml
@@ -1,9 +1,6 @@
 <use   name="CondFormats/PhysicsToolsObjects"/>
 <use   name="RecoBTag/Records"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="DataFormats/PatCandidates"/>
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="RecoBTag/PerformanceDB"/>
 <library   file="*.cc" name="testRecoBTagTestPerformanceDBPlugins">
   <flags   EDM_PLUGIN="1"/>

diff --git a/RecoBTag/SoftLepton/test/BuildFile.xml b/RecoBTag/SoftLepton/test/BuildFile.xml
@@ -1,12 +1,7 @@
 <use   name="RecoBTag/SoftLepton"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
 <use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="SimTracker/Records"/>
-<use   name="SimTracker/TrackAssociation"/>
 <use   name="boost"/>
 <library   file="testLeptonAssociator.cc" name="testLeptonAssociator">
   <flags   EDM_PLUGIN="1"/>

diff --git a/RecoBTag/TensorFlow/plugins/BuildFile.xml b/RecoBTag/TensorFlow/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <library file="*.cc" name="RecoBTagTensorFlowPlugins">
   <use name="DataFormats/BTauReco"/>
   <use name="RecoBTag/TensorFlow"/>

diff --git a/RecoBTag/TrackProbability/test/BuildFile.xml b/RecoBTag/TrackProbability/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <use   name="clhep"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>

diff --git a/RecoCaloTools/Navigation/test/BuildFile.xml b/RecoCaloTools/Navigation/test/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="DataFormats/HcalDetId"/>
 <use   name="DataFormats/EcalDetId"/>
 <use   name="FWCore/Framework"/>
-<use   name="Geometry/Records"/>
+<use   name="Geometry/CaloEventSetup"/>
+<use   name="Geometry/CaloTopology"/>
+<use   name="RecoCaloTools/Navigation"/>
 <flags   EDM_PLUGIN="1"/>
 <library   file="stubs/CaloNavigationAnalyzer.cc" name="testCaloNavigationAnalyzer">
 </library>
diff --git a/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc b/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc
@@ -1,6 +1,40 @@
-#include "RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.h"
+// system include files
+#include <memory>
 
-#include "FWCore/Framework/interface/MakerMacros.h"
+// user include files
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
+#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
+#include "Geometry/CaloTopology/interface/CaloTopology.h"
+#include "RecoCaloTools/Navigation/interface/EcalBarrelNavigator.h"
+#include "RecoCaloTools/Navigation/interface/EcalEndcapNavigator.h"
+#include "RecoCaloTools/Navigation/interface/EcalPreshowerNavigator.h"
+#include "RecoCaloTools/Navigation/interface/CaloTowerNavigator.h"
+#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDetId/interface/EEDetId.h"
+#include "DataFormats/EcalDetId/interface/ESDetId.h"
+
+#include <iostream>
+
+class CaloNavigationAnalyzer : public edm::EDAnalyzer {
+public:
+  explicit CaloNavigationAnalyzer(const edm::ParameterSet&);
+  ~CaloNavigationAnalyzer();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  int pass_;
+};
 
 //
 // constructors and destructor
@@ -131,4 +165,5 @@ void CaloNavigationAnalyzer::analyze(const edm::Event& iEvent, const edm::EventS
 }
 
 //define this as a plug-in
+#include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(CaloNavigationAnalyzer);
diff --git a/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.h b/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.h
diff --git a/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
 <use   name="DataFormats/BeamSpot"/>
 <use   name="DataFormats/Candidate"/>
 <use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
 <use   name="DataFormats/EcalRecHit"/>
 <use   name="DataFormats/EgammaCandidates"/>
 <use   name="DataFormats/EgammaReco"/>

diff --git a/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml
@@ -1,11 +1,9 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="Geometry/CaloGeometry"/>
 <use   name="DataFormats/EgammaReco"/>
 <use   name="Geometry/Records"/>
 <use   name="DataFormats/RecoCandidate"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
 <use   name="root"/>
 <library   file="*.cc" name="RecoEgammaEgammaHFProducersPlugins">
   <flags   EDM_PLUGIN="1"/>

diff --git a/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml b/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml
@@ -1,10 +1,7 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="CommonTools/UtilAlgos"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EgammaObjects"/>
 <use   name="DataFormats/EgammaCandidates"/>
 <use   name="DataFormats/EcalRecHit"/>
 <use   name="root"/>

diff --git a/RecoEgamma/ElectronIdentification/test/BuildFile.xml b/RecoEgamma/ElectronIdentification/test/BuildFile.xml
@@ -1,11 +1,6 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CondFormats/DataRecord"/>
 <use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="CommonTools/UtilAlgos"/>
 <use   name="root"/>
 <use   name="rootcore"/>
 <use   name="RecoEgamma/ElectronIdentification"/>

diff --git a/RecoEgamma/Examples/plugins/BuildFile.xml b/RecoEgamma/Examples/plugins/BuildFile.xml
@@ -1,8 +1,6 @@
-<use   name="RecoEgamma/EgammaElectronAlgos"/>
 <use   name="RecoEgamma/EgammaMCTools"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
 <use   name="RecoTracker/TkDetLayers"/>
-<use   name="SimTracker/TrackAssociation"/>
 <use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/CaloTopology"/>
 <use   name="Geometry/CommonDetUnit"/>
@@ -32,7 +30,6 @@
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/Math"/>
 <use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/SiPixelDetId"/>
 <use   name="DataFormats/SiStripDetId"/>
 <use   name="DataFormats/TrackerRecHit2D"/>
 <use   name="DataFormats/TrackingRecHit"/>