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.10 by nmohr, Wed Sep 19 14:25:25 2012 UTC vs.
Revision 1.12 by peller, Thu Sep 20 13:10:53 2012 UTC

# Line 31 | Line 31 | def getScale(job,path,config,rescale,sub
31          theScale = float(job.lumi)*xsec*sf/(CountWithPU.GetBinContent(1))*rescale/float(job.split)
32      return theScale
33  
34 < def getHistoFromTree(job,path,config,options,rescale=1,subsample=-1):
34 > def getHistoFromTree(job,path,config,options,rescale=1,subsample=-1,which_weightF='weightF'):
35  
36      #print job.getpath()
37      #print options
# Line 49 | Line 49 | def getHistoFromTree(job,path,config,opt
49      xMax=float(options[5])
50  
51      if job.type != 'DATA':
52 <        cutcut=config.get('Cuts',options[7])
52 >    
53 >        if type(options[7])==str:
54 >            cutcut=config.get('Cuts',options[7])
55 >        elif type(options[7])==list:
56 >            cutcut=config.get('Cuts',options[7][0])
57 >            cutcut=cutcut.replace(options[7][1],options[7][2])
58 >            print cutcut
59          if subsample>-1:
60              treeCut='%s & %s & EventForTraining == 0'%(cutcut,job.subcuts[subsample])        
61          else:
# Line 67 | Line 73 | def getHistoFromTree(job,path,config,opt
73      #Tree.SetDirectory(0)
74      
75      #Tree=tmpTree.Clone()
76 <    weightF=config.get('Weights','weightF')
76 >    weightF=config.get('Weights',which_weightF)
77      #hTree = ROOT.TH1F('%s'%name,'%s'%title,nBins,xMin,xMax)
78      #hTree.SetDirectory(0)
79      #hTree.Sumw2()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines