updates using the UL samples

cms-analysis · Jan 11, 2023 · f40c264 · f40c264
1 parent 080bd80
commit f40c264
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/Combine/PlotScans.py b/Combine/PlotScans.py
@@ -69,15 +69,15 @@ def run(cmd):
     for poi in _fitpois:
       resfile = "higgsCombine_%s_%s.MultiDimFit.mH125.root"%(_name,poi)
       if os.path.isfile(resfile): 
-        print " --> Storing ",_fit.split(":")[0],": %s/higgsCombine_%s_%s.root"%(resfile,pdir,_name,poi)
+        print " --> Storing ",_fit.split(":")[0],": %s/higgsCombine_%s_%s.root"%(pdir,_name,poi)
         run("mv %s %s/higgsCombine_%s_%s.root"%(resfile,pdir,_name,poi))
       if poi in ["r_ggH","r_VBF","r_top","r_VH"]:
         translate_json = "pois_mu.json" 
       elif poi=='CMS_zz4l_fai1':
         if 'ALT0M' in opt.ext: translate_json = "pois_fa3.json"
         if 'ALT0PH' in opt.ext: translate_json = "pois_fa2.json"
-        if 'ALTL1' in opt.ext: translate_json = "pois_flambda1.json"
-        if 'ALTL1Zg' in opt.ext: translate_json = "pois_flambda1zgamma.json"
+        if 'ALT0L1' in opt.ext: translate_json = "pois_flambda1.json"
+        if 'ALT0L1Zg' in opt.ext: translate_json = "pois_flambda1zgamma.json"
       else:
         print "Warning: unknown poi. Use r as default"
         translate_json = "pois_mu.json"

diff --git a/Combine/RunFits.py b/Combine/RunFits.py
@@ -98,8 +98,6 @@ def getPdfIndicesFromJson(pdfjson):
   _points = points[fidx]
   _fit_opts = fit_opts[fidx]
 
-  if _fit.split(":")[0] != "bestfit": continue
-
   # If ALL in fit_opts: replace by list of constrained nuisances in workspace
   if "ALL" in _fit_opts: 
     fd = ROOT.TFile("Datacard_%s.root"%(opt.ext))

