[Rivet-svn] r3795 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Jul  3 21:32:44 2012
New Revision: 3795

Log:
Filling zeros acutally matters in a Profile1D ...

Modified:
   trunk/src/Analyses/ATLAS_2010_S8894728.cc
   trunk/src/Analyses/ATLAS_2011_S8994773.cc

Modified: trunk/src/Analyses/ATLAS_2010_S8894728.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2010_S8894728.cc	Tue Jul  3 21:28:12 2012	(r3794)
+++ trunk/src/Analyses/ATLAS_2010_S8894728.cc	Tue Jul  3 21:32:44 2012	(r3795)
@@ -193,14 +193,11 @@
       assert(ptcut.size() == 4);
       for (size_t i = 0; i < nbins; ++i) {
         // First Nch
-        double mean;
-        double value;
+        double mean = hist_num_dphi_500.bin(i).midpoint();
+        double value = 0.;
         if (hist_num_dphi_500.bin(i).numEntries() > 0) {
           mean = hist_num_dphi_500.bin(i).xMean();
           value = hist_num_dphi_500.bin(i).area()/hist_num_dphi_500.bin(i).width()/10.0;
-        } else {
-          mean = hist_num_dphi_500.bin(i).midpoint();
-          value = 0.;
         }
         if (pTlead/GeV >= ptcut[0]) _hist_N_vs_dPhi_1_500->fill(mean, value, weight);
         if (pTlead/GeV >= ptcut[1]) _hist_N_vs_dPhi_2_500->fill(mean, value, weight);
@@ -208,12 +205,11 @@
         if (pTlead/GeV >= ptcut[3]) _hist_N_vs_dPhi_5_500->fill(mean, value, weight);
 
         // Then pT
+        mean = hist_pt_dphi_500.bin(i).midpoint();
+        value = 0.;
         if (hist_pt_dphi_500.bin(i).numEntries() > 0) {
           mean = hist_pt_dphi_500.bin(i).xMean();
           value = hist_pt_dphi_500.bin(i).area()/hist_pt_dphi_500.bin(i).width()/10.0;
-        } else {
-          mean = hist_pt_dphi_500.bin(i).midpoint();
-          value = 0.;
         }
         if (pTlead/GeV >= ptcut[0]) _hist_pT_vs_dPhi_1_500->fill(mean, value, weight);
         if (pTlead/GeV >= ptcut[1]) _hist_pT_vs_dPhi_2_500->fill(mean, value, weight);

Modified: trunk/src/Analyses/ATLAS_2011_S8994773.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_S8994773.cc	Tue Jul  3 21:28:12 2012	(r3794)
+++ trunk/src/Analyses/ATLAS_2011_S8994773.cc	Tue Jul  3 21:32:44 2012	(r3795)
@@ -90,13 +90,15 @@
       // |Delta(phi)| and so differ by a factor of 2: we have to actually norm for angular range = 2pi
       const size_t nbins = referenceData(13+isqrts,1,1).numPoints();
       for (size_t i = 0; i < nbins; ++i) {
+        double mean = hist_num_dphi_500.bin(i).midpoint();
+        double value = 0.;
         if (hist_num_dphi_500.bin(i).numEntries() > 0) {
-          const double binmean_num = hist_num_dphi_500.bin(i).xMean();
-          const double binvalue_num = hist_num_dphi_500.bin(i).area()/hist_num_dphi_500.bin(i).width()/10.0;
-          if (pTlead/GeV >= 1.0) _hist_N_vs_dPhi_1_500->fill(binmean_num, binvalue_num, weight);
-          if (pTlead/GeV >= 2.0) _hist_N_vs_dPhi_2_500->fill(binmean_num, binvalue_num, weight);
-          if (pTlead/GeV >= 3.0) _hist_N_vs_dPhi_3_500->fill(binmean_num, binvalue_num, weight);
+          mean = hist_num_dphi_500.bin(i).xMean();
+          value = hist_num_dphi_500.bin(i).area()/hist_num_dphi_500.bin(i).width()/10.0;
         }
+        if (pTlead/GeV >= 1.0) _hist_N_vs_dPhi_1_500->fill(mean, value, weight);
+        if (pTlead/GeV >= 2.0) _hist_N_vs_dPhi_2_500->fill(mean, value, weight);
+        if (pTlead/GeV >= 3.0) _hist_N_vs_dPhi_3_500->fill(mean, value, weight);
       }
 
     }