[Rivet-svn] r3634 - in branches/2011-07-aida2yoda: . data/anainfo data/plotinfo data/refdata src/Analyses

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Tue Mar 20 14:41:28 GMT 2012


Author: hoeth
Date: Tue Mar 20 14:41:28 2012
New Revision: 3634

Log:
merge c3594-3602 from trunk

Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info
   branches/2011-07-aida2yoda/data/plotinfo/LHCB_2011_I919315.plot
   branches/2011-07-aida2yoda/data/refdata/CMS_2011_S9120041.aida
   branches/2011-07-aida2yoda/data/refdata/LHCB_2011_I919315.aida
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc
   branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc
   branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8968497.cc
   branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I919315.cc
   branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc
   branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc
   branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/ChangeLog	Tue Mar 20 14:41:28 2012	(r3634)
@@ -1,3 +1,8 @@
+2012-03-07  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Marking ATLAS_2011_I919017 as VALIDATED (this should have
+	happened a long time ago) and adding more references.
+
 2012-02-28  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
 	* lighthisto.py: Caching for re.compile(). This speeds up aida2flat

Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info
==============================================================================
--- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info	Tue Mar 20 14:41:28 2012	(r3634)
@@ -4,11 +4,14 @@
 Experiment: ATLAS
 Collider: LHC
 InspireID: 919017
-Status: UNVALIDATED
+Status: VALIDATED
 Authors:
  - Seth Zenz <seth.zenz at cern.ch>
  - Andy Buckley <andy.buckley at cern.ch>
 References:
+ - Phys.Rev.D 84 (2011) 054001
+ - doi:10.1103/PhysRevD.84.054001
+ - arXiv:1107.3311
  - ATLAS-STDM-2010-14
  - CERN-PH-EP-2011-110
 RunInfo:

Modified: branches/2011-07-aida2yoda/data/plotinfo/LHCB_2011_I919315.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/LHCB_2011_I919315.plot	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/data/plotinfo/LHCB_2011_I919315.plot	Tue Mar 20 14:41:28 2012	(r3634)
@@ -1,6 +1,6 @@
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y..
+# BEGIN PLOT /LHCB_2011_I919315/d0[2-6]-x01-y..
 Title=Transverse momentum of $\Phi$-mesons
-XLabel=$p_T^\Phi$ [MeV]
+XLabel=$p_T^\Phi$ [GeV]
 YLabel=$\text{d}\sigma /\text{d}p_\perp$ $[\mu \text{b}/\text{MeV}]$
 LogY=1
 # END PLOT
@@ -15,42 +15,56 @@
 LegendYPos=0.4
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y10
+# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y01
 CustomLegend=$(2.44<y^\Phi<4.06)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y01
+# BEGIN PLOT /LHCB_2011_I919315/d02-x01-y01
 CustomLegend=$(2.44<y^\Phi<2.62)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y02
+# BEGIN PLOT /LHCB_2011_I919315/d02-x01-y02
 CustomLegend=$(2.62<y^\Phi<2.80)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y03
+# BEGIN PLOT /LHCB_2011_I919315/d03-x01-y01
 CustomLegend=$(2.80<y^\Phi<2.98)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y04
+# BEGIN PLOT /LHCB_2011_I919315/d03-x01-y02
 CustomLegend=$(2.98<y^\Phi<3.16)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y05
+# BEGIN PLOT /LHCB_2011_I919315/d04-x01-y01
 CustomLegend=$(3.16<y^\Phi<3.34)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y06
+# BEGIN PLOT /LHCB_2011_I919315/d04-x01-y02
 CustomLegend=$(3.34<y^\Phi<3.52)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y07
+# BEGIN PLOT /LHCB_2011_I919315/d05-x01-y01
 CustomLegend=$(3.52<y^\Phi<3.70)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y08
+# BEGIN PLOT /LHCB_2011_I919315/d05-x01-y02
 CustomLegend=$(3.70<y^\Phi<3.88)$
 # END PLOT
 
