keep aux files around

Author: andrzejnovak

README.md

@@ -46,7 +46,9 @@ cd higgstocharm
 # Must chose --data or --MC, other options get printed
 # python new_Hxx.py --data --unblind --year 2017 --templates n2nano/templates_nskim17_CC.root -o Test17
 python new_Hxx.py --data --unblind --year 2017 -t tau/templates_new17_CC.root -o Test17 --degs 0,0 --fast 1
-python new_Hxx.py --data --unblind --year 2016 -t temps/templates_corr16_CC.root --mut temps/templatesmuCR_corr16_CC.root -o Correct16 --degs 2,0
+python new_Hxx.py --data --unblind --year 2016 -t temps/templates_corr16_CC.root --mut temps/templatesmuCR_corr16_CC.root -o Correct16 --degs 1,0
+
+python new_Hxx.py --data --unblind --year 2016 -t temps/templates_corr16_CC.root --mut temps/templatesmuCR_corr16_CC.root -o Unblind16mod --degs 1,0
 ```
 
 ## Fitting
@@ -58,9 +60,8 @@ bash build.sh
 # text2workspace.py -P HiggsAnalysis.CombinedLimit.PhysicsModel:multiSignalModel  --PO verbose --PO 'map=.*/*hcc*:r[1,-500,500]' model_combined.txt
 # text2workspace.py -P HiggsAnalysis.CombinedLimit.PhysicsModel:multiSignalModel  --PO verbose --PO 'map=.*/zcc:r[1,-5,5]' model_combined.txt
 
-combine -M FitDiagnostics -d model_combined.root --cminDefaultMinimizerStrategy 0 --robustFit=1 
---setParameters z=1,r=1 -n "" -t -1 --toysFrequentist 
-combine -M FitDiagnostics --expectSignal 1 -d model_combined.root --cminDefaultMinimizerStrategy 0 --robustFit=1 --saveShapes --saveWithUncertainties -t -1 --toysFrequentist --setParameters z=1 -n ""
+combine -M FitDiagnostics -d model_combined.root --cminDefaultMinimizerStrategy 0 --robustFit=1  --setParameters z=1,r=1 -n "" -t -1 --toysFrequentist 
+combine -M FitDiagnostics --expectSignal 1 -d model_combined.root --cminDefaultMinimizerStrategy 0 --robustFit=1 --saveShapes --saveWithUncertainties -n "" -t -1 --toysFrequentist --setParameters z=1 
 combine -M Significance model_combined.root --expectSignal 1 --redefineSignalPOIs z -t -1 --toysFrequentist
 combineTool.py -M AsymptoticLimits -m 125 -d model_combined.root --expectSignal 1 --setParameters z=1 --redefineSignalPOIs r -t -1 --toysFrequentist 
 python ../../../HiggsAnalysis/CombinedLimit/test/diffNuisances.py fitDiagnostics.root 
@@ -87,9 +88,9 @@ plotImpacts.py -i impactsZ.json -o plots/impacts_out_Z
 Fitting Z unblinding
 ```
 # Baseline
-combineTool.py -M Impacts -d model_combined.root -m 125 --doInitialFit --robustFit 1 --setParameterRanges r=-1,5 --cminDefaultMinimizerStrategy 0 --X-rtd FITTER_DYN_STEP --expectSignal 1 --redefineSignalPOIs z
+combineTool.py -M Impacts -d model_combined.root -m 125 --doInitialFit --robustFit 1 --setParameterRanges r=-100,100 --cminDefaultMinimizerStrategy 0 --X-rtd FITTER_DYN_STEP --expectSignal 1 --redefineSignalPOIs z
 # Condor
