[Rivet-svn] r4322 - in trunk: . include/Rivet src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed May 29 00:37:58 2013
New Revision: 4322

Log:
Removing Constraints.hh header

Deleted:
   trunk/include/Rivet/Constraints.hh
Modified:
   trunk/ChangeLog
   trunk/include/Rivet/Analysis.hh
   trunk/include/Rivet/Makefile.am
   trunk/include/Rivet/Projection.hh
   trunk/src/Core/Analysis.cc
   trunk/src/Core/AnalysisHandler.cc
   trunk/src/Core/Projection.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/ChangeLog	Wed May 29 00:37:58 2013	(r4322)
@@ -1,5 +1,7 @@
 2013-05-29  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Removing Constraints.hh header.
+
 	* Minor bugfixes and improvements in Scatter2D booking and MC_JetAnalysis.
 
 2013-05-28  Andy Buckley  <andy.buckley at cern.ch>

Modified: trunk/include/Rivet/Analysis.hh
==============================================================================
--- trunk/include/Rivet/Analysis.hh	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/include/Rivet/Analysis.hh	Wed May 29 00:37:58 2013	(r4322)
@@ -5,7 +5,6 @@
 #include "Rivet/Rivet.hh"
 #include "Rivet/AnalysisInfo.hh"
 #include "Rivet/Event.hh"
-#include "Rivet/Constraints.hh"
 #include "Rivet/Projection.hh"
 #include "Rivet/ProjectionApplier.hh"
 #include "Rivet/ProjectionHandler.hh"

Modified: trunk/include/Rivet/Makefile.am
==============================================================================
--- trunk/include/Rivet/Makefile.am	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/include/Rivet/Makefile.am	Wed May 29 00:37:58 2013	(r4322)
@@ -6,15 +6,19 @@
 
 ## Rivet interface
 nobase_pkginclude_HEADERS += \
-  Rivet.hh             Exceptions.hh      Event.hh       Run.hh \
-  RivetBoost.hh        RivetHepMC.hh      RivetSTL.hh    RivetYODA.hh \
-  ParticleBase.hh      Particle.fhh       Particle.hh    Jet.hh \
-  ProjectionApplier.hh Projection.fhh     Projection.hh \
-  ParticleName.hh      Cmp.fhh            Cmp.hh \
+  Rivet.hh             Exceptions.hh \
+  Event.hh             Run.hh \
+  RivetBoost.hh        RivetHepMC.hh \
+  RivetSTL.hh          RivetYODA.hh \
+  ParticleBase.hh      Jet.hh \
+  Particle.fhh         Particle.hh \
+  ParticleName.hh      BeamConstraint.hh \
+  ProjectionApplier.hh ProjectionHandler.hh \
+  Projection.fhh       Projection.hh \
+  Cmp.fhh              Cmp.hh \
   Analysis.hh          AnalysisInfo.hh \
   AnalysisBuilder.hh   AnalysisLoader.hh \
-  AnalysisHandler.hh   ProjectionHandler.hh \
-  Constraints.hh       BeamConstraint.hh
+  AnalysisHandler.hh
 
 
 ## Build config stuff

Modified: trunk/include/Rivet/Projection.hh
==============================================================================
--- trunk/include/Rivet/Projection.hh	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/include/Rivet/Projection.hh	Wed May 29 00:37:58 2013	(r4322)
@@ -6,7 +6,6 @@
 #include "Rivet/Projection.fhh"
 #include "Rivet/ProjectionApplier.hh"
 #include "Rivet/ProjectionHandler.hh"
-#include "Rivet/Constraints.hh"
 #include "Rivet/ParticleName.hh"
 #include "Rivet/Tools/Logging.hh"
 
@@ -92,10 +91,11 @@
     /// the virtual compare(const Projection &) will be returned.
     bool before(const Projection& p) const;
 
