[Rivet-svn] r3336 - in branches/2011-07-aida2yoda: . include/Rivet include/Rivet/Projections include/Rivet/Tools src/Projections test

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Aug 26 18:29:32 2011
New Revision: 3336

Log:
Removing more long-deprecated API features and the PVertex projection

Deleted:
   branches/2011-07-aida2yoda/include/Rivet/Projections/PVertex.hh
   branches/2011-07-aida2yoda/src/Projections/PVertex.cc
Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/include/Rivet/AnalysisHandler.hh
   branches/2011-07-aida2yoda/include/Rivet/Makefile.am
   branches/2011-07-aida2yoda/include/Rivet/Rivet.hh
   branches/2011-07-aida2yoda/include/Rivet/Tools/Utils.hh
   branches/2011-07-aida2yoda/src/Projections/Makefile.am
   branches/2011-07-aida2yoda/test/testApi.cc

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/ChangeLog	Fri Aug 26 18:29:32 2011	(r3336)
@@ -1,7 +1,9 @@
 2011-08-26  Andy Buckley  <andy at insectnation.org>
 
-	* Removing deprecated setBeams method from Analysis, and the
-	deprecated TotalVisibleMomentum projection.
+	* Removing deprecated features: the setBeams(...) method on
+	Analysis, the MaxRapidity constant, the split(...) function, the
+	default init() method from AnalysisHandler and its test, and the
+	deprecated TotalVisibleMomentum and PVertex projections.
 
 2011-08-23  Andy Buckley  <andy at insectnation.org>
 

Modified: branches/2011-07-aida2yoda/include/Rivet/AnalysisHandler.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/AnalysisHandler.hh	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/include/Rivet/AnalysisHandler.hh	Fri Aug 26 18:29:32 2011	(r3336)
@@ -152,10 +152,6 @@
     /// @name Main init/execute/finalise
     //@{
 
-    /// @deprecated Obsolete method, kept only for backwards compatibility
-    void init() {}
-
-
     /// Initialize a run, with the run beams taken from the example event.
     void init(const GenEvent& event);
 
@@ -171,9 +167,11 @@
 
     //@}
 
+
     /// Write all analyses' plots to the named file.
     void writeData(const std::string& filename);
 
+
   private:
 
     /// The collection of Analysis objects to be used.

Modified: branches/2011-07-aida2yoda/include/Rivet/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Makefile.am	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/include/Rivet/Makefile.am	Fri Aug 26 18:29:32 2011	(r3336)
@@ -64,7 +64,6 @@
   Projections/Multiplicity.hh   \
   Projections/NeutralFinalState.hh \
   Projections/ParisiTensor.hh   \
-  Projections/PVertex.hh        \
   Projections/Sphericity.hh     \
   Projections/Spherocity.hh     \
   Projections/SVertex.hh	    \

Modified: branches/2011-07-aida2yoda/include/Rivet/Rivet.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Rivet.hh	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/include/Rivet/Rivet.hh	Fri Aug 26 18:29:32 2011	(r3336)
@@ -22,8 +22,6 @@
 
   /// A sensible default maximum value of rapidity for Rivet analyses to use.
   static const double MAXRAPIDITY = 100000.0;
-  /// @deprecated
-  static const double MaxRapidity = 100000.0;
 
   /// A function to get the Rivet version string
   string version();

Modified: branches/2011-07-aida2yoda/include/Rivet/Tools/Utils.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Tools/Utils.hh	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/include/Rivet/Tools/Utils.hh	Fri Aug 26 18:29:32 2011	(r3336)
@@ -74,10 +74,6 @@
     return dirs;
   }
 
-  /// @deprecated Use @c pathsplit instead.
-  inline vector<string> split(const string& path, const string& UNUSED(delim) = ":") {
-    return pathsplit(path);
-  }
 
   /// @brief Join several filesystem paths together with a delimiter character.
   /// Note that this does NOT join path elements together with a platform-portable

Modified: branches/2011-07-aida2yoda/src/Projections/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Projections/Makefile.am	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/src/Projections/Makefile.am	Fri Aug 26 18:29:32 2011	(r3336)
@@ -27,7 +27,6 @@
   Multiplicity.cc \
   NeutralFinalState.cc \
   ParisiTensor.cc \
-  PVertex.cc \
   Sphericity.cc \
   Spherocity.cc \
   SVertex.cc \

Modified: branches/2011-07-aida2yoda/test/testApi.cc
==============================================================================
--- branches/2011-07-aida2yoda/test/testApi.cc	Fri Aug 26 18:23:31 2011	(r3335)
+++ branches/2011-07-aida2yoda/test/testApi.cc	Fri Aug 26 18:29:32 2011	(r3336)
@@ -16,9 +16,6 @@
   vector<string> moreanalyses(1, "MC_JETS");
   rivet.addAnalyses(moreanalyses);
 
-  // Initialise: obsolete, but allowed for compatibility
-  rivet.init();
-
   std::istream* file = new std::fstream("testApi.hepmc", std::ios::in);
   HepMC::IO_GenEvent hepmcio(*file);
   HepMC::GenEvent* evt = hepmcio.read_next_event();