[Rivet-svn] r3997 - in trunk: bin data/anainfo src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Nov 14 16:40:36 2012
New Revision: 3997

Log:
Merge changesets [3958], [3959], [3960], [3961] from AIDA branch

Modified:
   trunk/bin/Makefile.am
   trunk/bin/rivet-merge-CDF_2012_NOTE10874   (props changed)
   trunk/data/anainfo/CDF_2012_NOTE10874.info
   trunk/src/Analyses/CDF_2012_NOTE10874.cc

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	Wed Nov 14 16:38:58 2012	(r3996)
+++ trunk/bin/Makefile.am	Wed Nov 14 16:40:36 2012	(r3997)
@@ -9,7 +9,8 @@
     rivet \
     rivet-mkanalysis rivet-buildplugin \
     rivet-chopbins rivet-rmgaps rivet-rescale \
-    rivet-mergeruns rivet-mkhtml rivet-findid
+    rivet-mergeruns rivet-mkhtml rivet-findid \
+    rivet-merge-CDF_2012_NOTE10874
 
 if ENABLE_PYEXT
 dist_bin_SCRIPTS += $(RIVETPROGS)

Modified: trunk/data/anainfo/CDF_2012_NOTE10874.info
==============================================================================
--- trunk/data/anainfo/CDF_2012_NOTE10874.info	Wed Nov 14 16:38:58 2012	(r3996)
+++ trunk/data/anainfo/CDF_2012_NOTE10874.info	Wed Nov 14 16:40:36 2012	(r3997)
@@ -17,7 +17,7 @@
 PtCuts: []
 Description:
   In this analysis the behavior of the underlying event in hard scattering
-  proton-antiproton collisions at 300 GeV, 600 GeV, and 1.96 TeV is studied.
+  proton-antiproton collisions at 300 GeV, 900 GeV, and 1.96 TeV is studied.
   The 300 GeV and 900 GeV data are a result of the Tevatron Energy Scan
   which was performed just before the Tevatron was shut down. The energy
   ratio histograms can be created from different runs with a merging script

Modified: trunk/src/Analyses/CDF_2012_NOTE10874.cc
==============================================================================
--- trunk/src/Analyses/CDF_2012_NOTE10874.cc	Wed Nov 14 16:38:58 2012	(r3996)
+++ trunk/src/Analyses/CDF_2012_NOTE10874.cc	Wed Nov 14 16:40:36 2012	(r3997)
@@ -54,7 +54,6 @@
       ParticleVector particles = cfs.particlesByPt();
       Particle p_lead = particles[0];
       const double philead = p_lead.momentum().phi();
-      const double etalead = p_lead.momentum().eta();
       const double pTlead  = p_lead.momentum().pT();
 
       int    tNch = 0;
@@ -69,7 +68,6 @@
         }
       }
 
-      const double avePt = ptSum / tNch;
       const double dEtadPhi = 4.0*PI/3.0;
 
       _h_nch_transverse->fill(pTlead/GeV, tNch/dEtadPhi, weight);