[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.0-13-g3953032

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 3953032d946ab3afc016d1cfad12546298279d01
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 10 19:44:02 2012 +0800

    Revise patchset.

diff --git a/debian/patches/fix-analysis-plugin-path.patch b/debian/patches/fix-analysis-plugin-path.patch
index 5171372..c8082f8 100644
--- a/debian/patches/fix-analysis-plugin-path.patch
+++ b/debian/patches/fix-analysis-plugin-path.patch
@@ -38,7 +38,7 @@
  RivetATLASAnalyses_la_SOURCES = \
      ATLAS_2010_S8591806.cc \
      ATLAS_2010_S8817804.cc \
-@@ -79,7 +79,7 @@
+@@ -97,7 +97,7 @@
  endif
  
  
@@ -47,25 +47,31 @@
  RivetCMSAnalyses_la_SOURCES = \
      CMS_2010_S8547297.cc \
      CMS_2010_S8656010.cc \
-@@ -99,7 +99,7 @@
-     CMS_QCD_10_024.cc
+@@ -118,7 +118,7 @@
  endif
  
+ 
 -lib_LTLIBRARIES += RivetLHCbAnalyses.la
 +pkglib_LTLIBRARIES += RivetLHCbAnalyses.la
  RivetLHCbAnalyses_la_SOURCES =
  if ENABLE_UNVALIDATED
  RivetLHCbAnalyses_la_SOURCES += \
-@@ -109,7 +109,7 @@
+@@ -128,12 +128,12 @@
  endif
  
  
+-lib_LTLIBRARIES += RivetTOTEMAnalyses.la
++pkglib_LTLIBRARIES += RivetTOTEMAnalyses.la
+ RivetTOTEMAnalyses_la_SOURCES = \
+     TOTEM_2012_DNDETA.cc
+ 
+ 
 -lib_LTLIBRARIES += RivetCDFAnalyses.la
 +pkglib_LTLIBRARIES += RivetCDFAnalyses.la
  RivetCDFAnalyses_la_SOURCES = \
      CDF_1988_S1865951.cc \
      CDF_1990_S2089246.cc \
-@@ -157,7 +157,7 @@
+@@ -181,7 +181,7 @@
  endif
  
  
@@ -74,7 +80,7 @@
  RivetD0Analyses_la_SOURCES = \
      D0_2000_S4480767.cc \
      D0_2001_S4674421.cc \
-@@ -184,7 +184,7 @@
+@@ -209,7 +209,7 @@
  endif
  
  
@@ -83,7 +89,7 @@
  RivetHERAAnalyses_la_SOURCES = \
      H1_1994_S2919893.cc \
      H1_2000_S4129130.cc
-@@ -194,12 +194,12 @@
+@@ -219,12 +219,12 @@
      ZEUS_2001_S4815815.cc
  endif
  
@@ -98,7 +104,7 @@
  RivetLEPAnalyses_la_SOURCES = \
      ALEPH_1991_S2435284.cc \
      ALEPH_1996_S3486095.cc \
-@@ -222,7 +222,7 @@
+@@ -264,7 +264,7 @@
  endif
  
  
@@ -107,7 +113,7 @@
  RivetRHICAnalyses_la_SOURCES = \
      STAR_2006_S6500200.cc \
      STAR_2006_S6860818.cc \
-@@ -238,7 +238,7 @@
+@@ -280,7 +280,7 @@
  endif
  
  
@@ -116,7 +122,7 @@
  RivetSPSAnalyses_la_SOURCES = \
      UA1_1990_S2044935.cc \
      UA5_1982_S875503.cc \
-@@ -248,7 +248,7 @@
+@@ -290,7 +290,7 @@
      UA5_1989_S1926373.cc
  
  
@@ -125,7 +131,7 @@
  RivetMiscAnalyses_la_SOURCES = \
      PDG_HADRON_MULTIPLICITIES.cc \
      PDG_HADRON_MULTIPLICITIES_RATIOS.cc \
-@@ -261,7 +261,7 @@
+@@ -311,7 +311,7 @@
  endif
  
  
diff --git a/debian/patches/yaml-cpp.patch b/debian/patches/yaml-cpp.patch
index 9ec3f8e..6095f4c 100644
--- a/debian/patches/yaml-cpp.patch
+++ b/debian/patches/yaml-cpp.patch
@@ -1,42 +1,3 @@
-diff --git a/include/Rivet/Math/eigen/ludecomposition.h b/include/Rivet/Math/eigen/ludecomposition.h
-index 28e9aea..c2b0bcf 100644
---- a/include/Rivet/Math/eigen/ludecomposition.h
-+++ b/include/Rivet/Math/eigen/ludecomposition.h
-@@ -85,7 +85,7 @@ class LUDecomposition
- public:
- 
-     /** Performs the LU Decomposition of mat. Use this constructor. */
--    LUDecomposition( const Matrix<T, Size> & mat ) { perform( mat ); }
-+    LUDecomposition( const Matrix<T, Size> & mat ) { this->perform( mat ); }
- 
- protected:
-     /** Default constructor. Does nothing. \internal
-diff --git a/include/Rivet/Math/eigen/matrix.h b/include/Rivet/Math/eigen/matrix.h
-index 2b68510..7c1d6fd 100644
---- a/include/Rivet/Math/eigen/matrix.h
-+++ b/include/Rivet/Math/eigen/matrix.h
-@@ -170,7 +170,7 @@ public:
-       */
-     Matrix( const Matrix & other )
-     {
--        readArray( other.array() );
-+        this->readArray( other.array() );
-     }
- 
-     /**
-diff --git a/include/Rivet/Math/eigen/vector.h b/include/Rivet/Math/eigen/vector.h
-index 9ac8626..f52ad44 100644
---- a/include/Rivet/Math/eigen/vector.h
-+++ b/include/Rivet/Math/eigen/vector.h
-@@ -141,7 +141,7 @@ public:
-       */
-     Vector( const Vector &v )
-     {
--        readArray( v.array() );
-+        this->readArray( v.array() );
-     }
- 
-     /**
 diff --git a/src/Core/AnalysisInfo.cc b/src/Core/AnalysisInfo.cc
 index 9aa03f2..b6eacb7 100644
 --- a/src/Core/AnalysisInfo.cc

-- 
Rivet: Robust Independent Validation of Experiment and Theory