-    /// Return the BeamConstraints for this projection, not including
-    /// recursion. Derived classes should ensure that all contained projections
-    /// are registered in the @a _projections set for the beam constraint
-    /// chaining to work.
+    /// Return the allowed beam pairs on which this projection can operate, not
+    /// including recursion. Derived classes should ensure that all contained
+    /// projections are registered in the @a _projections set for the beam
+    /// constraint chaining to work.
+    /// @todo Remove the beam constraints system from projections.
     virtual const std::set<PdgIdPair> beamPairs() const;
 
     /// Get the name of the projection.

Modified: trunk/src/Core/Analysis.cc
==============================================================================
--- trunk/src/Core/Analysis.cc	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/src/Core/Analysis.cc	Wed May 29 00:37:58 2013	(r4322)
@@ -1,9 +1,10 @@
 // -*- C++ -*-
 #include "Rivet/Rivet.hh"
-#include "Rivet/RivetYODA.hh"
+#include "Rivet/Analysis.hh"
 #include "Rivet/AnalysisHandler.hh"
 #include "Rivet/AnalysisInfo.hh"
-#include "Rivet/Analysis.hh"
+#include "Rivet/RivetYODA.hh"
+#include "Rivet/BeamConstraint.hh"
 #include "Rivet/Tools/Logging.hh"
 
 namespace Rivet {

Modified: trunk/src/Core/AnalysisHandler.cc
==============================================================================
--- trunk/src/Core/AnalysisHandler.cc	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/src/Core/AnalysisHandler.cc	Wed May 29 00:37:58 2013	(r4322)
@@ -1,22 +1,21 @@
 // -*- C++ -*-
 #include "Rivet/Rivet.hh"
-#include "Rivet/Tools/Logging.hh"
-#include "Rivet/ParticleName.hh"
 #include "Rivet/AnalysisHandler.hh"
-#include "Rivet/RivetYODA.hh"
 #include "Rivet/Analysis.hh"
-#include "Rivet/Event.hh"
+#include "Rivet/ParticleName.hh"
+#include "Rivet/RivetYODA.hh"
+#include "Rivet/Tools/Logging.hh"
+#include "Rivet/BeamConstraint.hh"
 #include "Rivet/Projections/Beam.hh"
 
-namespace {
-  bool AOSortByPath(const Rivet::AnalysisObjectPtr a,
-		    const Rivet::AnalysisObjectPtr b) {
-    return a->path() < b->path();
-  }
-}
+namespace Rivet {
 
 
-namespace Rivet {
+  namespace {
+    bool AOSortByPath(const AnalysisObjectPtr a, const AnalysisObjectPtr b) {
+      return a->path() < b->path();
+    }
+  }
 
 
   AnalysisHandler::AnalysisHandler(const string& runname)
@@ -102,9 +101,9 @@
     const PdgIdPair beams = Rivet::beamIds(ge);
     const double sqrts = Rivet::sqrtS(ge);
     if (!compatible(beams, _beams) || !fuzzyEquals(sqrts, sqrtS())) {
-      cerr     << "Event beams mismatch: "
-               << PID::toBeamsString(beams) << " @ " << sqrts/GeV << " GeV" << " vs. first beams "
-               << this->beams() << " @ " << this->sqrtS()/GeV << " GeV" << endl;
+      cerr << "Event beams mismatch: "
+           << PID::toBeamsString(beams) << " @ " << sqrts/GeV << " GeV" << " vs. first beams "
+           << this->beams() << " @ " << this->sqrtS()/GeV << " GeV" << endl;
       exit(1);
     }
 

Modified: trunk/src/Core/Projection.cc
==============================================================================
--- trunk/src/Core/Projection.cc	Wed May 29 00:07:48 2013	(r4321)
+++ trunk/src/Core/Projection.cc	Wed May 29 00:37:58 2013	(r4322)
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Projection.hh"
 #include "Rivet/Tools/Logging.hh"
+#include "Rivet/BeamConstraint.hh"
 #include "Rivet/Event.hh"
 #include "Rivet/Cmp.hh"