Merge pull request #78 from skyriacoCMS/CMSSW_8_0_X_V3

Cmssw 8 0 x v3

Author: dmajumder

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;

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<fastjet::PseudoJet>  jetnew = sorted_by_pt(clust_seq_08.exclusive_jets_up_to(1));
+      std::vector<fastjet::PseudoJet>  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]);