From f36819ffb99d25c8a976e2d37329e452c7ad637f Mon Sep 17 00:00:00 2001 From: Aaron Levine Date: Wed, 16 Jul 2014 14:50:55 -0500 Subject: [PATCH 1/3] added l1gTauVetoNeighbor info --- plugins/RateTree.cc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/plugins/RateTree.cc b/plugins/RateTree.cc index a0ef56b..29a0b40 100644 --- a/plugins/RateTree.cc +++ b/plugins/RateTree.cc @@ -77,7 +77,9 @@ class RateTree : public edm::EDAnalyzer { std::vector* puEM_; std::vector* puUICEM_; std::vector* effArea_; + std::vector* eneighbor_; std::vector* taus_; + std::vector* tausneighbor_; std::vector* mips_; }; @@ -89,7 +91,9 @@ RateTree::RateTree(const edm::ParameterSet& pset) { pts_ = new std::vector(); etas_ = new std::vector(); phis_ = new std::vector(); + eneighbor_ = new std::vector(); taus_ = new std::vector(); + tausneighbor_ = new std::vector(); mips_ = new std::vector(); @@ -162,7 +166,9 @@ RateTree::RateTree(const edm::ParameterSet& pset) { tree->Branch("puEM", "std::vector", &puEM_); tree->Branch("puUICEM", "std::vector", &puUICEM_); tree->Branch("effArea", "std::vector", &effArea_); + tree->Branch("associated4x4Et", "std::vector",&eneighbor_); tree->Branch("tauVeto", "std::vector", &taus_); + tree->Branch("associated4x4Tau","std::vector",&tausneighbor_); tree->Branch("mipBit", "std::vector", &mips_); // Now add nice aliases so the same draw commands work for rate/eff @@ -183,6 +189,7 @@ RateTree::RateTree(const edm::ParameterSet& pset) { tree->SetAlias("l1gEllIso", "ellIso"); tree->SetAlias("l1gTauVeto", "tauVeto"); + tree->SetAlias("l1gTauVetoNeighbor","associated4x4Tau"); tree->SetAlias("l1gMIP", "mipBit"); tree->SetAlias("l1gPU", "pu"); @@ -228,7 +235,9 @@ RateTree::~RateTree() { delete puUICEM_; delete effArea_; delete mips_; + delete eneighbor_; delete taus_; + delete tausneighbor_; } @@ -303,7 +312,9 @@ void RateTree::analyze(const edm::Event& evt, const edm::EventSetup& es) { puEM_->clear(); puUICEM_->clear(); effArea_->clear(); + eneighbor_->clear(); taus_->clear(); + tausneighbor_->clear(); mips_->clear(); // Setup meta info @@ -359,7 +370,10 @@ void RateTree::analyze(const edm::Event& evt, const edm::EventSetup& es) { puUICEM_->push_back(uct->getFloat("puLevelUICEM", -4)); effArea_->push_back(uct->getFloat("effArea", -4)); mips_->push_back(uct->getInt("mipBit", -4)); + eneighbor_->push_back(uct->getFloat("associated4x4Et",-4)); taus_->push_back(uct->getInt("tauVeto", -4)); + //std::cout << "tauVeto Rate Tree:" << uct->getFloat("tauVeto",-4) << std::endl; + tausneighbor_->push_back(uct->getInt("associated4x4Tau",-4)); // UCT doesn't have a type type_->push_back(-1); } else { @@ -409,7 +423,8 @@ void RateTree::analyze(const edm::Event& evt, const edm::EventSetup& es) { puUICEM_->push_back(-5); effArea_->push_back(-5); mips_->push_back(-5); - taus_->push_back(-5); + //taus_->push_back(-5); + //tausneighbor_->push_back(-5); type_->push_back(-5); tree->Fill(); From da18e0bd8da061b79541dffde660f8f898c6411b Mon Sep 17 00:00:00 2001 From: Aaron Levine Date: Wed, 16 Jul 2014 14:52:29 -0500 Subject: [PATCH 2/3] added l1gTauVetoNeighbor info --- test/makeEfficiencyTree_cfg.py | 45 +++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/test/makeEfficiencyTree_cfg.py b/test/makeEfficiencyTree_cfg.py index bb677bd..90e22b9 100755 --- a/test/makeEfficiencyTree_cfg.py +++ b/test/makeEfficiencyTree_cfg.py @@ -24,19 +24,23 @@ options = VarParsing ('analysis') # Set useful defaults #options.inputFiles = '/store/user/tapas/ETauSkim/skim_12_1_erV.root' -options.outputFile = "uct_efficiency_tree.root" +#options.inputFiles = '/store/user/ldodd/GluGluToHToTauTau_M-125_13TeV-powheg-pythia6/GluGluToHToTauTau_M-125_13TeV-powheg-pythia6_Fall13dr-tsg_PU40bx25_POSTLS162_V2-v1/05a81b8d696d27a5c3c2ca036967addd/skim_20_1_63z.root' +#options.inputFiles = '/store/mc/Fall13dr/Neutrino_Pt-2to20_gun/GEN-SIM-RAW/tsg_PU40bx25_POSTLS162_V2-v1/20003/CC8426A6-B27C-E311-8767-002618943934.root' +#options.inputFiles = '/store/user/ldodd/TT_Tune4C_13TeV-pythia8-tauola/TT_Tune4C_13TeV-pythia8-tauola-tsg_PU40bx25_POSTLS162_V2-v1/fb508503c16d6e4b02bc25104d11f7c2/skim_105_1_Equ.root' +#options.inputFiles = '/store/user/ldodd/TT_Tune4C_13TeV-pythia8-tauola/TT_Tune4C_13TeV-pythia8-tauola-tsg_PU40bx25_POSTLS162_V2-v1/fb508503c16d6e4b02bc25104d11f7c2/skim_104_1_uT6.root' +#options.outputFile = "uct_efficiency_tree.root" options.register( 'eicIsolationThreshold', 3, VarParsing.multiplicity.singleton, VarParsing.varType.int, "EIC Isolation threshold") -options.register( - 'hActivityCut', - 0.5, - VarParsing.multiplicity.singleton, - VarParsing.varType.float, - "HCAL activity threshold") +#options.register( +# 'hActivityCut', +# 5.0, +# VarParsing.multiplicity.singleton, +# VarParsing.varType.float, +# "HCAL activity threshold") options.register( 'ecalCalib', 'CALIB_V4', @@ -51,7 +55,7 @@ 'If 1, turn off the ECAL for the stage1 EGTau path.') options.register( 'isMC', - 0, + 1, VarParsing.multiplicity.singleton, VarParsing.varType.int, 'Set to 1 for simulated samples - updates GT, emulates HCAL TPGs.') @@ -83,6 +87,7 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(options.maxEvents) + #input = cms.untracked.int32(500) ) process.source = cms.Source( @@ -156,6 +161,7 @@ l1gDPhi = cms.string("? l1gMatch ? deltaPhi(l1g.phi, reco.phi) : -1"), l1gDEta = cms.string("? l1gMatch ? l1g.eta - reco.eta : -10"), l1gDR = cms.string("? l1gMatch ? deltaR(l1g.eta, l1g.phi, reco.eta, reco.phi) : -1"), + ) jet_branches = cms.PSet( @@ -177,6 +183,7 @@ l1gJetPt = cms.string("? l1gMatch ? l1g.getFloat('associatedJetPt', -4) : -2"), l1gEllIso = cms.string("? l1gMatch ? l1g.getInt('ellIsolation', -4) : -2"), l1gTauVeto = cms.string("? l1gMatch ? l1g.getInt('tauVeto', -4) : -2"), + l1gTauVetoNeighbor = cms.string("? l1gMatch ? l1g.getInt('associated4x4Tau', -4) : -2"), l1gMIP = cms.string("? l1gMatch ? l1g.getInt('mipBit', -4) : -2"), l1gIsEle = cms.string("? l1gMatch ? l1g.getInt('isEle', -4) : -2"), ) @@ -202,6 +209,24 @@ process.isoTauEfficiency = cms.EDAnalyzer( "EfficiencyTree", + #recoSrc = cms.VInputTag("isoTaus"), + recoSrc = cms.VInputTag("recoTaus"), + l1Src = cms.VInputTag(cms.InputTag("l1extraParticles", "Tau")), + l1GSrc = cms.VInputTag(cms.InputTag("UCT2015Producer", "IsolatedTauUnpacked")), + l1GPUSrc = cms.InputTag("UCT2015Producer", "PULevelPUM0Unpacked"), + # Max DR for RECO-trigger matching + maxDR = cms.double(0.5), + # Ntuple configuration + ntuple = cms.PSet( + common_ntuple_branches, + egtau_branches, + tau_branches, + ) +) + +process.isoTauCheckEfficiency = cms.EDAnalyzer( + "EfficiencyTree", + #recoSrc = cms.VInputTag("isoTaus"), recoSrc = cms.VInputTag("isoTaus"), l1Src = cms.VInputTag(cms.InputTag("l1extraParticles", "Tau")), l1GSrc = cms.VInputTag(cms.InputTag("UCT2015Producer", "IsolatedTauUnpacked")), @@ -315,6 +340,7 @@ process.leptonEfficiencies = cms.Sequence( process.isoTauEfficiency * + process.isoTauCheckEfficiency * process.rlxTauEfficiency *process.rlxTauPlusJetEfficiency * @@ -427,6 +453,7 @@ process.isoTauEfficiency.recoSrc = cms.VInputTag("trueTaus") process.rlxTauEfficiency.recoSrc = cms.VInputTag("trueTaus") process.isoTauEfficiency.recoSrc = cms.VInputTag("trueTaus") + process.isoTauCheckEfficiency.recoSrc = cms.VInputTag("trueTaus") process.rlxTauEfficiency.recoSrc = cms.VInputTag("trueTaus") process.printTaus.src=cms.InputTag("trueTaus") @@ -561,7 +588,7 @@ # Make the framework shut up. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr.FwkReport.reportEvery = 1000 +process.MessageLogger.cerr.FwkReport.reportEvery = 100 # Spit out filter efficiency at the end. process.options = cms.untracked.PSet(wantSummary = cms.untracked.bool(False)) From 0ed96495e13f99b56614b13858107873188c9e5f Mon Sep 17 00:00:00 2001 From: Aaron Levine Date: Wed, 16 Jul 2014 14:58:23 -0500 Subject: [PATCH 3/3] got rid of commented out configurations --- test/makeEfficiencyTree_cfg.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/test/makeEfficiencyTree_cfg.py b/test/makeEfficiencyTree_cfg.py index 90e22b9..722a7b5 100755 --- a/test/makeEfficiencyTree_cfg.py +++ b/test/makeEfficiencyTree_cfg.py @@ -24,23 +24,19 @@ options = VarParsing ('analysis') # Set useful defaults #options.inputFiles = '/store/user/tapas/ETauSkim/skim_12_1_erV.root' -#options.inputFiles = '/store/user/ldodd/GluGluToHToTauTau_M-125_13TeV-powheg-pythia6/GluGluToHToTauTau_M-125_13TeV-powheg-pythia6_Fall13dr-tsg_PU40bx25_POSTLS162_V2-v1/05a81b8d696d27a5c3c2ca036967addd/skim_20_1_63z.root' -#options.inputFiles = '/store/mc/Fall13dr/Neutrino_Pt-2to20_gun/GEN-SIM-RAW/tsg_PU40bx25_POSTLS162_V2-v1/20003/CC8426A6-B27C-E311-8767-002618943934.root' -#options.inputFiles = '/store/user/ldodd/TT_Tune4C_13TeV-pythia8-tauola/TT_Tune4C_13TeV-pythia8-tauola-tsg_PU40bx25_POSTLS162_V2-v1/fb508503c16d6e4b02bc25104d11f7c2/skim_105_1_Equ.root' -#options.inputFiles = '/store/user/ldodd/TT_Tune4C_13TeV-pythia8-tauola/TT_Tune4C_13TeV-pythia8-tauola-tsg_PU40bx25_POSTLS162_V2-v1/fb508503c16d6e4b02bc25104d11f7c2/skim_104_1_uT6.root' -#options.outputFile = "uct_efficiency_tree.root" +options.outputFile = "uct_efficiency_tree.root" options.register( 'eicIsolationThreshold', 3, VarParsing.multiplicity.singleton, VarParsing.varType.int, "EIC Isolation threshold") -#options.register( -# 'hActivityCut', -# 5.0, -# VarParsing.multiplicity.singleton, -# VarParsing.varType.float, -# "HCAL activity threshold") +options.register( + 'hActivityCut', + 0.5, + VarParsing.multiplicity.singleton, + VarParsing.varType.float, + "HCAL activity threshold") options.register( 'ecalCalib', 'CALIB_V4', @@ -87,7 +83,6 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(options.maxEvents) - #input = cms.untracked.int32(500) ) process.source = cms.Source( @@ -161,7 +156,6 @@ l1gDPhi = cms.string("? l1gMatch ? deltaPhi(l1g.phi, reco.phi) : -1"), l1gDEta = cms.string("? l1gMatch ? l1g.eta - reco.eta : -10"), l1gDR = cms.string("? l1gMatch ? deltaR(l1g.eta, l1g.phi, reco.eta, reco.phi) : -1"), - ) jet_branches = cms.PSet(