From 41e25d158af8dcf4e506b4c63d0c5ee52f4ddf2c Mon Sep 17 00:00:00 2001 From: hqucms Date: Thu, 23 Nov 2017 00:21:39 +0100 Subject: [PATCH 1/3] Remove buggy BulkGrav samples. --- NtupleAK8/run/samples/BulkGrav.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NtupleAK8/run/samples/BulkGrav.conf b/NtupleAK8/run/samples/BulkGrav.conf index 7531716..a1ddb2e 100644 --- a/NtupleAK8/run/samples/BulkGrav.conf +++ b/NtupleAK8/run/samples/BulkGrav.conf @@ -92,7 +92,7 @@ fjKeepFlavors=2,3,4 /BulkGravTohhTohVVhbb_narrow_M-3500_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM /BulkGravTohhTohVVhbb_narrow_M-4000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM /BulkGravTohhTohVVhbb_narrow_M-4500_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM -/BulkGravTohhTohbbhbb_narrow_M-500_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM +######BUGGY######/BulkGravTohhTohbbhbb_narrow_M-500_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM /BulkGravTohhTohbbhbb_narrow_M-600_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM ###/BulkGravTohhTohbbhbb_narrow_M-1000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM /BulkGravTohhTohbbhbb_narrow_M-1000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM @@ -106,5 +106,5 @@ fjKeepFlavors=2,3,4 ###/BulkGravTohhTohbbhbb_narrow_M-3000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM /BulkGravTohhTohbbhbb_narrow_M-3000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM /BulkGravTohhTohbbhbb_narrow_M-4000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM -/BulkGravTohhTohbbhbb_narrow_M-4000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/MINIAODSIM +######BUGGY######/BulkGravTohhTohbbhbb_narrow_M-4000_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/MINIAODSIM /BulkGravTohhTohbbhbb_narrow_M-4500_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM From 54d9c7440b04cc3754aba8eac51b6fe24b3c28a4 Mon Sep 17 00:00:00 2001 From: hqucms Date: Thu, 23 Nov 2017 00:24:16 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 677c214..db2aa8e 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,7 @@ To check all the options of the submission script, run ``` You can set arguments to be passed to the cmsRun job in the beginning of the sample.conf file, e.g., -``` -fjKeepFlavors=2,3,4 # only keep fatjets whose labels match to the given number. 0:Light, 1:Top, 2:W, 3:Z, 4:Higgs -``` +~~fjKeepFlavors=2,3,4 # only keep fatjets whose labels match to the given number. 0:Light, 1:Top, 2:W, 3:Z, 4:Higgs~~ ## Merge outputs (with random mixing of different samples) From ac1de32cfcdfcacb6bf6003cf1c283b4599d3e57 Mon Sep 17 00:00:00 2001 From: Michele Selvaggi Date: Fri, 10 Jan 2020 13:51:54 +0100 Subject: [PATCH 3/3] added generic targetmass to fatjet ntuples --- Ntupler/src/FatJetInfoFiller.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Ntupler/src/FatJetInfoFiller.cc b/Ntupler/src/FatJetInfoFiller.cc index aac2fde..4c88ed1 100644 --- a/Ntupler/src/FatJetInfoFiller.cc +++ b/Ntupler/src/FatJetInfoFiller.cc @@ -91,10 +91,14 @@ void FatJetInfoFiller::book() { data.add("fj_genOverReco_mass_null", 0); // default to 0 if not gen-matched data.add("fj_genjet_sdmass", 0); data.add("fj_genjet_sdmass_sqrt", 0); + data.add("fj_genjet_targetmass", 0); data.add("fj_genOverReco_sdmass", 1); // default to 1 if not gen-matched data.add("fj_genOverReco_sdmass_null", 0); // default to 0 if not gen-matched // ---------------------------------- + // --- target mass for energy regression --- + data.add("fj_targetgenmass", 0); + // fatjet kinematics data.add("fj_pt", 0); data.add("fj_eta", 0); @@ -142,7 +146,6 @@ void FatJetInfoFiller::book() { data.add("fj_relptdiff", 0); data.add("fj_sdn2", 0); - //double-b data.add("fj_doubleb", 0); @@ -246,7 +249,8 @@ bool FatJetInfoFiller::fill(const pat::Jet& jet, size_t jetidx, const JetHelper& // gen-matched particle (top/W/etc.) data.fill("fj_gen_pt", fjlabel.second ? fjlabel.second->pt() : -999); data.fill("fj_gen_eta", fjlabel.second ? fjlabel.second->eta() : -999); - data.fill("fj_gen_mass", (fjlabel.first < FatJetMatching::QCD_all && fjlabel.second) ? fjlabel.second->mass() : 0); + float gen_mass = (fjlabel.first < FatJetMatching::QCD_all && fjlabel.second) ? fjlabel.second->mass() : 0.; + data.fill("fj_gen_mass", gen_mass); data.fill("fj_gen_deltaR", fjlabel.second ? reco::deltaR(jet, fjlabel.second->p4()) : 999); // ---------------------------------- @@ -323,13 +327,13 @@ bool FatJetInfoFiller::fill(const pat::Jet& jet, size_t jetidx, const JetHelper& if (sdgenjet){ // jet here points to the uncorrected jet auto pos = [](double x){ return x<0 ? 0 : x; }; - data.fill("fj_genjet_sdmass", pos(sdgenjet->mass())); + data.fill("fj_genjet_sdmass", pos(sdgenjet->mass())); + data.fill("fj_genjet_targetmass",(gen_mass > 6.) ? gen_mass : pos(sdgenjet->mass()) ); data.fill("fj_genjet_sdmass_sqrt", std::sqrt(pos(sdgenjet->mass()))); data.fill("fj_genOverReco_sdmass", catchInfs(pos(sdgenjet->mass()) / pos(msd_uncorr), 1)); data.fill("fj_genOverReco_sdmass_null", catchInfs(pos(sdgenjet->mass()) / pos(msd_uncorr), 0)); } - // -------- // double-b