diff --git a/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml index 66e6231ad8e27..330cd348ad64d 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml +++ b/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml @@ -4,6 +4,7 @@ + @@ -16,6 +17,5 @@ - diff --git a/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml index e44139374af91..344c022629808 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml +++ b/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml @@ -3,7 +3,6 @@ - diff --git a/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml index fccc9db800017..724a37f5d75cc 100644 --- a/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml +++ b/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml @@ -2,15 +2,11 @@ - - - - diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml index ba1c600664caa..0300c119ff612 100644 --- a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml +++ b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml @@ -4,7 +4,6 @@ - diff --git a/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.cc b/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.cc index 2cad486aac6c6..eca38b076189a 100644 --- 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 index 29195d770ca3f..d5310c37a87e5 100644 --- a/CommonTools/RecoUtils/plugins/BuildFile.xml +++ b/CommonTools/RecoUtils/plugins/BuildFile.xml @@ -1,27 +1,10 @@ - - - - - - - -# - - - -# - - -# - - \ No newline at end of file diff --git a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc index 8f2d333793e60..582de07ff5f77 100644 --- 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 index e509b333fa6bd..6bcf2e223a3b9 100644 --- a/DataFormats/MuonReco/test/BuildFile.xml +++ b/DataFormats/MuonReco/test/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/DataFormats/VertexReco/test/BuildFile.xml b/DataFormats/VertexReco/test/BuildFile.xml index 23b6edbb1fbf4..99c67e52dc2ee 100644 --- a/DataFormats/VertexReco/test/BuildFile.xml +++ b/DataFormats/VertexReco/test/BuildFile.xml @@ -1,9 +1,4 @@ - - - - - diff --git a/Geometry/CaloEventSetup/BuildFile.xml b/Geometry/CaloEventSetup/BuildFile.xml new file mode 100644 index 0000000000000..ecdaf9ddf20d6 --- /dev/null +++ b/Geometry/CaloEventSetup/BuildFile.xml @@ -0,0 +1,3 @@ + + + diff --git a/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.cc b/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.cc index 50a2cef84dacf..191b7cd1f51c3 100644 --- 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 index f32f982c1df67..22ffc2cc39964 100644 --- 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 index 8cd5ff6fac85e..77037dcd38cee 100644 --- 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 index f28e752101aac..2515204ac7e4f 100644 --- a/RecoBTag/Combined/plugins/BuildFile.xml +++ b/RecoBTag/Combined/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoBTag/FeatureTools/plugins/BuildFile.xml b/RecoBTag/FeatureTools/plugins/BuildFile.xml index b08781e68fe77..e54a0b51a55bd 100644 --- a/RecoBTag/FeatureTools/plugins/BuildFile.xml +++ b/RecoBTag/FeatureTools/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoBTag/ImpactParameter/plugins/BuildFile.xml b/RecoBTag/ImpactParameter/plugins/BuildFile.xml index 10958e02c2381..e18858bdb30aa 100644 --- a/RecoBTag/ImpactParameter/plugins/BuildFile.xml +++ b/RecoBTag/ImpactParameter/plugins/BuildFile.xml @@ -12,7 +12,6 @@ - diff --git a/RecoBTag/ImpactParameter/test/BuildFile.xml b/RecoBTag/ImpactParameter/test/BuildFile.xml index cadcdb00201bf..4047d516a8470 100644 --- a/RecoBTag/ImpactParameter/test/BuildFile.xml +++ b/RecoBTag/ImpactParameter/test/BuildFile.xml @@ -1,6 +1,5 @@ - @@ -8,7 +7,6 @@ - diff --git a/RecoBTag/MXNet/plugins/BuildFile.xml b/RecoBTag/MXNet/plugins/BuildFile.xml index b6d6eaed37b09..e64a37659f9a9 100644 --- a/RecoBTag/MXNet/plugins/BuildFile.xml +++ b/RecoBTag/MXNet/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoBTag/ONNXRuntime/plugins/BuildFile.xml b/RecoBTag/ONNXRuntime/plugins/BuildFile.xml index 067eae1ac3715..8deb93e335e1b 100644 --- a/RecoBTag/ONNXRuntime/plugins/BuildFile.xml +++ b/RecoBTag/ONNXRuntime/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoBTag/PerformanceDB/bin/BuildFile.xml b/RecoBTag/PerformanceDB/bin/BuildFile.xml index 1fe80eee5310f..f9f7c8084d113 100644 --- a/RecoBTag/PerformanceDB/bin/BuildFile.xml +++ b/RecoBTag/PerformanceDB/bin/BuildFile.xml @@ -1,8 +1,4 @@ - - - - diff --git a/RecoBTag/PerformanceDB/test/BuildFile.xml b/RecoBTag/PerformanceDB/test/BuildFile.xml index 8a75ef283f929..eea23ecea1b4c 100644 --- a/RecoBTag/PerformanceDB/test/BuildFile.xml +++ b/RecoBTag/PerformanceDB/test/BuildFile.xml @@ -1,9 +1,6 @@ - - - diff --git a/RecoBTag/SoftLepton/test/BuildFile.xml b/RecoBTag/SoftLepton/test/BuildFile.xml index 077112f49b995..2e419634d44be 100644 --- a/RecoBTag/SoftLepton/test/BuildFile.xml +++ b/RecoBTag/SoftLepton/test/BuildFile.xml @@ -1,12 +1,7 @@ - - - - - diff --git a/RecoBTag/TensorFlow/plugins/BuildFile.xml b/RecoBTag/TensorFlow/plugins/BuildFile.xml index 84335c68879f2..1b4348b1c5d05 100644 --- a/RecoBTag/TensorFlow/plugins/BuildFile.xml +++ b/RecoBTag/TensorFlow/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoBTag/TrackProbability/test/BuildFile.xml b/RecoBTag/TrackProbability/test/BuildFile.xml index 1ccbcf5bb9509..b1859df21e56d 100644 --- a/RecoBTag/TrackProbability/test/BuildFile.xml +++ b/RecoBTag/TrackProbability/test/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoCaloTools/Navigation/test/BuildFile.xml b/RecoCaloTools/Navigation/test/BuildFile.xml index e7d5182f87a14..6dd64dc93fe87 100644 --- a/RecoCaloTools/Navigation/test/BuildFile.xml +++ b/RecoCaloTools/Navigation/test/BuildFile.xml @@ -1,9 +1,8 @@ - - - - + + + diff --git a/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc b/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc index 1ce31962c08f6..a03b6691725ef 100644 --- 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 -#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 + +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 deleted file mode 100644 index 5cebfea933067..0000000000000 --- a/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef CaloNavigationAnalyzer_h -#define CaloNavigationAnalyzer_h -// system include files -#include - -// 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 - -class CaloNavigationAnalyzer : public edm::EDAnalyzer { -public: - explicit CaloNavigationAnalyzer(const edm::ParameterSet&); - ~CaloNavigationAnalyzer(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - int pass_; -}; - -#endif diff --git a/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml index dae6fae7ade3c..c9ce4264d01ee 100644 --- a/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml +++ b/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml @@ -2,7 +2,6 @@ - diff --git a/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml index 4f8adbdb61229..9a8df5d55d61e 100644 --- a/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml +++ b/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml @@ -1,11 +1,9 @@ - - diff --git a/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml b/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml index bf864a2f478c3..5a02a8245db68 100644 --- a/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml +++ b/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml @@ -1,10 +1,7 @@ - - - diff --git a/RecoEgamma/ElectronIdentification/test/BuildFile.xml b/RecoEgamma/ElectronIdentification/test/BuildFile.xml index a7279b3b510b1..7de6563367022 100644 --- a/RecoEgamma/ElectronIdentification/test/BuildFile.xml +++ b/RecoEgamma/ElectronIdentification/test/BuildFile.xml @@ -1,11 +1,6 @@ - - - - - diff --git a/RecoEgamma/Examples/plugins/BuildFile.xml b/RecoEgamma/Examples/plugins/BuildFile.xml index 1f7323a718f89..4edc5b2702ca4 100644 --- a/RecoEgamma/Examples/plugins/BuildFile.xml +++ b/RecoEgamma/Examples/plugins/BuildFile.xml @@ -1,8 +1,6 @@ - - @@ -32,7 +30,6 @@ - diff --git a/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml b/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml index 5044557c4eb77..514d643860932 100644 --- a/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml +++ b/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml @@ -1,14 +1,11 @@ - - - diff --git a/RecoHGCal/TICL/plugins/BuildFile.xml b/RecoHGCal/TICL/plugins/BuildFile.xml index 0d8eaf63600b4..3b178dfe53467 100644 --- a/RecoHGCal/TICL/plugins/BuildFile.xml +++ b/RecoHGCal/TICL/plugins/BuildFile.xml @@ -1,22 +1,14 @@ - - - - - - - - diff --git a/RecoHI/HiJetAlgos/plugins/BuildFile.xml b/RecoHI/HiJetAlgos/plugins/BuildFile.xml index 3cadb85f26ea7..306f76eece8d1 100644 --- a/RecoHI/HiJetAlgos/plugins/BuildFile.xml +++ b/RecoHI/HiJetAlgos/plugins/BuildFile.xml @@ -1,14 +1,10 @@ - - - - diff --git a/RecoHI/HiMuonAlgos/plugins/BuildFile.xml b/RecoHI/HiMuonAlgos/plugins/BuildFile.xml index dcf0460b0d414..9bd2d44ef4cca 100644 --- a/RecoHI/HiMuonAlgos/plugins/BuildFile.xml +++ b/RecoHI/HiMuonAlgos/plugins/BuildFile.xml @@ -3,29 +3,7 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/RecoHI/HiTracking/plugins/BuildFile.xml b/RecoHI/HiTracking/plugins/BuildFile.xml index 457a3fc67b288..f3d2e35c337b1 100644 --- a/RecoHI/HiTracking/plugins/BuildFile.xml +++ b/RecoHI/HiTracking/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoHI/HiTracking/test/BuildFile.xml b/RecoHI/HiTracking/test/BuildFile.xml index ab8c10a97596b..261f7e3df1bd8 100644 --- a/RecoHI/HiTracking/test/BuildFile.xml +++ b/RecoHI/HiTracking/test/BuildFile.xml @@ -1,7 +1,9 @@ - - + + + + diff --git a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc index c25fa12d63390..6e4fc1a0bc196 100644 --- a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc +++ b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc @@ -1,4 +1,11 @@ -#include "HIPixelClusterVtxAnalyzer.h" +#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 "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -26,6 +33,43 @@ #include #include +// ROOT includes +#include + +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 { + float z; + float r; + float w; + }; + + virtual void analyze(const edm::Event &ev, const edm::EventSetup &es); + int getContainedHits(const std::vector &hits, double z0, double &chi); + + edm::EDGetTokenT srcPixels_; //pixel rec hits + + double minZ_; + double maxZ_; + double zStep_; + + edm::Service fs; + int maxHists_; + int counter; +}; + /*****************************************************************************/ HIPixelClusterVtxAnalyzer::HIPixelClusterVtxAnalyzer(const edm::ParameterSet &ps) : srcPixels_(consumes(ps.getParameter("pixelRecHits"))), @@ -152,3 +196,6 @@ int HIPixelClusterVtxAnalyzer::getContainedHits(const std::vector &hi } return n; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(HIPixelClusterVtxAnalyzer); diff --git a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.h b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.h deleted file mode 100644 index b584ad03d2478..0000000000000 --- a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef HIPixelClusterVtxAnalyzer_H -#define HIPixelClusterVtxAnalyzer_H - -#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" - -// ROOT includes -#include - -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 { - float z; - float r; - float w; - }; - - virtual void analyze(const edm::Event& ev, const edm::EventSetup& es); - int getContainedHits(const std::vector& hits, double z0, double& chi); - - edm::EDGetTokenT srcPixels_; //pixel rec hits - - double minZ_; - double maxZ_; - double zStep_; - - edm::Service fs; - int maxHists_; - int counter; -}; -#endif diff --git a/RecoHI/HiTracking/test/modules.cc b/RecoHI/HiTracking/test/modules.cc deleted file mode 100644 index d654d59bc0dcb..0000000000000 --- a/RecoHI/HiTracking/test/modules.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" - -// Cluster Vertexing -#include "HIPixelClusterVtxAnalyzer.h" -DEFINE_FWK_MODULE(HIPixelClusterVtxAnalyzer); diff --git a/RecoJets/JetProducers/plugins/BetaStarVarProducer.cc b/RecoJets/JetProducers/plugins/BetaStarVarProducer.cc index 507b6a0b7f92d..6409c57030ef1 100644 --- a/RecoJets/JetProducers/plugins/BetaStarVarProducer.cc +++ b/RecoJets/JetProducers/plugins/BetaStarVarProducer.cc @@ -38,8 +38,6 @@ #include "DataFormats/Common/interface/View.h" -#include "PhysicsTools/NanoAOD/interface/MatchingUtils.h" - template class BetaStarVarProducer : public edm::global::EDProducer<> { public: diff --git a/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml b/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml index b9f3e4841e166..1730308fa44a8 100644 --- a/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml +++ b/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml index e44939a79cba2..9ca8edb5b8e14 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml +++ b/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml @@ -12,7 +12,6 @@ - diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml index 852d855f4d49a..d1d71a7bc04ef 100644 --- a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml +++ b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml @@ -5,9 +5,7 @@ - - diff --git a/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml b/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml index 7e60c8b866b97..b8bcbe8af1095 100644 --- a/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml +++ b/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml b/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml index 43d578285a8d8..197798c6419b6 100644 --- a/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml +++ b/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml @@ -1,8 +1,6 @@ - - diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc index 469870354beb6..dc6f5b7b8e344 100644 --- a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc +++ b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc @@ -16,8 +16,6 @@ Original Author: John Paul Chou (Brown University) #include "DataFormats/METReco/interface/HcalCaloFlagLabels.h" #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h" #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h" - -#include "RecoMET/METAlgorithms/interface/HcalHPDRBXMap.h" #include "CondFormats/HcalObjects/interface/HcalChannelQuality.h" #include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h" #include "CondFormats/DataRecord/interface/HcalFrontEndMapRcd.h" diff --git a/RecoLocalFastTime/FTLClusterizer/plugins/BuildFile.xml b/RecoLocalFastTime/FTLClusterizer/plugins/BuildFile.xml index 980e858b53f65..19b23103f804c 100644 --- a/RecoLocalFastTime/FTLClusterizer/plugins/BuildFile.xml +++ b/RecoLocalFastTime/FTLClusterizer/plugins/BuildFile.xml @@ -1,10 +1,8 @@ - - diff --git a/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml b/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml index 6f0d340788df5..1567d3e4d7677 100644 --- a/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml +++ b/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml @@ -1,15 +1,7 @@ - - - - - - - - diff --git a/RecoLocalFastTime/FTLRecProducers/plugins/BuildFile.xml b/RecoLocalFastTime/FTLRecProducers/plugins/BuildFile.xml index b935ebef55e1c..28423d404975c 100644 --- a/RecoLocalFastTime/FTLRecProducers/plugins/BuildFile.xml +++ b/RecoLocalFastTime/FTLRecProducers/plugins/BuildFile.xml @@ -1,4 +1,3 @@ - @@ -7,10 +6,7 @@ - - - diff --git a/RecoLocalFastTime/FTLRecProducers/test/BuildFile.xml b/RecoLocalFastTime/FTLRecProducers/test/BuildFile.xml index d5cf7092ede3b..15b6f9c676af8 100644 --- a/RecoLocalFastTime/FTLRecProducers/test/BuildFile.xml +++ b/RecoLocalFastTime/FTLRecProducers/test/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoLocalMuon/CSCSegment/test/BuildFile.xml b/RecoLocalMuon/CSCSegment/test/BuildFile.xml index 887f4f7f77c60..10cd2d7d37dd9 100644 --- a/RecoLocalMuon/CSCSegment/test/BuildFile.xml +++ b/RecoLocalMuon/CSCSegment/test/BuildFile.xml @@ -2,7 +2,6 @@ - diff --git a/RecoLocalMuon/DTRecHit/test/BuildFile.xml b/RecoLocalMuon/DTRecHit/test/BuildFile.xml index efbcc39dff957..c8ce533c2c3aa 100644 --- a/RecoLocalMuon/DTRecHit/test/BuildFile.xml +++ b/RecoLocalMuon/DTRecHit/test/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoLocalMuon/DTSegment/plugins/BuildFile.xml b/RecoLocalMuon/DTSegment/plugins/BuildFile.xml index 4e37509c48327..2d6712841343c 100644 --- a/RecoLocalMuon/DTSegment/plugins/BuildFile.xml +++ b/RecoLocalMuon/DTSegment/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoLocalMuon/DTSegment/test/BuildFile.xml b/RecoLocalMuon/DTSegment/test/BuildFile.xml index 8521dd7cfe92c..b99aa2e6f3aba 100644 --- a/RecoLocalMuon/DTSegment/test/BuildFile.xml +++ b/RecoLocalMuon/DTSegment/test/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml b/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml index d87bd3527173b..002bb61d4a210 100644 --- a/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml +++ b/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml @@ -1,46 +1,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -55,5 +26,3 @@ - - diff --git a/RecoLocalMuon/GEMRecHit/test/BuildFile.xml b/RecoLocalMuon/GEMRecHit/test/BuildFile.xml index 8de1ebcc7e65f..889f5dd3fd0f6 100644 --- a/RecoLocalMuon/GEMRecHit/test/BuildFile.xml +++ b/RecoLocalMuon/GEMRecHit/test/BuildFile.xml @@ -1,46 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/RecoLocalMuon/GEMSegment/plugins/BuildFile.xml b/RecoLocalMuon/GEMSegment/plugins/BuildFile.xml index 5fd1b31f83f89..319d93be58a91 100644 --- a/RecoLocalMuon/GEMSegment/plugins/BuildFile.xml +++ b/RecoLocalMuon/GEMSegment/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - @@ -9,7 +8,6 @@ - diff --git a/RecoLocalMuon/GEMSegment/test/BuildFile.xml b/RecoLocalMuon/GEMSegment/test/BuildFile.xml index 556bec0165e27..2963a9941cf41 100644 --- a/RecoLocalMuon/GEMSegment/test/BuildFile.xml +++ b/RecoLocalMuon/GEMSegment/test/BuildFile.xml @@ -1,46 +1,17 @@ - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - @@ -55,5 +26,3 @@ - - diff --git a/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml b/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml index 2bf6247d06c94..6309bbd9d4297 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml +++ b/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml @@ -3,8 +3,6 @@ - - @@ -13,13 +11,9 @@ - - - - diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml index 188af2a30e045..58554c497295a 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml +++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml @@ -1,9 +1,7 @@ - - diff --git a/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml index 81db3032c9257..ecd3219c6e9d9 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml +++ b/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml @@ -2,10 +2,8 @@ - - @@ -15,13 +13,8 @@ - - - - - diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml index f6958151bdb91..51e90278cee01 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml index 3445783781551..fe6b2c39ba9d2 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml +++ b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml @@ -2,7 +2,6 @@ - @@ -10,7 +9,6 @@ - diff --git a/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml index abc5a07b88521..a49bf419dc4e3 100644 --- a/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml +++ b/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml @@ -4,30 +4,20 @@ - -# -# -# # # -# -# for tracks -# -# - - diff --git a/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml index 96eae3a39ffac..045cac3e0be42 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml +++ b/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml index 164afaf96dcca..99a052b59bf1a 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml +++ b/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml @@ -2,10 +2,6 @@ - - - - diff --git a/RecoMTD/Navigation/test/BuildFile.xml b/RecoMTD/Navigation/test/BuildFile.xml index 693b2ce1b1f3f..f2fdfebc02042 100644 --- a/RecoMTD/Navigation/test/BuildFile.xml +++ b/RecoMTD/Navigation/test/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/RecoMuon/CosmicMuonProducer/test/BuildFile.xml b/RecoMuon/CosmicMuonProducer/test/BuildFile.xml index cffaadaf34ad6..842557ca22baf 100644 --- a/RecoMuon/CosmicMuonProducer/test/BuildFile.xml +++ b/RecoMuon/CosmicMuonProducer/test/BuildFile.xml @@ -1,12 +1,7 @@ - - - - - diff --git a/RecoMuon/GlobalMuonProducer/test/BuildFile.xml b/RecoMuon/GlobalMuonProducer/test/BuildFile.xml index c92ac221bea04..56e5400e962d6 100644 --- a/RecoMuon/GlobalMuonProducer/test/BuildFile.xml +++ b/RecoMuon/GlobalMuonProducer/test/BuildFile.xml @@ -6,8 +6,6 @@ - - diff --git a/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h b/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h index e4f9003ec53a5..5b7e43adec27b 100644 --- a/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h +++ b/RecoMuon/GlobalTrackingTools/interface/DynamicTruncation.h @@ -36,7 +36,6 @@ #include "RecoTracker/Record/interface/NavigationSchoolRecord.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" #include "RecoMuon/Navigation/interface/DirectMuonNavigation.h" -#include "Alignment/MuonAlignment/interface/MuonAlignment.h" #include "DataFormats/MuonReco/interface/DYTInfo.h" #include "RecoMuon/GlobalTrackingTools/interface/ThrParameters.h" #include "RecoMuon/GlobalTrackingTools/interface/ChamberSegmentUtility.h" diff --git a/RecoMuon/L2MuonIsolationProducer/test/BuildFile.xml b/RecoMuon/L2MuonIsolationProducer/test/BuildFile.xml index c86241c8c9440..c7d6ab0a8649a 100644 --- a/RecoMuon/L2MuonIsolationProducer/test/BuildFile.xml +++ b/RecoMuon/L2MuonIsolationProducer/test/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/RecoMuon/L3MuonIsolationProducer/test/BuildFile.xml b/RecoMuon/L3MuonIsolationProducer/test/BuildFile.xml index 9546173d8b2b6..7c4d0dbe50ff3 100644 --- a/RecoMuon/L3MuonIsolationProducer/test/BuildFile.xml +++ b/RecoMuon/L3MuonIsolationProducer/test/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/RecoMuon/MuonIdentification/test/BuildFile.xml b/RecoMuon/MuonIdentification/test/BuildFile.xml index a04ec1aa00765..819f4b6f45d3d 100644 --- a/RecoMuon/MuonIdentification/test/BuildFile.xml +++ b/RecoMuon/MuonIdentification/test/BuildFile.xml @@ -1,15 +1,12 @@ - - - - + diff --git a/RecoMuon/MuonIsolationProducers/test/BuildFile.xml b/RecoMuon/MuonIsolationProducers/test/BuildFile.xml index 518a3da2912fa..c9e0accf46d65 100644 --- a/RecoMuon/MuonIsolationProducers/test/BuildFile.xml +++ b/RecoMuon/MuonIsolationProducers/test/BuildFile.xml @@ -1,7 +1,5 @@ - - diff --git a/RecoMuon/Navigation/test/BuildFile.xml b/RecoMuon/Navigation/test/BuildFile.xml index a6d03df4ca1ca..edc3b14ce3d7b 100644 --- a/RecoMuon/Navigation/test/BuildFile.xml +++ b/RecoMuon/Navigation/test/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/RecoMuon/StandAloneMuonProducer/test/BuildFile.xml b/RecoMuon/StandAloneMuonProducer/test/BuildFile.xml index dee5572814cf9..889e568e690ff 100644 --- a/RecoMuon/StandAloneMuonProducer/test/BuildFile.xml +++ b/RecoMuon/StandAloneMuonProducer/test/BuildFile.xml @@ -1,6 +1,4 @@ - - diff --git a/RecoMuon/TrackingTools/test/BuildFile.xml b/RecoMuon/TrackingTools/test/BuildFile.xml index 625a919cdb2d4..7fb9ab9c979aa 100644 --- a/RecoMuon/TrackingTools/test/BuildFile.xml +++ b/RecoMuon/TrackingTools/test/BuildFile.xml @@ -1,14 +1,11 @@ - - - diff --git a/RecoPPS/Local/plugins/BuildFile.xml b/RecoPPS/Local/plugins/BuildFile.xml index 79c45d27cfaad..6e01add076bfd 100644 --- a/RecoPPS/Local/plugins/BuildFile.xml +++ b/RecoPPS/Local/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - @@ -9,7 +8,6 @@ - diff --git a/RecoParticleFlow/PFClusterTools/test/BuildFile.xml b/RecoParticleFlow/PFClusterTools/test/BuildFile.xml index 3aa42b5339e1f..5bc1f71e924ac 100644 --- a/RecoParticleFlow/PFClusterTools/test/BuildFile.xml +++ b/RecoParticleFlow/PFClusterTools/test/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/RecoParticleFlow/PFTracking/test/BuildFile.xml b/RecoParticleFlow/PFTracking/test/BuildFile.xml index e40f6b92ab7eb..4479767f00b8f 100644 --- a/RecoParticleFlow/PFTracking/test/BuildFile.xml +++ b/RecoParticleFlow/PFTracking/test/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/RecoPixelVertexing/PixelLowPtUtilities/bin/BuildFile.xml b/RecoPixelVertexing/PixelLowPtUtilities/bin/BuildFile.xml index 12c21d2222bd7..ecebf5875e58d 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/bin/BuildFile.xml +++ b/RecoPixelVertexing/PixelLowPtUtilities/bin/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/RecoPixelVertexing/PixelTrackFitting/test/BuildFile.xml b/RecoPixelVertexing/PixelTrackFitting/test/BuildFile.xml index a80e3015549e3..815283eb3572e 100644 --- a/RecoPixelVertexing/PixelTrackFitting/test/BuildFile.xml +++ b/RecoPixelVertexing/PixelTrackFitting/test/BuildFile.xml @@ -1,16 +1,8 @@ + - - - - - - - - - diff --git a/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml b/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml index c0353421246fc..c111971140c12 100644 --- a/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml +++ b/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml @@ -2,7 +2,6 @@ - diff --git a/RecoPixelVertexing/PixelVertexFinding/test/BuildFile.xml b/RecoPixelVertexing/PixelVertexFinding/test/BuildFile.xml index 708bcb9ea8bbd..4e1c176f83b8c 100644 --- a/RecoPixelVertexing/PixelVertexFinding/test/BuildFile.xml +++ b/RecoPixelVertexing/PixelVertexFinding/test/BuildFile.xml @@ -1,17 +1,7 @@ - - - - - - - - - - diff --git a/RecoTBCalo/HcalTBObjectUnpacker/plugins/BuildFile.xml b/RecoTBCalo/HcalTBObjectUnpacker/plugins/BuildFile.xml index 42fbbca4508b0..ad67f514d33de 100644 --- a/RecoTBCalo/HcalTBObjectUnpacker/plugins/BuildFile.xml +++ b/RecoTBCalo/HcalTBObjectUnpacker/plugins/BuildFile.xml @@ -2,7 +2,6 @@ - diff --git a/RecoTauTag/ImpactParameter/plugins/BuildFile.xml b/RecoTauTag/ImpactParameter/plugins/BuildFile.xml index 2c1fbd19de92a..53f2d95a96f53 100644 --- a/RecoTauTag/ImpactParameter/plugins/BuildFile.xml +++ b/RecoTauTag/ImpactParameter/plugins/BuildFile.xml @@ -1,18 +1,14 @@ - - - - diff --git a/RecoTauTag/ImpactParameter/test/BuildFile.xml b/RecoTauTag/ImpactParameter/test/BuildFile.xml index 910a49d5dce35..7854c0d8720f6 100644 --- a/RecoTauTag/ImpactParameter/test/BuildFile.xml +++ b/RecoTauTag/ImpactParameter/test/BuildFile.xml @@ -1,12 +1,8 @@ - - - - diff --git a/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml b/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml index 3411eff2129ca..2a5b8da3afc8f 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml +++ b/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml @@ -1,22 +1,17 @@ - - - - - diff --git a/RecoTracker/DebugTools/plugins/BuildFile.xml b/RecoTracker/DebugTools/plugins/BuildFile.xml index 56cd2070a37b6..2755bd5d1c347 100644 --- a/RecoTracker/DebugTools/plugins/BuildFile.xml +++ b/RecoTracker/DebugTools/plugins/BuildFile.xml @@ -1,8 +1,5 @@ - - - diff --git a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml index 9358fc760c59d..f9109bc5b5387 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml +++ b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml @@ -1,7 +1,6 @@ - @@ -17,11 +16,9 @@ - - diff --git a/RecoTracker/FinalTrackSelectors/test/BuildFile.xml b/RecoTracker/FinalTrackSelectors/test/BuildFile.xml index a88d51f3e32d4..115f3a114e9a9 100644 --- a/RecoTracker/FinalTrackSelectors/test/BuildFile.xml +++ b/RecoTracker/FinalTrackSelectors/test/BuildFile.xml @@ -1,2 +1,2 @@ - + diff --git a/RecoTracker/GeometryESProducer/test/BuildFile.xml b/RecoTracker/GeometryESProducer/test/BuildFile.xml index 85525057a1a02..b0b13bc7bcce4 100644 --- a/RecoTracker/GeometryESProducer/test/BuildFile.xml +++ b/RecoTracker/GeometryESProducer/test/BuildFile.xml @@ -1,9 +1,6 @@ - - - diff --git a/RecoTracker/NuclearSeedGenerator/plugins/BuildFile.xml b/RecoTracker/NuclearSeedGenerator/plugins/BuildFile.xml index f7bdcf9c33b39..b33c461111054 100644 --- a/RecoTracker/NuclearSeedGenerator/plugins/BuildFile.xml +++ b/RecoTracker/NuclearSeedGenerator/plugins/BuildFile.xml @@ -1,5 +1,6 @@ + diff --git a/RecoTracker/TkHitPairs/plugins/BuildFile.xml b/RecoTracker/TkHitPairs/plugins/BuildFile.xml index af7185a4200fb..b76e633119491 100644 --- a/RecoTracker/TkHitPairs/plugins/BuildFile.xml +++ b/RecoTracker/TkHitPairs/plugins/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/RecoTracker/TkMSParametrization/test/BuildFile.xml b/RecoTracker/TkMSParametrization/test/BuildFile.xml index 2d2197170b32a..04676f1a6b389 100644 --- a/RecoTracker/TkMSParametrization/test/BuildFile.xml +++ b/RecoTracker/TkMSParametrization/test/BuildFile.xml @@ -1,11 +1,7 @@ - - - - diff --git a/RecoTracker/TkNavigation/plugins/BuildFile.xml b/RecoTracker/TkNavigation/plugins/BuildFile.xml index 6f179e5732300..8f36597a91053 100644 --- a/RecoTracker/TkNavigation/plugins/BuildFile.xml +++ b/RecoTracker/TkNavigation/plugins/BuildFile.xml @@ -1,10 +1,7 @@ - - - diff --git a/RecoTracker/TkNavigation/test/BuildFile.xml b/RecoTracker/TkNavigation/test/BuildFile.xml index 011fb817e7802..5964a201a1954 100644 --- a/RecoTracker/TkNavigation/test/BuildFile.xml +++ b/RecoTracker/TkNavigation/test/BuildFile.xml @@ -1,8 +1,6 @@ - - diff --git a/RecoTracker/TkSeedGenerator/test/BuildFile.xml b/RecoTracker/TkSeedGenerator/test/BuildFile.xml index b3952d1d24bab..e667a99e41958 100644 --- a/RecoTracker/TkSeedGenerator/test/BuildFile.xml +++ b/RecoTracker/TkSeedGenerator/test/BuildFile.xml @@ -1,4 +1,4 @@ - + diff --git a/RecoTracker/TkSeedingLayers/test/BuildFile.xml b/RecoTracker/TkSeedingLayers/test/BuildFile.xml index 3cfa1860302bc..bb0cc26dcc065 100644 --- a/RecoTracker/TkSeedingLayers/test/BuildFile.xml +++ b/RecoTracker/TkSeedingLayers/test/BuildFile.xml @@ -1,4 +1,4 @@ - + diff --git a/RecoTracker/TrackProducer/plugins/BuildFile.xml b/RecoTracker/TrackProducer/plugins/BuildFile.xml index 5ae378794fc14..ea9b11148b196 100644 --- a/RecoTracker/TrackProducer/plugins/BuildFile.xml +++ b/RecoTracker/TrackProducer/plugins/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/RecoTracker/TrackProducer/test/BuildFile.xml b/RecoTracker/TrackProducer/test/BuildFile.xml index 78c1d97fb8067..af4140ba922e8 100644 --- a/RecoTracker/TrackProducer/test/BuildFile.xml +++ b/RecoTracker/TrackProducer/test/BuildFile.xml @@ -3,7 +3,6 @@ - diff --git a/RecoTracker/TransientTrackingRecHit/test/BuildFile.xml b/RecoTracker/TransientTrackingRecHit/test/BuildFile.xml index 28fc9d42bc68f..4e6f6f0bbf393 100644 --- a/RecoTracker/TransientTrackingRecHit/test/BuildFile.xml +++ b/RecoTracker/TransientTrackingRecHit/test/BuildFile.xml @@ -2,8 +2,6 @@ - - diff --git a/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml b/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml index 778e25b69f085..2eaba22eb84b1 100644 --- a/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml +++ b/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml @@ -1,11 +1,8 @@ - - - diff --git a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml index bb4502c33b332..9c4a69b6f0e82 100644 --- a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml +++ b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml @@ -1,9 +1,7 @@ - - diff --git a/RecoVertex/BeamSpotProducer/test/BuildFile.xml b/RecoVertex/BeamSpotProducer/test/BuildFile.xml index 78edef644d070..0d5970489e1bb 100644 --- a/RecoVertex/BeamSpotProducer/test/BuildFile.xml +++ b/RecoVertex/BeamSpotProducer/test/BuildFile.xml @@ -1,11 +1,3 @@ - - - - - - - - diff --git a/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml b/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml index 870c9d7e310cb..5d6071c435024 100644 --- a/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml +++ b/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml @@ -2,17 +2,15 @@ - + + - - - diff --git a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml index c95556a953f4a..667762709a108 100644 --- a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml +++ b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml @@ -4,13 +4,10 @@ - - - diff --git a/RecoVertex/KalmanVertexFit/test/BuildFile.xml b/RecoVertex/KalmanVertexFit/test/BuildFile.xml index ee097f7dcb53b..312ee4a1e5732 100644 --- a/RecoVertex/KalmanVertexFit/test/BuildFile.xml +++ b/RecoVertex/KalmanVertexFit/test/BuildFile.xml @@ -1,13 +1,4 @@ - - - - - - - - - diff --git a/RecoVertex/KinematicFit/plugins/BuildFile.xml b/RecoVertex/KinematicFit/plugins/BuildFile.xml index f7a30f8d5d385..3b0dba7df842b 100644 --- a/RecoVertex/KinematicFit/plugins/BuildFile.xml +++ b/RecoVertex/KinematicFit/plugins/BuildFile.xml @@ -1,17 +1,14 @@ - - + - - diff --git a/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml b/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml index 915883a38f9ad..f7fb492d49085 100644 --- a/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml +++ b/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml @@ -1,6 +1,4 @@ - - diff --git a/RecoVertex/V0Producer/test/BuildFile.xml b/RecoVertex/V0Producer/test/BuildFile.xml index 64852393b6a7c..034ee16ea3e05 100644 --- a/RecoVertex/V0Producer/test/BuildFile.xml +++ b/RecoVertex/V0Producer/test/BuildFile.xml @@ -1,4 +1,3 @@ - @@ -10,12 +9,10 @@ - - diff --git a/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc b/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc index 8f55bfc48ac2a..c0b29f9e727cd 100644 --- a/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc +++ b/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc @@ -121,7 +121,6 @@ namespace { #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" -#include "PhysicsTools/HepMCCandAlgos/interface/MCTruthHelper.h" #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h" #include "DataFormats/HepMCCandidate/interface/GenParticle.h" diff --git a/TrackingTools/RecoGeometry/plugins/BuildFile.xml b/TrackingTools/RecoGeometry/plugins/BuildFile.xml index 53a15a7fe5a3a..d152503b4de2d 100644 --- a/TrackingTools/RecoGeometry/plugins/BuildFile.xml +++ b/TrackingTools/RecoGeometry/plugins/BuildFile.xml @@ -1,6 +1,4 @@ - - diff --git a/Validation/RecoB/plugins/BuildFile.xml b/Validation/RecoB/plugins/BuildFile.xml index ab1b33ab3e022..8c0cceee0a028 100644 --- a/Validation/RecoB/plugins/BuildFile.xml +++ b/Validation/RecoB/plugins/BuildFile.xml @@ -7,13 +7,8 @@ - - - - - diff --git a/Validation/RecoEgamma/plugins/BuildFile.xml b/Validation/RecoEgamma/plugins/BuildFile.xml index d0213a51de2f3..518a77054bc01 100644 --- a/Validation/RecoEgamma/plugins/BuildFile.xml +++ b/Validation/RecoEgamma/plugins/BuildFile.xml @@ -14,22 +14,18 @@ - - + - - - diff --git a/Validation/RecoHI/plugins/BuildFile.xml b/Validation/RecoHI/plugins/BuildFile.xml index 8d0f6c652083e..541f95b417d31 100644 --- a/Validation/RecoHI/plugins/BuildFile.xml +++ b/Validation/RecoHI/plugins/BuildFile.xml @@ -3,7 +3,6 @@ - diff --git a/Validation/RecoJets/plugins/BuildFile.xml b/Validation/RecoJets/plugins/BuildFile.xml index ace253c4c1eae..53e51ba658d7a 100644 --- a/Validation/RecoJets/plugins/BuildFile.xml +++ b/Validation/RecoJets/plugins/BuildFile.xml @@ -4,8 +4,6 @@ - - diff --git a/Validation/RecoMET/plugins/BuildFile.xml b/Validation/RecoMET/plugins/BuildFile.xml index a669a533593ef..c2b7a8cda75e7 100644 --- a/Validation/RecoMET/plugins/BuildFile.xml +++ b/Validation/RecoMET/plugins/BuildFile.xml @@ -4,15 +4,6 @@ - - - - - - - - - diff --git a/Validation/RecoMuon/plugins/BuildFile.xml b/Validation/RecoMuon/plugins/BuildFile.xml index ba4b3adce00bc..7151aa738f1a3 100644 --- a/Validation/RecoMuon/plugins/BuildFile.xml +++ b/Validation/RecoMuon/plugins/BuildFile.xml @@ -1,26 +1,16 @@ - - - - - - - - - - diff --git a/Validation/RecoPixelVertexing/test/BuildFile.xml b/Validation/RecoPixelVertexing/test/BuildFile.xml index bcf519bc14d80..eb80ae742400d 100644 --- a/Validation/RecoPixelVertexing/test/BuildFile.xml +++ b/Validation/RecoPixelVertexing/test/BuildFile.xml @@ -2,20 +2,10 @@ - - - - - - - - - - diff --git a/Validation/RecoTau/plugins/BuildFile.xml b/Validation/RecoTau/plugins/BuildFile.xml index 39631ca19a260..2e97dd4aa3511 100644 --- a/Validation/RecoTau/plugins/BuildFile.xml +++ b/Validation/RecoTau/plugins/BuildFile.xml @@ -4,7 +4,6 @@ - diff --git a/Validation/RecoTrack/plugins/BuildFile.xml b/Validation/RecoTrack/plugins/BuildFile.xml index 66b79cbfb3b0d..e223967a34efc 100644 --- a/Validation/RecoTrack/plugins/BuildFile.xml +++ b/Validation/RecoTrack/plugins/BuildFile.xml @@ -5,9 +5,7 @@ - - @@ -18,20 +16,15 @@ - - - - -