[Rivet-svn] r3132 - in trunk: . bin doc

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Mon Jun  6 23:06:50 2011
New Revision: 3132

Log:
make-plots: For RatioPlotMode=deviation also consider the MC uncertainties, not just data.

Modified:
   trunk/ChangeLog
   trunk/bin/make-plots
   trunk/doc/make-plots.txt

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Mon Jun  6 22:20:54 2011	(r3131)
+++ trunk/ChangeLog	Mon Jun  6 23:06:50 2011	(r3132)
@@ -2,6 +2,9 @@
 
 	* Allow for negative cross-sections. NLO tools need this.
 
+	* make-plots: For RatioPlotMode=deviation also consider the MC
+	uncertainties, not just data.
+
 2011-06-04  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
 	* Add support for goodness-of-fit calculations to make-plots.

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Mon Jun  6 22:20:54 2011	(r3131)
+++ trunk/bin/make-plots	Mon Jun  6 23:06:50 2011	(r3132)
@@ -550,7 +550,7 @@
         def pickcolor(gof):
             color=None
             colordefs = {}
-            for i in inputdata.description.setdefault('GofFrameColor', '0:green 3:yellow 5:red').strip().split():
+            for i in inputdata.description.setdefault('GofFrameColor', '0:green 3:yellow 6:red!70').strip().split():
                 foo = i.split(':')
                 if len(foo)!=2: continue
                 colordefs[float(foo[0])] = foo[1]
@@ -1274,7 +1274,8 @@
                fuzzyeq(self.data[i]['UpEdge'], name.data[i]['UpEdge']):
                 self.data[i]['Content'] -= name.data[i]['Content']
                 try:
-                    self.data[i]['Content'] /= 0.5*(name.data[i]['Error'][0] + name.data[i]['Error'][1])
+                    self.data[i]['Content'] /= 0.5*sqrt((name.data[i]['Error'][0] + name.data[i]['Error'][1])**2 + \
+                                                        (self.data[i]['Error'][0] + self.data[i]['Error'][1])**2)
                 except ZeroDivisionError:
                     self.data[i]['Content'] = 0.0
                 try:
@@ -1584,8 +1585,8 @@
             # 
             out += ('\\rput(0,1){\\psline[linewidth=%scm,linecolor=%s](%scm,%scm)(%scm,%scm)}' %(top, color, -left, top/2, width+right, top/2))
             out += ('\\rput(0,%scm){\\psline[linewidth=%scm,linecolor=%s](%scm,%scm)(%scm,%scm)}' %(height[1], bottom, color, -left, -bottom/2, width+right, -bottom/2))
-            out += ('\\rput(0,0){\\psline[linewidth=%scm,linecolor=%s](%scm,%scm)(%scm,%scm)}' %(left, color, -left/2, height[1]-0.0001, -left/2, height[0]+0.0001))
-            out += ('\\rput(1,0){\\psline[linewidth=%scm,linecolor=%s](%scm,%scm)(%scm,%scm)}' %(right, color, right/2, height[1]-0.0001, right/2, height[0]+0.0001))
+            out += ('\\rput(0,0){\\psline[linewidth=%scm,linecolor=%s](%scm,%scm)(%scm,%scm)}' %(left, color, -left/2, height[1]-0.05, -left/2, height[0]+0.05))
+            out += ('\\rput(1,0){\\psline[linewidth=%scm,linecolor=%s](%scm,%scm)(%scm,%scm)}' %(right, color, right/2, height[1]-0.05, right/2, height[0]+0.05))
 
 
         out += ('\\psframe[linewidth='+self.framelinewidth+',dimen=middle](0,0)(1,1)\n')

Modified: trunk/doc/make-plots.txt
==============================================================================
--- trunk/doc/make-plots.txt	Mon Jun  6 22:20:54 2011	(r3131)
+++ trunk/doc/make-plots.txt	Mon Jun  6 23:06:50 2011	(r3132)
@@ -329,7 +329,7 @@
 
 to specify the thresholds for the frame color. This option takes a list of
 `<threshold>:<color>` pairs, separated by whitespace. The default is
-`GofFrameColor=0:green 3:yellow 5:red`.
+`GofFrameColor=0:green 3:yellow 6:red!70`.
 
 
 Color Palettes for 2-dim Plots