[Rivet-svn] r3924 - branches/2012-06-aidarivet branches/2012-06-aidarivet/src/Analyses trunk trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Sep  4 16:34:37 2012
New Revision: 3924

Log:
Fix overflow handling in ATLAS_2010_CONF_2010_049 (thanks to Anil Pratap)

Modified:
   branches/2012-06-aidarivet/ChangeLog
   branches/2012-06-aidarivet/src/Analyses/ATLAS_2010_CONF_2010_049.cc
   trunk/ChangeLog
   trunk/src/Analyses/ATLAS_2010_CONF_2010_049.cc

Modified: branches/2012-06-aidarivet/ChangeLog
==============================================================================
--- branches/2012-06-aidarivet/ChangeLog	Tue Sep  4 15:57:53 2012	(r3923)
+++ branches/2012-06-aidarivet/ChangeLog	Tue Sep  4 16:34:37 2012	(r3924)
@@ -2,7 +2,8 @@
 
 	* Cleanup and multiple fixes in CMS_2011_S9120041
 
-	* Bugfix in ALEPH_2004_S5765862 (thanks to Anil Pratap)
+	* Bugfixed in ALEPH_2004_S5765862 and ATLAS_2010_CONF_2010_049
+	(thanks to Anil Pratap)
 
 2012-08-09  Andy Buckley  <andy.buckley at cern.ch>
 

Modified: branches/2012-06-aidarivet/src/Analyses/ATLAS_2010_CONF_2010_049.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/ATLAS_2010_CONF_2010_049.cc	Tue Sep  4 15:57:53 2012	(r3923)
+++ branches/2012-06-aidarivet/src/Analyses/ATLAS_2010_CONF_2010_049.cc	Tue Sep  4 16:34:37 2012	(r3924)
@@ -65,7 +65,8 @@
           _h_xsec[i]->fill(pTjet, weight);
           if (pTjet > 24*GeV) continue;
           foreach (const Particle& p, jet.particles()) {
-            const double z=p.momentum().p().mod()/pjet;
+            double z=p.momentum().p().mod()/pjet;
+            if (z>0.9999) z=0.9999;   // Make sure that z=1 doesn't go into overflow
             if (pTjet > 15*GeV) {
               _h_frag_15_24[i]->fill(z, weight);
             }

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Sep  4 15:57:53 2012	(r3923)
+++ trunk/ChangeLog	Tue Sep  4 16:34:37 2012	(r3924)
@@ -2,7 +2,8 @@
 
 	* Cleanup and multiple fixes in CMS_2011_S9120041
 
-	* Bugfix in ALEPH_2004_S5765862 (thanks to Anil Pratap)
+	* Bugfixed in ALEPH_2004_S5765862 and ATLAS_2010_CONF_2010_049
+	(thanks to Anil Pratap)
 
 2012-08-09  Andy Buckley  <andy.buckley at cern.ch>
 

Modified: trunk/src/Analyses/ATLAS_2010_CONF_2010_049.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2010_CONF_2010_049.cc	Tue Sep  4 15:57:53 2012	(r3923)
+++ trunk/src/Analyses/ATLAS_2010_CONF_2010_049.cc	Tue Sep  4 16:34:37 2012	(r3924)
@@ -64,7 +64,8 @@
           _h_xsec[i]->fill(pTjet, weight);
           if (pTjet > 24*GeV) continue;
           foreach (const Particle& p, jet.particles()) {
-            const double z=p.momentum().p().mod()/pjet;
+            double z=p.momentum().p().mod()/pjet;
+            if (z>0.9999) z=0.9999;   // Make sure that z=1 doesn't go into overflow
             if (pTjet > 15*GeV) {
               _h_frag_15_24[i]->fill(z, weight);
             }