|
[Rivet-svn] rivet: Make cmp enums typesafe. Remove deprecated functions.Rivet Mercurial rivet at projects.hepforge.orgSun Jun 24 00:45:03 BST 2018
details: https://rivet.hepforge.org/hg/rivet/rev/11c043ec29ba branches: multiweight changeset: 6348:11c043ec29ba user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Sun Jun 24 00:41:14 2018 +0100 description: Make cmp enums typesafe. Remove deprecated functions. diffs (truncated from 1645 to 50 lines): --- a/analyses/pluginRHIC/STAR_2008_S7869363.cc Sat Jun 23 17:41:19 2018 +0100 +++ b/analyses/pluginRHIC/STAR_2008_S7869363.cc Sun Jun 24 00:41:14 2018 +0100 @@ -20,8 +20,8 @@ return (rand()/static_cast<double>(RAND_MAX) > _trkeff[idx]); } - int compare(const STARRandomFilter& other) const { - return true; + CmpState compare(const STARRandomFilter& other) const { + return CmpState::GT; // @todo really? } private: --- a/include/Rivet/Jet.hh Sat Jun 23 17:41:19 2018 +0100 +++ b/include/Rivet/Jet.hh Sun Jun 24 00:41:14 2018 +0100 @@ -137,37 +137,6 @@ /// Does this jet have at least one tau-tag (that passes the supplied selector function)? bool tauTagged(const ParticleSelector& f) const { return !tauTags(f).empty(); } - - /// @brief Check whether this jet contains a bottom-flavoured hadron. - /// - /// @deprecated The bTags() or bTagged() function is probably what you want - /// for tagging. This one ignores the tags() list and draws conclusions - /// based directly on the jet constituents; the other gives a much better match - /// to typical experimental methods. - /// - /// @note The decision is made by first trying to find a bottom-flavoured particle - /// in the particles list. Most likely this will fail unless bottom hadrons - /// are set stable. If @a include_decay_products is true (the default), a - /// fallback is attempted, using the post-hadronization ancestor history of - /// all constituents. - DEPRECATED("Prefer the bTags() or bTagged() function") - bool containsBottom(bool include_decay_products=true) const; - - /// @brief Check whether this jet contains a charm-flavoured hadron. - /// - /// @deprecated The cTags() or cTagged() function is probably what you want - /// for tagging. This one ignores the tags() list and draws conclusions - /// based directly on the jet constituents; the other gives a much better match - /// to typical experimental methods. - /// - /// @note The decision is made by first trying to find a charm-flavoured particle - /// in the particles list. Most likely this will fail unless charmed hadrons - /// are set stable. If @a include_decay_products is true (the default), a - /// fallback is attempted, using the post-hadronization ancestor history of - /// all constituents. - DEPRECATED("Prefer the cTags() or cTagged() function") - bool containsCharm(bool include_decay_products=true) const; -
More information about the Rivet-svn mailing list |