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.17 by peller, Sun Oct 14 09:53:49 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 +    TrainFlag = eval(config.get('Analysis','TrainFlag'))
54 +    if TrainFlag: traincut = " & EventForTraining == 0"
55 +    if not TrainFlag: traincut=""
56  
57      if job.type != 'DATA':
58      
# Line 55 | Line 61 | def getHistoFromTree(job,path,config,opt
61          elif type(options[7])==list:
62              cutcut=config.get('Cuts',options[7][0])
63              cutcut=cutcut.replace(options[7][1],options[7][2])
64 <            print cutcut
64 >            #print cutcut
65          if subsample>-1:
66 <            treeCut='%s & %s & EventForTraining == 0'%(cutcut,job.subcuts[subsample])        
66 >            treeCut='%s & %s%s'%(cutcut,job.subcuts[subsample],traincut)        
67          else:
68 <            treeCut='%s & EventForTraining == 0'%(cutcut)
68 >            treeCut='%s%s'%(cutcut,traincut)
69  
70      elif job.type == 'DATA':
71          cutcut=config.get('Cuts',options[8])
# Line 106 | Line 112 | def getHistoFromTree(job,path,config,opt
112          ScaleFactor = getScale(job,path,config,rescale,subsample)
113          if ScaleFactor != 0:
114              hTree.Scale(ScaleFactor)
115 +    
116 +    if addOverFlow:
117 +            print 'Adding overflow'
118 +            uFlow = hTree.GetBinContent(0)+hTree.GetBinContent(1)
119 +            oFlow = hTree.GetBinContent(hTree.GetNbinsX()+1)+hTree.GetBinContent(hTree.GetNbinsX())
120 +            uFlowErr = ROOT.TMath.Sqrt(ROOT.TMath.Power(hTree.GetBinError(0),2)+ROOT.TMath.Power(hTree.GetBinError(1),2))
121 +            oFlowErr = ROOT.TMath.Sqrt(ROOT.TMath.Power(hTree.GetBinError(hTree.GetNbinsX()),2)+ROOT.TMath.Power(hTree.GetBinError(hTree.GetNbinsX()+1),2))
122 +            hTree.SetBinContent(1,uFlow)
123 +            hTree.SetBinContent(hTree.GetNbinsX(),oFlow)
124 +            hTree.SetBinError(1,uFlowErr)
125 +            hTree.SetBinError(hTree.GetNbinsX(),oFlowErr)
126 +              
127              
128      print '\t-->import %s\t Integral: %s'%(job.name,hTree.Integral())
129              
130      hTree.SetDirectory(0)
131      input.Close()  
132      
115 –              
116 –    
133      return hTree, group
134      
135  
# Line 140 | Line 156 | def orderandadd(histos,typs,setup):
156      histos=ordnung
157      typs=ordnungtyp
158  
159 +    print typs
160 +
161      for k in range(0,len(num)):
162          for m in range(0,num[k]):
163              if m > 0:

Diff Legend

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