From de47aa44b0898e409603728f3616ec256e624682 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 2 Dec 2016 16:35:41 +0100 Subject: [PATCH] Remove *TracksForL3Isolation_cf*.py and IsolationRegionAroundL3Muon as obsolete --- .../python/PixelTracksForL3Isolation_cff.py | 6 -- .../python/PixelTracksForL3Isolation_cfi.py | 19 ---- .../RegionalCKFTracksForL3Isolation_cff.py | 10 -- .../RegionalCKFTracksForL3Isolation_cfi.py | 26 ----- .../src/IsolationRegionAroundL3Muon.h | 102 ------------------ .../L3MuonIsolationProducer/src/SealModule.cc | 6 -- 6 files changed, 169 deletions(-) delete mode 100644 RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cff.py delete mode 100644 RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cfi.py delete mode 100644 RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cff.py delete mode 100644 RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cfi.py delete mode 100644 RecoMuon/L3MuonIsolationProducer/src/IsolationRegionAroundL3Muon.h diff --git a/RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cff.py b/RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cff.py deleted file mode 100644 index bcde932e49e9c..0000000000000 --- a/RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cff.py +++ /dev/null @@ -1,6 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import * -from RecoMuon.L3MuonIsolationProducer.PixelTracksForL3Isolation_cfi import * - - diff --git a/RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cfi.py b/RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cfi.py deleted file mode 100644 index a201948dea995..0000000000000 --- a/RecoMuon/L3MuonIsolationProducer/python/PixelTracksForL3Isolation_cfi.py +++ /dev/null @@ -1,19 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -import RecoPixelVertexing.PixelTrackFitting.PixelTracks_cfi -pixelTracksForL3Isolation = RecoPixelVertexing.PixelTrackFitting.PixelTracks_cfi.pixelTracks.clone() -pixelTracksForL3Isolation.RegionFactoryPSet.ComponentName = 'IsolationRegionAroundL3Muon' -pixelTracksForL3Isolation.RegionFactoryPSet.RegionPSet = cms.PSet( - deltaPhiRegion = cms.double(0.24), - TrkSrc = cms.InputTag("L3Muons"), - originHalfLength = cms.double(15.0), - deltaEtaRegion = cms.double(0.24), - vertexZDefault = cms.double(0.0), - vertexSrc = cms.InputTag(""), - originRadius = cms.double(0.2), - vertexZConstrained = cms.bool(False), - ptMin = cms.double(1.0), - measurementTrackerName = cms.string("") -) - - diff --git a/RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cff.py b/RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cff.py deleted file mode 100644 index 017713eb7709d..0000000000000 --- a/RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cff.py +++ /dev/null @@ -1,10 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from RecoTracker.TkSeedGenerator.GlobalPixelSeeds_cff import * -from RecoTracker.Configuration.RecoTracker_cff import * -from TrackingTools.Configuration.TrackingTools_cff import * -from RecoMuon.Configuration.RecoMuon_cff import * -from RecoTracker.CkfPattern.CkfTrajectoryBuilder_cff import * -from RecoMuon.L3MuonIsolationProducer.RegionalCKFTracksForL3Isolation_cfi import * - - diff --git a/RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cfi.py b/RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cfi.py deleted file mode 100644 index e30f1fd0011a6..0000000000000 --- a/RecoMuon/L3MuonIsolationProducer/python/RegionalCKFTracksForL3Isolation_cfi.py +++ /dev/null @@ -1,26 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -import RecoTracker.TkSeedGenerator.GlobalPixelSeeds_cff -regionalSeedsForL3Isolation = RecoTracker.TkSeedGenerator.GlobalPixelSeeds_cff.globalPixelSeeds.clone() -import RecoTracker.CkfPattern.CkfTrackCandidates_cfi -regionalCandidatesForL3Isolation = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone() -import RecoTracker.TrackProducer.TrackProducer_cfi -regionalTracksForL3Isolation = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone() -regionalCKFTracksForL3Isolation = cms.Sequence(regionalSeedsForL3Isolation*regionalCandidatesForL3Isolation*regionalTracksForL3Isolation) -regionalSeedsForL3Isolation.RegionFactoryPSet.ComponentName = 'IsolationRegionAroundL3Muon' -regionalSeedsForL3Isolation.RegionFactoryPSet.RegionPSet = cms.PSet( - deltaPhiRegion = cms.double(0.24), - TrkSrc = cms.InputTag("L3Muons"), - originHalfLength = cms.double(15.0), - deltaEtaRegion = cms.double(0.24), - vertexZDefault = cms.double(0.0), - vertexSrc = cms.InputTag(""), - originRadius = cms.double(0.2), - vertexZConstrained = cms.bool(False), - ptMin = cms.double(1.0), - measurementTrackerName = cms.string("") -) -regionalCandidatesForL3Isolation.src = cms.InputTag('regionalSeedsForL3Isolation') -regionalTracksForL3Isolation.src = 'regionalCandidatesForL3Isolation' - - diff --git a/RecoMuon/L3MuonIsolationProducer/src/IsolationRegionAroundL3Muon.h b/RecoMuon/L3MuonIsolationProducer/src/IsolationRegionAroundL3Muon.h deleted file mode 100644 index 845c62d4ecbf1..0000000000000 --- a/RecoMuon/L3MuonIsolationProducer/src/IsolationRegionAroundL3Muon.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef RecoMuon_L3MuonIsolationProducer_IsolationRegionAroundL3Muon_H -#define RecoMuon_L3MuonIsolationProducer_IsolationRegionAroundL3Muon_H - -#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h" -#include "RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h" -#include "RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h" -#include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" -#include "DataFormats/VertexReco/interface/Vertex.h" -#include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "DataFormats/TrackReco/interface/Track.h" -#include "FWCore/Framework/interface/ConsumesCollector.h" - - -class IsolationRegionAroundL3Muon : public TrackingRegionProducer { - -public: - - IsolationRegionAroundL3Muon(const edm::ParameterSet& cfg, - edm::ConsumesCollector && iC) { - - edm::ParameterSet regionPSet = cfg.getParameter("RegionPSet"); - - theVertexSrc = regionPSet.getParameter("vertexSrc"); - if (theVertexSrc.label().length()>1) theVertexToken = iC.consumes(theVertexSrc); - theInputTrkToken = iC.consumes(regionPSet.getParameter("TrkSrc")); - - thePtMin = regionPSet.getParameter("ptMin"); - theOriginRadius = regionPSet.getParameter("originRadius"); - theOriginHalfLength = regionPSet.getParameter("originHalfLength"); - theVertexZconstrained = regionPSet.getParameter("vertexZConstrained"); - theOriginZPos = regionPSet.getParameter("vertexZDefault"); - - theDeltaEta = regionPSet.getParameter("deltaEtaRegion"); - theDeltaPhi = regionPSet.getParameter("deltaPhiRegion"); - theMeasurementTrackerToken = iC.consumes(regionPSet.getParameter("measurementTrackerName")); - } - - virtual ~IsolationRegionAroundL3Muon(){} - - virtual std::vector > regions(const edm::Event& ev, - const edm::EventSetup& es) const override { - - std::vector > result; - - // optional constraint for vertex - // get highest Pt pixel vertex (if existing) - double deltaZVertex = theOriginHalfLength; - double originz = theOriginZPos; - if (theVertexSrc.label().length()>1) { - edm::Handle vertices; - ev.getByToken(theVertexToken,vertices); - const reco::VertexCollection vertCollection = *(vertices.product()); - reco::VertexCollection::const_iterator ci = vertCollection.begin(); - if (vertCollection.size()>0) { - originz = ci->z(); - } else { - originz = theOriginZPos; - deltaZVertex = 15.; - } - } - - edm::Handle trks; - ev.getByToken(theInputTrkToken, trks); - - edm::Handle hmte; - ev.getByToken(theMeasurementTrackerToken, hmte); - const MeasurementTrackerEvent *measurementTrackerEvent = hmte.product(); - - for(reco::TrackCollection::const_iterator iTrk = trks->begin();iTrk != trks->end();iTrk++) { - double vz = (theVertexZconstrained) ? iTrk->dz() : originz; - GlobalVector dirVector((iTrk)->px(),(iTrk)->py(),(iTrk)->pz()); - result.push_back( - std::make_unique( dirVector, GlobalPoint(0,0,float(vz)), - thePtMin, theOriginRadius, deltaZVertex, theDeltaEta, theDeltaPhi, - RectangularEtaPhiTrackingRegion::UseMeasurementTracker::kForSiStrips, - true,measurementTrackerEvent) ); - } - - return result; - } - -private: - - edm::InputTag theVertexSrc; - edm::EDGetTokenT theVertexToken; - edm::EDGetTokenT theInputTrkToken; - - double thePtMin; - double theOriginRadius; - double theOriginHalfLength; - bool theVertexZconstrained; - double theOriginZPos; - - double theDeltaEta; - double theDeltaPhi; - edm::EDGetTokenT theMeasurementTrackerToken; -}; - -#endif - diff --git a/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc b/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc index 45fba1a044c37..3249312b2d406 100755 --- a/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc +++ b/RecoMuon/L3MuonIsolationProducer/src/SealModule.cc @@ -11,12 +11,6 @@ DEFINE_FWK_MODULE(L3MuonIsolationProducer); #include "L3MuonCombinedRelativeIsolationProducer.h" DEFINE_FWK_MODULE(L3MuonCombinedRelativeIsolationProducer); -#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducerFactory.h" -#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h" -#include "IsolationRegionAroundL3Muon.h" - -DEFINE_EDM_PLUGIN(TrackingRegionProducerFactory, IsolationRegionAroundL3Muon, "IsolationRegionAroundL3Muon"); - #include "RecoMuon/L3MuonIsolationProducer/src/L3MuonSumCaloPFIsolationProducer.h" DEFINE_FWK_MODULE(L3MuonSumCaloPFIsolationProducer);