[Rivet-svn] r3471 - in trunk: include/Rivet src/Projections

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Nov  3 01:27:53 2011
New Revision: 3471

Log:
Cosmetics and adding a missing header file to the tarball

Modified:
   trunk/include/Rivet/Makefile.am
   trunk/src/Projections/InvMassFinalState.cc
   trunk/src/Projections/WFinder.cc

Modified: trunk/include/Rivet/Makefile.am
==============================================================================
--- trunk/include/Rivet/Makefile.am	Wed Nov  2 16:18:10 2011	(r3470)
+++ trunk/include/Rivet/Makefile.am	Thu Nov  3 01:27:53 2011	(r3471)
@@ -63,6 +63,7 @@
   Projections/MissingMomentum.hh \
   Projections/Multiplicity.hh   \
   Projections/NeutralFinalState.hh \
+  Projections/NonHadronicFinalState.hh \
   Projections/ParisiTensor.hh   \
   Projections/PVertex.hh        \
   Projections/Sphericity.hh     \

Modified: trunk/src/Projections/InvMassFinalState.cc
==============================================================================
--- trunk/src/Projections/InvMassFinalState.cc	Wed Nov  2 16:18:10 2011	(r3470)
+++ trunk/src/Projections/InvMassFinalState.cc	Thu Nov  3 01:27:53 2011	(r3471)
@@ -79,12 +79,12 @@
   }
 
 
-
   void InvMassFinalState::project(const Event& e) {
     const FinalState& fs = applyProjection<FinalState>(e, "FS");
     calc(fs.particles());
   }
 
+
   void InvMassFinalState::calc(const ParticleVector& inparticles) {
     _theParticles.clear();
     _particlePairs.clear();
@@ -107,7 +107,7 @@
         }
       }
     }
-    if(type1.empty() || type2.empty()) return;
+    if (type1.empty() || type2.empty()) return;
 
     // Temporary container of selected particles iterators
     // Useful to compare iterators and avoid double occurrences of the same
@@ -119,7 +119,7 @@
     closestPair.first = 1e30;
     foreach (const Particle* i1, type1) {
       foreach (const Particle* i2, type2) {
-        // check this is actually a pair
+        // Check this is actually a pair
         // (if more than one pair in vector particles can be unrelated)
         bool found = false;
         foreach (const PdgIdPair& ipair, _decayids) {

Modified: trunk/src/Projections/WFinder.cc
==============================================================================
--- trunk/src/Projections/WFinder.cc	Wed Nov  2 16:18:10 2011	(r3470)
+++ trunk/src/Projections/WFinder.cc	Thu Nov  3 01:27:53 2011	(r3471)
@@ -107,7 +107,6 @@
             cmp(_useTransverseMass, other._useTransverseMass) ||
             cmp(_etMiss, other._etMiss) ||
             cmp(_pid, other._pid) || cmp(_trackPhotons, other._trackPhotons));
-
   }
 
 
@@ -168,7 +167,7 @@
     const PdgId wpid = (wcharge == 1) ? WPLUSBOSON : WMINUSBOSON;
     _bosons.push_back(Particle(wpid, pW));
 
-    // find the LeptonClusters and neutrinos which survived the IMFS cut such that we can
+    // Find the LeptonClusters and neutrinos which survived the IMFS cut such that we can
     // extract their original particles
     foreach (const Particle& p, _constituentNeutrinos) {
       _theParticles.push_back(p);