[Rivet-svn] r2282 - in trunk: bin data/plotinfo src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Mar  1 18:12:19 2010
New Revision: 2282

Log:
Deal with silly AIDA definition of binWidth...

Modified:
   trunk/bin/rivet
   trunk/data/plotinfo/UA1_1990_S2044935.plot
   trunk/src/Analyses/UA1_1990_S2044935.cc

Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet	Mon Mar  1 17:53:30 2010	(r2281)
+++ trunk/bin/rivet	Mon Mar  1 18:12:19 2010	(r2282)
@@ -289,7 +289,8 @@
         print "Status: %s" % ana.status()
         print ""
         print "Spires ID: %s" % ana.spiresId()
-        print "Spires URL: http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+%s" % ana.spiresId()
+        print "Spires URL:  http://www.slac.stanford.edu/spires/find/hep/www?rawcmd=key+%s" % ana.spiresId()
+        print "HepData URL: http://hepdata.cedar.ac.uk/key+%s" % ana.spiresId()
         print "Experiment: %s" % ana.experiment(), ana.collider()
         print "Year of publication: %s" % ana.year()
         print "Authors:"

Modified: trunk/data/plotinfo/UA1_1990_S2044935.plot
==============================================================================
--- trunk/data/plotinfo/UA1_1990_S2044935.plot	Mon Mar  1 17:53:30 2010	(r2281)
+++ trunk/data/plotinfo/UA1_1990_S2044935.plot	Mon Mar  1 18:12:19 2010	(r2282)
@@ -17,37 +17,37 @@
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d02-x01-y01 
-Title=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta =0$, $\sqrt{s} = \unit{200}{\GeV}$
+Title=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta =0$, $\sqrt{s} = \unit{200}{\GeV}$
 XLabel=$p_\perp$ [GeV]
 YLabel=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ [\millibarn\,\inverse\squared\GeV]
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d02-x01-y02
-Title=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta =0$, $\sqrt{s} = \unit{500}{\GeV}$
+Title=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta =0$, $\sqrt{s} = \unit{500}{\GeV}$
 XLabel=$p_\perp$ [GeV]
 YLabel=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ [\millibarn\,\inverse\squared\GeV]
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d02-x01-y03
-Title=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta =0$, $\sqrt{s} = \unit{900}{\GeV}$
+Title=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta =0$, $\sqrt{s} = \unit{900}{\GeV}$
 XLabel=$p_\perp$ [GeV]
 YLabel=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ [\millibarn\,\inverse\squared\GeV]
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d03-x01-y01
-Title=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta=0$, $\sqrt{s} = \unit{900}{\GeV}$ ($\mathrm{d}n_\text{ch}/\mathrm{d}\eta = 0.8 \dots 4$)
+Title=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta=0$, $\sqrt{s} = \unit{900}{\GeV}$ ($\mathrm{d}n_\text{ch}/\mathrm{d}\eta = 0.8 \dots 4$)
 XLabel=$p_\perp$ [GeV]
 YLabel=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ [\microbarn\,\inverse\squared\GeV]
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d04-x01-y01
-Title=Cross section $E \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta=0$, $\sqrt{s} = \unit{900}{\GeV}$ ($\mathrm{d}n_\text{ch}/\mathrm{d}\eta = 4 \dots 8$)
+Title=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta=0$, $\sqrt{s} = \unit{900}{\GeV}$ ($\mathrm{d}n_\text{ch}/\mathrm{d}\eta = 4 \dots 8$)
 XLabel=$p_\perp$ [GeV]
 YLabel=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ [\microbarn\,\inverse\squared\GeV]
 # END PLOT
 
 # BEGIN PLOT /UA1_1990_S2044935/d05-x01-y01
-Title=Cross section $E \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta=0$, $\sqrt{s} = \unit{900}{\GeV}$ ($\mathrm{d}n_\text{ch}/\mathrm{d}\eta > 8$)
+Title=$E \, \mathrm{d}^3\sigma/\mathrm{d}p^3$ at $\eta=0$, $\sqrt{s} = \unit{900}{\GeV}$ ($\mathrm{d}n_\text{ch}/\mathrm{d}\eta > 8$)
 XLabel=$p_\perp$ [GeV]
 YLabel=$E \mathrm{d}^3\sigma/\mathrm{d}p^3$ [\microbarn\,\inverse\squared\GeV]
 # END PLOT

Modified: trunk/src/Analyses/UA1_1990_S2044935.cc
==============================================================================
--- trunk/src/Analyses/UA1_1990_S2044935.cc	Mon Mar  1 17:53:30 2010	(r2281)
+++ trunk/src/Analyses/UA1_1990_S2044935.cc	Mon Mar  1 18:12:19 2010	(r2282)
@@ -130,11 +130,12 @@
       scale(_hist_Esigd3p, xsec/millibarn);
       scale(_hist_Et, xsec/millibarn);
       if (fuzzyEquals(sqrtS()/GeV, 900, 1E-3)) {
-        const double scale08 = 0.933e5/_hist_Esigd3p08->binHeight(0);
+        // NB. Ref data is normalised to a fixed value. Note silly AIDA binHeight forgets the bin width.
+        const double scale08 = 0.933e5/(_hist_Esigd3p08->binHeight(0)/_hist_Esigd3p08->binWidth(0));
         scale(_hist_Esigd3p08, scale08);
-        const double scale40 = 1.369e5/_hist_Esigd3p40->binHeight(0);
+        const double scale40 = 1.369e5/(_hist_Esigd3p40->binHeight(0)/_hist_Esigd3p40->binWidth(0));
         scale(_hist_Esigd3p40, scale40);
-        const double scale80 = 1.657e5/_hist_Esigd3p80->binHeight(0);
+        const double scale80 = 1.657e5/(_hist_Esigd3p80->binHeight(0)/_hist_Esigd3p80->binWidth(0));
         scale(_hist_Esigd3p80, scale80);
       }
     }