ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/VHbb/python/gethistofromtree.py

Comparing UserCode/VHbb/python/gethistofromtree.py (file contents):
Revision 1.7 by peller, Thu Aug 2 16:03:52 2012 UTC vs.
Revision 1.9 by nmohr, Mon Sep 17 18:23:58 2012 UTC

#	Line 11 | Line 11 | import sys
11
12		#load config
13		config = BetterConfigParser()
14	<	config.read('./config')
14	>	config.read('./config7TeV_ZZ')
15
16		#get locations:
17		Wdir=config.get('Directories','Wdir')
#	Line 19 | Line 19 | anaTag=config.get('Analysis','tag')
19
20
21
22	<	def getScale(job,rescale,subsample=-1):
23	<	input = TFile.Open(job.getpath())
22	>	def getScale(job,path,rescale,subsample=-1):
23	>	input = TFile.Open(path+'/'+job.getpath())
24		CountWithPU = input.Get("CountWithPU")
25		CountWithPU2011B = input.Get("CountWithPU2011B")
26		#print lumi*xsecs[i]/hist.GetBinContent(1)
#	Line 40 | Line 40 | def getScale(job,rescale,subsample=-1):
40		theScale = float(job.lumi)*xsec*sf/(CountWithPU.GetBinContent(1))*rescale/float(job.split)
41		return theScale
42
43	<	def getHistoFromTree(job,options,rescale=1,subsample=-1):
43	>	def getHistoFromTree(job,path,options,rescale=1,subsample=-1):
44	>
45	>	#print job.getpath()
46	>	#print options
47		treeVar=options[0]
48		if subsample>-1:
49		name=job.subnames[subsample]
#	Line 56 | Line 59 | def getHistoFromTree(job,options,rescale
59
60		if job.type != 'DATA':
61		cutcut=config.get('Cuts',options[7])
62	<	if subsample>0:
62	>	if subsample>-1:
63		treeCut='%s & %s & EventForTraining == 0'%(cutcut,job.subcuts[subsample])
64		else:
65		treeCut='%s & EventForTraining == 0'%(cutcut)
66
67		elif job.type == 'DATA':
68		cutcut=config.get('Cuts',options[8])
69	<	treeCut='%s & EventForTraining == 0'%(cutcut)
69	>	treeCut='%s'%(cutcut)
70
71
72	<	input = TFile.Open(job.getpath(),'read')
72	>	input = TFile.Open(path+'/'+job.getpath(),'read')
73
74		Tree = input.Get(job.tree)
75		#Tree=tmpTree.CloneTree()
#	Line 103 | Line 106 | def getHistoFromTree(job,options,rescale
106		#print job.name + ' Sumw2', hTree.GetEntries()
107
108		if job.type != 'DATA':
109	<	ScaleFactor = getScale(job,rescale,subsample)
109	>	ScaleFactor = getScale(job,path,rescale,subsample)
110		if ScaleFactor != 0:
111		hTree.Scale(ScaleFactor)
112

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines