[Rivet-svn] r3051 - in trunk: bin src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Apr  8 17:51:21 2011
New Revision: 3051

Log:
HTML source cosmetics (to make manual hacking of ivet-html output easier).

Modified:
   trunk/bin/rivet-mkhtml
   trunk/src/Analyses/CDF_2000_S4155203.cc

Modified: trunk/bin/rivet-mkhtml
==============================================================================
--- trunk/bin/rivet-mkhtml	Fri Apr  8 12:24:41 2011	(r3050)
+++ trunk/bin/rivet-mkhtml	Fri Apr  8 17:51:21 2011	(r3051)
@@ -204,9 +204,9 @@
         if opts.IGNORE_UNVALIDATED and ana.status().upper() != "VALIDATED":
             continue
     if opts.SINGLE:
-        index.write('<h3 style="clear:left; padding-top:2em;"><a name="%s">%s</a></h3>\n' % (analysis, summary) )
+        index.write('\n<h3 style="clear:left; padding-top:2em;"><a name="%s">%s</a></h3>\n' % (analysis, summary) )
     else:
-        index.write('<h3><a href="%s/index.html" style="text-decoration:none;">%s</a></h3>\n' % (analysis, summary))
+        index.write('\n<h3><a href="%s/index.html" style="text-decoration:none;">%s</a></h3>\n' % (analysis, summary))
     reflist = []
     if spiresid and spiresid != "NONE":
         reflist.append('<a href="http://durpdg.dur.ac.uk/cgi-bin/spiface/hep/www?irn+%s">Spires</a>' % spiresid)
@@ -248,7 +248,7 @@
 
     if not opts.SINGLE:
         anaindex.write("</body>\n%s</html>\n" % timestamp)
-index.write('</body>\n%s</html>' % timestamp)
+index.write('</body>\n%s</html>\n' % timestamp)
 
 
 ## Run make-plots on all generated .dat files

Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc	Fri Apr  8 12:24:41 2011	(r3050)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc	Fri Apr  8 17:51:21 2011	(r3051)
@@ -41,18 +41,18 @@
     void analyze(const Event& e) {
       const ZFinder& zfinder = applyProjection<ZFinder>(e, "ZFinder");
       if (zfinder.particles().size() != 1) {
-        getLog() << Log::DEBUG << "Num e+ e- pairs found = " << zfinder.particles().size() << endl;
+        MSG_DEBUG("Num e+ e- pairs found = " << zfinder.particles().size());
         vetoEvent;
       }
 
       FourMomentum pZ = zfinder.particles()[0].momentum();
       if (pZ.mass2() < 0) {
-        getLog() << Log::DEBUG << "Negative Z mass**2 = " << pZ.mass2()/GeV2 << "!" << endl;
+        MSG_DEBUG("Negative Z mass**2 = " << pZ.mass2()/GeV2 << "!");
         vetoEvent;
       }
 
-      getLog() << Log::DEBUG << "Dilepton mass = " << pZ.mass()/GeV << " GeV"  << endl;
-      getLog() << Log::DEBUG << "Dilepton pT   = " << pZ.pT()/GeV << " GeV" << endl;
+      MSG_DEBUG("Dilepton mass = " << pZ.mass()/GeV << " GeV");
+      MSG_DEBUG("Dilepton pT   = " << pZ.pT()/GeV << " GeV");
       _hist_zpt->fill(pZ.pT()/GeV, e.weight());
     }