-# BEGIN PLOT /LHCB_2011_I919315/d01-x01-y09
+# BEGIN PLOT /LHCB_2011_I919315/d06-x01-y02
 CustomLegend=$(3.88<y^\Phi<4.06)$
 # END PLOT
+
+# BEGIN PLOT /LHCB_2011_I919315/d07-x01-y01
+Title=Transverse momentum of $\Phi$-mesons
+XLabel=$p_T^\Phi$ [MeV]
+YLabel=$\text{d}\sigma /\text{d}p_\perp$ $[\mu \text{b}/\text{MeV}]$
+LogY=1
+# END PLOT
+
+# BEGIN PLOT /LHCB_2011_I919315/d08-x01-y01
+Title=Rapidity of $\Phi$-mesons
+XLabel=$y^\Phi$
+YLabel=$\text{d}\sigma /\text{d}y$ $[\mu \text{b}]$
+LogY=1
+# END PLOT

Modified: branches/2011-07-aida2yoda/data/refdata/CMS_2011_S9120041.aida
==============================================================================
--- branches/2011-07-aida2yoda/data/refdata/CMS_2011_S9120041.aida	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/data/refdata/CMS_2011_S9120041.aida	Tue Mar 20 14:41:28 2012	(r3634)
@@ -1536,7 +1536,7 @@
 </dataPointSet> 
 <dataPointSet name="d13-x01-y01" dimension="2" path="/REF/CMS_2011_S9120041" title="Dist_pT_09TeV_pT3">
     <dataPoint>
-      <measurement value="0.75" errorPlus="0.5" errorMinus="0.25"/>
+      <measurement value="0.75" errorPlus="0.25" errorMinus="0.25"/>
       <measurement value="4.631" errorPlus="0.15505160431288675" errorMinus="0.15505160431288675"/>
     </dataPoint>
     <dataPoint>

Modified: branches/2011-07-aida2yoda/data/refdata/LHCB_2011_I919315.aida
==============================================================================
--- branches/2011-07-aida2yoda/data/refdata/LHCB_2011_I919315.aida	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/data/refdata/LHCB_2011_I919315.aida	Tue Mar 20 14:41:28 2012	(r3634)
@@ -2,13 +2,13 @@
 <!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd">
 <aida version="3.3">
   <implementation version="1.0" package="HepData"/>
-  <dataPointSet name="d01-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="SIG IN MUB" >
+  <dataPointSet name="d01-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="SIG IN MUB" >
     <dataPoint>
       <measurement value="7000.0" errorPlus="0.5" errorMinus="0.5"/>
       <measurement value="1758.0" errorPlus="187.9734023738465" errorMinus="183.52384041317356"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d02-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d02-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.001" errorPlus="0.18969712702094357" errorMinus="0.17574128712399942"/>
@@ -58,7 +58,7 @@
       <measurement value="0.014" errorPlus="0.0017320508075688774" errorMinus="0.0017320508075688774"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d02-x01-y02" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d02-x01-y02" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="0.853" errorPlus="0.16523014252853502" errorMinus="0.1456845908117945"/>
@@ -108,7 +108,7 @@
       <measurement value="0.014" errorPlus="0.0017320508075688774" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d03-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d03-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.069" errorPlus="0.1800361074895811" errorMinus="0.15650239614779066"/>
@@ -158,7 +158,7 @@
       <measurement value="0.011" errorPlus="0.001414213562373095" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d03-x01-y02" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d03-x01-y02" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.171" errorPlus="0.1673469449975111" errorMinus="0.15963082409108836"/>
@@ -208,7 +208,7 @@
       <measurement value="0.01" errorPlus="0.0017320508075688774" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d04-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d04-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.06" errorPlus="0.14516886718577093" errorMinus="0.14897650821522163"/>
@@ -258,7 +258,7 @@
       <measurement value="0.01" errorPlus="0.001414213562373095" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d04-x01-y02" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d04-x01-y02" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.131" errorPlus="0.18933039903829496" errorMinus="0.25686767021172596"/>
@@ -308,7 +308,7 @@
       <measurement value="0.0090" errorPlus="0.001414213562373095" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d05-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d05-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.341" errorPlus="0.21316894708188622" errorMinus="0.29518468794976477"/>
