[Rivet-svn] r3691 - in branches/2011-07-aida2yoda: bin include/Rivet/Math/eigen src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Apr 19 11:50:34 2012
New Revision: 3691

Log:
merge c3646-3649 from trunk

Modified:
   branches/2011-07-aida2yoda/bin/rivet-rescale
   branches/2011-07-aida2yoda/bin/rivet-rmgaps
   branches/2011-07-aida2yoda/include/Rivet/Math/eigen/ludecomposition.h
   branches/2011-07-aida2yoda/include/Rivet/Math/eigen/matrix.h
   branches/2011-07-aida2yoda/include/Rivet/Math/eigen/vector.h
   branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc

Modified: branches/2011-07-aida2yoda/bin/rivet-rescale
==============================================================================
--- branches/2011-07-aida2yoda/bin/rivet-rescale	Thu Apr 19 11:42:05 2012	(r3690)
+++ branches/2011-07-aida2yoda/bin/rivet-rescale	Thu Apr 19 11:50:34 2012	(r3691)
@@ -166,7 +166,8 @@
     """
     area = None
     # Try to read bin specs for chopping
-    splitline = line.strip().split()
+    # Remove possible comments at the end of the line
+    splitline = line.strip().rsplit("#")[0].split()
     try:
         path, low, high = splitline[0].split(":")
     except:
@@ -321,7 +322,6 @@
             else:
                 scalefactor= 0.0
             if scalefactor != 1.0 and scalefactor > 0.0:
-                print scalefactor
                 oldarea = histos[name].getArea()
                 newarea = histos[name].getArea() * scalefactor
 

Modified: branches/2011-07-aida2yoda/bin/rivet-rmgaps
==============================================================================
--- branches/2011-07-aida2yoda/bin/rivet-rmgaps	Thu Apr 19 11:42:05 2012	(r3690)
+++ branches/2011-07-aida2yoda/bin/rivet-rmgaps	Thu Apr 19 11:50:34 2012	(r3691)
@@ -1,7 +1,8 @@
 #! /usr/bin/env python
 
-"""\
-%prog datafile.aida mcfile.aida [outputfile.aida]
+"""
+%prog mcfile.aida [outputfile.aida]
+%prog --no-rivet-refs datafile.aida mcfile.aida [outputfile.aida]
 
 Remove bins in Rivet-generated MC AIDA files which are actually binning gaps in
 the reference histogram. Rivet's histogramming system currently has no way to

Modified: branches/2011-07-aida2yoda/include/Rivet/Math/eigen/ludecomposition.h
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Math/eigen/ludecomposition.h	Thu Apr 19 11:42:05 2012	(r3690)
+++ branches/2011-07-aida2yoda/include/Rivet/Math/eigen/ludecomposition.h	Thu Apr 19 11:50:34 2012	(r3691)
@@ -85,7 +85,7 @@
 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
@@ -128,7 +128,7 @@
 
 public:
     /** Performs the LU Decomposition of mat. Use this constructor. */
-    LUDecompositionX( const MatrixX<T> & mat ) { perform( mat ); }
+    LUDecompositionX( const MatrixX<T> & mat ) { this->perform( mat ); }
 
 protected:
     /** Default constructor. Does nothing. \internal

Modified: branches/2011-07-aida2yoda/include/Rivet/Math/eigen/matrix.h
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Math/eigen/matrix.h	Thu Apr 19 11:42:05 2012	(r3690)
+++ branches/2011-07-aida2yoda/include/Rivet/Math/eigen/matrix.h	Thu Apr 19 11:50:34 2012	(r3691)
@@ -170,7 +170,7 @@
       */
     Matrix( const Matrix & other )
     {
-        readArray( other.array() );
+        this->readArray( other.array() );
     }
 
     /**
@@ -179,7 +179,7 @@
       */
     Matrix( const T * array )
     {
-        readArray( array );
+        this->readArray( array );
     }
 
     /**
@@ -322,7 +322,7 @@
     MatrixX( const MatrixX & other )
     {
         init( other.size() );
-        readArray( other.array() );
+        this->readArray( other.array() );
     }
 
     /**
@@ -336,7 +336,7 @@
     MatrixX( int size, const T * array )
     {
         init( size );
-        readArray( array );
+        this->readArray( array );
     }
 
     /**

Modified: branches/2011-07-aida2yoda/include/Rivet/Math/eigen/vector.h
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Math/eigen/vector.h	Thu Apr 19 11:42:05 2012	(r3690)
+++ branches/2011-07-aida2yoda/include/Rivet/Math/eigen/vector.h	Thu Apr 19 11:50:34 2012	(r3691)
@@ -141,7 +141,7 @@
       */
     Vector( const Vector &v )
     {
-        readArray( v.array() );
+        this->readArray( v.array() );
     }
 
     /**
@@ -149,7 +149,7 @@
       */
     Vector( const T *array )
     {
-        readArray( array );
+        this->readArray( array );
     }
 
     /**
@@ -160,7 +160,7 @@
     Vector( int unused_size, const T *array )
     {
         assert( unused_size == this->size() );
-        readArray( array );
+        this->readArray( array );
     }
 
     /**
@@ -312,7 +312,7 @@
     VectorX( const VectorX & other )
     {
         init( other._size() );
-        readArray( other.array() );
+        this->readArray( other.array() );
     }
 
     /**
@@ -328,7 +328,7 @@
     VectorX( int size, const T * array )
     {
         init( size );
-        readArray( array );
+        this->readArray( array );
     }
 
     ~VectorX()

Modified: branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc	Thu Apr 19 11:42:05 2012	(r3690)
+++ branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc	Thu Apr 19 11:50:34 2012	(r3691)
@@ -29,8 +29,12 @@
       // Projections
       const FinalState fs;
       addProjection(fs, "FS");
-      addProjection(FastJets(fs, FastJets::JADE, 0.7), "JadeJets");
-      addProjection(FastJets(fs, FastJets::DURHAM, 0.7), "DurhamJets");
+      FastJets JadeJets = FastJets(fs, FastJets::JADE, 0.7);
+      FastJets DurhamJets = FastJets(fs, FastJets::DURHAM, 0.7);
+      JadeJets.useInvisibles(true);
+      DurhamJets.useInvisibles(true);
+      addProjection(JadeJets, "JadeJets");
+      addProjection(DurhamJets, "DurhamJets");
 
       // Histos
       int offset = 0;