[Rivet-svn] r2647 - in trunk: . data/anainfo data/plotinfo

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Aug  5 17:40:47 2010
New Revision: 2647

Log:
Merging my version of James' last update to the SWIG/g++ compatibility check! Basically just a tiny cosmetic change

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/anainfo/CDF_2002_S4796047.info
   trunk/data/plotinfo/CDF_2000_S4155203.plot

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Aug  5 17:02:34 2010	(r2646)
+++ trunk/ChangeLog	Thu Aug  5 17:40:47 2010	(r2647)
@@ -1,3 +1,8 @@
+2010-08-03  Andy Buckley  <andy at insectnation.org>
+
+	* Fixing compare-histos treatment of what is now a ref file, and
+	speeding things up... again. What a mess!
+
 2010-08-02  Andy Buckley  <andy at insectnation.org>
 
 	* Adding rivet-nopy: a super-simple Rivet C++ command line

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Thu Aug  5 17:02:34 2010	(r2646)
+++ trunk/configure.ac	Thu Aug  5 17:40:47 2010	(r2647)
@@ -238,16 +238,12 @@
       AC_MSG_ERROR([Can't build Python extension since $SWIG is not able to make a Python wrapper])
       enable_pyext=no
     else
-    
       swig_compiler=$CXX
-                
-      AC_CEDAR_CHECKCXXFLAG([-Wno-format], [AC_MSG_NOTICE([Adding -Wno-format to swig compilation test]);
+      AC_CEDAR_CHECKCXXFLAG([-Wno-format], [AC_MSG_NOTICE([adding -Wno-format to swig compilation test]);
         swig_compiler="$swig_compiler -Wno-format"])
-    
       AC_MSG_CHECKING([if $SWIG is compatible with the $CXX compiler])
       flag_ok=yes
       if test x$flag_ok == xyes; then
-      
         stat_string=`$swig_compiler -c conftest_wrap.cxx -I$python_incpath 2>&1 1>&5` ; test -z "$stat_string" || flag_ok=no
       fi
       AC_MSG_RESULT([$flag_ok])

Modified: trunk/data/anainfo/CDF_2002_S4796047.info
==============================================================================
--- trunk/data/anainfo/CDF_2002_S4796047.info	Thu Aug  5 17:02:34 2010	(r2646)
+++ trunk/data/anainfo/CDF_2002_S4796047.info	Thu Aug  5 17:40:47 2010	(r2647)
@@ -9,7 +9,7 @@
  - Hendrik Hoeth <hendrik.hoeth at cern.ch>
 References:
  - Phys.Rev.D65:072005,2002
- - doi:10.1103/PhysRevD.65.072005 
+ - doi:10.1103/PhysRevD.65.072005
 RunInfo:
   QCD events at sqrt(s) = 630 and 1800 GeV.
 NumEvents: 1000000
@@ -26,10 +26,17 @@
   results shows distinct differences in the behavior of the two samples
   as a function of the center of mass energy. The properties of the soft
   sample are invariant as a function of c.m. energy.
+
+  It should be noticed that minimum bias tunings of PYTHIA made by ATLAS
+  in early 2010, which used this among all other available data from CDF
+  and from ATLAS at 900~GeV and 7~TeV, found an unavoidable tension between
+  this data and the rest. Accordingly, this data was excluded from the fits.
+  Whether this reflects a problem with this dataset or with the PYTHIA MPI
+  model is a judgement for users to make!
 BibKey: Acosta:2001rm
 BibTeX: '@Article{Acosta:2001rm,
      author    = "Acosta, Darin E. and others",
- collaboration = "CDF",
+     collaboration = "CDF",
      title     = "{Soft and hard interactions in $p\bar{p}$ collisions at
                   $\sqrt{s}=$ 1800-GeV and 630-GeV}",
      journal   = "Phys. Rev.",

Modified: trunk/data/plotinfo/CDF_2000_S4155203.plot
==============================================================================
--- trunk/data/plotinfo/CDF_2000_S4155203.plot	Thu Aug  5 17:02:34 2010	(r2646)
+++ trunk/data/plotinfo/CDF_2000_S4155203.plot	Thu Aug  5 17:40:47 2010	(r2647)
@@ -1,7 +1,7 @@
 # BEGIN PLOT /CDF_2000_S4155203/d01-x01-y01
 Title=$p_\perp(Z)$ in $Z \to e^+ e^-$ events
-XLabel=$p_\perp(Z)$ / GeV
-YLabel=$\mathrm{d}{\sigma}/\mathrm{d}{p_\perp(Z)}$ / (pb/GeV)
+XLabel=$p_\perp(Z)$ [$\text{GeV}\!/\!c$]
+YLabel=$\mathrm{d}{\sigma}/\mathrm{d}{p_\perp(Z)}$ [$\text{pb} / (\text{GeV}\!/\!c)$]
 LogY=0
 XMax=45
 # END PLOT