@@ -358,7 +358,7 @@
       <measurement value="0.0080" errorPlus="0.0017320508075688774" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d05-x01-y02" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d05-x01-y02" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.164" errorPlus="0.19987245933344594" errorMinus="0.20802403707264217"/>
@@ -408,7 +408,7 @@
       <measurement value="0.0070" errorPlus="0.0017320508075688774" errorMinus="0.001414213562373095"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d06-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d06-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="0.7" errorPlus="0.10000000000000009" errorMinus="0.09999999999999998"/>
       <measurement value="1.341" errorPlus="0.2664019519448009" errorMinus="0.24055352834660315"/>
@@ -458,7 +458,7 @@
       <measurement value="0.0070" errorPlus="0.0022360679774997894" errorMinus="0.0030"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d07-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DPT IN MUB/MEV" >
+  <dataPointSet name="d07-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DPT IN MUB/MEV" >
     <dataPoint>
       <measurement value="700.0" errorPlus="100.0" errorMinus="100.0"/>
       <measurement value="1.8235" errorPlus="0.2074463063059933" errorMinus="0.21070647830572273"/>
@@ -508,7 +508,7 @@
       <measurement value="0.0161" errorPlus="0.001905255888325765" errorMinus="0.0017972200755611428"/>
     </dataPoint>
   </dataPointSet>
-  <dataPointSet name="d08-x01-y01" dimension="2" path="/REF/LHCB_2011_S9139796" title="D(SIG)/DYRAP IN MUB" >
+  <dataPointSet name="d08-x01-y01" dimension="2" path="/REF/LHCB_2011_I919315" title="D(SIG)/DYRAP IN MUB" >
     <dataPoint>
       <measurement value="2.5300000000000002" errorPlus="0.08999999999999986" errorMinus="0.0900000000000003"/>
       <measurement value="1130.0" errorPlus="155.42844012599497" errorMinus="123.3450444890268"/>

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -258,7 +258,7 @@
         /// @todo Assuming unit weights here! Should use N_effective = sumW**2/sumW2?
         const double numentries = moment_profiles[0]->bin(b).numEntries();
         const double var = moment_profiles[1]->bin(b).mean() - intpow(moment_profiles[0]->bin(b).mean(), 2);
