[Rivet-svn] r3335 - in branches/2011-07-aida2yoda: . include/Rivet include/Rivet/Projections src/Core src/Projections

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Aug 26 18:23:31 2011
New Revision: 3335

Log:
Removing deprecated setBeams method from Analysis, and the deprecated TotalVisibleMomentum projection.

Deleted:
   branches/2011-07-aida2yoda/include/Rivet/Projections/TotalVisibleMomentum.hh
   branches/2011-07-aida2yoda/src/Projections/TotalVisibleMomentum.cc
Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/include/Rivet/Analysis.hh
   branches/2011-07-aida2yoda/include/Rivet/Makefile.am
   branches/2011-07-aida2yoda/src/Core/Analysis.cc
   branches/2011-07-aida2yoda/src/Projections/Makefile.am

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Thu Aug 25 12:56:18 2011	(r3334)
+++ branches/2011-07-aida2yoda/ChangeLog	Fri Aug 26 18:23:31 2011	(r3335)
@@ -1,3 +1,8 @@
+2011-08-26  Andy Buckley  <andy at insectnation.org>
+
+	* Removing deprecated setBeams method from Analysis, and the
+	deprecated TotalVisibleMomentum projection.
+
 2011-08-23  Andy Buckley  <andy at insectnation.org>
 
 	* Adding a new DECLARE_RIVET_PLUGIN wrapper macro to hide the

Modified: branches/2011-07-aida2yoda/include/Rivet/Analysis.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Analysis.hh	Thu Aug 25 12:56:18 2011	(r3334)
+++ branches/2011-07-aida2yoda/include/Rivet/Analysis.hh	Fri Aug 26 18:23:31 2011	(r3335)
@@ -245,13 +245,6 @@
       return *_info;
     }
 
-    /// Set the required beams
-    /// @deprecated To be removed in 2.0.0. Use .info file and AnalysisInfo class instead
-    virtual Analysis& setBeams(PdgId beam1, PdgId beam2) {
-      /// @todo Print out a warning to use setRequiredBeams() instead (and really to use .info files)
-      return setRequiredBeams(std::vector<PdgIdPair>(1, make_pair(beam1, beam2)));
-    }
-
     //@}
 
 
@@ -370,7 +363,7 @@
     const YODA::Scatter2D & referenceData(const string& hname) const;
 
     /// Get reference data for a numbered histo
-    const YODA::Scatter2D & referenceData(size_t datasetId, 
+    const YODA::Scatter2D & referenceData(size_t datasetId,
 				    size_t xAxisId, size_t yAxisId) const;
 
     /// Get bin edges with logarithmic widths
@@ -423,9 +416,9 @@
     /// Book a 1D histogram based on the name in the corresponding AIDA
     /// file. The binnings will be obtained by reading the bundled AIDA data
     /// record file with the same filename as the analysis' name() property.
-    Histo1DPtr bookHisto1D(const std::string& name, 
+    Histo1DPtr bookHisto1D(const std::string& name,
 			   const std::string& title="",
-			   const std::string& xtitle="", 
+			   const std::string& xtitle="",
 			   const std::string& ytitle="");
 
     /// Book a 1D histogram based on the paper, dataset and x/y-axis IDs in the corresponding
@@ -433,7 +426,7 @@
     /// of the same filename as the analysis' name() property.
     Histo1DPtr bookHisto1D(size_t datasetId, size_t xAxisId, size_t yAxisId,
 			   const std::string& title="",
-			   const std::string& xtitle="", 
+			   const std::string& xtitle="",
 			   const std::string& ytitle="");
 
     //@}
@@ -465,7 +458,7 @@
     /// record file with the same filename as the analysis' name() property.
     Profile1DPtr bookProfile1D(const std::string& name, const std::string& title="",
 			       const std::string& xtitle="", const std::string& ytitle="");
-    
+
     /// Book a 1D profile histogram based on the paper, dataset and x/y-axis IDs in the corresponding
     /// HepData record. The binnings will be obtained by reading the bundled AIDA data record file
     /// of the same filename as the analysis' name() property.

Modified: branches/2011-07-aida2yoda/include/Rivet/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Makefile.am	Thu Aug 25 12:56:18 2011	(r3334)
+++ branches/2011-07-aida2yoda/include/Rivet/Makefile.am	Fri Aug 26 18:23:31 2011	(r3335)
@@ -69,7 +69,6 @@
   Projections/Spherocity.hh     \
   Projections/SVertex.hh	    \
   Projections/Thrust.hh         \
-  Projections/TotalVisibleMomentum.hh \
   Projections/TriggerCDFRun0Run1.hh \
   Projections/TriggerCDFRun2.hh \
   Projections/TriggerUA5.hh \

Modified: branches/2011-07-aida2yoda/src/Core/Analysis.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Core/Analysis.cc	Thu Aug 25 12:56:18 2011	(r3334)
+++ branches/2011-07-aida2yoda/src/Core/Analysis.cc	Fri Aug 26 18:23:31 2011	(r3335)
@@ -206,7 +206,7 @@
     // Get the bin edges (only read the AIDA file once)
     const Scatter2D & refdata = referenceData(hname);
     const string path = histoPath(hname);
-    Histo1DPtr hist( new Histo1D(refdata,title) );
+    Histo1DPtr hist( new Histo1D(refdata, title) );
     addPlot(hist);
     MSG_TRACE("Made histogram " << hname <<  " for " << name());
     // hist->setXTitle(xtitle);
@@ -232,7 +232,7 @@
   Histo1DPtr Analysis::bookHisto1D(const string& hname,
 				   const vector<double>& binedges,
 				   const string& title,
-				   const string& xtitle, 
+				   const string& xtitle,
 				   const string& ytitle) {
     const string path = histoPath(hname);
     Histo1DPtr hist( new Histo1D(binedges, path, title) );

Modified: branches/2011-07-aida2yoda/src/Projections/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Projections/Makefile.am	Thu Aug 25 12:56:18 2011	(r3334)
+++ branches/2011-07-aida2yoda/src/Projections/Makefile.am	Fri Aug 26 18:23:31 2011	(r3335)
@@ -32,7 +32,6 @@
   Spherocity.cc \
   SVertex.cc \
   Thrust.cc \
-  TotalVisibleMomentum.cc \
   TriggerCDFRun0Run1.cc \
   TriggerCDFRun2.cc \
   TriggerUA5.cc \