[Rivet-svn] rivet: LHCB weights and booking conversion

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6436285380b6
branches:  multiweights-fixptrs
changeset: 6026:6436285380b6
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Sep 19 14:47:44 2017 +0100
description:
LHCB weights and booking conversion

diffs (truncated from 1080 to 50 lines):

--- a/analyses/pluginLHCb/LHCB_2010_I867355.cc	Tue Sep 19 12:46:41 2017 +0100
+++ b/analyses/pluginLHCb/LHCB_2010_I867355.cc	Tue Sep 19 14:47:44 2017 +0100
@@ -23,8 +23,6 @@
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
-      double weight = 1.0;
-
       Particles bhadrons;
       foreach (const GenParticle* p, particles(event.genEvent())) {
         if (!( PID::isHadron( p->pdg_id() ) && PID::hasBottom( p->pdg_id() )) ) continue;
@@ -51,11 +49,11 @@
         // take fabs() to use full statistics and then multiply weight by 0.5 because LHCb is single-sided
         double eta = fabs(particle.eta());
 
-        _h_sigma_vs_eta_lep->fill( eta, 0.5*weight );
-        _h_sigma_vs_eta_tvt->fill( eta, 0.5*weight );
+        _h_sigma_vs_eta_lep->fill( eta, 0.5 );
+        _h_sigma_vs_eta_tvt->fill( eta, 0.5 );
 
-        _h_sigma_total_lep->fill( eta, 0.5*weight ); // histogram for full kinematic range
-        _h_sigma_total_tvt->fill( eta, 0.5*weight ); // histogram for full kinematic range
+        _h_sigma_total_lep->fill( eta, 0.5 ); // histogram for full kinematic range
+        _h_sigma_total_tvt->fill( eta, 0.5 ); // histogram for full kinematic range
 
       }
 
--- a/analyses/pluginLHCb/LHCB_2010_S8758301.cc	Tue Sep 19 12:46:41 2017 +0100
+++ b/analyses/pluginLHCb/LHCB_2010_S8758301.cc	Tue Sep 19 14:47:44 2017 +0100
@@ -11,7 +11,6 @@
 namespace Rivet {
 
 using namespace HepMC;
-using namespace std;
 
   // Lifetime cut: longest living ancestor ctau < 10^-11 [m]
   namespace {
@@ -27,8 +26,7 @@
     /// Constructor
     LHCB_2010_S8758301()
       : Analysis("LHCB_2010_S8758301"),
-      sumKs0_30(0.0), sumKs0_35(0.0),
-      sumKs0_40(0.0), sumKs0_badnull(0),
+      sumKs0_badnull(0),
       sumKs0_badlft(0), sumKs0_all(0),
       sumKs0_outup(0), sumKs0_outdwn(0),
       sum_low_pt_loss(0), sum_high_pt_loss(0)
@@ -49,6 +47,10 @@
       book(_h_K0s_pt_y_35  ,2,1,2);
       book(_h_K0s_pt_y_40  ,2,1,3);