[Rivet-svn] r2166 - in trunk/src: Analyses Core

[blackhole at projects.hepforge.org]

Author: eike
Date: Thu Dec 10 15:49:42 2009
New Revision: 2166

Log:
Make E735 compile.

Modified:
   trunk/src/Analyses/BELLE_2006_S6265367.cc
   trunk/src/Analyses/E735_1998_S3905616.cc
   trunk/src/Core/Run.cc

Modified: trunk/src/Analyses/BELLE_2006_S6265367.cc
==============================================================================
--- trunk/src/Analyses/BELLE_2006_S6265367.cc	Thu Dec 10 15:44:00 2009	(r2165)
+++ trunk/src/Analyses/BELLE_2006_S6265367.cc	Thu Dec 10 15:49:42 2009	(r2166)
@@ -41,7 +41,7 @@
       const bool onresonance = true;
       // const bool onresonance = fuzzyEquals(beamproj.sqrtS(), 10.58, 1E-4);
 
-      // Particle masses from PDGlive (online 16. Nov. 2009).
+      // Particle masses from PDGlive (accessed online 16. Nov. 2009).
       foreach (const Particle& p, ufs.particles()) {
         // TODO: Data is not corrected for branching fractions.
 

Modified: trunk/src/Analyses/E735_1998_S3905616.cc
==============================================================================
--- trunk/src/Analyses/E735_1998_S3905616.cc	Thu Dec 10 15:44:00 2009	(r2165)
+++ trunk/src/Analyses/E735_1998_S3905616.cc	Thu Dec 10 15:49:42 2009	(r2166)
@@ -21,8 +21,8 @@
  
     void init() {
       // Projection
-      const ChargedFinalState cfs();
-      addProjection(cfs, "FS");
+      // const ChargedFinalState cfs();
+      addProjection(ChargedFinalState(), "FS");
 
       // Histo
       _hist_multiplicity = bookHistogram1D(1, 1, 1);

Modified: trunk/src/Core/Run.cc
==============================================================================
--- trunk/src/Core/Run.cc	Thu Dec 10 15:44:00 2009	(r2165)
+++ trunk/src/Core/Run.cc	Thu Dec 10 15:49:42 2009	(r2166)
@@ -32,8 +32,18 @@
   bool Run::readEvent() {
     /// @todo Clear rather than new the GenEvent object per-event?
     _evt.reset(new GenEvent());
-    if (_io->rdstate() != 0 || !_io->fill_next_event(_evt.get()) ) {
+    // if (_io->rdstate() != 0 || !_io->fill_next_event(_evt.get()) ) {
       //Log::getLog("Rivet.Run") << Log::DEBUG << "Read failed. End of file?" << endl;
+      // return false;
+    // }
+    if (_io->rdstate() != 0) {
+      Log::getLog("Rivet.Run") << Log::ERROR
+        << "Read failed: HepMC rdstate != 0" << endl;
+      return false;
+    } else if (!_io->fill_next_event(_evt.get())) {
+      Log::getLog("Rivet.Run") << Log::ERROR
+        << "HepMC fill_next_event failed!" << endl;
+      cout << "HepMC error: " << _io->error_message() << " (type: " << _io->error_type() << ")" << endl;
       return false;
     }
     return true;