ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/VHbb/python/gethistofromtree.py
(Generate patch)

Comparing UserCode/VHbb/python/gethistofromtree.py (file contents):
Revision 1.7 by peller, Thu Aug 2 16:03:52 2012 UTC vs.
Revision 1.10 by nmohr, Wed Sep 19 14:25:25 2012 UTC

# Line 9 | Line 9 | from BetterConfigParser import BetterCon
9   import sys
10  
11  
12 < #load config
13 < config = BetterConfigParser()
14 < config.read('./config')
15 <
16 < #get locations:
17 < Wdir=config.get('Directories','Wdir')
18 < anaTag=config.get('Analysis','tag')
19 <
20 <
21 <
22 < def getScale(job,rescale,subsample=-1):
23 <    input = TFile.Open(job.getpath())
12 > def getScale(job,path,config,rescale,subsample=-1):
13 >    anaTag=config.get('Analysis','tag')
14 >    input = TFile.Open(path+'/'+job.getpath())
15      CountWithPU = input.Get("CountWithPU")
16      CountWithPU2011B = input.Get("CountWithPU2011B")
17      #print lumi*xsecs[i]/hist.GetBinContent(1)
# Line 40 | Line 31 | def getScale(job,rescale,subsample=-1):
31          theScale = float(job.lumi)*xsec*sf/(CountWithPU.GetBinContent(1))*rescale/float(job.split)
32      return theScale
33  
34 < def getHistoFromTree(job,options,rescale=1,subsample=-1):
34 > def getHistoFromTree(job,path,config,options,rescale=1,subsample=-1):
35 >
36 >    #print job.getpath()
37 >    #print options
38      treeVar=options[0]
39      if subsample>-1:
40          name=job.subnames[subsample]
# Line 56 | Line 50 | def getHistoFromTree(job,options,rescale
50  
51      if job.type != 'DATA':
52          cutcut=config.get('Cuts',options[7])
53 <        if subsample>0:
53 >        if subsample>-1:
54              treeCut='%s & %s & EventForTraining == 0'%(cutcut,job.subcuts[subsample])        
55          else:
56              treeCut='%s & EventForTraining == 0'%(cutcut)
57  
58      elif job.type == 'DATA':
59          cutcut=config.get('Cuts',options[8])
60 <        treeCut='%s & EventForTraining == 0'%(cutcut)
60 >        treeCut='%s'%(cutcut)
61  
62  
63 <    input = TFile.Open(job.getpath(),'read')
63 >    input = TFile.Open(path+'/'+job.getpath(),'read')
64  
65      Tree = input.Get(job.tree)
66      #Tree=tmpTree.CloneTree()
# Line 103 | Line 97 | def getHistoFromTree(job,options,rescale
97      #print job.name + ' Sumw2', hTree.GetEntries()
98  
99      if job.type != 'DATA':
100 <        ScaleFactor = getScale(job,rescale,subsample)
100 >        ScaleFactor = getScale(job,path,config,rescale,subsample)
101          if ScaleFactor != 0:
102              hTree.Scale(ScaleFactor)
103              

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines