diff --git a/Calibration/IsolatedParticles/interface/MatchingSimTrack.h b/Calibration/IsolatedParticles/interface/MatchingSimTrack.h index bf1c84d67b76b..65651476041e6 100644 --- a/Calibration/IsolatedParticles/interface/MatchingSimTrack.h +++ b/Calibration/IsolatedParticles/interface/MatchingSimTrack.h @@ -22,7 +22,6 @@ #include "SimDataFormats/Vertex/interface/SimVertexContainer.h" #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" namespace spr { diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc index 7ec5dc03c3392..9363fde7f1ca7 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc @@ -71,7 +71,6 @@ #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" // track associator #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc index b11c09ba028e5..4d9a6fc653808 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc @@ -101,7 +101,6 @@ #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" // tracker hit associator -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" #include "RecoCaloTools/Navigation/interface/CaloNavigator.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc index e3670218df38b..446b3ea5c36e8 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc @@ -92,7 +92,6 @@ #include "SimDataFormats/Vertex/interface/SimVertexContainer.h" // track associator -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc index 259a05b66da96..72967463cfc1a 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc @@ -134,7 +134,6 @@ #include "SimDataFormats/Vertex/interface/SimVertexContainer.h" // track associator -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc index e15be0e8a046d..5ae0ae1fb3e00 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc @@ -35,7 +35,6 @@ #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" // track associator #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" diff --git a/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml b/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml index afa7f595a4ced..e106085532aff 100644 --- a/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml +++ b/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc b/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc index 2b086f298ae2d..105136a983d22 100644 --- a/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc +++ b/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc @@ -56,7 +56,6 @@ #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h" #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include #include "CommonTools/Utils/interface/StringCutObjectSelector.h" diff --git a/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc b/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc index 22ddcda9f2bf0..8b2e15211990d 100644 --- a/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc +++ b/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc @@ -26,7 +26,6 @@ #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" #include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h" #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #define MAX_THR 1e7 diff --git a/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis b/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis index 2733e30a3c33e..8a854e8cc095e 100644 --- a/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis +++ b/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis @@ -1,5 +1,4 @@ - diff --git a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml index 190b1e5e60c2e..8c0202df544b6 100644 --- a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml +++ b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml @@ -1,8 +1,8 @@ - + diff --git a/RecoVertex/KalmanVertexFit/plugins/KVFTrackUpdate.cc b/RecoVertex/KalmanVertexFit/plugins/KVFTrackUpdate.cc index 4c0426ad7b072..ed4f6007e1ff2 100644 --- a/RecoVertex/KalmanVertexFit/plugins/KVFTrackUpdate.cc +++ b/RecoVertex/KalmanVertexFit/plugins/KVFTrackUpdate.cc @@ -9,7 +9,6 @@ #include "TrackingTools/TransientTrack/interface/TransientTrack.h" #include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "RecoVertex/KalmanVertexFit/interface/SingleTrackVertexConstraint.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h b/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h deleted file mode 100644 index ea641728df1ec..0000000000000 --- a/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef MuonToSimAssociatorBase_h -#define MuonToSimAssociatorBase_h - -#include "DataFormats/Common/interface/Handle.h" -#include "DataFormats/Common/interface/Ref.h" -#include "DataFormats/MuonReco/interface/Muon.h" -#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" - -class TrackerTopology; - -class MuonToSimAssociatorBase { -public: - MuonToSimAssociatorBase(); - virtual ~MuonToSimAssociatorBase(); - - enum MuonTrackType { InnerTk, OuterTk, GlobalTk, Segments }; - - struct RefToBaseSort { - template - bool operator()(const edm::RefToBase &r1, const edm::RefToBase &r2) const { - return (r1.id() == r2.id() ? r1.key() < r2.key() : r1.id() < r2.id()); - } - }; - typedef std::map, std::vector>, RefToBaseSort> - MuonToSimCollection; - typedef std::map, double>>> SimToMuonCollection; - - virtual void associateMuons(MuonToSimCollection &recoToSim, - SimToMuonCollection &simToReco, - const edm::RefToBaseVector &, - MuonTrackType, - const edm::RefVector &, - const edm::Event *event = nullptr, - const edm::EventSetup *setup = nullptr) const = 0; - - virtual void associateMuons(MuonToSimCollection &recoToSim, - SimToMuonCollection &simToReco, - const edm::Handle> &, - MuonTrackType, - const edm::Handle &, - const edm::Event *event = nullptr, - const edm::EventSetup *setup = nullptr) const = 0; -}; - -#endif diff --git a/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h b/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h deleted file mode 100644 index 82c76c9a4e8d6..0000000000000 --- a/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef MuonToSimAssociatorByHits_h -#define MuonToSimAssociatorByHits_h - -#include "FWCore/Framework/interface/ConsumesCollector.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h" - -#include "SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h" -#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" - -class MuonToSimAssociatorByHits : public MuonToSimAssociatorBase { -public: - MuonToSimAssociatorByHits(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC); - ~MuonToSimAssociatorByHits() override; - - void associateMuons(MuonToSimCollection &recoToSim, - SimToMuonCollection &simToReco, - const edm::RefToBaseVector &, - MuonTrackType, - const edm::RefVector &, - const edm::Event *event = nullptr, - const edm::EventSetup *setup = nullptr) const override; - - void associateMuons(MuonToSimCollection &recoToSim, - SimToMuonCollection &simToReco, - const edm::Handle> &, - MuonTrackType, - const edm::Handle &, - const edm::Event *event = nullptr, - const edm::EventSetup *setup = nullptr) const override; - -private: - MuonAssociatorByHitsHelper helper_; - edm::ParameterSet const conf_; - TrackerHitAssociator::Config trackerHitAssociatorConfig_; -}; - -#endif diff --git a/SimMuon/MCTruth/plugins/BuildFile.xml b/SimMuon/MCTruth/plugins/BuildFile.xml index 1dc8c8c33d871..ba294d90ef1b3 100644 --- a/SimMuon/MCTruth/plugins/BuildFile.xml +++ b/SimMuon/MCTruth/plugins/BuildFile.xml @@ -6,10 +6,10 @@ + - diff --git a/SimMuon/MCTruth/plugins/MuonSimClassifier.cc b/SimMuon/MCTruth/plugins/MuonSimClassifier.cc index 7788dc18362aa..e6a18e89e2a2d 100644 --- a/SimMuon/MCTruth/plugins/MuonSimClassifier.cc +++ b/SimMuon/MCTruth/plugins/MuonSimClassifier.cc @@ -61,7 +61,6 @@ #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h" #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "CommonTools/Utils/interface/StringCutObjectSelector.h" diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc deleted file mode 100644 index e823d4c04f713..0000000000000 --- a/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc +++ /dev/null @@ -1,34 +0,0 @@ -// -*- C++ -*- -// -// Package: SimMuon/MCTruth -// Class : MuonToSimAssociatorBase -// -// Implementation: -// [Notes on implementation] -// -// Original Author: Christopher Jones -// Created: Tue, 06 Jan 2015 20:14:49 GMT -// - -// system include files - -// user include files -#include "FWCore/Utilities/interface/typelookup.h" -#include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h" - -// -// constants, enums and typedefs -// - -// -// static data member definitions -// - -// -// constructors and destructor -// -MuonToSimAssociatorBase::MuonToSimAssociatorBase() {} - -MuonToSimAssociatorBase::~MuonToSimAssociatorBase() {} - -TYPELOOKUP_DATA_REG(MuonToSimAssociatorBase); diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc deleted file mode 100644 index d34ce7951cdb5..0000000000000 --- a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc +++ /dev/null @@ -1,160 +0,0 @@ -#include "DataFormats/CSCRecHit/interface/CSCSegment.h" -#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h" -#include "DataFormats/DetId/interface/DetId.h" -#include "DataFormats/MuonDetId/interface/MuonSubdetId.h" -#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "DataFormats/SiStripDetId/interface/StripSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h" -#include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h" -#include - -using namespace reco; -using namespace std; - -MuonToSimAssociatorByHits::MuonToSimAssociatorByHits(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC) - : helper_(conf), conf_(conf), trackerHitAssociatorConfig_(conf, std::move(iC)) { - TrackerMuonHitExtractor hitExtractor(conf_, std::move(iC)); - - // hack for consumes - RPCHitAssociator rpctruth(conf, std::move(iC)); - GEMHitAssociator gemtruth(conf, std::move(iC)); - DTHitAssociator dttruth(conf, std::move(iC)); - CSCHitAssociator muonTruth(conf, std::move(iC)); -} - -MuonToSimAssociatorByHits::~MuonToSimAssociatorByHits() {} - -void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection &recToSim, - SimToMuonCollection &simToRec, - const edm::Handle> &tCH, - MuonTrackType type, - const edm::Handle &tPCH, - const edm::Event *event, - const edm::EventSetup *setup) const { - edm::RefVector tpc(tPCH.id()); - for (unsigned int j = 0; j < tPCH->size(); j++) - tpc.push_back(edm::Ref(tPCH, j)); - - edm::RefToBaseVector muonBaseRefVector; - for (size_t i = 0; i < tCH->size(); ++i) - muonBaseRefVector.push_back(tCH->refAt(i)); - - associateMuons(recToSim, simToRec, muonBaseRefVector, type, tpc, event, setup); -} - -void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection &recToSim, - SimToMuonCollection &simToRec, - const edm::RefToBaseVector &muons, - MuonTrackType trackType, - const edm::RefVector &tPC, - const edm::Event *event, - const edm::EventSetup *setup) const { - /// PART 1: Fill MuonToSimAssociatorByHits::TrackHitsCollection - MuonAssociatorByHitsHelper::TrackHitsCollection muonHitRefs; - edm::OwnVector allTMRecHits; // this I will fill in only for tracker muon hits from - // segments - switch (trackType) { - case InnerTk: - for (edm::RefToBaseVector::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) { - edm::RefToBase mur = *it; - if (mur->track().isNonnull()) { - muonHitRefs.push_back(std::make_pair(mur->track()->recHitsBegin(), mur->track()->recHitsEnd())); - } else { - muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end())); - } - } - break; - case OuterTk: - for (edm::RefToBaseVector::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) { - edm::RefToBase mur = *it; - if (mur->outerTrack().isNonnull()) { - muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd())); - } else { - muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end())); - } - } - break; - case GlobalTk: - for (edm::RefToBaseVector::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) { - edm::RefToBase mur = *it; - if (mur->globalTrack().isNonnull()) { - muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd())); - } else { - muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end())); - } - } - break; - case Segments: { - TrackerMuonHitExtractor hitExtractor(conf_); - hitExtractor.init(*event, *setup); - // puts hits in the vector, and record indices - std::vector> muonHitIndices; - for (edm::RefToBaseVector::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) { - edm::RefToBase mur = *it; - std::pair indices(allTMRecHits.size(), allTMRecHits.size()); - if (mur->isTrackerMuon()) { - std::vector hits = hitExtractor.getMuonHits(*mur); - for (std::vector::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh; - ++ith) { - allTMRecHits.push_back(**ith); - } - indices.second += hits.size(); - } - muonHitIndices.push_back(indices); - } - // convert indices into pairs of iterators to references - typedef std::pair index_pair; - trackingRecHit_iterator hitRefBegin = allTMRecHits.data().begin(); - for (std::vector>::const_iterator idxs = muonHitIndices.begin(), - idxend = muonHitIndices.end(); - idxs != idxend; - ++idxs) { - muonHitRefs.push_back(std::make_pair(hitRefBegin + idxs->first, hitRefBegin + idxs->second)); - } - - } break; - } - - /// PART 2: call the association routines - // Retrieve tracker topology from geometry - edm::ESHandle tTopoHand; - setup->get().get(tTopoHand); - const TrackerTopology *tTopo = tTopoHand.product(); - - // Tracker hit association - TrackerHitAssociator trackertruth(*event, trackerHitAssociatorConfig_); - // CSC hit association - CSCHitAssociator csctruth(*event, *setup, conf_); - // DT hit association - bool printRtS = true; - DTHitAssociator dttruth(*event, *setup, conf_, printRtS); - // RPC hit association - RPCHitAssociator rpctruth(*event, *setup, conf_); - // GEM hit association - GEMHitAssociator gemtruth(*event, *setup, conf_); - - MuonAssociatorByHitsHelper::Resources resources = { - tTopo, &trackertruth, &csctruth, &dttruth, &rpctruth, &gemtruth, {}}; - - auto recSimColl = helper_.associateRecoToSimIndices(muonHitRefs, tPC, resources); - for (auto it = recSimColl.begin(), ed = recSimColl.end(); it != ed; ++it) { - edm::RefToBase rec = muons[it->first]; - std::vector> &tpAss = recToSim[rec]; - for (auto const &a : it->second) { - tpAss.push_back(std::make_pair(tPC[a.idx], a.quality)); - } - } - auto simRecColl = helper_.associateSimToRecoIndices(muonHitRefs, tPC, resources); - for (auto it = simRecColl.begin(), ed = simRecColl.end(); it != ed; ++it) { - TrackingParticleRef sim = tPC[it->first]; - std::vector, double>> &recAss = simToRec[sim]; - for (auto const &a : it->second) { - recAss.push_back(std::make_pair(muons[a.idx], a.quality)); - } - } -} diff --git a/SimMuon/MCTruth/test/BuildFile.xml b/SimMuon/MCTruth/test/BuildFile.xml index 4e69410ccc547..25633ab5e59bd 100644 --- a/SimMuon/MCTruth/test/BuildFile.xml +++ b/SimMuon/MCTruth/test/BuildFile.xml @@ -5,7 +5,6 @@ - diff --git a/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc b/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc deleted file mode 100644 index 3d51f85ab2c6f..0000000000000 --- a/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc +++ /dev/null @@ -1,164 +0,0 @@ -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" -#include - -#include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" - -#include -#include -#include - -class testAssociatorRecoMuon : public edm::EDAnalyzer { -public: - testAssociatorRecoMuon(const edm::ParameterSet &); - ~testAssociatorRecoMuon() override; - void analyze(const edm::Event &, const edm::EventSetup &) override; - -private: - edm::InputTag muonsTag; - edm::InputTag tpTag; - - std::string associatorLabel_; - - MuonToSimAssociatorBase::MuonTrackType trackType_; -}; - -#include "DataFormats/MuonReco/interface/Muon.h" -#include "DataFormats/TrackReco/interface/Track.h" -#include "DataFormats/TrackReco/interface/TrackFwd.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" - -testAssociatorRecoMuon::testAssociatorRecoMuon(const edm::ParameterSet &parset) - : muonsTag(parset.getParameter("muonsTag")), - tpTag(parset.getParameter("tpTag")), - associatorLabel_(parset.getParameter("associatorLabel")) { - std::string trackType = parset.getParameter("trackType"); - if (trackType == "inner") - trackType_ = MuonToSimAssociatorBase::InnerTk; - else if (trackType == "outer") - trackType_ = MuonToSimAssociatorBase::OuterTk; - else if (trackType == "global") - trackType_ = MuonToSimAssociatorBase::GlobalTk; - else if (trackType == "segments") - trackType_ = MuonToSimAssociatorBase::Segments; - else - throw cms::Exception("Configuration") << "Track type '" << trackType << "' not supported.\n"; -} - -testAssociatorRecoMuon::~testAssociatorRecoMuon() {} - -void testAssociatorRecoMuon::analyze(const edm::Event &event, const edm::EventSetup &setup) { - edm::ESHandle associatorBase; - setup.get().get(associatorLabel_, associatorBase); - const MuonToSimAssociatorBase *assoByHits = associatorBase.product(); - if (assoByHits == nullptr) - throw cms::Exception("Configuration") - << "The Track Associator with label '" << associatorLabel_ << "' is not a MuonAssociatorByHits.\n"; - - edm::Handle> muonCollectionH; - LogTrace("testAssociatorRecoMuon") << "getting reco::Track collection " << muonsTag; - event.getByLabel(muonsTag, muonCollectionH); - - const edm::View muonCollection = *(muonCollectionH.product()); - LogTrace("testAssociatorRecoMuon") << "...size = " << muonCollection.size(); - - edm::Handle TPCollectionH; - LogTrace("testAssociatorRecoMuon") << "getting TrackingParticle collection " << tpTag; - event.getByLabel(tpTag, TPCollectionH); - - LogTrace("testAssociatorRecoMuon") << "...size = " << TPCollectionH->size(); - - edm::LogVerbatim("testAssociatorRecoMuon") << "\n === Event ID = " << event.id() << " ==="; - - // RECOTOSIM - edm::LogVerbatim("testAssociatorRecoMuon") << "\n ****************** Reco To Sim " - "****************** "; - - MuonToSimAssociatorBase::MuonToSimCollection recSimColl; - MuonToSimAssociatorBase::SimToMuonCollection simRecColl; - - assoByHits->associateMuons(recSimColl, simRecColl, muonCollectionH, trackType_, TPCollectionH, &event, &setup); - - edm::LogVerbatim("testAssociatorRecoMuon") << "\n There are " << muonCollection.size() << " reco::Muon " - << "(" << recSimColl.size() << " matched) \n"; - - for (edm::View::size_type i = 0; i < muonCollection.size(); ++i) { - edm::RefToBase track(muonCollectionH, i); - - if (recSimColl.find(track) != recSimColl.end()) { - std::vector> recSimAsso = recSimColl[track]; - - for (std::vector>::const_iterator IT = recSimAsso.begin(); - IT != recSimAsso.end(); - ++IT) { - TrackingParticleRef trpart = IT->first; - double purity = IT->second; - edm::LogVerbatim("testAssociatorRecoMuon") - << "reco::Muon #" << int(i) << " with pt = " << track->pt() << " associated to TrackingParticle #" - << trpart.key() << " (pdgId = " << trpart->pdgId() << ", pt = " << trpart->pt() - << ") with Quality = " << purity; - } - } else { - edm::LogVerbatim("testAssociatorRecoMuon") - << "reco::Muon #" << int(i) << " with pt = " << track->pt() << " NOT associated to any TrackingParticle" - << "\n"; - } - } - - // SIMTORECO - edm::LogVerbatim("testAssociatorRecoMuon") << "\n ****************** Sim To Reco " - "****************** "; - - edm::LogVerbatim("testAssociatorRecoMuon") << "\n There are " << TPCollectionH->size() << " TrackingParticles " - << "(" << simRecColl.size() << " matched) \n"; - - bool any_trackingParticle_matched = false; - - for (TrackingParticleCollection::size_type i = 0; i < TPCollectionH->size(); i++) { - TrackingParticleRef trpart(TPCollectionH, i); - - std::vector, double>> simRecAsso; - if (simRecColl.find(trpart) != simRecColl.end()) { - simRecAsso = simRecColl[trpart]; - - for (std::vector, double>>::const_iterator IT = simRecAsso.begin(); - IT != simRecAsso.end(); - ++IT) { - edm::RefToBase track = IT->first; - double quality = IT->second; - any_trackingParticle_matched = true; - - // find the purity from RecoToSim association (set purity = -1 for - // unmatched recoToSim) - double purity = -1.; - if (recSimColl.find(track) != recSimColl.end()) { - std::vector> recSimAsso = recSimColl[track]; - for (std::vector>::const_iterator ITS = recSimAsso.begin(); - ITS != recSimAsso.end(); - ++ITS) { - TrackingParticleRef tp(ITS->first); - if (tp == trpart) - purity = ITS->second; - } - } - - edm::LogVerbatim("testAssociatorRecoMuon") - << "TrackingParticle #" << int(i) << " with pdgId = " << trpart->pdgId() << ", pt = " << trpart->pt() - << " associated to reco::Muon #" << track.key() << " (pt = " << track->pt() - << ") with Quality = " << quality << " and Purity = " << purity; - } - } - } - if (!any_trackingParticle_matched) { - edm::LogVerbatim("testAssociatorRecoMuon") << "NO TrackingParticle associated to ANY input reco::Muon !" - << "\n"; - } -} -#include "FWCore/Framework/interface/MakerMacros.h" -DEFINE_FWK_MODULE(testAssociatorRecoMuon); diff --git a/SimTracker/Records/BuildFile.xml b/SimTracker/Records/BuildFile.xml deleted file mode 100644 index eb2b497f90bb1..0000000000000 --- a/SimTracker/Records/BuildFile.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/SimTracker/Records/doc/Records.doc b/SimTracker/Records/doc/Records.doc deleted file mode 100644 index 1f4b9c14822c7..0000000000000 --- a/SimTracker/Records/doc/Records.doc +++ /dev/null @@ -1,42 +0,0 @@ - -/*! - -\page SimTracker_Records Package SimTracker/Records - -
- - - -Source code (CVS tag: @CVS_TAG@) - -Administrative privileges - -
- -\section desc Description - - -This package store the records of Track and Vertex Associators - -\subsection interface Public interface - - -- TrackAssociatorRecord -- VertexAssociatorRecord - -\subsection modules Modules - - - -\subsection tests Unit tests and examples - - - -\section status Status and planned development - -completed - -
-Last updated: -@DATE@ Author: G. Cerati -*/ - diff --git a/SimTracker/Records/interface/TrackAssociatorRecord.h b/SimTracker/Records/interface/TrackAssociatorRecord.h deleted file mode 100644 index afdb3f58a4c00..0000000000000 --- a/SimTracker/Records/interface/TrackAssociatorRecord.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef SimTracker_TrackAssociatorRecord_h -#define SimTracker_TrackAssociatorRecord_h - -/** \class TrackAssociatorRecord - * Record of Tracs Associators - * - * \author cerati - */ - -#include "FWCore/Framework/interface/DependentRecordImplementation.h" -#include "FWCore/Framework/interface/EventSetupRecordImplementation.h" -#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" -#include "TrackingTools/Records/interface/TrackingComponentsRecord.h" - -#include "FWCore/Utilities/interface/mplVector.h" - -class TrackAssociatorRecord - : public edm::eventsetup::DependentRecordImplementation< - TrackAssociatorRecord, - edm::mpl::Vector> {}; - -#endif diff --git a/SimTracker/Records/src/TrackAssociatorRecord.cc b/SimTracker/Records/src/TrackAssociatorRecord.cc deleted file mode 100644 index 624331aa332ea..0000000000000 --- a/SimTracker/Records/src/TrackAssociatorRecord.cc +++ /dev/null @@ -1,15 +0,0 @@ -// -*- C++ -*- -// -// Package: Records -// Class : TrackAssociatorRecord -// -// Implementation: -// -// -// Author: -// Created: Mon Sep 11 17:54:35 CEST 2006 - -#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" - -EVENTSETUP_RECORD_REG(TrackAssociatorRecord); diff --git a/SimTracker/TrackAssociation/plugins/BuildFile.xml b/SimTracker/TrackAssociation/plugins/BuildFile.xml index 53bafb604988e..fb3fec56f7d9d 100644 --- a/SimTracker/TrackAssociation/plugins/BuildFile.xml +++ b/SimTracker/TrackAssociation/plugins/BuildFile.xml @@ -1,10 +1,10 @@ - + diff --git a/SimTracker/TrackHistory/BuildFile.xml b/SimTracker/TrackHistory/BuildFile.xml index dae2984c69973..22aebf3986744 100644 --- a/SimTracker/TrackHistory/BuildFile.xml +++ b/SimTracker/TrackHistory/BuildFile.xml @@ -11,7 +11,6 @@ - diff --git a/SimTracker/TrackHistory/src/TrackHistory.cc b/SimTracker/TrackHistory/src/TrackHistory.cc index f52862a2b75d0..017b087625f53 100644 --- a/SimTracker/TrackHistory/src/TrackHistory.cc +++ b/SimTracker/TrackHistory/src/TrackHistory.cc @@ -1,5 +1,4 @@ -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/TrackHistory/interface/TrackHistory.h" TrackHistory::TrackHistory(const edm::ParameterSet &config, edm::ConsumesCollector &&collector) : HistoryBase() { diff --git a/SimTracker/VertexAssociation/test/BuildFile.xml b/SimTracker/VertexAssociation/test/BuildFile.xml index 95b0652d71511..ca00dd96352d1 100644 --- a/SimTracker/VertexAssociation/test/BuildFile.xml +++ b/SimTracker/VertexAssociation/test/BuildFile.xml @@ -6,7 +6,6 @@ - diff --git a/SimTracker/VertexAssociation/test/testVertexAssociator.cc b/SimTracker/VertexAssociation/test/testVertexAssociator.cc index b238910f4254c..d03f73363d944 100644 --- a/SimTracker/VertexAssociation/test/testVertexAssociator.cc +++ b/SimTracker/VertexAssociation/test/testVertexAssociator.cc @@ -9,7 +9,6 @@ #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h" #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/VertexAssociation/test/testVertexAssociator.h" #include "CommonTools/Statistics/interface/ChiSquaredProbability.h" diff --git a/Validation/RecoEgamma/plugins/BuildFile.xml b/Validation/RecoEgamma/plugins/BuildFile.xml index 2403d4c81724f..e0f92d206aa53 100644 --- a/Validation/RecoEgamma/plugins/BuildFile.xml +++ b/Validation/RecoEgamma/plugins/BuildFile.xml @@ -18,7 +18,6 @@ - diff --git a/Validation/RecoEgamma/plugins/TkConvValidator.cc b/Validation/RecoEgamma/plugins/TkConvValidator.cc index 31c0e77a15a4e..ee356afeb1e52 100644 --- a/Validation/RecoEgamma/plugins/TkConvValidator.cc +++ b/Validation/RecoEgamma/plugins/TkConvValidator.cc @@ -21,7 +21,6 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h" // #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/Validation/RecoMuon/plugins/BuildFile.xml b/Validation/RecoMuon/plugins/BuildFile.xml index 44f272c4ebb8a..63b5e07f234b1 100644 --- a/Validation/RecoMuon/plugins/BuildFile.xml +++ b/Validation/RecoMuon/plugins/BuildFile.xml @@ -9,7 +9,6 @@ - diff --git a/Validation/RecoMuon/plugins/MuonTrackValidator.h b/Validation/RecoMuon/plugins/MuonTrackValidator.h index a8a43bf300d03..517329ba21f7c 100644 --- a/Validation/RecoMuon/plugins/MuonTrackValidator.h +++ b/Validation/RecoMuon/plugins/MuonTrackValidator.h @@ -14,7 +14,6 @@ #include "SimDataFormats/Associations/interface/TrackAssociation.h" #include "DQMServices/Core/interface/DQMEDAnalyzer.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h" #include "SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h" diff --git a/Validation/RecoTrack/plugins/BuildFile.xml b/Validation/RecoTrack/plugins/BuildFile.xml index 0cd8b0b15dc91..b0284ed3f3618 100644 --- a/Validation/RecoTrack/plugins/BuildFile.xml +++ b/Validation/RecoTrack/plugins/BuildFile.xml @@ -14,7 +14,6 @@ - diff --git a/Validation/RecoTrack/plugins/TrackingNtuple.cc b/Validation/RecoTrack/plugins/TrackingNtuple.cc index 237ae41e31ec0..4f82fe9dd366d 100644 --- a/Validation/RecoTrack/plugins/TrackingNtuple.cc +++ b/Validation/RecoTrack/plugins/TrackingNtuple.cc @@ -71,7 +71,6 @@ #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h" #include "SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h" #include "SimTracker/TrackerHitAssociation/interface/ClusterTPAssociation.h" diff --git a/Validation/RecoVertex/src/PrimaryVertexAnalyzer4PUSlimmed.cc b/Validation/RecoVertex/src/PrimaryVertexAnalyzer4PUSlimmed.cc index 3e4ad5e3246e9..b11fef25e0c7e 100644 --- a/Validation/RecoVertex/src/PrimaryVertexAnalyzer4PUSlimmed.cc +++ b/Validation/RecoVertex/src/PrimaryVertexAnalyzer4PUSlimmed.cc @@ -14,7 +14,6 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h" // associator -#include "SimTracker/Records/interface/TrackAssociatorRecord.h" #include "SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h" // DQM