diff --git a/Combine/inputs.json b/Combine/inputs.json
@@ -1,9 +1,9 @@
 {
-    "mu_simple":{
-        "pois":"r_ggH,r_VBF,r_top,r_VH",
+    "xsec":{
+        "pois":"r_VBF",
         "fits":"profile1D:syst:all+bestfit:syst:all",
         "points":"20:1+:",
-        "fit_opts":"--setParameters r_ggH=1,r_top=1,r_VH=1 --setParameterRanges r_VBF=0,3:r_ggH=0,3:r_top=-5,5:r_VH=-5,5 --saveSpecifiedNuis all --saveInactivePOI 1 --freezeParameters MH  --autoBoundsPOIs 'r_VBF' --autoMaxPOIs 'r_VBF' --fastScan+--setParameters r_ggH=1,r_top=1,r_VH=1 --setParameterRanges r_VBF=0,3:r_ggH=0,3:r_top=-5,5:r_VH=-5,5 --saveSpecifiedNuis all --saveInactivePOI 1 --freezeParameters MH --saveWorkspace"
+        "fit_opts":"--setParameters r_ggH=1,r_top=1,r_VH=1 --setParameterRanges r_VBF=0,3:r_ggH=0.99,1.01:r_top=0.99,1.01:r_VH=0.99,1.01 --saveSpecifiedNuis all --saveInactivePOI 1 --freezeParameters MH,r_ggH,r_top,r_VH  --autoBoundsPOIs 'r_VBF' --autoMaxPOIs 'r_VBF' --fastScan+--setParameters r_ggH=1,r_top=1,r_VH=1 --setParameterRanges r_VBF=0,3:r_ggH=0.99,1.01:r_top=0.99,1.01:r_VH=0.99,1.01 --saveSpecifiedNuis all --saveInactivePOI 1 --freezeParameters MH,r_ggH,r_top,r_VH --saveWorkspace"
     },
     "cp":{
         "pois":"x",
@@ -14,25 +14,25 @@
     "ALT0M":{
         "pois":"CMS_zz4l_fai1",
         "fits":"profile1D:syst:all",
-        "points":"20:1",
-        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --setParameterRanges CMS_zz4l_fai1=-0.003,0.003"
+        "points":"200:1",
+        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10  --setParameterRanges CMS_zz4l_fai1=-0.003,0.003 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --autoMaxPOIs 'CMS_zz4l_fai1' --autoBoundsPOIs 'CMS_zz4l_fai1' "
     },
     "ALT0PH":{
         "pois":"CMS_zz4l_fai1",
         "fits":"profile1D:syst:all",
-        "points":"20:1",
-        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --setParameterRanges CMS_zz4l_fai1=-0.003,0.003"
+        "points":"200:1",
+        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10  --setParameterRanges CMS_zz4l_fai1=-0.003,0.003 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --autoMaxPOIs 'CMS_zz4l_fai1' --autoBoundsPOIs 'CMS_zz4l_fai1' "
     },
-    "ALTL1":{
+    "ALT0L1":{
         "pois":"CMS_zz4l_fai1",
         "fits":"profile1D:syst:all",
-        "points":"20:1",
-        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --setParameterRanges CMS_zz4l_fai1=-0.003,0.003"
+        "points":"200:1",
+        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10  --setParameterRanges CMS_zz4l_fai1=-0.003,0.003 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --autoMaxPOIs 'CMS_zz4l_fai1' --autoBoundsPOIs 'CMS_zz4l_fai1' "
     },
-    "ALTL1Zg":{
+    "ALT0L1Zg":{
         "pois":"CMS_zz4l_fai1",
         "fits":"profile1D:syst:all",
-        "points":"20:1",
-        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --setParameterRanges CMS_zz4l_fai1=-0.003,0.003"
+        "points":"200:1",
+        "fit_opts":"--saveSpecifiedNuis all --saveInactivePOI 1 --cminApproxPreFitTolerance=10  --setParameterRanges CMS_zz4l_fai1=-0.003,0.003 --freezeParameters MH,fa3_ggH,muf --fastScan --setParameters muV=1,muf=1,fa3_ggH=1 --autoMaxPOIs 'CMS_zz4l_fai1' --autoBoundsPOIs 'CMS_zz4l_fai1' "
     }
 }
diff --git a/Combine/run_sequence.sh b/Combine/run_sequence.sh
@@ -44,7 +44,7 @@ elif [[ $STEP == "fit" ]]; then
     done
 elif [[ $STEP == "plot" ]]; then
     #for obs in " " " --doObserved "
-    for obs in " --doObserved "
+    for obs in " "
     do
         for fit in ${fits[*]}
         do

diff --git a/Plots/makeToys.py b/Plots/makeToys.py
@@ -124,5 +124,5 @@ def get_options():
 
   # Submission
   os.system("chmod 775 ./SplusBModels%s/toys/jobs/sub_toys.sh"%opt.ext)
-  if not opt.dryRun: os.system("cd ./SplusBModels%s/toys/jobs; source /cvmfs/cms.cern.ch/cmsset_default.csh; eval `scramv1 runtime -csh`; condor_submit sub_toys.sub; cd ../../.."%opt.ext)
+  if not opt.dryRun: os.system("cd ./SplusBModels%s/toys/jobs; source /cvmfs/cms.cern.ch/cmsset_default.sh; eval `scramv1 runtime -sh`; condor_submit sub_toys.sub; cd ../../.."%opt.ext)
   else: print " --> [DRY-RUN] jobs have not been submitted"  
diff --git a/Plots/makeYieldsTables.py b/Plots/makeYieldsTables.py
@@ -225,7 +225,7 @@ def LoadTranslations(jsonfilename):
   _s0_yields = od()
   _nominal_yield = 0
   _target_yield = 0
-  for year in ['2016','2017','2018']:
+  for year in ['2016preVFP','2016postVFP','2017','2018']:
     mask = (data['cat']==cat)&(data['type']=='sig')&(data['year']==year)
     # Extract rate from lumi
     _rate = float(lumiMap[year])