Remove SealModule from RecoMuon/TrackerSeedGenerator

cms-sw · Jan 9, 2025 · 79465de · 79465de
1 parent c1fa31b
commit 79465de
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 54 deletions.
diff --git a/...ackerSeedGenerator/plugins/CompositeTSG.h → ...kerSeedGenerator/interface/CompositeTSG.h b/...ackerSeedGenerator/plugins/CompositeTSG.h → ...kerSeedGenerator/interface/CompositeTSG.h
diff --git a/...ckerSeedGenerator/plugins/SeparatingTSG.h → ...erSeedGenerator/interface/SeparatingTSG.h b/...ckerSeedGenerator/plugins/SeparatingTSG.h → ...erSeedGenerator/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
@@ -11,6 +11,7 @@
   <use name="DataFormats/Phase2TrackerDigi"/>
   <use name="DataFormats/RecoCandidate"/>
   <use name="DataFormats/SiPixelDetId"/>
+  <use name="DataFormats/TrackCandidate"/>
   <use name="DataFormats/TrackerCommon"/>
   <use name="DataFormats/TrackReco"/>
   <use name="DataFormats/TrackingRecHit"/>

diff --git 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<std::vector<Trajectory> > TrajectoryCombiner;
+typedef CollectionCombiner<L3MuonTrajectorySeedCollection> L3MuonTrajectorySeedCombiner;
+typedef CollectionCombiner<reco::TrackCollection> L3TrackCombiner;
+typedef CollectionCombiner<TrackCandidateCollection> L3TrackCandCombiner;
+typedef CollectionCombiner<reco::MuonTrackLinksCollection> 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -32,3 +32,7 @@ void TSGFromOrderedHits::run(TrajectorySeedCollection &seeds,
                              const TrackingRegion &region) {
   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
@@ -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
@@ -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/...ckerSeedGenerator/plugins/CompositeTSG.cc → .../TrackerSeedGenerator/src/CompositeTSG.cc b/...ckerSeedGenerator/plugins/CompositeTSG.cc → .../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/...kerSeedGenerator/plugins/SeparatingTSG.cc → ...TrackerSeedGenerator/src/SeparatingTSG.cc b/...kerSeedGenerator/plugins/SeparatingTSG.cc → ...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"