[Rivet-svn] r3006 - in trunk: . src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Mar  7 11:09:35 2011
New Revision: 3006

Log:
Reducing the required accuracy of beam energy matching to 1%, to make the UI a bit more forgiving without seriously compromising accuracy. Still best to give the exactly correct value, though, especially when on resonances like the Z pole.

Modified:
   trunk/ChangeLog
   trunk/src/Core/Analysis.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Sun Mar  6 08:43:02 2011	(r3005)
+++ trunk/ChangeLog	Mon Mar  7 11:09:35 2011	(r3006)
@@ -1,3 +1,9 @@
+2011-03-07  Andy Buckley  <andy at insectnation.org>
+
+	* Changing the accuracy of the beam energy checking to 1%, to make
+	the UI a bit more forgiving. It's still best to specify exactly the right
+	energy of course!
+
 2011-03-01  Andy Buckley  <andy at insectnation.org>
 
 	* Adding --no-plottitle to compare-histos (+ completion).

Modified: trunk/src/Core/Analysis.cc
==============================================================================
--- trunk/src/Core/Analysis.cc	Sun Mar  6 08:43:02 2011	(r3005)
+++ trunk/src/Core/Analysis.cc	Mon Mar  7 11:09:35 2011	(r3006)
@@ -142,12 +142,12 @@
     }
     if (!beamIdsOk) return false;
 
-    // Next check that the energies are compatible
+    // Next check that the energies are compatible (within 1%, to give a bit of UI forgiveness)
     bool beamEnergiesOk = requiredEnergies().size()>0 ? false : true;
     typedef pair<double,double> DoublePair;
     foreach (const DoublePair& ep, requiredEnergies()) {
-      if ((fuzzyEquals(ep.first, energies.first) && fuzzyEquals(ep.second, energies.second)) ||
-          (fuzzyEquals(ep.first, energies.second) && fuzzyEquals(ep.second, energies.first))) {
+      if ((fuzzyEquals(ep.first, energies.first, 0.01) && fuzzyEquals(ep.second, energies.second, 0.01)) ||
+          (fuzzyEquals(ep.first, energies.second, 0.01) && fuzzyEquals(ep.second, energies.first, 0.01))) {
         beamEnergiesOk =  true;
         break;
       }