[Rivet-svn] rivet: Petra / RHIC weights and booking conversion

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/fac680aadd93
branches:  multiweights-fixptrs
changeset: 6028:fac680aadd93
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Sep 19 15:59:42 2017 +0100
description:
Petra / RHIC weights and booking conversion

diffs (truncated from 575 to 50 lines):

--- a/analyses/pluginPetra/JADE_1998_S3612880.cc	Tue Sep 19 15:40:14 2017 +0100
+++ b/analyses/pluginPetra/JADE_1998_S3612880.cc	Tue Sep 19 15:59:42 2017 +0100
@@ -64,7 +64,6 @@
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
-      const double weight = 1.0;
       const ChargedFinalState& cfs = apply<ChargedFinalState>(event, "CFS");
 
       // JADE hadronic event selection TODO: move this into a trigger definition
@@ -88,12 +87,12 @@
       // Make sure we don't run into a segfault by trying to fill non-existing histos
       int s = int(sqrtS()/GeV);
       if (s == 44 || s == 35) {
-        _h_thrust->fill(1. - thrust.thrust(), weight);
-        _h_MH->fill(sqrt(hemi.scaledM2high()), weight);
-        _h_BT->fill(hemi.Bsum(), weight);
-        _h_BW->fill(hemi.Bmax(), weight);
+        _h_thrust->fill(1. - thrust.thrust());
+        _h_MH->fill(sqrt(hemi.scaledM2high()));
+        _h_BT->fill(hemi.Bsum());
+        _h_BW->fill(hemi.Bmax());
       }
-      _h_y23->fill(y23, weight);
+      _h_y23->fill(y23);
     }
 
     /// Normalise histograms etc., after the run
--- a/analyses/pluginPetra/JADE_OPAL_2000_S4300807.cc	Tue Sep 19 15:40:14 2017 +0100
+++ b/analyses/pluginPetra/JADE_OPAL_2000_S4300807.cc	Tue Sep 19 15:59:42 2017 +0100
@@ -59,7 +59,6 @@
 
 
     void analyze(const Event& e) {
-      const double weight = 1.0;
       MSG_DEBUG("Num particles = " << apply<FinalState>(e, "FS").particles().size());
 
       const FastJets& jadejet = apply<FastJets>(e, "JadeJets");
@@ -73,35 +72,35 @@
           double ycut = _h_R_Jade[0]->bin(i).xMid();
           double width = _h_R_Jade[0]->bin(i).xWidth();
           if (y_23 < ycut) {
-            _h_R_Jade[0]->fillBin(i, weight*width);
+            _h_R_Jade[0]->fillBin(i, width);
           }
         }
         for (size_t i = 0; i < _h_R_Jade[1]->numBins(); ++i) {
           double ycut = _h_R_Jade[1]->bin(i).xMid();
           double width = _h_R_Jade[1]->bin(i).xWidth();
           if (y_34 < ycut && y_23 > ycut) {