diff --git a/RecoMuon/CosmicMuonProducer/BuildFile.xml b/RecoMuon/CosmicMuonProducer/BuildFile.xml index 23b7316e241a9..b52858682f79a 100644 --- a/RecoMuon/CosmicMuonProducer/BuildFile.xml +++ b/RecoMuon/CosmicMuonProducer/BuildFile.xml @@ -26,4 +26,6 @@ - + + + diff --git a/RecoMuon/CosmicMuonProducer/plugins/BuildFile.xml b/RecoMuon/CosmicMuonProducer/plugins/BuildFile.xml new file mode 100644 index 0000000000000..38d26b196fed9 --- /dev/null +++ b/RecoMuon/CosmicMuonProducer/plugins/BuildFile.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.cc b/RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.cc similarity index 97% rename from RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.cc rename to RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.cc index 75a0f703b7356..5361f840ccf1b 100644 --- a/RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.cc +++ b/RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.h" +#include "RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.h" /**\class CosmicMuonLinksProducer * @@ -152,3 +152,6 @@ int CosmicMuonLinksProducer::sharedHits(const reco::Track& track1, const reco::T return match; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(CosmicMuonLinksProducer); diff --git a/RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.h b/RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.h similarity index 100% rename from RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.h rename to RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.h diff --git a/RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.cc b/RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.cc similarity index 94% rename from RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.cc rename to RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.cc index c976b8de89c59..517113c7b1ee7 100644 --- a/RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.cc +++ b/RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.h" +#include "RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.h" /**\class CosmicMuonProducer * @@ -81,3 +81,6 @@ void CosmicMuonProducer::produce(Event& iEvent, const EventSetup& iSetup) { theService->update(iSetup); theTrackFinder->reconstruct(seeds, iEvent, iSetup); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(CosmicMuonProducer); diff --git a/RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.h b/RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.h similarity index 100% rename from RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.h rename to RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.h diff --git a/RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.cc b/RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.cc similarity index 95% rename from RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.cc rename to RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.cc index cc4c515b7b0d0..d37b842509848 100644 --- a/RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.cc +++ b/RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.h" +#include "RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.h" /**\class GlobalCosmicMuonProducer * @@ -91,3 +91,6 @@ void GlobalCosmicMuonProducer::produce(edm::Event& iEvent, const edm::EventSetup theTrackFinder->reconstruct(cosTrackCands, iEvent, iSetup); LogTrace(metname) << "Event loaded"; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(GlobalCosmicMuonProducer); diff --git a/RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.h b/RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.h similarity index 100% rename from RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.h rename to RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.h diff --git a/RecoMuon/CosmicMuonProducer/src/SealModule.cc b/RecoMuon/CosmicMuonProducer/src/SealModule.cc deleted file mode 100644 index 6f44a95805e22..0000000000000 --- a/RecoMuon/CosmicMuonProducer/src/SealModule.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.h" -#include "RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.h" -#include "RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.h" - -DEFINE_FWK_MODULE(CosmicMuonProducer); -DEFINE_FWK_MODULE(CosmicMuonLinksProducer); -DEFINE_FWK_MODULE(GlobalCosmicMuonProducer); diff --git a/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc b/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc index 8f4e2fe559a78..4da963b3f839d 100644 --- a/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc +++ b/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc @@ -797,3 +797,6 @@ TrajectoryStateOnSurface CosmicMuonValidator::updatedState(const TrajectoryState edm::ESHandle CosmicMuonValidator::propagator() const { return theService->propagator("SteppingHelixPropagatorAny"); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(CosmicMuonValidator); diff --git a/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc b/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc index c803a689a24e9..5e50a1c113f82 100644 --- a/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc +++ b/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc @@ -507,6 +507,5 @@ edm::ESHandle RealCosmicDataAnalyzer::propagator() const { return theService->propagator("SteppingHelixPropagatorAny"); } -//define this as a plug-in - +#include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(RealCosmicDataAnalyzer); diff --git a/RecoMuon/CosmicMuonProducer/test/SealModules.cc b/RecoMuon/CosmicMuonProducer/test/SealModules.cc deleted file mode 100644 index a77aa2caf770e..0000000000000 --- a/RecoMuon/CosmicMuonProducer/test/SealModules.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "FWCore/Framework/interface/MakerMacros.h" - -//define this as a plug-in -#include "RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc" -#include "RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc" - - -DEFINE_FWK_MODULE(CosmicMuonValidator); -DEFINE_FWK_MODULE(RealCosmicDataAnalyzer); diff --git a/RecoMuon/GlobalMuonProducer/BuildFile.xml b/RecoMuon/GlobalMuonProducer/plugins/BuildFile.xml similarity index 80% rename from RecoMuon/GlobalMuonProducer/BuildFile.xml rename to RecoMuon/GlobalMuonProducer/plugins/BuildFile.xml index 2c308fca95e06..d5388d160126f 100644 --- a/RecoMuon/GlobalMuonProducer/BuildFile.xml +++ b/RecoMuon/GlobalMuonProducer/plugins/BuildFile.xml @@ -1,12 +1,14 @@ - - - + + + + - + + \ No newline at end of file diff --git a/RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.cc b/RecoMuon/GlobalMuonProducer/plugins/GlobalMuonProducer.cc similarity index 97% rename from RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.cc rename to RecoMuon/GlobalMuonProducer/plugins/GlobalMuonProducer.cc index d4720b170ac4f..bed30f41a8bf2 100644 --- a/RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.cc +++ b/RecoMuon/GlobalMuonProducer/plugins/GlobalMuonProducer.cc @@ -17,7 +17,7 @@ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.h" +#include "RecoMuon/GlobalMuonProducer/plugins/GlobalMuonProducer.h" // TrackFinder and specific GLB Trajectory Builder #include "RecoMuon/GlobalTrackFinder/interface/GlobalMuonTrajectoryBuilder.h" @@ -151,3 +151,6 @@ void GlobalMuonProducer::produce(Event& event, const EventSetup& eventSetup) { << "================================" << endl << endl; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(GlobalMuonProducer); diff --git a/RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.h b/RecoMuon/GlobalMuonProducer/plugins/GlobalMuonProducer.h similarity index 100% rename from RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.h rename to RecoMuon/GlobalMuonProducer/plugins/GlobalMuonProducer.h diff --git a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc b/RecoMuon/GlobalMuonProducer/plugins/TevMuonProducer.cc similarity index 97% rename from RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc rename to RecoMuon/GlobalMuonProducer/plugins/TevMuonProducer.cc index c7b34637f50bf..8096449dbf621 100644 --- a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc +++ b/RecoMuon/GlobalMuonProducer/plugins/TevMuonProducer.cc @@ -16,7 +16,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "RecoMuon/GlobalMuonProducer/src/TevMuonProducer.h" +#include "RecoMuon/GlobalMuonProducer/plugins/TevMuonProducer.h" // TrackFinder and specific GLB Trajectory Builder #include "RecoMuon/GlobalTrackFinder/interface/GlobalMuonTrajectoryBuilder.h" @@ -145,3 +145,6 @@ void TevMuonProducer::produce(Event& event, const EventSetup& eventSetup) { LogTrace(metname) << "Done." << endl; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(TevMuonProducer); diff --git a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.h b/RecoMuon/GlobalMuonProducer/plugins/TevMuonProducer.h similarity index 100% rename from RecoMuon/GlobalMuonProducer/src/TevMuonProducer.h rename to RecoMuon/GlobalMuonProducer/plugins/TevMuonProducer.h diff --git a/RecoMuon/GlobalMuonProducer/src/SealModule.cc b/RecoMuon/GlobalMuonProducer/src/SealModule.cc deleted file mode 100644 index 818b21244a004..0000000000000 --- a/RecoMuon/GlobalMuonProducer/src/SealModule.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.h" -#include "RecoMuon/GlobalMuonProducer/src/TevMuonProducer.h" - -DEFINE_FWK_MODULE(GlobalMuonProducer); -DEFINE_FWK_MODULE(TevMuonProducer); diff --git a/RecoMuon/L2MuonIsolationProducer/BuildFile.xml b/RecoMuon/L2MuonIsolationProducer/plugins/BuildFile.xml similarity index 81% rename from RecoMuon/L2MuonIsolationProducer/BuildFile.xml rename to RecoMuon/L2MuonIsolationProducer/plugins/BuildFile.xml index 857feca104b63..d66be2b830e5a 100644 --- a/RecoMuon/L2MuonIsolationProducer/BuildFile.xml +++ b/RecoMuon/L2MuonIsolationProducer/plugins/BuildFile.xml @@ -1,3 +1,4 @@ + @@ -8,3 +9,4 @@ + diff --git a/RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.cc b/RecoMuon/L2MuonIsolationProducer/plugins/L2MuonIsolationProducer.cc similarity index 97% rename from RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.cc rename to RecoMuon/L2MuonIsolationProducer/plugins/L2MuonIsolationProducer.cc index bdc4cf9401221..760f3ccc36b3b 100644 --- a/RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.cc +++ b/RecoMuon/L2MuonIsolationProducer/plugins/L2MuonIsolationProducer.cc @@ -12,7 +12,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/RecoCandidate/interface/IsoDepositDirection.h" -#include "RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.h" +#include "RecoMuon/L2MuonIsolationProducer/plugins/L2MuonIsolationProducer.h" #include "DataFormats/Common/interface/AssociationMap.h" #include "DataFormats/TrackReco/interface/Track.h" @@ -186,3 +186,6 @@ void L2MuonIsolationProducer::produce(Event& event, const EventSetup& eventSetup LogDebug(metname) << " Event loaded" << "================================"; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L2MuonIsolationProducer); diff --git a/RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.h b/RecoMuon/L2MuonIsolationProducer/plugins/L2MuonIsolationProducer.h similarity index 100% rename from RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.h rename to RecoMuon/L2MuonIsolationProducer/plugins/L2MuonIsolationProducer.h diff --git a/RecoMuon/L2MuonIsolationProducer/src/SealModule.cc b/RecoMuon/L2MuonIsolationProducer/src/SealModule.cc deleted file mode 100644 index 8ee18d4025a0d..0000000000000 --- a/RecoMuon/L2MuonIsolationProducer/src/SealModule.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/L2MuonIsolationProducer/src/L2MuonIsolationProducer.h" - -DEFINE_FWK_MODULE(L2MuonIsolationProducer); diff --git a/RecoMuon/L2MuonSeedGenerator/BuildFile.xml b/RecoMuon/L2MuonSeedGenerator/BuildFile.xml deleted file mode 100644 index 79af3d3b74e84..0000000000000 --- a/RecoMuon/L2MuonSeedGenerator/BuildFile.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/RecoMuon/L2MuonSeedGenerator/plugins/BuildFile.xml b/RecoMuon/L2MuonSeedGenerator/plugins/BuildFile.xml index eda34c6dead26..3e3df88d5a39e 100644 --- a/RecoMuon/L2MuonSeedGenerator/plugins/BuildFile.xml +++ b/RecoMuon/L2MuonSeedGenerator/plugins/BuildFile.xml @@ -16,5 +16,6 @@ + diff --git a/RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.cc b/RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGenerator.cc similarity index 99% rename from RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.cc rename to RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGenerator.cc index 20a903a105df0..806e15237c95c 100644 --- a/RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.cc +++ b/RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGenerator.cc @@ -16,7 +16,7 @@ //-------------------------------------------------- // Class Header -#include "RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.h" +#include "RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGenerator.h" // Framework #include "FWCore/Framework/interface/ConsumesCollector.h" @@ -402,3 +402,6 @@ const TrajectorySeed* L2MuonSeedGenerator::associateOfflineSeedToL1(edm::Handle< return selOffseed; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L2MuonSeedGenerator); diff --git a/RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.h b/RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGenerator.h similarity index 100% rename from RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.h rename to RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGenerator.h diff --git a/RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.cc b/RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGeneratorFromL1T.cc similarity index 99% rename from RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.cc rename to RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGeneratorFromL1T.cc index 78849b22693ec..5b3f23c6d26c3 100644 --- a/RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.cc +++ b/RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGeneratorFromL1T.cc @@ -18,7 +18,7 @@ //-------------------------------------------------- // Class Header -#include "RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.h" +#include "RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGeneratorFromL1T.h" // Framework #include "FWCore/Framework/interface/ConsumesCollector.h" @@ -1047,3 +1047,6 @@ bool L2MuonSeedGeneratorFromL1T::isAssociateOfflineSeedToL1( return isAssociated; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L2MuonSeedGeneratorFromL1T); diff --git a/RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.h b/RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGeneratorFromL1T.h similarity index 100% rename from RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.h rename to RecoMuon/L2MuonSeedGenerator/plugins/L2MuonSeedGeneratorFromL1T.h diff --git a/RecoMuon/L2MuonSeedGenerator/src/Phase2L2MuonSeedCreator.cc b/RecoMuon/L2MuonSeedGenerator/plugins/Phase2L2MuonSeedCreator.cc similarity index 99% rename from RecoMuon/L2MuonSeedGenerator/src/Phase2L2MuonSeedCreator.cc rename to RecoMuon/L2MuonSeedGenerator/plugins/Phase2L2MuonSeedCreator.cc index 4c7855f37238f..f2cadffdf1036 100644 --- a/RecoMuon/L2MuonSeedGenerator/src/Phase2L2MuonSeedCreator.cc +++ b/RecoMuon/L2MuonSeedGenerator/plugins/Phase2L2MuonSeedCreator.cc @@ -3,7 +3,7 @@ * \author Luca Ferragina (INFN BO), 2024 */ -#include "RecoMuon/L2MuonSeedGenerator/src/Phase2L2MuonSeedCreator.h" +#include "RecoMuon/L2MuonSeedGenerator/plugins/Phase2L2MuonSeedCreator.h" #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" @@ -164,7 +164,7 @@ void Phase2L2MuonSeedCreator::produce(edm::Event& iEvent, const edm::EventSetup& unsigned int nCscHits = 0; // Loop on L1TkMu stubs to find best association to DT/CSC segments - for (auto stub : stubRefs) { + for (const auto& stub : stubRefs) { #ifdef EDM_ML_DEBUG stub->print(); #endif @@ -409,7 +409,7 @@ void Phase2L2MuonSeedCreator::produce(edm::Event& iEvent, const edm::EventSetup& // Find valid detectors with states auto detsWithStates = detLayer->compatibleDets(tsos, *service_->propagator(propagatorName_), *estimator_); // Check that at least one valid detector was found - if (detsWithStates.size() > 0) { + if (!detsWithStates.empty()) { // Update the detId with the one from the first valid detector with measurments found propagateToId = detsWithStates.front().first->geographicalId(); // Create the Trajectory State on that detector's surface @@ -486,7 +486,7 @@ const std::pair Phase2L2MuonSeedCreator::matchingStubSegment(const DTC LogDebug(metname) << "Matching stub with DT segment"; int nMatchingIds = 0; - for (DTChamberId id : matchingIds(stubId)) { + for (const DTChamberId& id : matchingIds(stubId)) { DTRecSegment4DCollection::range segmentsInChamber = segments.get(id); for (DTRecSegment4DCollection::const_iterator segment = segmentsInChamber.first; segment != segmentsInChamber.second; diff --git a/RecoMuon/L2MuonSeedGenerator/src/Phase2L2MuonSeedCreator.h b/RecoMuon/L2MuonSeedGenerator/plugins/Phase2L2MuonSeedCreator.h similarity index 100% rename from RecoMuon/L2MuonSeedGenerator/src/Phase2L2MuonSeedCreator.h rename to RecoMuon/L2MuonSeedGenerator/plugins/Phase2L2MuonSeedCreator.h diff --git a/RecoMuon/L2MuonSeedGenerator/src/SealModule.cc b/RecoMuon/L2MuonSeedGenerator/src/SealModule.cc deleted file mode 100644 index 572707f7ca606..0000000000000 --- a/RecoMuon/L2MuonSeedGenerator/src/SealModule.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGenerator.h" -#include "RecoMuon/L2MuonSeedGenerator/src/L2MuonSeedGeneratorFromL1T.h" - -DEFINE_FWK_MODULE(L2MuonSeedGenerator); -DEFINE_FWK_MODULE(L2MuonSeedGeneratorFromL1T); diff --git a/RecoMuon/L3MuonIsolationProducer/BuildFile.xml b/RecoMuon/L3MuonIsolationProducer/BuildFile.xml index 857feca104b63..461e833c1cfe9 100644 --- a/RecoMuon/L3MuonIsolationProducer/BuildFile.xml +++ b/RecoMuon/L3MuonIsolationProducer/BuildFile.xml @@ -7,4 +7,6 @@ - + + + \ No newline at end of file diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3NominalEfficiencyConfigurator.h b/RecoMuon/L3MuonIsolationProducer/interface/L3NominalEfficiencyConfigurator.h similarity index 100% rename from RecoMuon/L3MuonIsolationProducer/src/L3NominalEfficiencyConfigurator.h rename to RecoMuon/L3MuonIsolationProducer/interface/L3NominalEfficiencyConfigurator.h diff --git a/RecoMuon/L3MuonIsolationProducer/plugins/BuildFile.xml b/RecoMuon/L3MuonIsolationProducer/plugins/BuildFile.xml new file mode 100644 index 0000000000000..cbd40fcad0ce5 --- /dev/null +++ b/RecoMuon/L3MuonIsolationProducer/plugins/BuildFile.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3MuonCombinedRelativeIsolationProducer.cc b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.cc similarity index 98% rename from RecoMuon/L3MuonIsolationProducer/src/L3MuonCombinedRelativeIsolationProducer.cc rename to RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.cc index ad3748d89b76c..71743a89ca479 100644 --- a/RecoMuon/L3MuonIsolationProducer/src/L3MuonCombinedRelativeIsolationProducer.cc +++ b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.cc @@ -1,4 +1,4 @@ -#include "L3MuonCombinedRelativeIsolationProducer.h" +#include "RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.h" // Framework #include "FWCore/Framework/interface/Event.h" @@ -25,7 +25,7 @@ #include "PhysicsTools/IsolationAlgos/interface/IsoDepositExtractor.h" #include "PhysicsTools/IsolationAlgos/interface/IsoDepositExtractorFactory.h" -#include "L3NominalEfficiencyConfigurator.h" +#include "RecoMuon/L3MuonIsolationProducer/interface/L3NominalEfficiencyConfigurator.h" #include @@ -342,3 +342,6 @@ void L3MuonCombinedRelativeIsolationProducer::produce(Event& event, const EventS std::cout << " END OF EVENT " << "================================"; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3MuonCombinedRelativeIsolationProducer); diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3MuonCombinedRelativeIsolationProducer.h b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.h similarity index 100% rename from RecoMuon/L3MuonIsolationProducer/src/L3MuonCombinedRelativeIsolationProducer.h rename to RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.h diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3MuonIsolationProducer.cc b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.cc similarity index 95% rename from RecoMuon/L3MuonIsolationProducer/src/L3MuonIsolationProducer.cc rename to RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.cc index 94b1570236273..ac12bb89f7bde 100644 --- a/RecoMuon/L3MuonIsolationProducer/src/L3MuonIsolationProducer.cc +++ b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.cc @@ -1,4 +1,4 @@ -#include "L3MuonIsolationProducer.h" +#include "RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.h" // Framework #include "FWCore/Framework/interface/Event.h" @@ -23,7 +23,7 @@ #include "PhysicsTools/IsolationAlgos/interface/IsoDepositExtractor.h" #include "PhysicsTools/IsolationAlgos/interface/IsoDepositExtractorFactory.h" -#include "L3NominalEfficiencyConfigurator.h" +#include "RecoMuon/L3MuonIsolationProducer/interface/L3NominalEfficiencyConfigurator.h" #include @@ -162,3 +162,6 @@ void L3MuonIsolationProducer::produce(Event& event, const EventSetup& eventSetup LogTrace(metname) << " END OF EVENT " << "================================"; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3MuonIsolationProducer); diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3MuonIsolationProducer.h b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.h similarity index 100% rename from RecoMuon/L3MuonIsolationProducer/src/L3MuonIsolationProducer.h rename to RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.h diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.cc b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.cc similarity index 94% rename from RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.cc rename to RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.cc index 87bb8cb71d6dd..ea35d9df68c85 100644 --- a/RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.cc +++ b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.cc @@ -1,4 +1,4 @@ -#include "L3MuonSumCaloPFIsolationProducer.h" +#include "RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.h" // Framework #include "FWCore/Framework/interface/Event.h" @@ -76,3 +76,6 @@ void L3MuonSumCaloPFIsolationProducer::produce(edm::StreamID, edm::Event& iEvent isoFloatFiller.fill(); iEvent.put(std::move(caloIsoMap)); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3MuonSumCaloPFIsolationProducer); diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.h b/RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.h similarity index 100% rename from RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.h rename to RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.h diff --git a/RecoMuon/L3MuonIsolationProducer/src/L3NominalEfficiencyConfigurator.cc b/RecoMuon/L3MuonIsolationProducer/src/L3NominalEfficiencyConfigurator.cc index 09ed27e656c9f..fd0bead4ebf49 100644 --- a/RecoMuon/L3MuonIsolationProducer/src/L3NominalEfficiencyConfigurator.cc +++ b/RecoMuon/L3MuonIsolationProducer/src/L3NominalEfficiencyConfigurator.cc @@ -1,4 +1,4 @@ -#include "L3NominalEfficiencyConfigurator.h" +#include "RecoMuon/L3MuonIsolationProducer/interface/L3NominalEfficiencyConfigurator.h" #include "RecoMuon/MuonIsolation/interface/IsolatorByNominalEfficiency.h" using namespace muonisolation; diff --git a/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc b/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc deleted file mode 100644 index 7edf14f3a57aa..0000000000000 --- a/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc +++ /dev/null @@ -1,12 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "L3MuonIsolationProducer.h" -DEFINE_FWK_MODULE(L3MuonIsolationProducer); - -#include "L3MuonCombinedRelativeIsolationProducer.h" -DEFINE_FWK_MODULE(L3MuonCombinedRelativeIsolationProducer); - -#include "RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.h" -DEFINE_FWK_MODULE(L3MuonSumCaloPFIsolationProducer); diff --git a/RecoMuon/L3MuonProducer/BuildFile.xml b/RecoMuon/L3MuonProducer/BuildFile.xml deleted file mode 100644 index 4ae2c69fe1cbc..0000000000000 --- a/RecoMuon/L3MuonProducer/BuildFile.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/RecoMuon/L3MuonProducer/plugins/BuildFile.xml b/RecoMuon/L3MuonProducer/plugins/BuildFile.xml new file mode 100644 index 0000000000000..3d3159ab1d8c2 --- /dev/null +++ b/RecoMuon/L3MuonProducer/plugins/BuildFile.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.cc b/RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducer.cc similarity index 97% rename from RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.cc rename to RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducer.cc index 7d881156e08b8..df3622bc2aecf 100644 --- a/RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.cc +++ b/RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducer.cc @@ -22,7 +22,7 @@ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.h" +#include "RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducer.h" #include "DataFormats/Math/interface/deltaR.h" @@ -176,3 +176,6 @@ void L3MuonCandidateProducer::produce(StreamID, Event& event, const EventSetup& LogTrace(category) << " Event loaded" << "================================"; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3MuonCandidateProducer); diff --git a/RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.h b/RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducer.h similarity index 100% rename from RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.h rename to RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducer.h diff --git a/RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.cc b/RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducerFromMuons.cc similarity index 94% rename from RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.cc rename to RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducerFromMuons.cc index d1fa7165138bf..8a7468ca4bc96 100644 --- a/RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.cc +++ b/RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducerFromMuons.cc @@ -13,7 +13,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.h" +#include "RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducerFromMuons.h" // Input and output collections #include "DataFormats/TrackReco/interface/Track.h" @@ -90,3 +90,6 @@ void L3MuonCandidateProducerFromMuons::produce(StreamID, Event& event, const Eve } event.put(std::move(candidates)); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3MuonCandidateProducerFromMuons); diff --git a/RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.h b/RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducerFromMuons.h similarity index 100% rename from RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.h rename to RecoMuon/L3MuonProducer/plugins/L3MuonCandidateProducerFromMuons.h diff --git a/RecoMuon/L3MuonProducer/src/L3MuonCleaner.cc b/RecoMuon/L3MuonProducer/plugins/L3MuonCleaner.cc similarity index 97% rename from RecoMuon/L3MuonProducer/src/L3MuonCleaner.cc rename to RecoMuon/L3MuonProducer/plugins/L3MuonCleaner.cc index dc89fda3223d2..cbc22fd80006c 100644 --- a/RecoMuon/L3MuonProducer/src/L3MuonCleaner.cc +++ b/RecoMuon/L3MuonProducer/plugins/L3MuonCleaner.cc @@ -6,8 +6,6 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/PluginManager/interface/ModuleDef.h" -#include "FWCore/Framework/interface/MakerMacros.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" @@ -50,4 +48,6 @@ void L3MuonCleaner::produce(edm::StreamID, edm::Event& event, const edm::EventSe } event.put(std::move(outTracks)); } + +#include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(L3MuonCleaner); diff --git a/RecoMuon/L3MuonProducer/src/L3MuonProducer.cc b/RecoMuon/L3MuonProducer/plugins/L3MuonProducer.cc similarity index 99% rename from RecoMuon/L3MuonProducer/src/L3MuonProducer.cc rename to RecoMuon/L3MuonProducer/plugins/L3MuonProducer.cc index 269929cf27bec..d7ed7237a563f 100644 --- a/RecoMuon/L3MuonProducer/src/L3MuonProducer.cc +++ b/RecoMuon/L3MuonProducer/plugins/L3MuonProducer.cc @@ -16,7 +16,7 @@ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoMuon/L3MuonProducer/src/L3MuonProducer.h" +#include "RecoMuon/L3MuonProducer/plugins/L3MuonProducer.h" // TrackFinder and specific GLB Trajectory Builder #include "RecoMuon/L3TrackFinder/interface/L3MuonTrajectoryBuilder.h" @@ -319,3 +319,6 @@ void L3MuonProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptio } descriptions.add("L3MuonProducer", desc); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3MuonProducer); diff --git a/RecoMuon/L3MuonProducer/src/L3MuonProducer.h b/RecoMuon/L3MuonProducer/plugins/L3MuonProducer.h similarity index 100% rename from RecoMuon/L3MuonProducer/src/L3MuonProducer.h rename to RecoMuon/L3MuonProducer/plugins/L3MuonProducer.h diff --git a/RecoMuon/L3MuonProducer/src/L3TkMuonProducer.cc b/RecoMuon/L3MuonProducer/plugins/L3TkMuonProducer.cc similarity index 98% rename from RecoMuon/L3MuonProducer/src/L3TkMuonProducer.cc rename to RecoMuon/L3MuonProducer/plugins/L3TkMuonProducer.cc index 330c222b6bbc0..bd30e3a4871f7 100644 --- a/RecoMuon/L3MuonProducer/src/L3TkMuonProducer.cc +++ b/RecoMuon/L3MuonProducer/plugins/L3TkMuonProducer.cc @@ -13,7 +13,7 @@ #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoMuon/L3MuonProducer/src/L3TkMuonProducer.h" +#include "RecoMuon/L3MuonProducer/plugins/L3TkMuonProducer.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" #include @@ -258,3 +258,6 @@ void L3TkMuonProducer::produce(Event& event, const EventSetup& eventSetup) { LogDebug(metname) << " Event loaded" << "================================"; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(L3TkMuonProducer); diff --git a/RecoMuon/L3MuonProducer/src/L3TkMuonProducer.h b/RecoMuon/L3MuonProducer/plugins/L3TkMuonProducer.h similarity index 100% rename from RecoMuon/L3MuonProducer/src/L3TkMuonProducer.h rename to RecoMuon/L3MuonProducer/plugins/L3TkMuonProducer.h diff --git a/RecoMuon/L3MuonProducer/src/QuarkoniaTrackSelector.cc b/RecoMuon/L3MuonProducer/plugins/QuarkoniaTrackSelector.cc similarity index 98% rename from RecoMuon/L3MuonProducer/src/QuarkoniaTrackSelector.cc rename to RecoMuon/L3MuonProducer/plugins/QuarkoniaTrackSelector.cc index af45308ddbe00..e8c7741e9a025 100644 --- a/RecoMuon/L3MuonProducer/src/QuarkoniaTrackSelector.cc +++ b/RecoMuon/L3MuonProducer/plugins/QuarkoniaTrackSelector.cc @@ -1,9 +1,8 @@ -#include "RecoMuon/L3MuonProducer/src/QuarkoniaTrackSelector.h" +#include "RecoMuon/L3MuonProducer/plugins/QuarkoniaTrackSelector.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -167,4 +166,5 @@ void QuarkoniaTrackSelector::produce(edm::StreamID, edm::Event& iEvent, const ed } //define this as a plug-in +#include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(QuarkoniaTrackSelector); diff --git a/RecoMuon/L3MuonProducer/src/QuarkoniaTrackSelector.h b/RecoMuon/L3MuonProducer/plugins/QuarkoniaTrackSelector.h similarity index 100% rename from RecoMuon/L3MuonProducer/src/QuarkoniaTrackSelector.h rename to RecoMuon/L3MuonProducer/plugins/QuarkoniaTrackSelector.h diff --git a/RecoMuon/L3MuonProducer/src/SealModule.cc b/RecoMuon/L3MuonProducer/src/SealModule.cc deleted file mode 100644 index c3b23dde3bef9..0000000000000 --- a/RecoMuon/L3MuonProducer/src/SealModule.cc +++ /dev/null @@ -1,13 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/L3MuonProducer/src/L3MuonProducer.h" -#include "RecoMuon/L3MuonProducer/src/L3TkMuonProducer.h" -#include "RecoMuon/L3MuonProducer/src/L3MuonCandidateProducer.h" -#include "RecoMuon/L3MuonProducer/src/L3MuonCandidateProducerFromMuons.h" - -DEFINE_FWK_MODULE(L3MuonProducer); -DEFINE_FWK_MODULE(L3TkMuonProducer); -DEFINE_FWK_MODULE(L3MuonCandidateProducer); -DEFINE_FWK_MODULE(L3MuonCandidateProducerFromMuons); diff --git a/RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.h b/RecoMuon/MuonSeedGenerator/interface/MuonCSCSeedFromRecHits.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.h rename to RecoMuon/MuonSeedGenerator/interface/MuonCSCSeedFromRecHits.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.h b/RecoMuon/MuonSeedGenerator/interface/MuonDTSeedFromRecHits.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.h rename to RecoMuon/MuonSeedGenerator/interface/MuonDTSeedFromRecHits.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.h b/RecoMuon/MuonSeedGenerator/interface/MuonOverlapSeedFromRecHits.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.h rename to RecoMuon/MuonSeedGenerator/interface/MuonOverlapSeedFromRecHits.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedBuilder.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedBuilder.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedCleaner.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedCleaner.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedCreator.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedCreator.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedFinder.h similarity index 75% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedFinder.h index 3f99c7947da4d..3528d8b2691c6 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/MuonSeedFinder.h @@ -11,11 +11,11 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonCSCSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonDTSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonOverlapSeedFromRecHits.h" #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedOrcaPatternRecognition.h similarity index 97% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedOrcaPatternRecognition.h index ee5b9249d957f..6630406b0fdc4 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.h +++ b/RecoMuon/MuonSeedGenerator/interface/MuonSeedOrcaPatternRecognition.h @@ -1,7 +1,7 @@ #ifndef MuonSeedGenerator_MuonSeedOrcaPatternRecognition_h #define MuonSeedGenerator_MuonSeedOrcaPatternRecognition_h -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVPatternRecognition.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Utilities/interface/ESGetToken.h" #include "RecoMuon/MeasurementDet/interface/MuonDetLayerMeasurements.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h similarity index 96% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h index bb3e245ac1a52..762b03df297ef 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h +++ b/RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h @@ -4,7 +4,7 @@ /** \class MuonSeedPtExtractor */ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVPtExtractor.h" #include "DataFormats/MuonDetId/interface/DTChamberId.h" #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedSimpleCleaner.h similarity index 81% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedSimpleCleaner.h index 8bcfc8447a953..7facb954059fb 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.h +++ b/RecoMuon/MuonSeedGenerator/interface/MuonSeedSimpleCleaner.h @@ -1,7 +1,7 @@ #ifndef MuonSeedGenerator_MuonSeedSimpleCleaner_h #define MuonSeedGenerator_MuonSeedSimpleCleaner_h -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVCleaner.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVCleaner.h" class MuonSeedSimpleCleaner : public MuonSeedVCleaner { public: diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedVCleaner.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedVCleaner.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedVCleaner.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedVCleaner.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedVFinder.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedVFinder.h similarity index 92% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedVFinder.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedVFinder.h index e9750605f5d96..9010ea14e40c1 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedVFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/MuonSeedVFinder.h @@ -12,7 +12,7 @@ #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h" #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" #include "MagneticField/Engine/interface/MagneticField.h" #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedVPatternRecognition.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedVPatternRecognition.h diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedVPtExtractor.h b/RecoMuon/MuonSeedGenerator/interface/MuonSeedVPtExtractor.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/MuonSeedVPtExtractor.h rename to RecoMuon/MuonSeedGenerator/interface/MuonSeedVPtExtractor.h diff --git a/RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.h b/RecoMuon/MuonSeedGenerator/interface/RPCCosmicSeedrecHitFinder.h similarity index 94% rename from RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.h rename to RecoMuon/MuonSeedGenerator/interface/RPCCosmicSeedrecHitFinder.h index d202ff2f62039..8423fca85bf2b 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/RPCCosmicSeedrecHitFinder.h @@ -8,7 +8,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h" #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h b/RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h similarity index 96% rename from RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h rename to RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h index 795b7e851eadc..c47d144111e73 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h @@ -8,7 +8,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedPattern.h" #include #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.h b/RecoMuon/MuonSeedGenerator/interface/RPCSeedLayerFinder.h similarity index 91% rename from RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.h rename to RecoMuon/MuonSeedGenerator/interface/RPCSeedLayerFinder.h index 64f5730b9b118..3b5938bacf95e 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/RPCSeedLayerFinder.h @@ -9,8 +9,8 @@ */ #include -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedrecHitFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCCosmicSeedrecHitFinder.h" #include #ifndef RPCLayerNumber diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.h b/RecoMuon/MuonSeedGenerator/interface/RPCSeedOverlapper.h similarity index 93% rename from RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.h rename to RecoMuon/MuonSeedGenerator/interface/RPCSeedOverlapper.h index 5186f180a2d67..a192880637156 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.h +++ b/RecoMuon/MuonSeedGenerator/interface/RPCSeedOverlapper.h @@ -13,7 +13,7 @@ #include #include #include -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedPattern.h" class RPCSeedOverlapper { typedef RPCSeedPattern::weightedTrajectorySeed weightedTrajectorySeed; diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.h b/RecoMuon/MuonSeedGenerator/interface/RPCSeedPattern.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.h rename to RecoMuon/MuonSeedGenerator/interface/RPCSeedPattern.h diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.h b/RecoMuon/MuonSeedGenerator/interface/RPCSeedrecHitFinder.h similarity index 93% rename from RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.h rename to RecoMuon/MuonSeedGenerator/interface/RPCSeedrecHitFinder.h index 23a25574154ea..302de1898265b 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/RPCSeedrecHitFinder.h @@ -8,7 +8,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h" #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/SETFilter.h b/RecoMuon/MuonSeedGenerator/interface/SETFilter.h similarity index 100% rename from RecoMuon/MuonSeedGenerator/src/SETFilter.h rename to RecoMuon/MuonSeedGenerator/interface/SETFilter.h diff --git a/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.h b/RecoMuon/MuonSeedGenerator/interface/SETPatternRecognition.h similarity index 95% rename from RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.h rename to RecoMuon/MuonSeedGenerator/interface/SETPatternRecognition.h index d1de8442e4b2c..43202b50c3e29 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.h +++ b/RecoMuon/MuonSeedGenerator/interface/SETPatternRecognition.h @@ -1,7 +1,7 @@ #ifndef MuonSeedGenerator_SETPatternRecognition_h #define MuonSeedGenerator_SETPatternRecognition_h -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVPatternRecognition.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" #include "FWCore/Framework/interface/ConsumesCollector.h" diff --git a/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.h b/RecoMuon/MuonSeedGenerator/interface/SETSeedFinder.h similarity index 91% rename from RecoMuon/MuonSeedGenerator/src/SETSeedFinder.h rename to RecoMuon/MuonSeedGenerator/interface/SETSeedFinder.h index 40204d7e55f84..3185356a70d81 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.h +++ b/RecoMuon/MuonSeedGenerator/interface/SETSeedFinder.h @@ -1,10 +1,10 @@ #ifndef MuonSeedGenerator_SETSeedFinder_h #define MuonSeedGenerator_SETSeedFinder_h -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVFinder.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" -#include "RecoMuon/MuonSeedGenerator/src/SETFilter.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETFilter.h" #include "CLHEP/Matrix/Vector.h" #include "CLHEP/Vector/ThreeVector.h" diff --git a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc index 101ad60791508..02bf523e3ebcb 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc @@ -553,3 +553,6 @@ void CosmicMuonSeedGenerator::fillDescriptions(edm::ConfigurationDescriptions& d desc.add("ForcePointDown", true); descriptions.addWithDefaultLabel(desc); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(CosmicMuonSeedGenerator); diff --git a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc index ba063f737b6e1..9618f6b5cc388 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc @@ -9,10 +9,10 @@ */ #include "RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedOrcaPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedSimpleCleaner.h" // Data Formats #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h" @@ -122,3 +122,6 @@ void MuonSeedGenerator::fillDescriptions(edm::ConfigurationDescriptions& descrip desc.add("deltaEtaCrackSearchWindow", 0.25); descriptions.add("muonSeedGenerator", desc); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(MuonSeedGenerator); diff --git a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedMerger.cc b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedMerger.cc index 3dd5a6780847b..6766f5ea54412 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedMerger.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedMerger.cc @@ -55,3 +55,6 @@ void MuonSeedMerger::produce(Event& event, const EventSetup& eventSetup) { event.put(std::move(output)); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(MuonSeedMerger); diff --git a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc index 3a5e2771d09b1..c6c9bb941a1c1 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc @@ -5,7 +5,7 @@ */ #include "RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedBuilder.h" // Data Formats #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" @@ -72,3 +72,6 @@ void MuonSeedProducer::produce(edm::Event& event, const edm::EventSetup& eSetup) // Append muon seed collection to event event.put(std::move(output)); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(MuonSeedProducer); diff --git a/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc b/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc index 7161d2a481e2a..d30d95c23d902 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc @@ -219,3 +219,6 @@ void SETMuonSeedProducer::produce(edm::Event& event, const edm::EventSetup& even // void SETMuonSeedProducer::setEvent(const edm::Event& event) { theFilter->setEvent(event); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SETMuonSeedProducer); diff --git a/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.h b/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.h index 36edb20b869aa..9391d8d6668dc 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.h +++ b/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.h @@ -16,10 +16,10 @@ #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" -#include "RecoMuon/MuonSeedGenerator/src/SETFilter.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETFilter.h" #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" -#include "RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.h" -#include "RecoMuon/MuonSeedGenerator/src/SETSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETSeedFinder.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" class TrajectorySeed; diff --git a/RecoMuon/MuonSeedGenerator/plugins/SealModule.cc b/RecoMuon/MuonSeedGenerator/plugins/SealModule.cc deleted file mode 100644 index 0361f64dc2274..0000000000000 --- a/RecoMuon/MuonSeedGenerator/plugins/SealModule.cc +++ /dev/null @@ -1,15 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.h" -#include "RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.h" -#include "RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.h" -#include "RecoMuon/MuonSeedGenerator/plugins/MuonSeedMerger.h" -#include "RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.h" - -DEFINE_FWK_MODULE(CosmicMuonSeedGenerator); -DEFINE_FWK_MODULE(MuonSeedGenerator); -DEFINE_FWK_MODULE(MuonSeedProducer); -DEFINE_FWK_MODULE(MuonSeedMerger); -DEFINE_FWK_MODULE(SETMuonSeedProducer); diff --git a/RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.cc b/RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.cc index 0dfefcee4128e..7c133d36a3beb 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.cc @@ -1,5 +1,5 @@ -#include "RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonCSCSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/ME0DetId.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.cc b/RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.cc index cd21191727e2a..9eee9781ff7e4 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.cc @@ -6,8 +6,8 @@ * \author porting R. Bellan * */ -#include "RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonDTSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.cc b/RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.cc index 74b4572a9a488..ccfbef85e23f3 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.cc @@ -1,7 +1,7 @@ -#include "RecoMuon/MuonSeedGenerator/src/MuonOverlapSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonDTSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonCSCSeedFromRecHits.h" -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonOverlapSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonDTSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonCSCSeedFromRecHits.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "DataFormats/MuonDetId/interface/DTChamberId.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc index d3779fb4d2d55..ddf8455256d6d 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc @@ -4,9 +4,9 @@ * \author Shih-Chuan Kao, Dominique Fortin - UCR */ -#include -#include -#include +#include +#include +#include // Data Formats #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc index 336dee0c1f2c3..7e6538152b55c 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc @@ -4,7 +4,7 @@ * \author Shih-Chuan Kao, Dominique Fortin - UCR */ -#include +#include // Data Formats #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.cc index b610c97a56721..528cac971d670 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.cc @@ -5,7 +5,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedCreator.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedCreator.h" #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.cc index 8f6e0c070981c..43bfd643116fd 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.cc @@ -6,7 +6,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedFinder.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" using namespace std; diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc index 8d18cdcd16449..aaff41de76855 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc @@ -8,7 +8,7 @@ * \author ported by: R. Bellan - INFN Torino */ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedOrcaPatternRecognition.h" #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h" #include "DataFormats/CSCRecHit/interface/CSCRecHit2D.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.cc index cc6a1b814bd9a..a82e7379f1d8c 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedPtExtractor.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedPtExtractor.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.cc index fff3925dff69f..02dad4eab1b32 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedSimpleCleaner.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedSimpleCleaner.h" void MuonSeedSimpleCleaner::clean(TrajectorySeedCollection& seeds) { for (std::vector::iterator seed = seeds.begin(); seed != seeds.end(); ++seed) { diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.cc index ab9d47512a4a3..fa8a8d57b4faf 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/MuonSeedGenerator/src/MuonSeedVPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/MuonSeedVPatternRecognition.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" MuonSeedVPatternRecognition::MuonSeedVPatternRecognition(const edm::ParameterSet& pset) diff --git a/RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.cc b/RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.cc index a278871b55e7a..44485e56abed3 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.cc @@ -3,7 +3,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCCosmicSeedrecHitFinder.h" #include #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.cc index 56e4e77744282..25155bf7a4292 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.cc @@ -3,7 +3,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h" #include using namespace std; diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedGenerator.cc index 1eff10d501cc6..687f2c605e16b 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedGenerator.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedGenerator.cc @@ -3,7 +3,7 @@ // Package: RPCSeedGenerator // Class: RPCSeedGenerator // -/**\class RPCSeedGenerator RPCSeedGenerator.cc RecoMuon/MuonSeedGenerator/src/RPCSeedGenerator.cc +/**\class RPCSeedGenerator RPCSeedGenerator.cc RecoMuon/MuonSeedGenerator/interface/RPCSeedGenerator.cc Description: @@ -32,12 +32,12 @@ Description: #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h" #include // Using other classes -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.h" -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/RPCCosmicSeedrecHitFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.h" -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedPattern.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedrecHitFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCCosmicSeedrecHitFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedLayerFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedOverlapper.h" // Geometry #include "TrackingTools/DetLayers/interface/DetLayer.h" #include "RecoMuon/MeasurementDet/interface/MuonDetLayerMeasurements.h" diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.cc index a98c11befe920..3cc44acb43d4a 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.cc @@ -3,7 +3,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedLayerFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedLayerFinder.h" using namespace std; using namespace edm; diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc index 7838975c9705c..34d56345aed31 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc @@ -3,7 +3,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedOverlapper.h" #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc index 7df32fba0f324..a03598ff30124 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc @@ -6,7 +6,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedPattern.h" #include #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.cc index bfcbc5fffe846..2192768293197 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.cc @@ -3,7 +3,7 @@ * */ -#include "RecoMuon/MuonSeedGenerator/src/RPCSeedrecHitFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/RPCSeedrecHitFinder.h" #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/SETFilter.cc b/RecoMuon/MuonSeedGenerator/src/SETFilter.cc index 55d79e3884557..d8adb3dc0b622 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETFilter.cc +++ b/RecoMuon/MuonSeedGenerator/src/SETFilter.cc @@ -1,7 +1,7 @@ /** \class SETFilter I. Bloch, E. James, S. Stoynev */ -#include "RecoMuon/MuonSeedGenerator/src/SETFilter.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETFilter.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc b/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc index 90011730a5048..ab06827886ea3 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc +++ b/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc @@ -2,7 +2,7 @@ I. Bloch, E. James, S. Stoynev */ -#include "RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETPatternRecognition.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" diff --git a/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc b/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc index c333564cea552..56833cd1dc25e 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc @@ -2,7 +2,7 @@ I. Bloch, E. James, S. Stoynev */ -#include "RecoMuon/MuonSeedGenerator/src/SETSeedFinder.h" +#include "RecoMuon/MuonSeedGenerator/interface/SETSeedFinder.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" diff --git a/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.cc index 3cf5e103a1421..1f00f1efc60d7 100644 --- a/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.cc +++ b/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.cc @@ -14,7 +14,6 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" diff --git a/RecoMuon/StandAloneMuonProducer/BuildFile.xml b/RecoMuon/StandAloneMuonProducer/BuildFile.xml deleted file mode 100644 index 8530c600ec7c5..0000000000000 --- a/RecoMuon/StandAloneMuonProducer/BuildFile.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/RecoMuon/StandAloneMuonProducer/plugins/BuildFile.xml b/RecoMuon/StandAloneMuonProducer/plugins/BuildFile.xml new file mode 100644 index 0000000000000..1e093963986f4 --- /dev/null +++ b/RecoMuon/StandAloneMuonProducer/plugins/BuildFile.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.cc b/RecoMuon/StandAloneMuonProducer/plugins/StandAloneMuonProducer.cc similarity index 96% rename from RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.cc rename to RecoMuon/StandAloneMuonProducer/plugins/StandAloneMuonProducer.cc index 49ba82724ca27..4c0ed1c7dadac 100644 --- a/RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.cc +++ b/RecoMuon/StandAloneMuonProducer/plugins/StandAloneMuonProducer.cc @@ -17,7 +17,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.h" +#include "RecoMuon/StandAloneMuonProducer/plugins/StandAloneMuonProducer.h" // TrackFinder and Specific STA Trajectory Builder #include "RecoMuon/StandAloneTrackFinder/interface/StandAloneTrajectoryBuilder.h" @@ -125,3 +125,6 @@ void StandAloneMuonProducer::produce(Event& event, const EventSetup& eventSetup) << "================================" << endl << endl; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(StandAloneMuonProducer); diff --git a/RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.h b/RecoMuon/StandAloneMuonProducer/plugins/StandAloneMuonProducer.h similarity index 100% rename from RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.h rename to RecoMuon/StandAloneMuonProducer/plugins/StandAloneMuonProducer.h diff --git a/RecoMuon/StandAloneMuonProducer/src/SealModule.cc b/RecoMuon/StandAloneMuonProducer/src/SealModule.cc deleted file mode 100644 index 665721b335be7..0000000000000 --- a/RecoMuon/StandAloneMuonProducer/src/SealModule.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" - -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/StandAloneMuonProducer/src/StandAloneMuonProducer.h" - -DEFINE_FWK_MODULE(StandAloneMuonProducer); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.h b/RecoMuon/TrackerSeedGenerator/interface/CompositeTSG.h similarity index 100% rename from RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.h rename to RecoMuon/TrackerSeedGenerator/interface/CompositeTSG.h diff --git a/RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.h b/RecoMuon/TrackerSeedGenerator/interface/SeparatingTSG.h similarity index 92% rename from RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.h rename to RecoMuon/TrackerSeedGenerator/interface/SeparatingTSG.h index 61d869ef58ea4..09b98ff342b84 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.h +++ b/RecoMuon/TrackerSeedGenerator/interface/SeparatingTSG.h @@ -9,7 +9,7 @@ * \author Jean-Roch Vlimant */ -#include "RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.h" +#include "RecoMuon/TrackerSeedGenerator/interface/CompositeTSG.h" #include "FWCore/Framework/interface/ConsumesCollector.h" class TrackerTopology; diff --git a/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml b/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml index 7a47fd226d191..244165f6a2816 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml +++ b/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml @@ -11,6 +11,7 @@ + diff --git a/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.cc b/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.cc index 549c333d32758..018722346745f 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.cc @@ -1 +1,23 @@ +#include "FWCore/Framework/interface/MakerMacros.h" + #include "RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.h" + +#include "TrackingTools/PatternTools/interface/Trajectory.h" +#include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeedCollection.h" +#include "DataFormats/TrackReco/interface/TrackFwd.h" +#include "DataFormats/TrackReco/interface/Track.h" +#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" +#include "DataFormats/MuonReco/interface/MuonTrackLinks.h" +#include "DataFormats/MuonReco/interface/MuonFwd.h" + +typedef CollectionCombiner > TrajectoryCombiner; +typedef CollectionCombiner L3MuonTrajectorySeedCombiner; +typedef CollectionCombiner L3TrackCombiner; +typedef CollectionCombiner L3TrackCandCombiner; +typedef CollectionCombiner L3TrackLinksCombiner; + +DEFINE_FWK_MODULE(TrajectoryCombiner); +DEFINE_FWK_MODULE(L3MuonTrajectorySeedCombiner); +DEFINE_FWK_MODULE(L3TrackCombiner); +DEFINE_FWK_MODULE(L3TrackCandCombiner); +DEFINE_FWK_MODULE(L3TrackLinksCombiner); \ No newline at end of file diff --git a/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.h b/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.h index a6d802e0b636f..9f120972f33bb 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/CollectionCombiner.h @@ -19,7 +19,6 @@ #include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" diff --git a/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.cc b/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.cc index 16702b864e608..cdf6b1dac4070 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.cc @@ -30,3 +30,7 @@ void CombinedTSG::trackerSeeds(const TrackCand& muonTrackCand, } } } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, CombinedTSG, "CombinedTSG"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.h b/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.h index e302661c14204..a3312c99019ea 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/CombinedTSG.h @@ -8,7 +8,7 @@ * \author Jean-Roch Vlimant, Alessandro Grelli */ -#include "RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.h" +#include "RecoMuon/TrackerSeedGenerator/interface/CompositeTSG.h" #include "FWCore/Framework/interface/ConsumesCollector.h" class TrackerTopology; diff --git a/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.cc b/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.cc index 12a11a75d2f9c..9f0eaf28383d3 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.cc @@ -14,3 +14,7 @@ unsigned int DualByEtaTSG::selectTSG(const TrackCand& muonTrackCand, const Track << " compared to: " << theEtaSeparation; return (fabs(muonTrackCand.second->eta()) < theEtaSeparation); } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, DualByEtaTSG, "DualByEtaTSG"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.h b/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.h index 90901ab036228..b4c475fe0a659 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/DualByEtaTSG.h @@ -8,7 +8,7 @@ * \author Jean-Roch vlimant, Adam Everett */ -#include "RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.h" +#include "RecoMuon/TrackerSeedGenerator/interface/SeparatingTSG.h" #include "FWCore/Framework/interface/ConsumesCollector.h" class DualByEtaTSG : public SeparatingTSG { diff --git a/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.cc b/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.cc index 4b361a885956d..a8d95f5372061 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.cc @@ -52,3 +52,7 @@ unsigned int DualByL2TSG::selectTSG(const TrackCand& muonTrackCand, const Tracki return re_do_this_L2 ? 1 : 0; } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, DualByL2TSG, "DualByL2TSG"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.h b/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.h index 9d5b318d91b7a..55d5d4f006e49 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/DualByL2TSG.h @@ -9,7 +9,7 @@ * \author Jean-Roch vlimant, Adam Everett */ -#include "RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.h" +#include "RecoMuon/TrackerSeedGenerator/interface/SeparatingTSG.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" diff --git a/RecoMuon/TrackerSeedGenerator/plugins/SealModule.cc b/RecoMuon/TrackerSeedGenerator/plugins/SealModule.cc deleted file mode 100644 index b06e1b86cb30f..0000000000000 --- a/RecoMuon/TrackerSeedGenerator/plugins/SealModule.cc +++ /dev/null @@ -1,47 +0,0 @@ -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Framework/interface/ConsumesCollector.h" - -#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" -#include "TSGFromOrderedHits.h" -#include "TSGSmart.h" -#include "TSGForRoadSearch.h" -#include "TSGFromPropagation.h" -#include "DualByEtaTSG.h" -#include "DualByL2TSG.h" -#include "CombinedTSG.h" - -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGSmart, "TSGSmart"); -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGFromOrderedHits, "TSGFromOrderedHits"); -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGForRoadSearch, "TSGForRoadSearch"); -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGFromPropagation, "TSGFromPropagation"); -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, DualByEtaTSG, "DualByEtaTSG"); -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, DualByL2TSG, "DualByL2TSG"); -DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, CombinedTSG, "CombinedTSG"); - -#include "FWCore/PluginManager/interface/ModuleDef.h" -#include "TSGFromL1Muon.h" -#include "TSGFromL2Muon.h" - -DEFINE_FWK_MODULE(TSGFromL1Muon); -DEFINE_FWK_MODULE(TSGFromL2Muon); - -#include "CollectionCombiner.h" - -#include "TrackingTools/PatternTools/interface/Trajectory.h" -#include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeedCollection.h" -#include "DataFormats/TrackReco/interface/TrackFwd.h" -#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" -#include "DataFormats/MuonReco/interface/MuonTrackLinks.h" -#include "DataFormats/MuonReco/interface/MuonFwd.h" - -typedef CollectionCombiner > TrajectoryCombiner; -typedef CollectionCombiner L3MuonTrajectorySeedCombiner; -typedef CollectionCombiner L3TrackCombiner; -typedef CollectionCombiner L3TrackCandCombiner; -typedef CollectionCombiner L3TrackLinksCombiner; - -DEFINE_FWK_MODULE(TrajectoryCombiner); -DEFINE_FWK_MODULE(L3MuonTrajectorySeedCombiner); -DEFINE_FWK_MODULE(L3TrackCombiner); -DEFINE_FWK_MODULE(L3TrackCandCombiner); -DEFINE_FWK_MODULE(L3TrackLinksCombiner); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc index 01a4632694c9a..97401fcaf84fe 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc @@ -543,3 +543,7 @@ void TSGForRoadSearch::pushTrajectorySeed(const reco::Track &muon, } return; } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGForRoadSearch, "TSGForRoadSearch"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL1Muon.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL1Muon.cc index bf8576ff3922c..d2f85ff716def 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL1Muon.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL1Muon.cc @@ -134,3 +134,6 @@ void TSGFromL1Muon::produce(edm::Event& ev, const edm::EventSetup& es) { LogDebug("TSGFromL1Muon") << result->size() << " seeds to the event."; ev.put(std::move(result)); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(TSGFromL1Muon); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc index 34dc6a2430947..d010e2904f3d1 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromL2Muon.cc @@ -126,3 +126,6 @@ void TSGFromL2Muon::fillDescriptions(edm::ConfigurationDescriptions& description edm::ParameterSetDescription desc; desc.setAllowAnything(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(TSGFromL2Muon); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromOrderedHits.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromOrderedHits.cc index 433f231d88245..53776c03e9623 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromOrderedHits.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromOrderedHits.cc @@ -32,3 +32,7 @@ void TSGFromOrderedHits::run(TrajectorySeedCollection &seeds, const TrackingRegion ®ion) { theGenerator->run(seeds, region, ev, es); } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGFromOrderedHits, "TSGFromOrderedHits"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc index eb1d3622bcd66..d80c44a7889a8 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc @@ -345,3 +345,7 @@ void TSGFromPropagation::adjust(TrajectoryStateOnSurface& state) const { state = TrajectoryStateOnSurface(state.weight(), state.globalParameters(), oMat, state.surface(), state.surfaceSide()); } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGFromPropagation, "TSGFromPropagation"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGSmart.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGSmart.cc index e24899bd51da7..5b0dd8718e6b4 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGSmart.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGSmart.cc @@ -56,3 +56,7 @@ void TSGSmart::run(TrajectorySeedCollection &seeds, thePairGenerator->run(seeds, region, ev, es); } } + +#include "FWCore/Framework/interface/MakerMacros.h" +#include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" +DEFINE_EDM_PLUGIN(TrackerSeedGeneratorFactory, TSGSmart, "TSGSmart"); diff --git a/RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.cc b/RecoMuon/TrackerSeedGenerator/src/CompositeTSG.cc similarity index 95% rename from RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.cc rename to RecoMuon/TrackerSeedGenerator/src/CompositeTSG.cc index 17965c929bc6f..2c1a5d49959b1 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.cc +++ b/RecoMuon/TrackerSeedGenerator/src/CompositeTSG.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/TrackerSeedGenerator/plugins/CompositeTSG.h" +#include "RecoMuon/TrackerSeedGenerator/interface/CompositeTSG.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" #include "RecoMuon/TrackerSeedGenerator/interface/TrackerSeedGeneratorFactory.h" diff --git a/RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.cc b/RecoMuon/TrackerSeedGenerator/src/SeparatingTSG.cc similarity index 93% rename from RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.cc rename to RecoMuon/TrackerSeedGenerator/src/SeparatingTSG.cc index f9f91d31f4908..cb287e010730d 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.cc +++ b/RecoMuon/TrackerSeedGenerator/src/SeparatingTSG.cc @@ -1,4 +1,4 @@ -#include "RecoMuon/TrackerSeedGenerator/plugins/SeparatingTSG.h" +#include "RecoMuon/TrackerSeedGenerator/interface/SeparatingTSG.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/RecoMuon/TrackingTools/test/MuonErrorMatrixAnalyzer.cc b/RecoMuon/TrackingTools/test/MuonErrorMatrixAnalyzer.cc index 31dd474a83fb2..5e81353915def 100644 --- a/RecoMuon/TrackingTools/test/MuonErrorMatrixAnalyzer.cc +++ b/RecoMuon/TrackingTools/test/MuonErrorMatrixAnalyzer.cc @@ -763,3 +763,6 @@ void MuonErrorMatrixAnalyzer::endJob() { thePlotFile->Close(); } } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(MuonErrorMatrixAnalyzer); diff --git a/RecoMuon/TrackingTools/test/SealModules.cc b/RecoMuon/TrackingTools/test/SealModules.cc deleted file mode 100644 index 9848ce7f37ad1..0000000000000 --- a/RecoMuon/TrackingTools/test/SealModules.cc +++ /dev/null @@ -1,10 +0,0 @@ -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" -#include "FWCore/Utilities/interface/typelookup.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "RecoMuon/TrackingTools/test/MuonErrorMatrixAnalyzer.h" - -DEFINE_FWK_MODULE(MuonErrorMatrixAnalyzer);