Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all SealModules from the RecoMuon package #47065

Merged
merged 10 commits into from
Jan 9, 2025
4 changes: 3 additions & 1 deletion RecoMuon/CosmicMuonProducer/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@
<use name="TrackingTools/TrackFitters"/>
<use name="TrackingTools/TrajectoryState"/>
<use name="TrackingTools/TransientTrackingRecHit"/>
<flags EDM_PLUGIN="1"/>
<export>
<lib name="1"/>
</export>
13 changes: 13 additions & 0 deletions RecoMuon/CosmicMuonProducer/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<library file="*.cc" name="RecoMuonCosmicMuonProducerPlugins">
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/TrajectorySeed"/>
<use name="RecoMuon/CosmicMuonProducer"/>
<use name="RecoMuon/TrackingTools"/>
<use name="TrackingTools/PatternTools"/>
<flags EDM_PLUGIN="1"/>
</library>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "RecoMuon/CosmicMuonProducer/src/CosmicMuonLinksProducer.h"
#include "RecoMuon/CosmicMuonProducer/plugins/CosmicMuonLinksProducer.h"

/**\class CosmicMuonLinksProducer
*
Expand Down Expand Up @@ -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);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "RecoMuon/CosmicMuonProducer/src/CosmicMuonProducer.h"
#include "RecoMuon/CosmicMuonProducer/plugins/CosmicMuonProducer.h"

/**\class CosmicMuonProducer
*
Expand Down Expand Up @@ -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);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "RecoMuon/CosmicMuonProducer/src/GlobalCosmicMuonProducer.h"
#include "RecoMuon/CosmicMuonProducer/plugins/GlobalCosmicMuonProducer.h"

/**\class GlobalCosmicMuonProducer
*
Expand Down Expand Up @@ -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);
9 changes: 0 additions & 9 deletions RecoMuon/CosmicMuonProducer/src/SealModule.cc

This file was deleted.

3 changes: 3 additions & 0 deletions RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -797,3 +797,6 @@ TrajectoryStateOnSurface CosmicMuonValidator::updatedState(const TrajectoryState
edm::ESHandle<Propagator> CosmicMuonValidator::propagator() const {
return theService->propagator("SteppingHelixPropagatorAny");
}

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(CosmicMuonValidator);
3 changes: 1 addition & 2 deletions RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,5 @@ edm::ESHandle<Propagator> RealCosmicDataAnalyzer::propagator() const {
return theService->propagator("SteppingHelixPropagatorAny");
}

//define this as a plug-in

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(RealCosmicDataAnalyzer);
9 changes: 0 additions & 9 deletions RecoMuon/CosmicMuonProducer/test/SealModules.cc

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/TrackReco"/>
<library file="*.cc" name="RecoMuonGlobalMuonProducerPlugins">
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/TrackReco"/>
<use name="RecoMuon/GlobalTrackFinder"/>
<use name="RecoMuon/GlobalTrackingTools"/>
<use name="RecoMuon/TrackingTools"/>
<use name="TrackingTools/PatternTools"/>
<flags EDM_PLUGIN="1"/>
<flags EDM_PLUGIN="1"/>
</library>
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -151,3 +151,6 @@ void GlobalMuonProducer::produce(Event& event, const EventSetup& eventSetup) {
<< "================================" << endl
<< endl;
}

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(GlobalMuonProducer);
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
9 changes: 0 additions & 9 deletions RecoMuon/GlobalMuonProducer/src/SealModule.cc

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<library name="RecoMuonL2MuonIsolationProducerPlugins" file="*.cc">
<use name="DataFormats/Common"/>
<use name="DataFormats/RecoCandidate"/>
<use name="DataFormats/TrackReco"/>
Expand All @@ -8,3 +9,4 @@
<use name="PhysicsTools/IsolationAlgos"/>
<use name="RecoMuon/MuonIsolation"/>
<flags EDM_PLUGIN="1"/>
</library>
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
7 changes: 0 additions & 7 deletions RecoMuon/L2MuonIsolationProducer/src/SealModule.cc

This file was deleted.

19 changes: 0 additions & 19 deletions RecoMuon/L2MuonSeedGenerator/BuildFile.xml

This file was deleted.

1 change: 1 addition & 0 deletions RecoMuon/L2MuonSeedGenerator/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
<use name="TrackingTools/TrajectoryParametrization"/>
<use name="TrackingTools/TrajectoryState"/>
<use name="clhep"/>
<use name="vdt"/>
<flags EDM_PLUGIN="1"/>
</library>
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -402,3 +402,6 @@ const TrajectorySeed* L2MuonSeedGenerator::associateOfflineSeedToL1(edm::Handle<

return selOffseed;
}

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(L2MuonSeedGenerator);
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1047,3 +1047,6 @@ bool L2MuonSeedGeneratorFromL1T::isAssociateOfflineSeedToL1(

return isAssociated;
}

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(L2MuonSeedGeneratorFromL1T);
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -486,7 +486,7 @@ const std::pair<int, int> 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;
Expand Down
9 changes: 0 additions & 9 deletions RecoMuon/L2MuonSeedGenerator/src/SealModule.cc

This file was deleted.

4 changes: 3 additions & 1 deletion RecoMuon/L3MuonIsolationProducer/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
<use name="FWCore/PluginManager"/>
<use name="PhysicsTools/IsolationAlgos"/>
<use name="RecoMuon/MuonIsolation"/>
<flags EDM_PLUGIN="1"/>
<export>
<lib name="1"/>
</export>
13 changes: 13 additions & 0 deletions RecoMuon/L3MuonIsolationProducer/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<library name="RecoMuonL3MuonIsolationProducerPlugins" file="*.cc">
<use name="DataFormats/Common"/>
<use name="DataFormats/RecoCandidate"/>
<use name="DataFormats/TrackReco"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="PhysicsTools/IsolationAlgos"/>
<use name="RecoMuon/MuonIsolation"/>
<use name="RecoMuon/L3MuonIsolationProducer"/>
<flags EDM_PLUGIN="1"/>
</library>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L3MuonCombinedRelativeIsolationProducer.h"
#include "RecoMuon/L3MuonIsolationProducer/plugins/L3MuonCombinedRelativeIsolationProducer.h"

// Framework
#include "FWCore/Framework/interface/Event.h"
Expand All @@ -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 <string>

Expand Down Expand Up @@ -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);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L3MuonIsolationProducer.h"
#include "RecoMuon/L3MuonIsolationProducer/plugins/L3MuonIsolationProducer.h"

// Framework
#include "FWCore/Framework/interface/Event.h"
Expand All @@ -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 <string>

Expand Down Expand Up @@ -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);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L3MuonSumCaloPFIsolationProducer.h"
#include "RecoMuon/L3MuonIsolationProducer/plugins/L3MuonSumCaloPFIsolationProducer.h"

// Framework
#include "FWCore/Framework/interface/Event.h"
Expand Down Expand Up @@ -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);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L3NominalEfficiencyConfigurator.h"
#include "RecoMuon/L3MuonIsolationProducer/interface/L3NominalEfficiencyConfigurator.h"
#include "RecoMuon/MuonIsolation/interface/IsolatorByNominalEfficiency.h"

using namespace muonisolation;
Expand Down
12 changes: 0 additions & 12 deletions RecoMuon/L3MuonIsolationProducer/src/SealModule.cc

This file was deleted.

Loading