-combineTool.py -M Impacts -d model_combined.root -m 125 --doFits --robustFit 1 --allPars --setParameterRanges r=-1,5  --redefineSignalPOIs z --cminDefaultMinimizerStrategy 0 --X-rtd MINIMIZER_analytic --job-mode condor --sub-opts='+JobFlavour = "workday"' --task-name ggHccZ --exclude 'rgx{qcdparams*}'
+combineTool.py -M Impacts -d model_combined.root -m 125 --doFits --robustFit 1 --allPars --setParameterRanges r=-100,100  --redefineSignalPOIs z --cminDefaultMinimizerStrategy 0 --X-rtd MINIMIZER_analytic --job-mode condor --sub-opts='+JobFlavour = "workday"' --task-name ggHccZ --exclude 'rgx{qcdparams*}'
 # Collect
 combineTool.py -M Impacts -d model_combined.root -m 125 --redefineSignalPOIs z -o impactsZunbl.json
 plotImpacts.py -i impactsZunbl.json -o plots/impacts_out_Zunbl --blind
@@ -160,7 +161,47 @@ tf2017_MCtempl_deco0=1.62,tf2017_MCtempl_deco1=-5.34e-02,tf2017_MCtempl_deco2=-1
 
 ### Running likelihood scan
 ```
-combineTool.py -M MultiDimFit -d model_combined.root --cminDefaultMinimizerStrategy 0 --expectSignal 1 --robustFit 1 --algo grid --points 40 --setParameterRanges r=-20,20 -m 125 -t -1 --toysFrequentist
+combineTool.py -M MultiDimFit -d model_combined.root --cminDefaultMinimizerStrategy 0 --expectSignal 1 --robustFit 1 --algo grid --points 40 --setParameterRanges z=0.2,1.8 -m 125 --redefineSignalPOIs=z
+plot1DScan.py higgsCombine.Test.MultiDimFit.mH125.root -o plots/LScan_data_Z_unbl --y-max 10 --y-cut 10 --POI=z
+
+# Split year form full fit
+text2workspace.py -P HiggsAnalysis.CombinedLimit.PhysicsModel:multiSignalModel  --PO verbose --PO 'map=.*/*hcc*:r[1,-500,500]' --PO 'map=.*2016/zcc:z16[1,0,2]' --PO 'map=.*2017/zcc:z17[1,0,2]' --PO 'map=.*2018/zcc:z18[1,0,2]' model_combined.txt
+
+combineTool.py -M MultiDimFit -d model_combined.root --cminDefaultMinimizerStrategy 0 --expectSignal 1 --robustFit 1 --algo grid --points 40 --setParameterRanges z16=0.2,1.8 -m 125 --redefineSignalPOIs=z16 -n .z16scan
+plot1DScan.py higgsCombine.z16scan.MultiDimFit.mH125.root -o plots/LScan_data_Z_unbl16 --y-max 10 --y-cut 10 --POI=z16 
+
+combineTool.py -M MultiDimFit -d model_combined.root --cminDefaultMinimizerStrategy 0 --expectSignal 1 --robustFit 1 --algo grid --points 40 --setParameterRanges z16=0.2,1.8 -m 125 --redefineSignalPOIs=z16 -n .z16scan
+plot1DScan.py higgsCombine.z16scan.MultiDimFit.mH125.root -o plots/LScan_data_Z_unbl16 --y-max 10 --y-cut 10 --POI=z16 
+
+combineTool.py -M MultiDimFit -d model_combined.root --cminDefaultMinimizerStrategy 0 --expectSignal 1 --robustFit 1 --algo grid --points 40 --setParameterRanges z16=0.2,1.8 -m 125 --redefineSignalPOIs=z16 -n .z16scan
+plot1DScan.py higgsCombine.z16scan.MultiDimFit.mH125.root -o plots/LScan_data_Z_unbl16 --y-max 10 --y-cut 10 --POI=z16 
+
+```
+
+### Channel (year) compatibility 
+
+```bash
+combineTool.py -M MultiDimFit -d model_combined.root --algo singles --cminDefaultMinimizerStrategy 0 --setParameters r=1,z=1 --redefineSignalPOIs z -n .cmb
 
-plot1DScan.py higgsCombine.Test.MultiDimFit.mH125.root -o plots/LScan_data_Zexp1 --y-max 30 --y-cut 30
+# Split year form full fit
+text2workspace.py -P HiggsAnalysis.CombinedLimit.PhysicsModel:multiSignalModel  --PO verbose --PO 'map=.*/*hcc*:r[1,-500,500]' --PO 'map=.*2016/zcc:z16[1,0,2]' --PO 'map=.*2017/zcc:z17[1,0,2]' --PO 'map=.*2018/zcc:z18[1,0,2]' model_combined.txt
+
+combineTool.py -M MultiDimFit -d model_combined.root --algo singles --cminDefaultMinimizerStrategy 0 --setParameters r=1,z16=1,z17=1,z18=1 --redefineSignalPOIs z16 -n .z16
+combineTool.py -M MultiDimFit -d model_combined.root --algo singles --cminDefaultMinimizerStrategy 0 --setParameters r=1,z16=1,z17=1,z18=1 --redefineSignalPOIs z17 -n .z17
+combineTool.py -M MultiDimFit -d model_combined.root --algo singles --cminDefaultMinimizerStrategy 0 --setParameters r=1,z16=1,z17=1,z18=1 --redefineSignalPOIs z18 -n .z18
+```
+
+```bash
+combineTool.py -M PrintFit --json MultiDimFit_ccc.json -P z -i higgsCombine.cmb.MultiDimFit.mH120.root --algo singles
+
+combineTool.py -M PrintFit --json MultiDimFit_ccc.json -P z16 -i higgsCombine.z16.MultiDimFit.mH120.root --algo singles
+combineTool.py -M PrintFit --json MultiDimFit_ccc.json -P z17 -i higgsCombine.z17.MultiDimFit.mH120.root --algo singles
+combineTool.py -M PrintFit --json MultiDimFit_ccc.json -P z18 -i higgsCombine.z18.MultiDimFit.mH120.root --algo singles
+
+python ../plotCCC.py -i MultiDimFit_ccc.json -o plots/ccc_corr
+```
+
+```bash
+bash build.sh
+combine -M ChannelCompatibilityCheck -d model_combined.root --setParameters z=1 --redefineSignalPOIs=z  -g 2016 -g 2017 -g 2018
 ```

config_Hxx.py

@@ -1,32 +1,41 @@
 import numpy as np
 
 # Define Bins
-ptbins = np.array([450, 500, 550, 600, 675, 800, 1200])
-npt = len(ptbins) - 1
-msdbins = np.linspace(40, 201, 24)
-
-# Define pt/msd/rho grids
-ptpts, msdpts = np.meshgrid(ptbins[:-1] + 0.3 * np.diff(ptbins),
-                            msdbins[:-1] + 0.5 * np.diff(msdbins),
-                            indexing='ij')
-rhopts = 2*np.log(msdpts/ptpts)
-ptscaled = (ptpts - 450.) / (1200. - 450.)
-rhoscaled = (rhopts - (-6)) / ((-2.1) - (-6))
-validbins = (rhoscaled >= 0) & (rhoscaled <= 1)
-rhoscaled[~validbins] = 1  # we will mask these out later
-
-# Define fine bins for smooth TF plots
-fptbins = np.arange(450, 1202, 2)
-fmsdbins = np.arange(40, 201.5, .5)
-
-fptpts, fmsdpts = np.meshgrid(fptbins[:-1] + 0.3 * np.diff(fptbins),
-                              fmsdbins[:-1] + 0.5 * np.diff(fmsdbins),
-                              indexing='ij')
-frhopts = 2*np.log(fmsdpts/fptpts)
-fptscaled = (fptpts - 450.) / (1200. - 450.)
-frhoscaled = (frhopts - (-6)) / ((-2.1) - (-6))
-fvalidbins = (frhoscaled >= 0) & (frhoscaled <= 1)
-frhoscaled[~fvalidbins] = 1  # we will mask these out later
+def get_bins(year="2017"):
+    if year == "2017":
+        ptbins = np.array([475, 500, 550, 600, 675, 800, 1200])
+    else:
+        ptbins = np.array([450, 500, 550, 600, 675, 800, 1200])
+    msdbins = np.linspace(40, 201, 24)
+
+    npt = len(ptbins) - 1
+
+    # Define pt/msd/rho grids
+    ptpts, msdpts = np.meshgrid(ptbins[:-1] + 0.3 * np.diff(ptbins),
+                                msdbins[:-1] + 0.5 * np.diff(msdbins),
+                                indexing='ij')
+    rhopts = 2*np.log(msdpts/ptpts)
+    ptscaled = (ptpts - ptbins[0]) / (ptbins[-1] - ptbins[0])
+    rhoscaled = (rhopts - (-6)) / ((-2.1) - (-6))
+    validbins = (rhoscaled >= 0) & (rhoscaled <= 1)
+    rhoscaled[~validbins] = 1  # we will mask these out later
+
+    # Define fine bins for smooth TF plots
+    fptbins = np.arange(ptbins[0], ptbins[0]+2, 2)
+    fmsdbins = np.arange(40, 201.5, .5)
+
+    fptpts, fmsdpts = np.meshgrid(fptbins[:-1] + 0.3 * np.diff(fptbins),
+                                fmsdbins[:-1] + 0.5 * np.diff(fmsdbins),
+                                indexing='ij')
+    frhopts = 2*np.log(fmsdpts/fptpts)
+    fptscaled = (fptpts - ptbins[0]) / (ptbins[-1] - ptbins[0])
+    frhoscaled = (frhopts - (-6)) / ((-2.1) - (-6))
+    fvalidbins = (frhoscaled >= 0) & (frhoscaled <= 1)
+    frhoscaled[~fvalidbins] = 1  # we will mask these out later
+
+    return msdbins, ptbins, ptscaled, rhoscaled, validbins
+
+msdbins, ptbins, ptscaled, rhoscaled, validbins = get_bins(year="2016")
 
 
 def TF_params(xparlist, xparnames=None, nrho=None, npt=None):

do_gof.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if  [[ "$2" -eq 0 ]]; then
+    ALGO=saturated
+elif [[ "$2" -eq 1 ]]; then
+    ALGO=KS
+fi
+echo "Using algo:" $ALGO
+
+if [[ "$1" -eq 0 ]]; then
+    combine -M FitDiagnostics -d model_combined.root --cminDefaultMinimizerStrategy 0 --robustFit=1  --setParameters z=1,r=1 -n "" --saveShapes --saveWithUncertainties #-t -1 --toysFrequentist --robustHesse 1
+elif [[ "$1" -eq 1 ]]; then
+    combine -M GoodnessOfFit model_combined.root --algo $ALGO  --expectSignal 1 --redefineSignalPOIs z -n DataGoF$ALGO
+elif [[ "$1" -eq 2 ]]; then
+    combineTool.py -M GoodnessOfFit model_combined.root --algo $ALGO  --expectSignal 1 -t 5 --toysFrequentist --redefineSignalPOIs z -n GoFs$ALGO --job-mode condor --sub-opts='+JobFlavour = "workday"' --task-name ggHcc$ALGO -s 1:"$3":1    
+elif [[ "$1" -eq 3 ]]; then 
+    hadd -f allgofs$ALGO.root higgsCombineGoFs$ALGO.GoodnessOfFit.mH120.*.root
+elif [[ "$1" -eq 4 ]]; then 
+    python ../plot_single_gof.py higgsCombineDataGoF$ALGO.GoodnessOfFit.mH120.root allgofs$ALGO.root --algo $ALGO --year "$3"
+fi
+
+
+# combineTool.py -M GoodnessOfFit --algorithm $ALGO -m 125 --there -d model_combined.root -n ".$ALGO.toys" --expectSignal 1 -t 500 --toysFrequentist 
+# combineTool.py -M GoodnessOfFit --algorithm $ALGO -m 125 --there -d model_combined.root -n ".$ALGO" 
+# combineTool.py -M CollectGoodnessOfFit --input higgsCombine.$ALGO.GoodnessOfFit.mH125.root higgsCombine.$ALGO.toys.GoodnessOfFit.mH125.*.root -o cmb_$ALGO.json   
+# python ../../../CombineHarvester/CombineTools/scripts/plotGof.py --statistic $ALGO --mass 125.0 cmb_$ALGO.json --title-right="35.9 fb^{-1} (13 TeV)" --output='-$ALGO'