|
[Rivet-svn] r3291 - in branches/2011-07-aida2yoda: . bin doc testblackhole at projects.hepforge.org blackhole at projects.hepforge.orgTue Aug 16 16:05:43 BST 2011
Author: hoeth Date: Tue Aug 16 16:05:42 2011 New Revision: 3291 Log: merge r3284-r3290 from trunk Modified: branches/2011-07-aida2yoda/ChangeLog branches/2011-07-aida2yoda/bin/aida2flat branches/2011-07-aida2yoda/doc/bend.eps branches/2011-07-aida2yoda/doc/cone.eps branches/2011-07-aida2yoda/doc/thinker.eps branches/2011-07-aida2yoda/doc/warning.eps branches/2011-07-aida2yoda/rivetenv.csh.in branches/2011-07-aida2yoda/rivetenv.sh.in branches/2011-07-aida2yoda/test/testMatVec.cc Modified: branches/2011-07-aida2yoda/ChangeLog ============================================================================== --- branches/2011-07-aida2yoda/ChangeLog Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/ChangeLog Tue Aug 16 16:05:42 2011 (r3291) @@ -1,3 +1,14 @@ +2011-08-09 David Mallows <dave.mallows at gmail.com> + * Fix aida2flat to ignore empty dataPointSet + +2011-08-07 Andy Buckley <andy at insectnation.org> + + * Adding TEXINPUTS and LATEXINPUTS prepend definitions to the + variables provided by rivetenv.(c)sh. A manual setting of these + variables that didn't include the Rivet TEXMFHOME path was + breaking make-plots on lxplus, presumably since the system LaTeX + packages are so old there. + 2011-08-02 Frank Siegert <frank.siegert at cern.ch> Version 1.6.0 release! Modified: branches/2011-07-aida2yoda/bin/aida2flat ============================================================================== --- branches/2011-07-aida2yoda/bin/aida2flat Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/bin/aida2flat Tue Aug 16 16:05:42 2011 (r3291) @@ -133,6 +133,14 @@ sys.exit(1) for dps in tree.findall("dataPointSet"): useThis = True + + ## Check dataPointSet contains at least one measurement + try: + if dps.find('dataPoint').find('measurement') is None: + useThis = False + except AttributeError, err: + logging.debug(err) + dpspath = os.path.join(dps.get("path"), dps.get("name")) ## If regexes have been provided, only add analyses which match and don't unmatch Modified: branches/2011-07-aida2yoda/doc/bend.eps ============================================================================== --- branches/2011-07-aida2yoda/doc/bend.eps Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/doc/bend.eps Tue Aug 16 16:05:42 2011 (r3291) @@ -1,7 +1,7 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: (GraphicsMagick) %%Title: (bend.eps) -%%CreationDate: (Thu Mar 31 22:39:15 2011) +%%CreationDate: (Tue Aug 2 14:59:39 2011) %%BoundingBox: 0 0 60 83 %%DocumentData: Clean7Bit %%LanguageLevel: 1 Modified: branches/2011-07-aida2yoda/doc/cone.eps ============================================================================== --- branches/2011-07-aida2yoda/doc/cone.eps Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/doc/cone.eps Tue Aug 16 16:05:42 2011 (r3291) @@ -1,7 +1,7 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: (GraphicsMagick) %%Title: (cone.eps) -%%CreationDate: (Thu Mar 31 22:39:15 2011) +%%CreationDate: (Tue Aug 2 14:59:39 2011) %%BoundingBox: 0 0 157 211 %%DocumentData: Clean7Bit %%LanguageLevel: 1 Modified: branches/2011-07-aida2yoda/doc/thinker.eps ============================================================================== --- branches/2011-07-aida2yoda/doc/thinker.eps Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/doc/thinker.eps Tue Aug 16 16:05:42 2011 (r3291) @@ -1,7 +1,7 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: (GraphicsMagick) %%Title: (thinker.eps) -%%CreationDate: (Thu Mar 31 22:39:15 2011) +%%CreationDate: (Tue Aug 2 14:59:39 2011) %%BoundingBox: 0 0 143 200 %%DocumentData: Clean7Bit %%LanguageLevel: 1 Modified: branches/2011-07-aida2yoda/doc/warning.eps ============================================================================== --- branches/2011-07-aida2yoda/doc/warning.eps Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/doc/warning.eps Tue Aug 16 16:05:42 2011 (r3291) @@ -1,7 +1,7 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: (GraphicsMagick) %%Title: (warning.eps) -%%CreationDate: (Thu Mar 31 22:39:15 2011) +%%CreationDate: (Tue Aug 2 14:59:39 2011) %%BoundingBox: 0 0 116 116 %%DocumentData: Clean7Bit %%LanguageLevel: 1 Modified: branches/2011-07-aida2yoda/rivetenv.csh.in ============================================================================== --- branches/2011-07-aida2yoda/rivetenv.csh.in Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/rivetenv.csh.in Tue Aug 16 16:05:42 2011 (r3291) @@ -23,3 +23,15 @@ else setenv HOMETEXMF "@datadir@/Rivet/texmf" endif + +if ($?TEXINPUTS) then +setenv TEXINPUTS "@datadir@/Rivet/texmf:$TEXINPUTS" +else +setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//" +endif + +if ($?LATEXINPUTS) then +setenv LATEXINPUTS "@datadir@/Rivet/texmf:$LATEXINPUTS" +else +setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//" +endif Modified: branches/2011-07-aida2yoda/rivetenv.sh.in ============================================================================== --- branches/2011-07-aida2yoda/rivetenv.sh.in Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/rivetenv.sh.in Tue Aug 16 16:05:42 2011 (r3291) @@ -6,9 +6,12 @@ export PATH="$exec_prefix/bin:$PATH" export @LIBPATHVARNAME@="@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:$@LIBPATHVARNAME@" export PYTHONPATH="@RIVET_PYTHONPATH@:$PYTHONPATH" + export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME" export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF" export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF" +export TEXINPUTS="@datadir@/Rivet/texmf/tex//:$TEXINPUTS" +export LATEXINPUTS="@datadir@/Rivet/texmf/tex//:$LATEXINPUTS" if (complete &> /dev/null); then test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion" Modified: branches/2011-07-aida2yoda/test/testMatVec.cc ============================================================================== --- branches/2011-07-aida2yoda/test/testMatVec.cc Mon Aug 15 17:14:33 2011 (r3290) +++ branches/2011-07-aida2yoda/test/testMatVec.cc Tue Aug 16 16:05:42 2011 (r3291) @@ -41,8 +41,6 @@ m.set(2, 2, 9); cout << m << endl << endl; EigenSystem<3> es = diagonalize(m); - /// @todo Fix the EigenSystem operator<< and toString() function - //cout << "Eigensolns = " << endl << toString(es) << endl << endl; cout << "Matrices:" << endl; cout << Matrix3() << endl; @@ -142,5 +140,27 @@ cout << (ltY * ltX).boost() << endl; cout << (ltX * ltX.inverse()).boost() << endl; + //////////// + + // Angle tests + assert(fuzzyEquals(angle(FourMomentum(1,0,0,1), FourMomentum(1,0,0,1))/M_PI, 0.0)); + assert(fuzzyEquals(angle(FourMomentum(1,0,0,1), FourMomentum(1,0,1,0))/M_PI, 0.5)); + assert(fuzzyEquals(angle(FourMomentum(1,0,0,1), FourMomentum(1,0,0,-1))/M_PI, 1.0)); + // Test with vectors of different magnitude + assert(fuzzyEquals(angle(FourMomentum(3,0,0,3), FourMomentum(1,0,0,1))/M_PI, 0.0)); + assert(fuzzyEquals(angle(FourMomentum(5,0,0,5), FourMomentum(1,0,1,0))/M_PI, 0.5)); + assert(fuzzyEquals(angle(FourMomentum(7,0,0,7), FourMomentum(1,0,0,-1))/M_PI, 1.0)); + + //////////// + + linspace(0, 10, 50); + logspace(0.000001, 1.0, 50); + + assert(isZero(1e-15)); + assert(fuzzyEquals(1e-15, 0.0)); + assert(fuzzyEquals(2.0, 2.0)); + assert(!fuzzyEquals(1, 2.0)); + assert(fuzzyGtrEquals(1.0, 1.0 - 1e-15)); + return EXIT_SUCCESS; }
More information about the Rivet-svn mailing list |