From 1c474b97d31ba8ee956e66ab2795701d0f3a962b Mon Sep 17 00:00:00 2001 From: Ed Scott Date: Thu, 28 Feb 2019 16:42:48 +0000 Subject: [PATCH] fix random plotting errors --- Background/edRunBackgroundScripts.py | 4 +-- .../combineHarvesterOptions13TeV_Template.dat | 4 +-- Signal/edRunSignalScripts.py | 9 +++-- Signal/src/Normalization_13TeV.cc | 34 +++++++++---------- Signal/src/Packager.cc | 8 +++++ Signal/test/PackageOutput.cpp | 2 +- .../test/makeParametricSignalModelPlots.cpp | 5 ++- edRunCombineScripts.py | 6 ++-- getFractions.py | 11 +++--- justCopyFiles.sh | 3 +- runFinalFitsScripts.sh | 4 +-- stage1helpers.py | 6 ++-- stxsPlotsFromWSs.py | 1 + tdrStyle/CMS_lumi.C | 1 + 14 files changed, 55 insertions(+), 43 deletions(-) diff --git a/Background/edRunBackgroundScripts.py b/Background/edRunBackgroundScripts.py index 78e45343..f553fd1c 100755 --- a/Background/edRunBackgroundScripts.py +++ b/Background/edRunBackgroundScripts.py @@ -10,8 +10,8 @@ #justPrint=True #unblind = True -fTestOnly = True -#bkgPlotsOnly = True +#fTestOnly = True +bkgPlotsOnly = True print 'About to run background scripts' print 'fTestOnly = %s, bkgPlotsOnly = %s'%(str(fTestOnly), str(bkgPlotsOnly)) diff --git a/Plots/FinalResults/combineHarvesterOptions13TeV_Template.dat b/Plots/FinalResults/combineHarvesterOptions13TeV_Template.dat index cea7bd04..e67e7df8 100644 --- a/Plots/FinalResults/combineHarvesterOptions13TeV_Template.dat +++ b/Plots/FinalResults/combineHarvesterOptions13TeV_Template.dat @@ -8,7 +8,7 @@ datacard=CMS-HGG_mva_13TeV_datacard.txt #outDir=combineJobs13TeV_!EXT!/Stage0/r_ggH method=PerProcessMu doSTXS profileMH jobs=40 pointsperjob=10 mh=125 perProcessMuPOI=r_ggH label=S0_ggH expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_.*:r_ggH[1,0,2];.*/WH_had_.*:r_qqH[1,-2,4];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage0/r_qqH method=PerProcessMu doSTXS profileMH jobs=40 pointsperjob=10 mh=125 perProcessMuPOI=r_qqH label=S0_qqH expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_.*:r_ggH[1,0,2];.*/WH_had_.*:r_qqH[1,-2,4];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters -#outDir=combineJobs13TeV_!EXT!/Stage1/r_ggH_0J method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_0J label=S1_ggH_0J expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters +outDir=combineJobs13TeV_!EXT!/Stage1/r_ggH_0J method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_0J label=S1_ggH_0J expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1/r_ggH_1J_low method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_1J_low label=S1_ggH_1J_low expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1/r_ggH_1J_med method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_1J_med label=S1_ggH_1J_med expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1/r_ggH_1J_high method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_1J_high label=S1_ggH_1J_high expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters @@ -16,7 +16,7 @@ datacard=CMS-HGG_mva_13TeV_datacard.txt #outDir=combineJobs13TeV_!EXT!/Stage1/r_ggH_GE2J method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_GE2J label=S1_ggH_GE2J expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1/r_qqH method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_qqH label=S1_qqH expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*:r_qqH[1,-2,4];.*/ggH_hgg_0J:r_ggH_0J[1,-1,3];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,4];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,4];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,4];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_VBFTOPO.*:r_ggH_GE2J[1,-2,4];.*/ggH_hgg_.*_GT200:r_ggH_BSM[1,-2,4];.*/WH_had_.*:r_qqH[1,-2,6];.*/ZH_had_.*:r_qqH[1,-2,4] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters -#outDir=combineJobs13TeV_!EXT!/Stage1Minimal/r_ggH_0J method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_0J label=S1min_ggH_0J expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*_JET3:r_qqH_3J[1,-2,6];.*/qqH_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/qqH_.*_REST:r_qqH_Rest[1,-2,6];.*/qqH_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/qqH_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ggH_hgg_0J:r_ggH_0J[1,0,2];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,6];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,6];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,6];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J_low[1,-2,6];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J_med[1,-2,6];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J_high[1,-2,6];.*/ggH_hgg_VBFTOPO.*:r_ggH_VBFTOPO[1,-2,6];.*/ggH_hgg_1J_PTH_GT200:r_ggH_1J_BSM[1,-2,6];.*/ggH_hgg_GE2J_PTH_GT200:r_ggH_2J_BSM[1,-2,6];.*/WH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/WH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/WH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/WH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/WH_had_.*_REST:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/ZH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/ZH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_REST:r_qqH_Rest[1,-2,6] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters +outDir=combineJobs13TeV_!EXT!/Stage1Minimal/r_ggH_0J method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_0J label=S1min_ggH_0J expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*_JET3:r_qqH_3J[1,-2,6];.*/qqH_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/qqH_.*_REST:r_qqH_Rest[1,-2,6];.*/qqH_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/qqH_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ggH_hgg_0J:r_ggH_0J[1,0,2];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,6];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,6];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,6];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J_low[1,-2,6];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J_med[1,-2,6];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J_high[1,-2,6];.*/ggH_hgg_VBFTOPO.*:r_ggH_VBFTOPO[1,-2,6];.*/ggH_hgg_1J_PTH_GT200:r_ggH_1J_BSM[1,-2,6];.*/ggH_hgg_GE2J_PTH_GT200:r_ggH_2J_BSM[1,-2,6];.*/WH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/WH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/WH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/WH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/WH_had_.*_REST:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/ZH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/ZH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_REST:r_qqH_Rest[1,-2,6] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1Minimal/r_ggH_1J_low method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_1J_low label=S1min_ggH_1J_low expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*_JET3:r_qqH_3J[1,-2,6];.*/qqH_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/qqH_.*_REST:r_qqH_Rest[1,-2,6];.*/qqH_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/qqH_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ggH_hgg_0J:r_ggH_0J[1,0,2];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,6];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,6];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,6];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J_low[1,-2,6];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J_med[1,-2,6];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J_high[1,-2,6];.*/ggH_hgg_VBFTOPO.*:r_ggH_VBFTOPO[1,-2,6];.*/ggH_hgg_1J_PTH_GT200:r_ggH_1J_BSM[1,-2,6];.*/ggH_hgg_GE2J_PTH_GT200:r_ggH_2J_BSM[1,-2,6];.*/WH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/WH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/WH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/WH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/WH_had_.*_REST:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/ZH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/ZH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_REST:r_qqH_Rest[1,-2,6] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1Minimal/r_ggH_1J_med method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_1J_med label=S1min_ggH_1J_med expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*_JET3:r_qqH_3J[1,-2,6];.*/qqH_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/qqH_.*_REST:r_qqH_Rest[1,-2,6];.*/qqH_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/qqH_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ggH_hgg_0J:r_ggH_0J[1,0,2];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,6];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,6];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,6];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J_low[1,-2,6];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J_med[1,-2,6];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J_high[1,-2,6];.*/ggH_hgg_VBFTOPO.*:r_ggH_VBFTOPO[1,-2,6];.*/ggH_hgg_1J_PTH_GT200:r_ggH_1J_BSM[1,-2,6];.*/ggH_hgg_GE2J_PTH_GT200:r_ggH_2J_BSM[1,-2,6];.*/WH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/WH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/WH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/WH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/WH_had_.*_REST:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/ZH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/ZH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_REST:r_qqH_Rest[1,-2,6] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters #outDir=combineJobs13TeV_!EXT!/Stage1Minimal/r_ggH_1J_high method=PerProcessMu doSTXS profileMH jobs=50 pointsperjob=4 mh=125 perProcessMuPOI=r_ggH_1J_high label=S1min_ggH_1J_high expected=1 expectSignalMass=125 expectSignal=1 catsMap=.*/qqH_.*_JET3:r_qqH_3J[1,-2,6];.*/qqH_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/qqH_.*_REST:r_qqH_Rest[1,-2,6];.*/qqH_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/qqH_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ggH_hgg_0J:r_ggH_0J[1,0,2];.*/ggH_hgg_1J_PTH_0_60:r_ggH_1J_low[1,-2,6];.*/ggH_hgg_1J_PTH_60_120:r_ggH_1J_med[1,-2,6];.*/ggH_hgg_1J_PTH_120_200:r_ggH_1J_high[1,-2,6];.*/ggH_hgg_GE2J_PTH_0_60:r_ggH_GE2J_low[1,-2,6];.*/ggH_hgg_GE2J_PTH_60_120:r_ggH_GE2J_med[1,-2,6];.*/ggH_hgg_GE2J_PTH_120_200:r_ggH_GE2J_high[1,-2,6];.*/ggH_hgg_VBFTOPO.*:r_ggH_VBFTOPO[1,-2,6];.*/ggH_hgg_1J_PTH_GT200:r_ggH_1J_BSM[1,-2,6];.*/ggH_hgg_GE2J_PTH_GT200:r_ggH_2J_BSM[1,-2,6];.*/WH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/WH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/WH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/WH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/WH_had_.*_REST:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_JET3:r_qqH_3J[1,-2,6];.*/ZH_had_.*_JET3VETO:r_qqH_2J[1,-2,6];.*/ZH_had_.*_PTJET1_GT200:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_VH2JET:r_qqH_Rest[1,-2,6];.*/ZH_had_.*_REST:r_qqH_Rest[1,-2,6] opts=--saveSpecifiedNuis--saveInactivePOI<1>--setParameters diff --git a/Signal/edRunSignalScripts.py b/Signal/edRunSignalScripts.py index 7c11e200..8c4be3e1 100755 --- a/Signal/edRunSignalScripts.py +++ b/Signal/edRunSignalScripts.py @@ -12,12 +12,12 @@ sigPlotsOnly = False #justPrint=True -##isSubmitted = True -phoSystOnly = True +#isSubmitted = True +#phoSystOnly = True #useDCB = True #sigFitOnly = True #packageOnly = True -#sigPlotsOnly = True +sigPlotsOnly = True print 'About to run signal scripts' print 'isSubmitted = %s, phoSystOnly = %s, sigFitOnly = %s, sigPlotsOnly = %s'%(str(isSubmitted), str(phoSystOnly), str(sigFitOnly), str(sigPlotsOnly)) @@ -53,6 +53,9 @@ print 'with processes: %s'%procs print 'and categories: %s'%cats +#FIXME temp for packaging... +procs = 'GG2H_1J_PTH_0_60,GG2H_GE2J_PTH_0_60,QQ2HLNU_PTV_150_250_0J,WH2HQQ_VBFTOPO_JET3,WH2HQQ_VH2JET,ZH2HQQ_VH2JET,GG2H_1J_PTH_60_120,VBF_VBFTOPO_JET3,QQ2HLL_PTV_150_250_0J,QQ2HLL_PTV_150_250_GE1J,GG2H_1J_PTH_GT200,testTHW,QQ2HLNU_PTV_150_250_GE1J,testTHQ,TTH,VBF_PTJET1_GT200,QQ2HLL_PTV_GT250,GG2H_0J,GG2H_GE2J_PTH_60_120,GG2H_GE2J_PTH_GT200,WH2HQQ_REST,WH2HQQ_VBFTOPO_JET3VETO,GGZH,VBF_REST,ZH2HQQ_REST,ZH2HQQ_VBFTOPO_JET3,GG2H_VBFTOPO_JET3,GG2H_VBFTOPO_JET3VETO,VBF_VBFTOPO_JET3VETO,VBF_VH2JET,WH2HQQ_PTJET1_GT200,ZH2HQQ_PTJET1_GT200,ZH2HQQ_VBFTOPO_JET3VETO,QQ2HLNU_PTV_0_150,QQ2HLL_PTV_0_150,GG2H_1J_PTH_120_200,GG2H_GE2J_PTH_120_200,QQ2HLNU_PTV_GT250 -f RECO_0J_Tag0,RECO_0J_Tag1,RECO_0J_Tag2,RECO_1J_PTH_0_60_Tag0,RECO_1J_PTH_0_60_Tag1,RECO_1J_PTH_60_120_Tag0,RECO_1J_PTH_60_120_Tag1,RECO_1J_PTH_120_200_Tag0,RECO_1J_PTH_120_200_Tag1,RECO_1J_PTH_GT200,RECO_GE2J_PTH_0_60_Tag0,RECO_GE2J_PTH_0_60_Tag1,RECO_GE2J_PTH_60_120_Tag0,RECO_GE2J_PTH_60_120_Tag1,RECO_GE2J_PTH_120_200_Tag0,RECO_GE2J_PTH_120_200_Tag1,RECO_GE2J_PTH_GT200_Tag0,RECO_GE2J_PTH_GT200_Tag1,RECO_VBFTOPO_JET3VETO_Tag0,RECO_VBFTOPO_JET3VETO_Tag1,RECO_VBFTOPO_JET3_Tag0,RECO_VBFTOPO_JET3_Tag1,RECO_VBFTOPO_REST,RECO_VBFTOPO_BSM,testBBH' + #misc config lumi = '35.9' if '2017' in ext: lumi = '41.5' diff --git a/Signal/src/Normalization_13TeV.cc b/Signal/src/Normalization_13TeV.cc index 0d5c7350..078615c3 100644 --- a/Signal/src/Normalization_13TeV.cc +++ b/Signal/src/Normalization_13TeV.cc @@ -50,23 +50,23 @@ int Normalization_13TeV::Init(int sqrtS){ XSectionMap_ZH2HQQ[mH] = valXSZH2HQQ; //Stage 1 - XSectionMap_GG2H_0J[mH] = 0.6236*valXSggH; - XSectionMap_GG2H_1J_PTH_0_60[mH] = 0.1508*valXSggH; - XSectionMap_GG2H_1J_PTH_60_120[mH] = 0.1008*valXSggH; - XSectionMap_GG2H_1J_PTH_120_200[mH] = 0.0173*valXSggH; - XSectionMap_GG2H_1J_PTH_GT200[mH] = 0.0027*valXSggH; - XSectionMap_GG2H_GE2J_PTH_0_60[mH] = 0.0233*valXSggH; - XSectionMap_GG2H_GE2J_PTH_60_120[mH] = 0.0406*valXSggH; - XSectionMap_GG2H_GE2J_PTH_120_200[mH] = 0.0170*valXSggH; - XSectionMap_GG2H_GE2J_PTH_GT200[mH] = 0.0097*valXSggH; - XSectionMap_GG2H_VBFTOPO_JET3VETO[mH] = 0.0063*valXSggH; - XSectionMap_GG2H_VBFTOPO_JET3[mH] = 0.0079*valXSggH; - - XSectionMap_VBF_PTJET1_GT200[mH] = 0.0508*valXSqqH; - XSectionMap_VBF_VH2JET[mH] = 0.0172*valXSqqH; - XSectionMap_VBF_VBFTOPO_JET3VETO[mH] = 0.2624*valXSqqH; - XSectionMap_VBF_VBFTOPO_JET3[mH] = 0.1017*valXSqqH; - XSectionMap_VBF_REST[mH] = 0.5680*valXSqqH; + XSectionMap_GG2H_0J[mH] = 0.91 * 0.6236 * valXSggH; // frac(central) * frac(of central) * totXS + XSectionMap_GG2H_1J_PTH_0_60[mH] = 0.91 * 0.1508 * valXSggH; + XSectionMap_GG2H_1J_PTH_60_120[mH] = 0.91 * 0.1008 * valXSggH; + XSectionMap_GG2H_1J_PTH_120_200[mH] = 0.91 * 0.0173 * valXSggH; + XSectionMap_GG2H_1J_PTH_GT200[mH] = 0.91 * 0.0027 * valXSggH; + XSectionMap_GG2H_GE2J_PTH_0_60[mH] = 0.91 * 0.0233 * valXSggH; + XSectionMap_GG2H_GE2J_PTH_60_120[mH] = 0.91 * 0.0406 * valXSggH; + XSectionMap_GG2H_GE2J_PTH_120_200[mH] = 0.91 * 0.0170 * valXSggH; + XSectionMap_GG2H_GE2J_PTH_GT200[mH] = 0.91 * 0.0097 * valXSggH; + XSectionMap_GG2H_VBFTOPO_JET3VETO[mH] = 0.91 * 0.0063 * valXSggH; + XSectionMap_GG2H_VBFTOPO_JET3[mH] = 0.91 * 0.0079 * valXSggH; + + XSectionMap_VBF_PTJET1_GT200[mH] = 0.93 * 0.0508 * valXSqqH; + XSectionMap_VBF_VH2JET[mH] = 0.93 * 0.0172 * valXSqqH; + XSectionMap_VBF_VBFTOPO_JET3VETO[mH] = 0.93 * 0.2624 * valXSqqH; + XSectionMap_VBF_VBFTOPO_JET3[mH] = 0.93 * 0.1017 * valXSqqH; + XSectionMap_VBF_REST[mH] = 0.93 * 0.5680 * valXSqqH; XSectionMap_QQ2HLNU_PTV_0_150[mH] = 0.9467*valXSQQ2HLNU; XSectionMap_QQ2HLNU_PTV_150_250_0J[mH] = 0.0203*valXSQQ2HLNU; diff --git a/Signal/src/Packager.cc b/Signal/src/Packager.cc index 29593048..fe4ec952 100644 --- a/Signal/src/Packager.cc +++ b/Signal/src/Packager.cc @@ -80,6 +80,14 @@ void Packager::packageOutput(bool split, string process , string tag){ expectedObjectsNotFound.push_back(Form("sig_%s_mass_m%d_%s",proc->c_str(),mh,catname.c_str())); continue; } + std::cout << "ED DEBUG printing tempData" << std::endl; + tempData->Print(); + //std::cout << "ED DEBUG allDataThisMass" << std::endl; + //allDataThisMass->Print(); + std::cout << "ED DEBUG proc " << *proc << std::endl; + std::cout << "ED DEBUG cat " << cat << std::endl; + std::cout << "ED DEBUG procs_.begin() " << *procs_.begin() << std::endl; + //allDataThisMass->Print(); if (!split_){ if ( cat==0 && proc==procs_.begin()) allDataThisMass = (RooDataSet*)tempData->Clone(Form("sig_mass_m%d_AllCats",mh)); else allDataThisMass->append(*tempData); diff --git a/Signal/test/PackageOutput.cpp b/Signal/test/PackageOutput.cpp index 845e88c2..887ce499 100644 --- a/Signal/test/PackageOutput.cpp +++ b/Signal/test/PackageOutput.cpp @@ -199,4 +199,4 @@ int main (int argc, char *argv[]){ outFile->Close(); return 0; } - + diff --git a/Signal/test/makeParametricSignalModelPlots.cpp b/Signal/test/makeParametricSignalModelPlots.cpp index 9c367a6a..2e717c99 100644 --- a/Signal/test/makeParametricSignalModelPlots.cpp +++ b/Signal/test/makeParametricSignalModelPlots.cpp @@ -570,8 +570,7 @@ void Plot(RooRealVar *mass, RooDataSet *data, RooAbsPdf *pdf, pairDraw("same <>"); } - string sim=""; - //string sim="Simulation Preliminary"; + string sim="Simulation Preliminary"; //string sim="Simulation"; //for the paper CMS_lumi( canv, 0,0,sim); canv->Print(Form("%s.pdf",savename.c_str())); @@ -593,7 +592,7 @@ int main(int argc, char *argv[]){ system("mkdir -p plots/SignalPlots/"); setTDRStyle(); writeExtraText = true; // if extra text - //extraText = ""; // default extra text is "Preliminary" + extraText = ""; // default extra text is "Preliminary" lumi_13TeV = "2.7 fb^{-1}"; // default is "19.7 fb^{-1}" lumi_8TeV = "19.1 fb^{-1}"; // default is "19.7 fb^{-1}" lumi_7TeV = "4.9 fb^{-1}"; // default is "5.1 fb^{-1}" diff --git a/edRunCombineScripts.py b/edRunCombineScripts.py index fc5682fc..102bcb5c 100755 --- a/edRunCombineScripts.py +++ b/edRunCombineScripts.py @@ -12,12 +12,12 @@ yieldsOnly = False #justPrint = True -datacardOnly = True -doUEPS = True +#datacardOnly = True +#doUEPS = True #combineOnly = True #combinePlotsOnly = True #effAccOnly = True -#yieldsOnly = True +yieldsOnly = True print 'About to run combine scripts' print 'datacardOnly = %s, combineOnly = %s, combinePlotsOnly = %s, effAccOnly = %s, yieldsOnly = %s'%(str(datacardOnly), str(combineOnly), str(combinePlotsOnly), str(effAccOnly), str(yieldsOnly) ) diff --git a/getFractions.py b/getFractions.py index a7722f29..9ccb837e 100755 --- a/getFractions.py +++ b/getFractions.py @@ -14,9 +14,8 @@ r.gROOT.SetBatch(True) #setup files -ext = 'fullNewTest2016' -#ext = 'fullNewTest2017' -#ext = 'preappFinal2016' +ext = 'preappFinal2016' +#ext = 'preappFinal2016_powheg' print 'ext = %s'%ext baseFilePath = '/vols/cms/es811/FinalFits/ws_%s/'%ext fileNames = [] @@ -37,12 +36,10 @@ if 'M125' not in fileName: continue procs[ fileName.split('pythia8_')[1].split('.root')[0] ] = 0. procsNoTag[ fileName.split('pythia8_')[1].split('.root')[0] ] = 0. -#cats = 'RECO_0J_Tag0,RECO_0J_Tag1,RECO_0J_Tag2,' -cats = 'RECO_0J_Tag0,RECO_0J_Tag1,' +cats = 'RECO_0J_Tag0,RECO_0J_Tag1,RECO_0J_Tag2,' cats += 'RECO_1J_PTH_0_60_Tag0,RECO_1J_PTH_0_60_Tag1,RECO_1J_PTH_60_120_Tag0,RECO_1J_PTH_60_120_Tag1,RECO_1J_PTH_120_200_Tag0,RECO_1J_PTH_120_200_Tag1,RECO_1J_PTH_GT200,' cats += 'RECO_GE2J_PTH_0_60_Tag0,RECO_GE2J_PTH_0_60_Tag1,RECO_GE2J_PTH_60_120_Tag0,RECO_GE2J_PTH_60_120_Tag1,RECO_GE2J_PTH_120_200_Tag0,RECO_GE2J_PTH_120_200_Tag1,RECO_GE2J_PTH_GT200_Tag0,RECO_GE2J_PTH_GT200_Tag1,' -#cats += 'RECO_VBFTOPO_JET3VETO_Tag0,RECO_VBFTOPO_JET3VETO_Tag1,RECO_VBFTOPO_JET3_Tag0,RECO_VBFTOPO_JET3_Tag1,RECO_VBFTOPO_REST,RECO_VBFTOPO_BSM' -cats += 'RECO_VBFTOPO_JET3VETO_Tag0,RECO_VBFTOPO_JET3VETO_Tag1,RECO_VBFTOPO_JET3_Tag0,RECO_VBFTOPO_JET3_Tag1,RECO_VBFTOPO_REST' +cats += 'RECO_VBFTOPO_JET3VETO_Tag0,RECO_VBFTOPO_JET3VETO_Tag1,RECO_VBFTOPO_JET3_Tag0,RECO_VBFTOPO_JET3_Tag1,RECO_VBFTOPO_REST,RECO_VBFTOPO_BSM' cats = cats.split(',') stage0procs = {} stage0procs['GG2H'] = 0. diff --git a/justCopyFiles.sh b/justCopyFiles.sh index 21f4ab8d..9ed22722 100755 --- a/justCopyFiles.sh +++ b/justCopyFiles.sh @@ -1,4 +1,5 @@ -EXT="preappFinal2016" +#EXT="preappFinal2016" +EXT="approvalFinal2016" OUTDIR="outdir_${EXT}" if [ ! -d "Signal/$OUTDIR" ]; then diff --git a/runFinalFitsScripts.sh b/runFinalFitsScripts.sh index cc9653b1..1c8c2112 100755 --- a/runFinalFitsScripts.sh +++ b/runFinalFitsScripts.sh @@ -291,8 +291,8 @@ if [ $COMBINEPLOTSONLY == 0 ]; then #mv higgsCombine_bonlyForLoading_$EXT.MultiDimFit.mH125.root STXSExpPerProcessMuFinerProfileMH_BonlyForLoading_$EXT.root echo "./combineHarvester.py -d combineHarvesterOptions13TeV_$EXT.dat -q $DEFAULTQUEUE --batch $BATCH --verbose" -./combineHarvester.py -d combineHarvesterOptions13TeV_${EXT}${FAKE}.dat -q $DEFAULTQUEUE --batch $BATCH --verbose #--S0 -#./combineHarvester.py -d combineHarvesterOptions13TeV_${EXT}${FAKE}.dat -q $DEFAULTQUEUE --batch $BATCH --verbose --dryRun +#./combineHarvester.py -d combineHarvesterOptions13TeV_${EXT}${FAKE}.dat -q $DEFAULTQUEUE --batch $BATCH --verbose #--S0 +./combineHarvester.py -d combineHarvesterOptions13TeV_${EXT}${FAKE}.dat -q $DEFAULTQUEUE --batch $BATCH --verbose --dryRun JOBS=999 RUN=999 diff --git a/stage1helpers.py b/stage1helpers.py index 2cecd903..08e667d2 100644 --- a/stage1helpers.py +++ b/stage1helpers.py @@ -130,6 +130,7 @@ def getProcAbbrev(self, theProc): elif 'GG2H' in theProc: return 'ggh' elif 'VBF' in theProc: return 'vbf' elif 'BBH' in theProc: return 'bbh' + elif 'GGZH' in theProc: return 'ggzh' elif 'THQ' in theProc: return 'th' elif 'THW' in theProc: return 'th' else: @@ -148,6 +149,7 @@ def getProcStage0(self, theProc): elif 'GG2H' in theProc: return 'GG2H' elif 'VBF' in theProc: return 'VBF' elif 'BBH' in theProc: return 'BBH' + elif 'GGZH' in theProc: return 'GGZH' elif 'THQ' in theProc: return 'THQ' elif 'THW' in theProc: return 'THW' else: @@ -155,7 +157,7 @@ def getProcStage0(self, theProc): raise Exception def getStage0list(self): - return ['GG2H', 'VBF', 'TTH', 'testTHQ', 'testTHW', 'testBBH', 'QQ2HLNU', 'WH2HQQ', 'QQ2HLL', 'ZH2HQQ'] + return ['GG2H', 'VBF', 'TTH', 'testTHQ', 'testTHW', 'testBBH', 'GGZH', 'QQ2HLNU', 'WH2HQQ', 'QQ2HLL', 'ZH2HQQ'] def getStage0dict(self): - return {'GG2H':'ggH', 'VBF':'VBF', 'TTH':'ttH', 'testTHQ':'tHq', 'testTHW':'tHW', 'testBBH':'bbH', 'QQ2HLNU':'WH lep', 'WH2HQQ':'WH had', 'QQ2HLL':'ZH lep', 'ZH2HQQ':'ZH had'} + return {'GG2H':'ggH', 'VBF':'VBF', 'TTH':'ttH', 'testTHQ':'tHq', 'testTHW':'tHW', 'testBBH':'bbH', 'GGZH':'ggZH', 'QQ2HLNU':'WH lep', 'WH2HQQ':'WH had', 'QQ2HLL':'ZH lep', 'ZH2HQQ':'ZH had'} diff --git a/stxsPlotsFromWSs.py b/stxsPlotsFromWSs.py index 20d0f37d..dda041eb 100755 --- a/stxsPlotsFromWSs.py +++ b/stxsPlotsFromWSs.py @@ -94,6 +94,7 @@ def prettyProc( proc ): nameMap['testBBH'] = 'bbh' nameMap['testTHQ'] = 'th' nameMap['testTHW'] = 'th' +nameMap['GGZH'] = 'ggzh' sumwProcCatMap = {} sumwProcMap = {} diff --git a/tdrStyle/CMS_lumi.C b/tdrStyle/CMS_lumi.C index cb547c62..53ebbe26 100644 --- a/tdrStyle/CMS_lumi.C +++ b/tdrStyle/CMS_lumi.C @@ -132,6 +132,7 @@ CMS_lumi( TPad* pad, int iPeriod, int iPosX , TString extraExtraText) //CMS_logo->Draw("X"); pad_logo->Modified(); pad->cd(); + delete pad_logo; } else {