[Rivet] [Rivet-svn] r3498 - trunk/src/Core

[Andy Buckley]

Whoa, how did this compile for me?! I guess maybe I made the change 
part-way through a compilation and so make didn't notice. Sorry about that!

However, I'm much happier about the Jet interface now -- no computations 
to get wrong, no possible inconsistencies, etc.

Andy


On 25/11/11 12:53, blackhole at projects.hepforge.org wrote:
> Author: dgrell
> Date: Fri Nov 25 12:53:29 2011
> New Revision: 3498
>
> Log:
> Fix for [3495]. Now compiles.
>
> Modified:
>     trunk/src/Core/Jet.cc
>
> Modified: trunk/src/Core/Jet.cc
> ==============================================================================
> --- trunk/src/Core/Jet.cc	Wed Nov 23 23:54:40 2011	(r3497)
> +++ trunk/src/Core/Jet.cc	Fri Nov 25 12:53:29 2011	(r3498)
> @@ -14,11 +14,11 @@
>     }
>
>
> -  Jet&  Jet::setState(const vector<FourMomentum>&  momenta, const FourMomentum&  pjet) {
> -    setParticles(momenta);
> -    setMomentum(pjet);
> -    return *this;
> -  }
> +  // Jet&  Jet::setState(const vector<FourMomentum>&  momenta, const FourMomentum&  pjet) {
> +  //   setParticles(momenta);
> +  //   setMomentum(pjet);
> +  //   return *this;
> +  // }
>
>
>     Jet&  Jet::setMomentum(const FourMomentum&  momentum) {
> @@ -27,19 +27,19 @@
>     }
>
>
> -  Jet&  Jet::setParticles(const vector<Particle>&  particles) {
> -    _particles = particles;
> -    foreach (const Particle&  p, particles) {
> -      _momenta.push_back(p.momentum());
> -    }
> -    return *this;
> -  }
> + Jet&  Jet::setParticles(const vector<Particle>&  particles) {
> +   _particles = particles;
> +   // foreach (const Particle&  p, particles) {
> +   //   _momenta.push_back(p.momentum());
> +   // }
> +   return *this;
> + }
>
>
> -  Jet&  Jet::setParticles(const vector<FourMomentum>&  momenta) {
> -    _momenta = momenta;
> -    return *this;
> -  }
> +  // Jet&  Jet::setParticles(const vector<FourMomentum>&  momenta) {
> +  //   _momenta = momenta;
> +  //   return *this;
> +  // }
>
>
>     // Jet&  Jet::addParticle(const FourMomentum&  particle) {
> @@ -144,7 +144,7 @@
>
>
>     Jet&  Jet::clear() {
> -    _momenta.clear();
> +    //_momenta.clear();
>       _particles.clear();
>       _momentum = FourMomentum();
>       return *this;
> _______________________________________________
> Rivet-svn mailing list
> Rivet-svn at projects.hepforge.org
> http://www.hepforge.org/lists/listinfo/rivet-svn
>


-- 
Dr Andy Buckley
SUPA Advanced Research Fellow
Particle Physics Experiment Group, University of Edinburgh

The University of Edinburgh is a charitable body, registered in
Scotland, with registration number SC005336.