[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/76ac9067736c
branches:  
changeset: 6183:76ac9067736c
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 19 10:51:35 2017 +0000
description:
Fix macros

details:   https://rivet.hepforge.org/hg/rivet/rev/ff37ab0f5f72
branches:  
changeset: 6184:ff37ab0f5f72
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 19 10:59:44 2017 +0000
description:
Allow 3-digit numbers without needing to drop into scientific notation

details:   https://rivet.hepforge.org/hg/rivet/rev/cbd7a4605251
branches:  
changeset: 6185:cbd7a4605251
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 19 13:13:18 2017 +0000
description:
Fix bugged PID codes in MC_PRINTEVENT.

details:   https://rivet.hepforge.org/hg/rivet/rev/a3dd7c9b7625
branches:  
changeset: 6186:a3dd7c9b7625
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 19 15:03:54 2017 +0000
description:
Tidying

details:   https://rivet.hepforge.org/hg/rivet/rev/9f15d4af9e5d
branches:  
changeset: 6187:9f15d4af9e5d
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Dec 19 15:05:08 2017 +0000
description:
Solving major problems in new handling of prompt FS requirement in W/ZFinder, plus removing explicit internal use of the DressedLepton type. Looks like some FS copy constructors are bugged

diffs (truncated from 815 to 50 lines):

--- a/ChangeLog	Mon Dec 18 19:36:22 2017 +0000
+++ b/ChangeLog	Tue Dec 19 15:05:08 2017 +0000
@@ -1,3 +1,7 @@
+2017-12-19  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix bugged PID codes in MC_PRINTEVENT.
+
 2017-12-13  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Protect Run methods and rivet script against being told to run from a missing or unreadable file.
--- a/analyses/pluginCDF/CDF_1997_S3541940.cc	Mon Dec 18 19:36:22 2017 +0000
+++ b/analyses/pluginCDF/CDF_1997_S3541940.cc	Tue Dec 19 15:05:08 2017 +0000
@@ -11,23 +11,18 @@
   class CDF_1997_S3541940 : public Analysis {
   public:
 
-    CDF_1997_S3541940()
-      : Analysis("CDF_1997_S3541940")
-    {
-    }
+    DEFAULT_RIVET_ANALYSIS_CTOR(CDF_1997_S3541940);
 
 
-  public:
-
     void init() {
 
       const FinalState fs(-4.2, 4.2);
-      FastJets fj (fs, FastJets::CDFJETCLU, 0.7);
-      declare(fj, "Jets");
+      FastJets fj(fs, FastJets::CDFJETCLU, 0.7);
+      // declare(fj, "Jets");
 
       // Smear Energy and mass with the 10% uncertainty quoted in the paper
       SmearedJets sj_E(fj, [](const Jet& jet){ return P4_SMEAR_MASS_GAUSS(P4_SMEAR_E_GAUSS(jet, 0.1*jet.E()), 0.1*jet.mass()); });
-      declare(sj_E, "SmearedJets");
+      declare(sj_E, "Jets");
 
       _h_m6J = bookHisto1D(1, 1, 1);
       _h_X3ppp = bookHisto1D(2, 1, 1);
@@ -56,10 +51,11 @@
       Jets jets;
       double sumEt = 0.0;
       FourMomentum jetsystem(0.0, 0.0, 0.0, 0.0);
-      foreach (const Jet& jet, apply<JetAlg>(event, "SmearedJets").jets(Cuts::Et>20*GeV && Cuts::abseta<3,cmpMomByEt)) {
+      const Jets jets = apply<JetAlg>(event, "Jets").jets(Cuts::Et > 20*GeV && Cuts::abseta < 3, cmpMomByEt);
+      for (const Jet& jet : jets) {
         double Et = jet.Et();
         bool separated = true;
-        foreach (const Jet& ref, jets) {