From 66dfb0e04c74354498f1f8eddb3ffe1a99e30433 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Fri, 6 Dec 2024 18:59:03 +0100 Subject: [PATCH 1/7] Fix PDF indices. --- NtupleProducer/plugins/HTauTauNtuplizer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NtupleProducer/plugins/HTauTauNtuplizer.cc b/NtupleProducer/plugins/HTauTauNtuplizer.cc index 1a463ce..8a53d46 100644 --- a/NtupleProducer/plugins/HTauTauNtuplizer.cc +++ b/NtupleProducer/plugins/HTauTauNtuplizer.cc @@ -2127,13 +2127,13 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e if (uncertScheme.find("MadGraph") != std::string::npos) { if(uncertScheme == "MadGraph45A") _MC_pdf_first_idx = 47; - else if (uncertScheme == "MadGraph45B") _MC_pdf_first_idx = 1611; - else if (uncertScheme == "MadGraph9A") _MC_pdf_first_idx = 10; + else if (uncertScheme == "MadGraph45B") _MC_pdf_first_idx = 611; + else if (uncertScheme == "MadGraph9A") _MC_pdf_first_idx = 9; else if (uncertScheme == "MadGraph9B") _MC_pdf_first_idx = 573; } else if (uncertScheme.find("Powheg") != std::string::npos) { - _MC_pdf_first_idx = 10; + _MC_pdf_first_idx = 9; } else if (uncertScheme.find("None") == std::string::npos) { From 127693912ec6763aa828049e6200a38abf202606 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Mon, 9 Dec 2024 16:01:06 +0100 Subject: [PATCH 2/7] Fix DY NLO scheme. --- NtupleProducer/test/datasets_UL16.txt | 8 ++++--- NtupleProducer/test/datasets_UL16APV.txt | 24 ++++++++++--------- NtupleProducer/test/datasets_UL17.txt | 30 ++++++++++++------------ 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/NtupleProducer/test/datasets_UL16.txt b/NtupleProducer/test/datasets_UL16.txt index 9f6b1f1..be7975f 100644 --- a/NtupleProducer/test/datasets_UL16.txt +++ b/NtupleProducer/test/datasets_UL16.txt @@ -47,6 +47,11 @@ /DYJetsToLL_0J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9A /DYJetsToLL_1J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9A /DYJetsToLL_2J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9A + +=== BACKGROUNDS_DY_LM_2016 === +/DYJetsToLL_M-10to50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A + +=== BACKGROUNDS_DY_NLO_PTSLICED_2016 === /DYJetsToLL_LHEFilterPtZ-0To50_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A /DYJetsToLL_LHEFilterPtZ-50To100_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A /DYJetsToLL_LHEFilterPtZ-100To250_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A @@ -54,9 +59,6 @@ /DYJetsToLL_LHEFilterPtZ-400To650_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A /DYJetsToLL_LHEFilterPtZ-650ToInf_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A -=== BACKGROUNDS_DY_LM_2016 === -/DYJetsToLL_M-10to50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9A - === BACKGROUNDS_VV_2016 === /ZZ_TuneCP5_13TeV-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9B /WW_TuneCP5_13TeV-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9B diff --git a/NtupleProducer/test/datasets_UL16APV.txt b/NtupleProducer/test/datasets_UL16APV.txt index 8b495d4..2df0109 100644 --- a/NtupleProducer/test/datasets_UL16APV.txt +++ b/NtupleProducer/test/datasets_UL16APV.txt @@ -53,20 +53,22 @@ /WJetsToLNu_HT-2500ToInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A === BACKGROUNDS_DY_NLO_2016APV === -/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph45A -/DYJetsToLL_0J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph45A -/DYJetsToLL_1J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph45A -/DYJetsToLL_2J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-0To50_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-50To100_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-100To250_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-250To400_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-400To650_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-650ToInf_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph45A +/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9A +/DYJetsToLL_0J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9A +/DYJetsToLL_1J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9A +/DYJetsToLL_2J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9A -=== BACKGROUNDS_DY_NLO_2016APV === +=== BACKGROUNDS_DY_LM_2016APV === /DYJetsToLL_M-10to50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A +=== BACKGROUNDS_DY_NLO_PTSLICED_2016APV === +/DYJetsToLL_LHEFilterPtZ-0To50_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-50To100_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-100To250_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-250To400_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-400To650_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-650ToInf_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9A + === BACKGROUNDS_VV_2016APV === /ZZ_TuneCP5_13TeV-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9B /WW_TuneCP5_13TeV-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9B diff --git a/NtupleProducer/test/datasets_UL17.txt b/NtupleProducer/test/datasets_UL17.txt index 30d6a24..9841f83 100644 --- a/NtupleProducer/test/datasets_UL17.txt +++ b/NtupleProducer/test/datasets_UL17.txt @@ -49,21 +49,6 @@ /WJetsToLNu_HT-1200To2500_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM MadGraph45A /WJetsToLNu_HT-2500ToInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -=== BACKGROUNDS_DY_NLO_2017 === -/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_0J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_1J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_2J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-0To50_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-50To100_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-100To250_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-250To400_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-400To650_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v4/MINIAODSIM MadGraph45A -/DYJetsToLL_LHEFilterPtZ-650ToInf_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A - -=== BACKGROUNDS_DY_LM_2017 === -/DYJetsToLL_M-10to50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A - === BACKGROUNDS_DY_2017 === /DYJetsToLL_M-10to50_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM MadGraph45A /DYJetsToLL_M-50_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A @@ -83,6 +68,21 @@ /DYBJetsToLL_M-50_Zpt-100to200_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A /DYBJetsToLL_M-50_Zpt-200toInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A +=== BACKGROUNDS_DY_NLO_2017 === +/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_0J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_1J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_2J_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-0To50_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-50To100_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-100To250_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-250To400_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-400To650_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v4/MINIAODSIM MadGraph9A +/DYJetsToLL_LHEFilterPtZ-650ToInf_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A + +=== BACKGROUNDS_DY_LM_2017 === +/DYJetsToLL_M-10to50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9A + === BACKGROUNDS_Z_TO_QQ_2017 === /ZJetsToQQ_HT-200to400_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A /ZJetsToQQ_HT-400to600_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A From ce849274087dce0bac10fdaa2f788540babe5115 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Thu, 12 Dec 2024 09:47:30 +0100 Subject: [PATCH 3/7] Fix ST_s-channel_4f factor of 2 mismatch. --- NtupleProducer/plugins/HTauTauNtuplizer.cc | 26 ++++++++++++++++------ NtupleProducer/test/datasets_UL16.txt | 2 +- NtupleProducer/test/datasets_UL16APV.txt | 2 +- NtupleProducer/test/datasets_UL17.txt | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/NtupleProducer/plugins/HTauTauNtuplizer.cc b/NtupleProducer/plugins/HTauTauNtuplizer.cc index 8a53d46..41026d7 100644 --- a/NtupleProducer/plugins/HTauTauNtuplizer.cc +++ b/NtupleProducer/plugins/HTauTauNtuplizer.cc @@ -2140,8 +2140,19 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e throw cms::Exception("InvalidOption") << "uncertainty scheme option is not valid"; } + // handle the factor of 2 error in the MINIAOD ST_s-channel_4f sample + double st_mult = 1.; + if (uncertScheme == "MadGraph9B_STlepton") { + st_mult = 2.; + } + for (unsigned pdf_idx = _MC_pdf_first_idx; pdf_idx <= _MC_pdf_first_idx+_MC_pdf_last_idx; ++pdf_idx) { - _MC_pdf[pdf_idx-_MC_pdf_first_idx] = lheweights[pdf_idx].wgt; + if (pdf_idx != _MC_pdf_first_idx) { + _MC_pdf[pdf_idx-_MC_pdf_first_idx] = st_mult * lheweights[pdf_idx].wgt; + } + else { + _MC_pdf[pdf_idx-_MC_pdf_first_idx] = lheweights[pdf_idx].wgt; + } } if (uncertScheme != "None") @@ -2169,12 +2180,12 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e uncertScheme.find("Powheg9") != std::string::npos) { _MC_QCDscale[0] = lheweights[0].wgt; // muF1p0_muR1p0 - _MC_QCDscale[1] = lheweights[1].wgt; - _MC_QCDscale[2] = lheweights[2].wgt; - _MC_QCDscale[3] = lheweights[3].wgt; - _MC_QCDscale[4] = lheweights[4].wgt; - _MC_QCDscale[5] = lheweights[6].wgt; - _MC_QCDscale[6] = lheweights[8].wgt; + _MC_QCDscale[1] = st_mult * lheweights[1].wgt; + _MC_QCDscale[2] = st_mult * lheweights[2].wgt; + _MC_QCDscale[3] = st_mult * lheweights[3].wgt; + _MC_QCDscale[4] = st_mult * lheweights[4].wgt; + _MC_QCDscale[5] = st_mult * lheweights[6].wgt; + _MC_QCDscale[6] = st_mult * lheweights[8].wgt; } else { _MC_QCDscale[0] = -99.f; @@ -3976,6 +3987,7 @@ void HTauTauNtuplizer::beginRun(edm::Run const& iRun, edm::EventSetup const& iSe void HTauTauNtuplizer::endRun(edm::Run const&, edm::EventSetup const&){ } + void HTauTauNtuplizer::beginLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const& iSetup){ if (theisMC) { diff --git a/NtupleProducer/test/datasets_UL16.txt b/NtupleProducer/test/datasets_UL16.txt index be7975f..966622f 100644 --- a/NtupleProducer/test/datasets_UL16.txt +++ b/NtupleProducer/test/datasets_UL16.txt @@ -76,7 +76,7 @@ /ST_t-channel_antitop_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM Powheg9 /ST_t-channel_top_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM Powheg9 /ST_s-channel_4f_hadronicDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM MadGraph9B -/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9B +/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph9B_STlepton === BACKGROUNDS_EWK_2016 === /EWKWMinus2Jets_WToLNu_M-50_TuneCP5_withDipoleRecoil_13TeV-madgraph-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v1/MINIAODSIM MadGraph45A diff --git a/NtupleProducer/test/datasets_UL16APV.txt b/NtupleProducer/test/datasets_UL16APV.txt index 2df0109..1018078 100644 --- a/NtupleProducer/test/datasets_UL16APV.txt +++ b/NtupleProducer/test/datasets_UL16APV.txt @@ -86,7 +86,7 @@ /ST_t-channel_antitop_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM Powheg9 /ST_t-channel_top_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM Powheg9 /ST_s-channel_4f_hadronicDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM MadGraph9B -/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9B +/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph9B_STlepton === BACKGROUNDS_EWK_2016APV === /EWKWMinus2Jets_WToLNu_M-50_TuneCP5_withDipoleRecoil_13TeV-madgraph-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v1/MINIAODSIM MadGraph45A diff --git a/NtupleProducer/test/datasets_UL17.txt b/NtupleProducer/test/datasets_UL17.txt index 9841f83..9973d41 100644 --- a/NtupleProducer/test/datasets_UL17.txt +++ b/NtupleProducer/test/datasets_UL17.txt @@ -120,7 +120,7 @@ /ST_t-channel_antitop_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM Powheg9 /ST_t-channel_top_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM Powheg9 /ST_s-channel_4f_hadronicDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph9B -/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM MadGraph9B +/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v1/MINIAODSIM MadGraph9B_STlepton === BACKGROUNDS_EWK_2017 === /EWKWMinus2Jets_WToLNu_M-50_TuneCP5_withDipoleRecoil_13TeV-madgraph-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM MadGraph45A From 24143afa71badbdb220f263b8f66c5fb01ad34df Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Thu, 12 Dec 2024 11:00:38 +0100 Subject: [PATCH 4/7] Add PDF ID check to endRun. --- NtupleProducer/plugins/HTauTauNtuplizer.cc | 96 ++++++++++++++++------ NtupleProducer/test/datasets_UL18.txt | 4 +- 2 files changed, 71 insertions(+), 29 deletions(-) diff --git a/NtupleProducer/plugins/HTauTauNtuplizer.cc b/NtupleProducer/plugins/HTauTauNtuplizer.cc index 41026d7..e94d7da 100644 --- a/NtupleProducer/plugins/HTauTauNtuplizer.cc +++ b/NtupleProducer/plugins/HTauTauNtuplizer.cc @@ -19,6 +19,7 @@ #include #include #include +#include //#include // user include files @@ -99,6 +100,7 @@ #include "Geometry/HcalCommonData/interface/HcalParametersFromDD.h" #include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h" +#include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h" #include "FWCore/Framework/interface/EventSetup.h" #include "JetMETCorrections/Objects/interface/JetCorrector.h" @@ -248,6 +250,7 @@ class HTauTauNtuplizer : public edm::EDAnalyzer { edm::EDGetTokenT theTotTag; edm::EDGetTokenT thePassTag; edm::EDGetTokenT theLHEPTag; + edm::EDGetTokenT theLHERunInfoTag; edm::EDGetTokenT beamSpotTag; edm::EDGetTokenT > theL1TauTag; edm::EDGetTokenT > theL1JetTag; @@ -788,6 +791,11 @@ class HTauTauNtuplizer : public edm::EDAnalyzer { // not a output tree branch, but used to assess object overlap in trg match // use as vTrgMatchedToDau_idx.at(idaughter).at(idxHLTPath) std::vector> vTrgMatchedToDau_idx; + + // PDF, alpha strong and QCD uncertainty schemes + double st_mult; + unsigned _MC_pdf_first_idx; + unsigned _MC_pdf_last_idx; }; const int HTauTauNtuplizer::ntauIds; // definition of static member @@ -831,6 +839,7 @@ HTauTauNtuplizer::HTauTauNtuplizer(const edm::ParameterSet& pset) : //reweight() theTotTag (consumes (pset.getParameter("totCollection"))), thePassTag (consumes (pset.getParameter("passCollection"))), theLHEPTag (consumes (pset.getParameter("lhepCollection"))), + theLHERunInfoTag (consumes (pset.getParameter("lhepCollection"))), beamSpotTag (consumes (pset.getParameter("beamSpot"))), theL1TauTag (consumes> (pset.getParameter("stage2TauCollection"))), theL1JetTag (consumes> (pset.getParameter("stage2JetCollection"))), @@ -2120,31 +2129,6 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e _nup=lheeventinfo->hepeup().NUP; const auto lheweights = lheeventinfo->weights(); - - // PDF and alpha strong uncertainties - unsigned _MC_pdf_first_idx = 0; - unsigned _MC_pdf_last_idx = _MC_pdf.size(); - if (uncertScheme.find("MadGraph") != std::string::npos) - { - if(uncertScheme == "MadGraph45A") _MC_pdf_first_idx = 47; - else if (uncertScheme == "MadGraph45B") _MC_pdf_first_idx = 611; - else if (uncertScheme == "MadGraph9A") _MC_pdf_first_idx = 9; - else if (uncertScheme == "MadGraph9B") _MC_pdf_first_idx = 573; - } - else if (uncertScheme.find("Powheg") != std::string::npos) - { - _MC_pdf_first_idx = 9; - } - else if (uncertScheme.find("None") == std::string::npos) - { - throw cms::Exception("InvalidOption") << "uncertainty scheme option is not valid"; - } - - // handle the factor of 2 error in the MINIAOD ST_s-channel_4f sample - double st_mult = 1.; - if (uncertScheme == "MadGraph9B_STlepton") { - st_mult = 2.; - } for (unsigned pdf_idx = _MC_pdf_first_idx; pdf_idx <= _MC_pdf_first_idx+_MC_pdf_last_idx; ++pdf_idx) { if (pdf_idx != _MC_pdf_first_idx) { @@ -3981,11 +3965,69 @@ void HTauTauNtuplizer::beginRun(edm::Run const& iRun, edm::EventSetup const& iSe // edm::LogInfo("AnalyzeRates")<<"Added path "< run; + iRun.getByToken(theLHERunInfoTag, run); + typedef std::vector::const_iterator headers_const_iterator; -void HTauTauNtuplizer::endRun(edm::Run const&, edm::EventSetup const&){ + int pdf_id_qcd_scale_ref = 1; + int pdf_id_pdf_ref = 2; // ensure the two IDs are different in case the for-loop is ignored + unsigned weight_lines_counter = 0; + + std::regex reg(".*<\\/weight>"); + for (headers_const_iterator iter = run->headers_begin(); iter != run->headers_end(); iter++) { + std::vector lines = iter->lines(); + for (unsigned int iLine = 0; iLine < lines.size(); iLine++) { + std::smatch match; + std::regex_search(lines.at(iLine), match, reg); + if (match.size()==2) { + if (weight_lines_counter == 0) { + pdf_id_qcd_scale_ref = std::atoi(match[1].str().c_str()); + } + else if (weight_lines_counter == _MC_pdf_first_idx) { + pdf_id_pdf_ref = std::atoi(match[1].str().c_str()); + } + weight_lines_counter += 1; + } + // no other checks, should exit + if (weight_lines_counter >= _MC_pdf_first_idx) { + break; + } + } + } + + if (pdf_id_qcd_scale_ref != pdf_id_pdf_ref) { + throw cms::Exception("InvalidOption") << "PDF ID of QCD scale reference weight does not match PDF ID of PDF reference weight"; + } } void HTauTauNtuplizer::beginLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const& iSetup){ diff --git a/NtupleProducer/test/datasets_UL18.txt b/NtupleProducer/test/datasets_UL18.txt index 8124c09..76e0e3d 100644 --- a/NtupleProducer/test/datasets_UL18.txt +++ b/NtupleProducer/test/datasets_UL18.txt @@ -107,13 +107,13 @@ /ZZZ_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v1/MINIAODSIM MadGraph9A /ZZZ_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1_ext1-v2/MINIAODSIM MadGraph9A -=== backgrounds_ST_2018 === +=== BACKGROUNDS_ST_2018 === /ST_tW_antitop_5f_inclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v2/MINIAODSIM Powheg9 /ST_tW_top_5f_inclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v2/MINIAODSIM Powheg9 /ST_t-channel_antitop_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v1/MINIAODSIM Powheg9 /ST_t-channel_top_5f_InclusiveDecays_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v1/MINIAODSIM Powheg9 /ST_s-channel_4f_hadronicDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v2/MINIAODSIM MadGraph9B -/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v1/MINIAODSIM MadGraph9B +/ST_s-channel_4f_leptonDecays_TuneCP5_13TeV-amcatnlo-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v1/MINIAODSIM MadGraph9B_STlepton === BACKGROUNDS_EWK_2018 === /EWKWMinus2Jets_WToLNu_M-50_TuneCP5_withDipoleRecoil_13TeV-madgraph-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v2/MINIAODSIM MadGraph45A From cd056e7b415899d33765945d7d7b69fbbb3a82a4 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Thu, 12 Dec 2024 11:27:42 +0100 Subject: [PATCH 5/7] Add new scheme option. --- NtupleProducer/python/HiggsTauTauProducer_106X.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NtupleProducer/python/HiggsTauTauProducer_106X.py b/NtupleProducer/python/HiggsTauTauProducer_106X.py index 39d6830..78e2e31 100644 --- a/NtupleProducer/python/HiggsTauTauProducer_106X.py +++ b/NtupleProducer/python/HiggsTauTauProducer_106X.py @@ -23,7 +23,7 @@ except: SCHEME = "None" print 'Uncertainty scheme:', SCHEME -assert SCHEME in ("None", "MadGraph45A", "MadGraph45B", "MadGraph9A", "MadGraph9B", "Powheg9") +assert SCHEME in ("None", "MadGraph45A", "MadGraph45B", "MadGraph9A", "MadGraph9B", "MadGraph9B_STlepton", "Powheg9") try: doCPVariables except NameError: doCPVariables=True From 5f571dd2cd49c816c6e102cb9fa572f6f07acf44 Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Fri, 13 Dec 2024 12:02:33 +0100 Subject: [PATCH 6/7] Bugfix: consider MadGraph9B_STlepton. --- NtupleProducer/plugins/HTauTauNtuplizer.cc | 37 ++++++++-------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/NtupleProducer/plugins/HTauTauNtuplizer.cc b/NtupleProducer/plugins/HTauTauNtuplizer.cc index e94d7da..9f44ee4 100644 --- a/NtupleProducer/plugins/HTauTauNtuplizer.cc +++ b/NtupleProducer/plugins/HTauTauNtuplizer.cc @@ -2139,15 +2139,8 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e } } - if (uncertScheme != "None") - { - _MC_astrong[0] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+1].wgt; - _MC_astrong[1] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+2].wgt; - } - else { - _MC_astrong[0] = -99.f; - _MC_astrong[1] = -99.f; - } + _MC_astrong[0] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+1].wgt; + _MC_astrong[1] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+2].wgt; // QCD scale if (uncertScheme.find("MadGraph45") != std::string::npos) @@ -2171,15 +2164,6 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e _MC_QCDscale[5] = st_mult * lheweights[6].wgt; _MC_QCDscale[6] = st_mult * lheweights[8].wgt; } - else { - _MC_QCDscale[0] = -99.f; - _MC_QCDscale[1] = -99.f; - _MC_QCDscale[2] = -99.f; - _MC_QCDscale[3] = -99.f; - _MC_QCDscale[4] = -99.f; - _MC_QCDscale[5] = -99.f; - _MC_QCDscale[6] = -99.f; - } } } @@ -3974,15 +3958,15 @@ void HTauTauNtuplizer::beginRun(edm::Run const& iRun, edm::EventSetup const& iSe if(uncertScheme == "MadGraph45A") _MC_pdf_first_idx = 47; else if (uncertScheme == "MadGraph45B") _MC_pdf_first_idx = 611; else if (uncertScheme == "MadGraph9A") _MC_pdf_first_idx = 9; - else if (uncertScheme == "MadGraph9B") _MC_pdf_first_idx = 573; + else if (uncertScheme.find("MadGraph9B") != std::string::npos) _MC_pdf_first_idx = 573; } else if (uncertScheme.find("Powheg") != std::string::npos) { _MC_pdf_first_idx = 9; } - else if (uncertScheme.find("None") == std::string::npos) + else { - throw cms::Exception("InvalidOption") << "uncertainty scheme option is not valid"; + throw cms::Exception("InvalidOption") << "uncertainty scheme " << uncertScheme << " option is not valid"; } // handle the factor of 2 error in the MINIAOD ST_s-channel_4f sample @@ -4009,6 +3993,7 @@ void HTauTauNtuplizer::endRun(edm::Run const& iRun, edm::EventSetup const& iSetu for (unsigned int iLine = 0; iLine < lines.size(); iLine++) { std::smatch match; std::regex_search(lines.at(iLine), match, reg); + std::cout << lines.at(iLine) << std::endl; if (match.size()==2) { if (weight_lines_counter == 0) { pdf_id_qcd_scale_ref = std::atoi(match[1].str().c_str()); @@ -4017,16 +4002,22 @@ void HTauTauNtuplizer::endRun(edm::Run const& iRun, edm::EventSetup const& iSetu pdf_id_pdf_ref = std::atoi(match[1].str().c_str()); } weight_lines_counter += 1; + std::cout << weight_lines_counter << " " << pdf_id_qcd_scale_ref << " " << pdf_id_pdf_ref << std::endl; } // no other checks, should exit - if (weight_lines_counter >= _MC_pdf_first_idx) { + if (weight_lines_counter > _MC_pdf_first_idx) { break; } } } if (pdf_id_qcd_scale_ref != pdf_id_pdf_ref) { - throw cms::Exception("InvalidOption") << "PDF ID of QCD scale reference weight does not match PDF ID of PDF reference weight"; + throw cms::Exception("InvalidOption") + << "PDF ID of QCD scale reference (" + << pdf_id_qcd_scale_ref + << ") weight does not match PDF ID of PDF reference (" + << pdf_id_pdf_ref + << ") weight"; } } From 2d8d016a1613b86da98afb44507fbe98ea461f9d Mon Sep 17 00:00:00 2001 From: Bruno Alves Date: Fri, 20 Dec 2024 18:18:28 +0100 Subject: [PATCH 7/7] Fix alpha strong mismatch. --- NtupleProducer/plugins/HTauTauNtuplizer.cc | 36 ++++++++++++++----- .../python/HiggsTauTauProducer_106X.py | 2 +- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/NtupleProducer/plugins/HTauTauNtuplizer.cc b/NtupleProducer/plugins/HTauTauNtuplizer.cc index 9f44ee4..eec4338 100644 --- a/NtupleProducer/plugins/HTauTauNtuplizer.cc +++ b/NtupleProducer/plugins/HTauTauNtuplizer.cc @@ -2139,8 +2139,15 @@ void HTauTauNtuplizer::analyze(const edm::Event& event, const edm::EventSetup& e } } - _MC_astrong[0] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+1].wgt; - _MC_astrong[1] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+2].wgt; + if (uncertScheme.find("MadGraph9B") == std::string::npos and + uncertScheme.find("MadGraph45B") == std::string::npos) { + _MC_astrong[0] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+1].wgt; + _MC_astrong[1] = lheweights[_MC_pdf_first_idx+_MC_pdf_last_idx+2].wgt; + } + else { // no alpha strong uncertainty with matching PDF ID + _MC_astrong[0] = 0.; + _MC_astrong[1] = 0.; + } // QCD scale if (uncertScheme.find("MadGraph45") != std::string::npos) @@ -3955,10 +3962,8 @@ void HTauTauNtuplizer::beginRun(edm::Run const& iRun, edm::EventSetup const& iSe _MC_pdf_last_idx = _MC_pdf.size(); if (uncertScheme.find("MadGraph") != std::string::npos) { - if(uncertScheme == "MadGraph45A") _MC_pdf_first_idx = 47; - else if (uncertScheme == "MadGraph45B") _MC_pdf_first_idx = 611; - else if (uncertScheme == "MadGraph9A") _MC_pdf_first_idx = 9; - else if (uncertScheme.find("MadGraph9B") != std::string::npos) _MC_pdf_first_idx = 573; + if (uncertScheme.find("MadGraph45") != std::string::npos) _MC_pdf_first_idx = 47; + else if (uncertScheme.find("MadGraph9") != std::string::npos) _MC_pdf_first_idx = 9; } else if (uncertScheme.find("Powheg") != std::string::npos) { @@ -3986,14 +3991,25 @@ void HTauTauNtuplizer::endRun(edm::Run const& iRun, edm::EventSetup const& iSetu int pdf_id_qcd_scale_ref = 1; int pdf_id_pdf_ref = 2; // ensure the two IDs are different in case the for-loop is ignored unsigned weight_lines_counter = 0; + + + std::regex reg; + if (uncertScheme.find("MadGraph") != std::string::npos) { + reg = ".*<\\/weight>"; + } + else if (uncertScheme.find("Powheg") != std::string::npos) { + reg = " lhapdf=(.*) .*<\\/weight>"; + } - std::regex reg(".*<\\/weight>"); for (headers_const_iterator iter = run->headers_begin(); iter != run->headers_end(); iter++) { std::vector lines = iter->lines(); for (unsigned int iLine = 0; iLine < lines.size(); iLine++) { std::smatch match; std::regex_search(lines.at(iLine), match, reg); - std::cout << lines.at(iLine) << std::endl; + if(DEBUG) { + std::cout << lines.at(iLine) << std::endl; + } + if (match.size()==2) { if (weight_lines_counter == 0) { pdf_id_qcd_scale_ref = std::atoi(match[1].str().c_str()); @@ -4002,7 +4018,9 @@ void HTauTauNtuplizer::endRun(edm::Run const& iRun, edm::EventSetup const& iSetu pdf_id_pdf_ref = std::atoi(match[1].str().c_str()); } weight_lines_counter += 1; - std::cout << weight_lines_counter << " " << pdf_id_qcd_scale_ref << " " << pdf_id_pdf_ref << std::endl; + if(DEBUG) { + std::cout << weight_lines_counter << " " << pdf_id_qcd_scale_ref << " " << pdf_id_pdf_ref << std::endl; + } } // no other checks, should exit if (weight_lines_counter > _MC_pdf_first_idx) { diff --git a/NtupleProducer/python/HiggsTauTauProducer_106X.py b/NtupleProducer/python/HiggsTauTauProducer_106X.py index 78e2e31..58c55a0 100644 --- a/NtupleProducer/python/HiggsTauTauProducer_106X.py +++ b/NtupleProducer/python/HiggsTauTauProducer_106X.py @@ -23,7 +23,7 @@ except: SCHEME = "None" print 'Uncertainty scheme:', SCHEME -assert SCHEME in ("None", "MadGraph45A", "MadGraph45B", "MadGraph9A", "MadGraph9B", "MadGraph9B_STlepton", "Powheg9") +assert SCHEME in ("MadGraph45A", "MadGraph45B", "MadGraph9A", "MadGraph9B", "MadGraph9B_STlepton", "Powheg9") try: doCPVariables except NameError: doCPVariables=True