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.12 by peller, Thu Sep 20 13:10:53 2012 UTC vs.
Revision 1.16 by peller, Tue Oct 9 21:17:34 2012 UTC

# Line 47 | Line 47 | def getHistoFromTree(job,path,config,opt
47      nBins=int(options[3])
48      xMin=float(options[4])
49      xMax=float(options[5])
50 +    #addOverFlow=eval(config.get('Plot_general','addOverFlow'))
51 +    addOverFlow = False
52  
53      if job.type != 'DATA':
54      
# Line 55 | Line 57 | def getHistoFromTree(job,path,config,opt
57          elif type(options[7])==list:
58              cutcut=config.get('Cuts',options[7][0])
59              cutcut=cutcut.replace(options[7][1],options[7][2])
60 <            print cutcut
60 >            #print cutcut
61          if subsample>-1:
62              treeCut='%s & %s & EventForTraining == 0'%(cutcut,job.subcuts[subsample])        
63          else:
# Line 106 | Line 108 | def getHistoFromTree(job,path,config,opt
108          ScaleFactor = getScale(job,path,config,rescale,subsample)
109          if ScaleFactor != 0:
110              hTree.Scale(ScaleFactor)
111 +    
112 +    if addOverFlow:
113 +            print 'Adding overflow'
114 +            uFlow = hTree.GetBinContent(0)+hTree.GetBinContent(1)
115 +            oFlow = hTree.GetBinContent(hTree.GetNbinsX()+1)+hTree.GetBinContent(hTree.GetNbinsX())
116 +            uFlowErr = ROOT.TMath.Sqrt(ROOT.TMath.Power(hTree.GetBinError(0),2)+ROOT.TMath.Power(hTree.GetBinError(1),2))
117 +            oFlowErr = ROOT.TMath.Sqrt(ROOT.TMath.Power(hTree.GetBinError(hTree.GetNbinsX()),2)+ROOT.TMath.Power(hTree.GetBinError(hTree.GetNbinsX()+1),2))
118 +            hTree.SetBinContent(1,uFlow)
119 +            hTree.SetBinContent(hTree.GetNbinsX(),oFlow)
120 +            hTree.SetBinError(1,uFlowErr)
121 +            hTree.SetBinError(hTree.GetNbinsX(),oFlowErr)
122 +              
123              
124      print '\t-->import %s\t Integral: %s'%(job.name,hTree.Integral())
125              
126      hTree.SetDirectory(0)
127      input.Close()  
128      
115 –              
116 –    
129      return hTree, group
130      
131  
# Line 140 | Line 152 | def orderandadd(histos,typs,setup):
152      histos=ordnung
153      typs=ordnungtyp
154  
155 +    print typs
156 +
157      for k in range(0,len(num)):
158          for m in range(0,num[k]):
159              if m > 0:

Diff Legend

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