Skip to content

Commit

Permalink
align master
Browse files Browse the repository at this point in the history 
Merge branch 'moriond17_dev'
  • Loading branch information
@MDallOsso
MDallOsso committed Feb 23, 2017
2 parents 0ff4172 + 3c5ca7e commit f78b42b
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 36 deletions.
97 changes: 65 additions & 32 deletions python/UtilsDraw.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from glob import glob

# ROOT imports
from ROOT import TChain, TH1D, TH2D, TFile, vector, TCanvas, TLatex, TLegend, THStack, gStyle
from ROOT import TChain, TH1D, TH2D, TFile, vector, TCanvas, TLatex, TLine, TLegend, THStack, gStyle
from rootpy.plotting import Hist, Hist2D

from Analysis.alp_analysis.alpSamplesOptions import sam_opt

Expand Down Expand Up @@ -109,7 +110,7 @@ def setYmax(hs, c, hname):
h.SetMaximum(ymax)
#------------

def getScale(hlist1, hlist2):
def getScale(hlist1, hlist2): #h2/h1
hsInt = 0
norm = 0
for h in hlist1:
Expand All @@ -124,7 +125,7 @@ def getScale(hlist1, hlist2):
return scale
#------------

def getStackH(histos, hsOpt, rebin, color, scale, fill): #hsOpt['rebin']
def getStackH(histos, hsOpt, rebin, color, scale, fill):
if color: col = color
else: col = samOpt['fillcolor']

Expand Down Expand Up @@ -161,9 +162,11 @@ def getStackH(histos, hsOpt, rebin, color, scale, fill): #hsOpt['rebin']
else:
h.SetLineWidth(1)
h.SetLineColorAlpha(col,0.)
if i==0: h_ = h.Clone("h_")
else: h_.Add(h)
hs.Add(h)
herr.Add(h)
return hs, herr
return hs, herr, h_

##
# DRAWING FUNCTIONS
Expand Down Expand Up @@ -470,27 +473,35 @@ def drawH1Stack(hdata, hsig, hbkg, hsOpt, samData, samSig, samBkg, ratio, norm,
return True
#------------

def drawH1(hlist1, legstack1, hlist2, legstack2, hsOpt, ratio, norm, oDir, colors, dofill):
def drawH1(hlist1, legstack1, hlist2, legstack2, hsOpt, residuals, norm, oDir, colors, dofill, rebin):
gStyle.SetOptStat(False)
legend = setLegend(1,1)
c1 = TCanvas("c1", hsOpt['hname'], 800, 800)

if rebin > 0: rb = rebin
else: rb = hsOpt['rebin']

ymax = 0.
if(norm): scale1 = getScale(hlist1, hlist2)
else: scale1 = 1.
print scale1
hs1, herr1 = getStackH(hlist1, hsOpt, hsOpt['rebin'], colors[0], scale1, dofill[0])
print "scale1", scale1
hs1, herr1, h1 = getStackH(hlist1, hsOpt,rb, colors[0], scale1, dofill[0])
legend.AddEntry(hlist1[len(hlist1)-1], legstack1)
if hs1.GetMaximum() > ymax: ymax = hs1.GetMaximum()*1.1
if herr1.GetMaximum() > ymax: ymax = herr1.GetMaximum()*1.1

if(norm): scale2 = getScale(hlist2, hlist2)
print scale2
hs2, herr2 = getStackH(hlist2, hsOpt, hsOpt['rebin'], colors[1], scale2, dofill[1])
print "scale2", scale2
hs2, herr2, h2 = getStackH(hlist2, hsOpt, rb, colors[1], scale2, dofill[1])
legend.AddEntry(hlist2[len(hlist2)-1], legstack2)
if hs2.GetMaximum() > ymax: ymax = hs2.GetMaximum()*1.1
if herr2.GetMaximum() > ymax: ymax = herr2.GetMaximum()*1.1

print "h1Int ", h1.Integral()
print h1.GetBinContent(1), h1.GetBinError(1)
print h2.GetBinContent(1), h2.GetBinError(1)
print herr1.GetBinContent(1), herr1.GetBinError(1)

#debug -- needed before drawing hs
herr1.GetXaxis().SetRangeUser(hsOpt['xmin'],hsOpt['xmax'])
herr1.SetMinimum(0.)
Expand All @@ -516,31 +527,53 @@ def drawH1(hlist1, legstack1, hlist2, legstack2, hsOpt, ratio, norm, oDir, color
c1.Update()
c1.SaveAs(oDir+"/"+hsOpt['hname']+".pdf")
c1.SaveAs(oDir+"/"+hsOpt['hname']+".png")
#c1.SaveAs(oDir+"/"+hsOpt['hname']+".root")

if ratio:
c2 = TCanvas("c2", "r"+hsOpt['hname'], 800, 400)

h1 = hs1.GetHistrogram()
norm_factor = scale1
hdiff = hs1.Clone("h_diff")
hdiff.Add(hs2,-1.)
hdiff_e = hs1.Clone("h_diff_err")
hdiff_e.Add(hs2,norm_factor**2)

#for b in full_hists["cr_diff_err"]: hdiff_e.value = np.sqrt(hdiff_e.value)

c1.SaveAs(oDir+"/"+hsOpt['hname']+".root")

if residuals: # data as h2!!!
if residuals>1:
c2 = TCanvas("c2", "r"+hsOpt['hname'], 800, 800)
c2.Divide(1,2)
c2.cd(1)
else:
c2 = TCanvas("c2", "r"+hsOpt['hname'], 800, 400)
norm_factor = scale1
hdiff = h2.Clone("h_diff")
hdiff.Add(h1,-1.)
hdiff_e = h2.Clone("h_diff_err")
hdiff_e.Add(h1,norm_factor**2)
for i in range(0, hdiff_e.GetXaxis().GetNbins()): #improve
hdiff_e.SetBinContent(i, math.sqrt(hdiff_e.GetBinContent(i)))
hdiff_e.SetBinError(i,1.) #DEBUG!
hres = Hist(10,0,1, name="")
hres = hdiff.Clone("h_residual")
hres.Divide(hdiff_e)

hres.Draw()
# full_hists["cr_frac"] = full_hists["cr_diff"] \
# .Clone(full_hists_name.format("cr_frac"))
# full_hists["cr_frac"].Divide(full_hists["cr_bkg_scaled"])
# full_hists["cr_frac_err2"] = full_hists["cr_frac"] \
# .Clone(full_hists_name.format("cr_frac_err2"))
# full_hists["cr_frac_inv_err2"] = full_hists["cr_frac"] \
# .Clone(full_hists_name.format("cr_frac_inv_err2"))
hres.GetXaxis().SetRangeUser(hsOpt['xmin'],hsOpt['xmax'])
hres.SetMarkerStyle(8)
hres.SetMarkerSize(0.8)
hres.SetMarkerColor(1)
hres.SetLineColor(1)
hres.GetXaxis().SetTitle(hsOpt['xname'])
hres.GetYaxis().SetTitle('residuals (sigma units)')
hres.Draw("E X0")
line = TLine(hsOpt['xmin'],0.,hsOpt['xmax'],0.);
line.Draw()
if residuals>1: #draw also pull with fit
c2.cd(2)
gStyle.SetOptFit(1)
res_a = []
for i in range(0, hres.GetXaxis().GetNbins()): #improve
if (not hres.IsBinOverflow(i)) and (math.fabs(hres.GetBinContent(i)) != 0):
res_a.append(hres.GetBinContent(i))
res_pull = Hist(50, -5., 5, name = "h_res_pull")
res_pull.GetXaxis().SetTitle("residuals (sigma units)")
for v in res_a: res_pull.fill(v)
res_pull.Fit("gaus", "ILL")
res_pull.Draw("E X0")

c2.Update()
c2.SaveAs(oDir+"/"+hsOpt['hname']+"_res.pdf")
c2.SaveAs(oDir+"/"+hsOpt['hname']+"_res.png")
c2.SaveAs(oDir+"/"+hsOpt['hname']+"_res.root")

return True
#------------
Expand Down
10 changes: 6 additions & 4 deletions scripts/drawcomp_afterBDT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
parser.add_argument("-n", "--doNorm" , help="normalize to data" , action='store_false')
parser.add_argument("-b", "--bdt" , help="bdt version, equal to input file name", default="")
parser.add_argument("-c", "--customCol", help="use custom colors" , action='store_false')
parser.add_argument("-r", "--plotResidual", help="to plot residuals" , action='store_true')
parser.add_argument("-r", "--clrebin", help="to rebin (classifier output)" , type=int, default=-1)
parser.add_argument("--res", dest="plotResidual", help="to plot residuals (2==fit)" , type=int, default=0)
parser.add_argument("-o", "--oDir" , help="output directory" , default="plots_moriond")
parser.set_defaults(doNorm=True, customCol=True, plotResidual=False)
args = parser.parse_args()
Expand Down Expand Up @@ -94,7 +95,7 @@
oname = 'comp_'+samples[0]+samples[1]+'_afterBDT'

elif which == 5:
samples = ['bkg','data']
samples = ['bkg','data'] #data always second
fractions = ['test','']
regions = ['cr','cr']
legList = ["bkg (mixed data) - CR", "data - CR"]
Expand Down Expand Up @@ -162,10 +163,11 @@
#----------------------------------
for h in histList:
hOpt = hist_opt[h]
if h == 'classifier': h+='-'+args.bdt
if h == 'classifier':
h+='-'+args.bdt
hs1 = UtilsDraw.getHistos_bdt(h, filename, plotDir[0])
hs2 = UtilsDraw.getHistos_bdt(h, filename, plotDir[1])

if hs1 and hs2:
UtilsDraw.drawH1(hs1, legList[0], hs2, legList[1], hOpt, args.plotResidual, args.doNorm, oDir, colors, dofill)
UtilsDraw.drawH1(hs1, legList[0], hs2, legList[1], hOpt, args.plotResidual, args.doNorm, oDir, colors, dofill, args.clrebin)

0 comments on commit f78b42b

Please sign in to comment.