|
[Rivet-svn] rivet: 2 new changesetsRivet Mercurial rivet at projects.hepforge.orgFri Jun 29 13:30:02 BST 2018
details: https://rivet.hepforge.org/hg/rivet/rev/954d70974dba branches: release-2-6-x changeset: 6352:954d70974dba user: Andy Buckley <andy at insectnation.org> date: Fri Jun 29 12:02:47 2018 +0100 description: Use valid MathJax URL details: https://rivet.hepforge.org/hg/rivet/rev/0ecaf29d01c4 branches: release-2-6-x changeset: 6353:0ecaf29d01c4 user: Andy Buckley <andy at insectnation.org> date: Fri Jun 29 13:21:20 2018 +0100 description: Merge diffs (truncated from 175 to 50 lines): --- a/analyses/pluginATLAS/ATLAS_2012_I1204784.cc Thu Jun 21 22:59:23 2018 +0100 +++ b/analyses/pluginATLAS/ATLAS_2012_I1204784.cc Fri Jun 29 13:21:20 2018 +0100 @@ -77,7 +77,7 @@ void fillPlots(const ZFinder& zfind, Histo1DPtr hist, BinnedHistogram<double>& binnedHist, double weight) { if (zfind.bosons().size() != 1) return; - Particles leptons = zfind.constituents(cmpMomByPt); + Particles leptons = sortBy(zfind.constituents(), cmpMomByPt); const FourMomentum lminus = leptons[0].charge() < 0 ? leptons[0].momentum() : leptons[1].momentum(); const FourMomentum lplus = leptons[0].charge() < 0 ? leptons[1].momentum() : leptons[0].momentum(); --- a/bin/make-pgfplots Thu Jun 21 22:59:23 2018 +0100 +++ b/bin/make-pgfplots Fri Jun 29 13:21:20 2018 +0100 @@ -1622,7 +1622,7 @@ return bool(int(self.props.get("ErrorBands", "0"))) def getErrorBandColor(self): - return self.getColor(self.props.get("ErrorBandColor", "yellow")) + return self.getColor(self.props.get("ErrorBandColor", self.getLineColor())) def getErrorBandStyle(self): return self.props.get("ErrorBandStyle", "solid") --- a/doc/mk-analysis-html Thu Jun 21 22:59:23 2018 +0100 +++ b/doc/mk-analysis-html Fri Jun 29 13:21:20 2018 +0100 @@ -48,14 +48,9 @@ /* h2 { margin-left:-1em; margin-bottom:1.5em; } */ /* h3 { color:#349; margin-top:2em; } */ </style> - <script type="text/x-mathjax-config"> - MathJax.Hub.Config({ - tex2jax: {inlineMath: [["$","$"]]} - }); - </script> - <script type="text/javascript" - src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> - </script> + <meta charset="utf-8"> + <script type="text/x-mathjax-config">MathJax.Hub.Config({ tex2jax: {inlineMath: [['$','$']]} });</script> + <script async="async" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-MML-AM_CHTML"></script> </head> <body> <h2>Rivet analyses reference</h2> --- a/include/Rivet/Projections/WFinder.hh Thu Jun 21 22:59:23 2018 +0100 +++ b/include/Rivet/Projections/WFinder.hh Fri Jun 29 13:21:20 2018 +0100 @@ -101,20 +101,20 @@ /// @brief Access to the Ws' constituent clustered leptons /// @note Either size 0 if no boson was found or 1 if one boson was found - const Particles constituentLeptons() const; + const Particles& constituentLeptons() const { return _leptons; }
More information about the Rivet-svn mailing list |