-        const double sd = isZero(var) ? 0 : sqrt(var); //< Numerical safety check
+        const double sd = fuzzyLessEquals(var,0.) ? 0 : sqrt(var); //< Numerical safety check
         target_dps->point(b).setY(sd);
         if (sd == 0 || numentries < 3) {
           MSG_WARNING("Need at least 3 bin entries and a non-zero central value to calculate "

Modified: branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 #include "Rivet/Analysis.hh"
 #include "Rivet/RivetYODA.hh"
 #include "Rivet/Projections/FinalState.hh"
@@ -13,9 +12,9 @@
   class CMS_2011_S8957746 : public Analysis {
   public:
 
-    /// Default constructor
-    CMS_2011_S8957746() : Analysis("CMS_2011_S8957746") {
-    }
+    /// Constructor
+    CMS_2011_S8957746()
+      : Analysis("CMS_2011_S8957746") {  }
 
 
     /// Initialization, called once before running
@@ -38,20 +37,20 @@
       const double weight = event.weight();
       const Jets& jets = applyProjection<FastJets>(event, "Jets").jetsByPt(30.0*GeV);
       if (jets.size() < 2 ||
-          fabs(jets[0].momentum().eta())>=1.3 ||
-          fabs(jets[1].momentum().eta())>=1.3 ||
-          jets[0].momentum().pT()<90) {
+          fabs(jets[0].momentum().eta()) >= 1.3 ||
+          fabs(jets[1].momentum().eta()) >= 1.3 ||
+          jets[0].momentum().pT() < 90/GeV) {
         vetoEvent;
       }
       std::vector<Vector3> momenta;
       foreach (const Jet& j, jets) {
-        if (fabs(j.momentum().eta())<1.3) {
+        if (fabs(j.momentum().eta()) < 1.3) {
           Vector3 mom = j.momentum().vector3();
           mom.setZ(0.0);
           momenta.push_back(mom);
         }
       }
-      if (momenta.size()==2) {
+      if (momenta.size() == 2) {
         // We need to use a ghost so that Thrust.calc() doesn't return 1.
         momenta.push_back(Vector3(1e-10*MeV, 0., 0.));
       }
@@ -59,15 +58,15 @@
       thrust.calc(momenta);
 
       // The lowest bin also includes the underflow:
-      const double T=max(log(1-thrust.thrust()), -12.0);
-      const double M=max(log(thrust.thrustMajor()), -6.0);
-      if (jets[0].momentum().pT()>200) {
+      const double T = max(log(1-thrust.thrust()), -12.0);
+      const double M = max(log(thrust.thrustMajor()), -6.0);
+      if (jets[0].momentum().pT()/GeV > 200) {
         _hist_T_200->fill(T, weight);
         _hist_m_200->fill(M, weight);
-      } else if (jets[0].momentum().pT()>125) {
+      } else if (jets[0].momentum().pT()/GeV > 125) {
         _hist_T_125->fill(T, weight);
         _hist_m_125->fill(M, weight);
-      } else if (jets[0].momentum().pT()>90) {
+      } else if (jets[0].momentum().pT()/GeV > 90) {
         _hist_T_90->fill(T, weight);
         _hist_m_90->fill(M, weight);
       }

Modified: branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8968497.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8968497.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8968497.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -41,7 +41,7 @@
       if (fabs(y0+y1)/2. > 1.11) vetoEvent;
       double mjj = FourMomentum(j0+j1).mass();
       double chi = exp(fabs(y0-y1));
-      _h_chi_dijet.fill(mjj, chi, weight);
+      if(chi<16.)  _h_chi_dijet.fill(mjj, chi, weight);
     }
 
 

Modified: branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I919315.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I919315.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I919315.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -62,7 +62,7 @@
           
           _h_Phi_y->fill (y, weight);
           _h_Phi_pT->fill (pT/MeV, weight);
-          _h_Phi_pT_y.fill(y, pT/MeV, weight);
+          _h_Phi_pT_y.fill(y, pT/GeV, weight);
         }
       }
     }
@@ -73,7 +73,7 @@
       double scale_factor = crossSectionPerEvent()/microbarn;
       scale (_h_Phi_y, scale_factor);
       scale (_h_Phi_pT, scale_factor);
-      _h_Phi_pT_y.scale(scale_factor, this);
+      _h_Phi_pT_y.scale(scale_factor/1000., this);
     }
 
     //@}

Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -47,7 +47,7 @@
       const ChargedFinalState& cfs = applyProjection<ChargedFinalState>(event, "CFS");
 
       // Fill mean charged multiplicity histos
-      _hist_nch->fill(_hist_nch->bin(0).xMean(), cfs.size());
+      _hist_nch->fill(_hist_nch->bin(0).xMean(), cfs.size()*weight);
 
       // Iterate over all tracks and fill eta histograms
       foreach (const Particle& p, cfs.particles()) {

Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -44,7 +44,7 @@
 
       // Fill histograms
       _hist_nch->fill(Nch, weight);
-      _hist_mean_nch->fill(_hist_mean_nch->bin(0).xMean(), Nch);
+      _hist_mean_nch->fill(_hist_mean_nch->bin(0).xMean(), Nch*weight);
 
     }
 

Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc	Tue Mar 20 14:34:56 2012	(r3633)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc	Tue Mar 20 14:41:28 2012	(r3634)
@@ -71,7 +71,7 @@
       _hist_nch_eta15->fill(numP15, weight);
       _hist_nch_eta30->fill(numP30, weight);
       _hist_nch_eta50->fill(numP50, weight);
-      _hist_mean_nch->fill(_hist_mean_nch->bin(0).xMean(), numP50);
+      _hist_mean_nch->fill(_hist_mean_nch->bin(0).xMean(), numP50*weight);
     }
 
 


More information about the Rivet-svn mailing list