|
[Rivet-svn] r1935 - trunkblackhole at projects.hepforge.org blackhole at projects.hepforge.orgMon Oct 19 15:15:31 BST 2009
Author: hoeth Date: Mon Oct 19 15:15:31 2009 New Revision: 1935 Log: cosmetic changes Modified: trunk/ChangeLog trunk/missing Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Mon Oct 19 15:09:01 2009 (r1934) +++ trunk/ChangeLog Mon Oct 19 15:15:31 2009 (r1935) @@ -10,6 +10,7 @@ state takes E_T instead of p_T as argument (makes more sense for neutral particles). The compare() method does not yet work as expected (E_T comparison still missing). + * Adding new MergedFinalState projection. This merges two final states, removing duplicate particles. Duplicates are identified by looking at the genParticle(), so users need to take care of @@ -1623,21 +1624,19 @@ * Fixed default fall-through in cut handling switch statement and now using -numeric_limits<double>::max() rather than min() - * Added more control of logging presentation via static flag + * Added more control of logging presentation via static flag methods on Log. - 2007-05-13 Andy Buckley <andy at insectnation.org> * Added self-consistency checking mechanisms for Cuts and Beam - + * Re-implemented the cut-handling part of RivetInfo as a Cuts class. - + * Changed names of Analysis and Projection name() and handler() methods to getName() and getHandler() to be more consistent with the rest of the public method names in those classes. - 2007-05-02 Andy Buckley <andy at insectnation.org> * Added auto-booking of histogram bins from AIDA XML files. The @@ -1650,7 +1649,6 @@ * Added a preliminary version of the Rick Field UE analysis, under the name PRD65092002. - 2007-04-19 Leif Lönnblad <Leif.Lonnblad at thep.lu.se> * src/Analysis/HepEx0409040.cc: The reason this did not compile @@ -1659,7 +1657,6 @@ to 0. I've changed this to initialize to end() of the corresponding vector and to compare with the same end() later. - 2007-04-05 Andy Buckley <andy at insectnation.org> * Lots of name changes in anticipation of the MCNet @@ -1672,13 +1669,11 @@ generator. The ParticleName includes an "ANY" wildcard for this purpose. - 2006-03-19 Andy Buckley <andy at insectnation.org> * Added "rivet" executable which can read in HepMC ASCII dump files and apply Rivet analyses on the events. - 2007-02-24 Leif Lönnblad <Leif.Lonnblad at thep.lu.se> * src/Projections/KtJets.cc: Added comparison of member variables @@ -1695,14 +1690,12 @@ also been changed to require the used projections themselves, rather than the arguments needed to construct them. - 2007-02-17 Leif Lönnblad <Leif.Lonnblad at thep.lu.se> * src/Projections/FinalState.cc, include/Rivet/Projections/FinalState.icc (Rivet), include/Rivet/Projections/FinalState.hh: Added cut in transverse momentum on the particles to be included in the final state. - 2007-02-06 Leif Lönnblad <Leif.Lonnblad at thep.lu.se> @@ -1713,8 +1706,7 @@ * include/LWH/Histogram1D.h: In normalize(double), do not do anything if the sum of the bins are zero to avoid dividing by zero. - - + 2007-01-20 Leif Lönnblad <Leif.Lonnblad at thep.lu.se> * src/Test/testLWH.cc: Modified to output files using the Tree. @@ -1722,7 +1714,6 @@ * configure.ac: Removed AC_CONFIG_AUX_DIR([include/Rivet/Config]) since the directory does not exist anymore. - 2006-12-21 Andy Buckley <andy at insectnation.org> * Rivet will now conditionally install the AIDA and LWH headers if @@ -1734,7 +1725,6 @@ * Replaced multitude of CLHEP wrapper headers with a single RivetCLHEP.h header. - 2006-11-20 Andy Buckley <andy at insectnation.org> * Introduced log4cpp logging. @@ -1742,7 +1732,6 @@ * Added analysis enum, which can be used as input to an analysis factory by Rivet users. - 2006-11-02 Andy Buckley <andy at insectnation.org> * Yet more, almost pointless, administrative moving around of @@ -1752,22 +1741,21 @@ * The RivetInfo and RivetHandler classes have been moved from src/Analysis into src as they are really the main Rivet interface classes. The Rivet.h header has also been moved into the - "header root". + "header root". * The build of a single shared library in lib has been disabled, with the library being built instead in src. - 2006-10-14 Andy Buckley <andy at insectnation.org> * Introduced a minimal subset of the Sherpa math tools, such as Vector{3,4}D, Matrix, etc. The intention is to eventually cut the dependency on CLHEP. - + 2006-07-28 Andy Buckley <andy at insectnation.org> * Moving things around: all sources now in directories under src - + 2006-06-04 Leif Lönnblad <Leif.Lonnblad at thep.lu.se> * Analysis/Examples/HZ95108.*: Now uses CentralEtHCM. Also set GeV Modified: trunk/missing ============================================================================== --- trunk/missing Mon Oct 19 15:09:01 2009 (r1934) +++ trunk/missing Mon Oct 19 15:15:31 2009 (r1935) @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0
More information about the Rivet-svn mailing list |