From 63f5474e04e7864a6cb857e27a6044bebfa46887 Mon Sep 17 00:00:00 2001 From: jang00777 Date: Fri, 1 Mar 2019 01:08:21 +0900 Subject: [PATCH 1/3] Add some jet vars for vts --- nanoAOD/plugins/JetMLIDProducer.cc | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nanoAOD/plugins/JetMLIDProducer.cc b/nanoAOD/plugins/JetMLIDProducer.cc index 7aad28b2..d0235950 100644 --- a/nanoAOD/plugins/JetMLIDProducer.cc +++ b/nanoAOD/plugins/JetMLIDProducer.cc @@ -34,7 +34,10 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) // saving all variables vector jet_delta, jet_axis2, jet_axis1, jet_ptD, jet_cpt1, jet_cpt2, jet_cpt3, - jet_npt1, jet_npt2, jet_npt3; + jet_npt1, jet_npt2, jet_npt3, + jet_JetAngularity, jet_GeoMoment, jet_HalfPtMoment, jet_DRSquareMoment, + jet_SmallDRPT, jet_MassMoment, jet_PTSquare, jet_MyMoment; + vector jet_cmult, jet_nmult; for (auto jet = jets->begin(); jet != jets->end(); ++jet) { @@ -147,6 +150,15 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) jet_npt1.push_back(neutralPt[0]); jet_npt2.push_back(neutralPt[0] + neutralPt[1]); jet_npt3.push_back(neutralPt[0] + neutralPt[1] + neutralPt[2]); + + jet_JetAngularity.push_back(JetAngularity); + jet_GeoMoment.push_back(GeoMoment); + jet_HalfPtMoment.push_back(HalfPtMoment); + jet_DRSquareMoment.push_back(DRSquareMoment); + jet_SmallDRPT.push_back(SmallDRPT); + jet_MassMoment.push_back(MassMoment); + jet_PTSquare.push_back(PTSquare); + jet_MyMoment.push_back(MyMoment); } auto jetID_table = make_unique(jets->size(),"jetID",false); @@ -155,6 +167,15 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) jetID_table->addColumn("axis1",jet_axis1,"axis1",nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("ptD",jet_ptD,"ptD",nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("angularity", jet_JetAngularity, "angularity", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("geoMoment", jet_GeoMoment, "geoMoment", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("halfPtMoment", jet_HalfPtMoment, "halfPtMoment", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("dRSquareMoment",jet_DRSquareMoment, "dRSquareMoment", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("smallDRPT", jet_SmallDRPT, "smallDRPT", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("massMoment", jet_MassMoment, "massMoment", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("pTSquare", jet_PTSquare, "pTSquare", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("myMoment", jet_MyMoment, "myMoment", nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("cpt1",jet_cpt1,"cpt1",nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("cpt2",jet_cpt2,"cpt2",nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("cpt3",jet_cpt3,"cpt3",nanoaod::FlatTable::FloatColumn); From 1f861af9e013b02a6d1a75e167834de53b956f24 Mon Sep 17 00:00:00 2001 From: jang00777 Date: Thu, 7 Mar 2019 22:50:45 +0900 Subject: [PATCH 2/3] Add daughter pdgId in JetMLIDProducer --- nanoAOD/plugins/JetMLIDProducer.cc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nanoAOD/plugins/JetMLIDProducer.cc b/nanoAOD/plugins/JetMLIDProducer.cc index d0235950..e316a8bf 100644 --- a/nanoAOD/plugins/JetMLIDProducer.cc +++ b/nanoAOD/plugins/JetMLIDProducer.cc @@ -12,6 +12,7 @@ JetMLIDProducer::JetMLIDProducer(const edm::ParameterSet & iConfig) : useQC( iConfig.getParameter("useQualityCuts")) { produces("jetID"); + produces("jetDau"); } void JetMLIDProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) @@ -39,7 +40,11 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) jet_SmallDRPT, jet_MassMoment, jet_PTSquare, jet_MyMoment; vector jet_cmult, jet_nmult; + vector jet_dauIdx1, jet_dauIdx2; + vector jetDau_pt, jetDau_eta, jetDau_phi, jetDau_E, jetDau_charge; + vector jetDau_pdgId; + int nDaughter = 0; for (auto jet = jets->begin(); jet != jets->end(); ++jet) { float sum_weight = 0., sum_deta = 0., sum_dphi = 0., sum_deta2 = 0., sum_dphi2 = 0., sum_detadphi = 0., sum_pt = 0.; @@ -52,6 +57,7 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) std::vector chargedPt; std::vector neutralPt; + jet_dauIdx1.push_back(nDaughter); //Loop over the jet constituents for(auto daughter : jet->getJetConstituentsQuick()){ //packed candidate situation @@ -111,7 +117,16 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) sum_deta2 += deta*deta*weight; sum_detadphi += deta*dphi*weight; sum_dphi2 += dphi*dphi*weight; + + nDaughter += 1; + jetDau_pt.push_back(daughter->pt()); + jetDau_eta.push_back(daughter->eta()); + jetDau_phi.push_back(daughter->phi()); + jetDau_E.push_back(daughter->energy()); + jetDau_charge.push_back(daughter->charge()); + jetDau_pdgId.push_back(daughter->pdgId()); } + jet_dauIdx2.push_back(nDaughter); //Calculate axis2 and ptD float a = 0., b = 0., c = 0.; @@ -166,6 +181,8 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) jetID_table->addColumn("axis2",jet_axis2,"axis2",nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("axis1",jet_axis1,"axis1",nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("ptD",jet_ptD,"ptD",nanoaod::FlatTable::FloatColumn); + jetID_table->addColumn("dauIdx1",jet_dauIdx1,"start index in daughter table",nanoaod::FlatTable::IntColumn); + jetID_table->addColumn("dauIdx2",jet_dauIdx2,"end index in daughter table",nanoaod::FlatTable::IntColumn); jetID_table->addColumn("angularity", jet_JetAngularity, "angularity", nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("geoMoment", jet_GeoMoment, "geoMoment", nanoaod::FlatTable::FloatColumn); @@ -186,7 +203,16 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) jetID_table->addColumn("npt3",jet_npt3,"npt3",nanoaod::FlatTable::FloatColumn); jetID_table->addColumn("nmult",jet_nmult,"nmult",nanoaod::FlatTable::IntColumn); + auto jetDau_table = make_unique(nDaughter,"jetDau",false); + jetDau_table->addColumn("pt",jetDau_pt,"pt",nanoaod::FlatTable::FloatColumn); + jetDau_table->addColumn("eta",jetDau_eta,"eta",nanoaod::FlatTable::FloatColumn); + jetDau_table->addColumn("phi",jetDau_phi,"phi",nanoaod::FlatTable::FloatColumn); + jetDau_table->addColumn("E",jetDau_E,"E",nanoaod::FlatTable::FloatColumn); + jetDau_table->addColumn("charge",jetDau_charge,"charge",nanoaod::FlatTable::FloatColumn); + jetDau_table->addColumn("pdgId",jetDau_pdgId,"pdgId",nanoaod::FlatTable::FloatColumn); + iEvent.put(move(jetID_table),"jetID"); + iEvent.put(move(jetDau_table),"jetDau"); } DEFINE_FWK_MODULE(JetMLIDProducer); From 93bc67e98eb2399b18d479972237ca9fb8a8d6e7 Mon Sep 17 00:00:00 2001 From: jang00777 Date: Thu, 14 Mar 2019 21:18:04 +0900 Subject: [PATCH 3/3] Fix wrong datatype for jet pdgId in JetMLIDProducer --- nanoAOD/plugins/JetMLIDProducer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nanoAOD/plugins/JetMLIDProducer.cc b/nanoAOD/plugins/JetMLIDProducer.cc index e316a8bf..bb82af1b 100644 --- a/nanoAOD/plugins/JetMLIDProducer.cc +++ b/nanoAOD/plugins/JetMLIDProducer.cc @@ -209,7 +209,7 @@ JetMLIDProducer::produce( edm::Event& iEvent, const edm::EventSetup& iSetup) jetDau_table->addColumn("phi",jetDau_phi,"phi",nanoaod::FlatTable::FloatColumn); jetDau_table->addColumn("E",jetDau_E,"E",nanoaod::FlatTable::FloatColumn); jetDau_table->addColumn("charge",jetDau_charge,"charge",nanoaod::FlatTable::FloatColumn); - jetDau_table->addColumn("pdgId",jetDau_pdgId,"pdgId",nanoaod::FlatTable::FloatColumn); + jetDau_table->addColumn("pdgId",jetDau_pdgId,"pdgId",nanoaod::FlatTable::IntColumn); iEvent.put(move(jetID_table),"jetID"); iEvent.put(move(jetDau_table),"jetDau");