From 6d8a261d113b16584f2ebd01df7a651a490e0d87 Mon Sep 17 00:00:00 2001 From: skyriacoCMS Date: Thu, 27 Apr 2017 18:39:08 +0200 Subject: [PATCH 1/2] Fix conflicting names --- src/PhotonJets.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhotonJets.cc b/src/PhotonJets.cc index d12a43d4951..01ac54d2773 100644 --- a/src/PhotonJets.cc +++ b/src/PhotonJets.cc @@ -247,7 +247,7 @@ void PhotonJets::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) { fastjet::JetDefinition jet_def_kt8(fastjet::kt_algorithm,0.8); fastjet::ClusterSequence clust_seq_08(FJparticles, jet_def_kt8); - std::vector jetnew = sorted_by_pt(clust_seq_08.exclusive_jets_up_to(1)); + std::vector jet_new = sorted_by_pt(clust_seq_08.exclusive_jets_up_to(1)); Pruner pruner(fastjet::kt_algorithm,0.1,0.5); PseudoJet jetnew = pruner(jet_new[0]); From 4b7d6288b880a54333b7c0eaee3129d2a36a9429 Mon Sep 17 00:00:00 2001 From: skyriacoCMS Date: Sat, 29 Apr 2017 01:30:16 +0200 Subject: [PATCH 2/2] Update BoostedJetToolboxUserData.cc --- src/BoostedJetToolboxUserData.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BoostedJetToolboxUserData.cc b/src/BoostedJetToolboxUserData.cc index a6430ab7c98..9604f518d24 100644 --- a/src/BoostedJetToolboxUserData.cc +++ b/src/BoostedJetToolboxUserData.cc @@ -91,7 +91,7 @@ void BoostedJetToolboxUserData::produce( edm::Event& iEvent, const edm::EventSet min_dR = temp_dR; TLorentzVector puppi_softdrop, puppi_softdrop_subjet; TLorentzVector puppi_softdrop_corr, puppi_softdrop_subjet_corr; - auto const & sbSubjetsPuppi = puppiSDJet.subjets("SoftDropPuppi"); + auto const & sbSubjetsPuppi = puppiSDJet.subjets("SoftDrop"); for ( auto const & it : sbSubjetsPuppi ) { puppi_softdrop_subjet.SetPtEtaPhiM(it->correctedP4(0).pt(),it->correctedP4(0).eta(),it->correctedP4(0).phi(),it->correctedP4(0).mass()); puppi_softdrop+=puppi_softdrop_subjet;