[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/9f7c26f17890
branches:  release-2-6-x
changeset: 6247:9f7c26f17890
user:      Jon Butterworth <j.butterworth at cern.ch>
date:      Wed Mar 07 06:37:25 2018 +0000
description:
remove some hidden non-ASCII character from the description

details:   https://rivet.hepforge.org/hg/rivet/rev/a8e4c62d701b
branches:  release-2-6-x
changeset: 6248:a8e4c62d701b
user:      Jon Butterworth <j.butterworth at cern.ch>
date:      Wed Mar 07 06:38:38 2018 +0000
description:
make the error message a bit more helpful

diffs (32 lines):

--- a/analyses/pluginCMS/CMS_2016_I1459051.info	Wed Feb 28 23:10:34 2018 +0100
+++ b/analyses/pluginCMS/CMS_2016_I1459051.info	Wed Mar 07 06:38:38 2018 +0000
@@ -21,8 +21,8 @@
   'A measurement of the double-differential inclusive jet cross section as a function of
   jet transverse momentum pT and absolute jet rapidity |y| is presented. The analysis is
   based on proton-proton collisions collected by the CMS experiment at the LHC at a
-  centre-of-mass energy of 13 TeV. The data samples correspond to integrated luminosities
-  of 71 and 44 pb−1 for |y| < 3 and 3.2 < |y| < 4.7, respectively. Jets are reconstructed
+  centre-of-mass energy of 13 TeV. The data samples correspond to integrated luminosities 
+  of 71 and 44 pb-1 for |y| < 3 and 3.2 < |y| < 4.7, respectively. Jets are reconstructed
   with the anti-kt clustering algorithm for two jet sizes, R, of 0.7 and 0.4, in a phase
   space region covering jet pT up to 2 TeV and jet rapidity up to |y| = 4.7. Predictions
   of perturbative quantum chromodynamics at next-to-leading order precision, complemented
@@ -33,6 +33,7 @@
   multiparton interactions. In the phase space accessible with the new data, this
   measurement provides a first indication that jet physics is as well understood at
   $\sqrt(s) = 13\;\TeV$ as at smaller centre-of-mass energies.'
+
 NeedCrossSection: yes
 BibKey: Khachatryan:2016wdh
 BibTeX: '@article{Khachatryan:2016wdh,
--- a/src/Projections/DressedLeptons.cc	Wed Feb 28 23:10:34 2018 +0100
+++ b/src/Projections/DressedLeptons.cc	Wed Mar 07 06:38:38 2018 +0000
@@ -21,7 +21,7 @@
   }
 
   void DressedLepton::addPhoton(const Particle& p, bool momsum) {
-    if (p.pid() != PID::PHOTON) throw Error("Clustering a non-photon on to a DressedLepton");
+    if (p.pid() != PID::PHOTON) throw Error("Clustering a non-photon on to a DressedLepton:"+to_string(p.pid()));
     addConstituent(p, momsum);
   }