diff --git a/Validation/RecoTrack/plugins/SimpleTrackValidation.cc b/Validation/RecoTrack/plugins/SimpleTrackValidation.cc index 6e3b87c6f53..0bb9040ca1a 100644 --- a/Validation/RecoTrack/plugins/SimpleTrackValidation.cc +++ b/Validation/RecoTrack/plugins/SimpleTrackValidation.cc @@ -4,7 +4,6 @@ #include "TTree.h" #include "TFile.h" - // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/one/EDAnalyzer.h" @@ -36,8 +35,6 @@ public: static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - - void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; @@ -56,15 +53,14 @@ private: std::vector>> trackTokens_; edm::EDGetTokenT trackAssociatorToken_; edm::EDGetTokenT trackingParticleToken_; - }; SimpleTrackValidation::SimpleTrackValidation(const edm::ParameterSet& iConfig) : trackLabels_(iConfig.getParameter>("trackLabels")), - trackAssociatorToken_(consumes(iConfig.getUntrackedParameter("trackAssociator"))), - trackingParticleToken_(consumes(iConfig.getParameter< edm::InputTag >("trackingParticles"))) -{ - + trackAssociatorToken_(consumes( + iConfig.getUntrackedParameter("trackAssociator"))), + trackingParticleToken_( + consumes(iConfig.getParameter("trackingParticles"))) { for (auto& itag : trackLabels_) { trackTokens_.push_back(consumes>(itag)); } @@ -85,12 +81,11 @@ SimpleTrackValidation::SimpleTrackValidation(const edm::ParameterSet& iConfig) iConfig.getParameter("maxPhiTP")); } -SimpleTrackValidation::~SimpleTrackValidation(){} +SimpleTrackValidation::~SimpleTrackValidation() {} void SimpleTrackValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - using namespace edm; - + auto const& associatorByHits = iEvent.get(trackAssociatorToken_); TrackingParticleRefVector tpCollection; @@ -103,17 +98,15 @@ void SimpleTrackValidation::analyze(const edm::Event& iEvent, const edm::EventSe tpCollection.push_back(tp); } } - - for (const auto& trackToken : trackTokens_) - { + for (const auto& trackToken : trackTokens_) { edm::Handle> tracksHandle; iEvent.getByToken(trackToken, tracksHandle); const edm::View& tracks = *tracksHandle; - + edm::RefToBaseVector trackRefs; for (edm::View::size_type i = 0; i < tracks.size(); ++i) { - trackRefs.push_back(tracks.refAt(i)); + trackRefs.push_back(tracks.refAt(i)); } reco::RecoToSimCollection recSimColl = associatorByHits.associateRecoToSim(trackRefs, tpCollection); @@ -126,26 +119,27 @@ void SimpleTrackValidation::analyze(const edm::Event& iEvent, const edm::EventSe for (const auto& track : trackRefs) { rt++; auto foundTP = recSimColl.find(track); - if (foundTP != recSimColl.end()) { - const auto& tp = foundTP->val; - if (!tp.empty()) { - at++; - } - if (simRecColl.find(tp[0].first) != simRecColl.end()) { - if (simRecColl[tp[0].first].size() > 1) { - dt++; - } + if (foundTP != recSimColl.end()) { + const auto& tp = foundTP->val; + if (!tp.empty()) { + at++; + } + if (simRecColl.find(tp[0].first) != simRecColl.end()) { + if (simRecColl[tp[0].first].size() > 1) { + dt++; } + } } } for (const TrackingParticleRef& tpr : tpCollection) { auto foundTrack = simRecColl.find(tpr); if (foundTrack != simRecColl.end()) { - ast++; + ast++; } } - LogPrint("TrackValidator") << "Tag " << trackLabels_[0].label() << " Total simulated "<< st << " Associated tracks " << at << " Total reconstructed " << rt; + LogPrint("TrackValidator") << "Tag " << trackLabels_[0].label() << " Total simulated " << st + << " Associated tracks " << at << " Total reconstructed " << rt; global_rt_ += rt; global_st_ += st; global_at_ += at; @@ -155,7 +149,6 @@ void SimpleTrackValidation::analyze(const edm::Event& iEvent, const edm::EventSe } void SimpleTrackValidation::beginJob() { - edm::Service fs; output_tree_ = fs->make("output", "Simple Track Validation TTree"); @@ -166,12 +159,9 @@ void SimpleTrackValidation::beginJob() { output_tree_->Branch("ast", &global_ast_); } -void SimpleTrackValidation::endJob() { - output_tree_->Fill(); -} +void SimpleTrackValidation::endJob() { output_tree_->Fill(); } void SimpleTrackValidation::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - edm::ParameterSetDescription desc; desc.setUnknown(); descriptions.addDefault(desc); @@ -195,7 +185,7 @@ void SimpleTrackValidation::fillDescriptions(edm::ConfigurationDescriptions& des desc.add("invertRapidityCutTP", false); desc.add("minPhiTP", -3.2); desc.add("maxPhiTP", 3.2); - + descriptions.addWithDefaultLabel(desc); }