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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Sep  6 03:38:22 2011
New Revision: 3340

Log:
Just some code cosmetics while trying to figure out how ZFinder works these days

Modified:
   trunk/include/Rivet/Projections/LeptonClusters.hh
   trunk/src/Projections/ZFinder.cc

Modified: trunk/include/Rivet/Projections/LeptonClusters.hh
==============================================================================
--- trunk/include/Rivet/Projections/LeptonClusters.hh	Sun Sep  4 10:51:55 2011	(r3339)
+++ trunk/include/Rivet/Projections/LeptonClusters.hh	Tue Sep  6 03:38:22 2011	(r3340)
@@ -12,22 +12,24 @@
 
 namespace Rivet {
 
-  class ClusteredLepton : public Particle {
 
+  class ClusteredLepton : public Particle {
   public:
+
     ClusteredLepton(Particle lepton) :
       Particle(lepton.pdgId(), lepton.momentum()),
       _constituentLepton(lepton) {}
 
     void addPhoton(const Particle& p, bool cluster) {
       _constituentPhotons.push_back(p);
-      if (cluster) setMomentum(momentum()+p.momentum());
+      if (cluster) setMomentum(momentum() + p.momentum());
     }
 
     const Particle& constituentLepton() const { return _constituentLepton; }
     const ParticleVector& constituentPhotons() const { return _constituentPhotons; }
 
   private:
+
     ParticleVector _constituentPhotons;
     Particle _constituentLepton;
   };
@@ -67,12 +69,12 @@
 
   private:
 
-    /// maximum cone radius to find photons in
+    /// Maximum cone radius to find photons in
     double _dRmax;
-    /// whether to actually add the photon momenta to clusteredLeptons
+    /// Whether to actually add the photon momenta to clusteredLeptons
     bool _cluster;
 
-    /// container which stores the clustered lepton objects
+    /// Container which stores the clustered lepton objects
     vector<ClusteredLepton> _clusteredLeptons;
   };
 

Modified: trunk/src/Projections/ZFinder.cc
==============================================================================
--- trunk/src/Projections/ZFinder.cc	Sun Sep  4 10:51:55 2011	(r3339)
+++ trunk/src/Projections/ZFinder.cc	Tue Sep  6 03:38:22 2011	(r3340)
@@ -103,9 +103,9 @@
         << " + " << l2.momentum() << " " << l2.pdgId() << endl;
 
     _bosons.push_back(Particle(ZBOSON, pZ));
-    getLog() << Log::DEBUG << name() << " found one Z." << endl;
+    MSG_DEBUG(name() << " found one Z");
 
-    // find the LeptonClusters which survived the IMFS cut such that we can
+    // Find the LeptonClusters which survived the IMFS cut such that we can
     // extract their original particles
     foreach (const Particle& p, _constituents) {
       foreach (const ClusteredLepton& l, leptons.clusteredLeptons()) {