|
[Rivet-svn] r3637 - in branches/2011-07-aida2yoda: . bin include/Rivet/Math pyext src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgTue Mar 20 14:52:46 GMT 2012
Author: hoeth Date: Tue Mar 20 14:52:46 2012 New Revision: 3637 Log: merge c3617-3625 from trunk and update ChangeLog Modified: branches/2011-07-aida2yoda/ChangeLog branches/2011-07-aida2yoda/bin/Makefile.am branches/2011-07-aida2yoda/bin/rivet-rescale branches/2011-07-aida2yoda/include/Rivet/Math/MathHeader.hh branches/2011-07-aida2yoda/pyext/setup.py.in branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8994773.cc branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I917009.cc Modified: branches/2011-07-aida2yoda/ChangeLog ============================================================================== --- branches/2011-07-aida2yoda/ChangeLog Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/ChangeLog Tue Mar 20 14:52:46 2012 (r3637) @@ -1,3 +1,16 @@ +2012-03-16 Andy Buckley <andy.buckley at cern.ch> + + * Version change to 1.8.0beta0 -- nearly ready for long-awaited release! + + * pyext/setup.py.in: Adding handling for the YAML library: fix for + Genser build from Anton Karneyeu. + + * src/Analyses/LHCB_2011_I917009.cc: Hiding lifetime-lookup error + message if the offending particle is not a hadron. + + * include/Rivet/Math/MathHeader.hh: Using unnamespaced std::isnan + and std::isinf as standard. + 2012-03-16 Hendrik Hoeth <hendrik.hoeth at cern.ch> * Improve default plot behaviour for 2D histograms @@ -21,7 +34,7 @@ 2012-02-28 Hendrik Hoeth <hendrik.hoeth at cern.ch> * lighthisto.py: Caching for re.compile(). This speeds up aida2flat - ant flat2aida by more than an order of magnitude. + and flat2aida by more than an order of magnitude. 2012-02-27 Andy Buckley <andy.buckley at cern.ch> Modified: branches/2011-07-aida2yoda/bin/Makefile.am ============================================================================== --- branches/2011-07-aida2yoda/bin/Makefile.am Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/bin/Makefile.am Tue Mar 20 14:52:46 2012 (r3637) @@ -20,4 +20,5 @@ noinst_PROGRAMS = rivet-nopy rivet_nopy_SOURCES = rivet-nopy.cc rivet_nopy_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS) -rivet_nopy_LDADD = ../src/libRivet.la -lHepMC +rivet_nopy_LDADD = $(top_builddir)/src/libRivet.la -lHepMC +rivet_nopy_LDFLAGS = -L$(HEPMCLIBPATH) Modified: branches/2011-07-aida2yoda/bin/rivet-rescale ============================================================================== --- branches/2011-07-aida2yoda/bin/rivet-rescale Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/bin/rivet-rescale Tue Mar 20 14:52:46 2012 (r3637) @@ -204,7 +204,7 @@ help="Produce AIDA output rather than FLAT") parser.add_option("-f", dest="AIDA", default=True, action="store_false", help="Produce FLAT output rather than AIDA") - parser.add_option("--multiply", default=False, action="store_true", + parser.add_option("--multiply", dest="MULTIPLY", default=False, action="store_true", help="Rescale histos using weight given as factor rather than new area") parser.add_option("-i", "--in-place", dest="IN_PLACE", default=False, action="store_true", help="Overwrite input file rather than making input-rescaled.aida") @@ -239,7 +239,7 @@ import rivet refdirs += rivet.getAnalysisRefPaths() refhistos = getRefHistos(refdirs, analyses) - if len(refhistos) == 0 and not opts.multiply: + if len(refhistos) == 0 and not opts.MULTIPLY: logging.warning("You haven't specified any reference histograms. You'd better know what you're doing!") # Read in observables, if no bindefinitions are given in the file or the @@ -273,7 +273,7 @@ aidaheader = """<?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE aida SYSTEM "http://aida.freehep.org/schemas/3.3/aida.dtd"> <aida version="3.3"> - <implementation version="1.1" package="FreeHEP"/> + <implementation version="1.1" package="Rivet"/> """ # Open file for output f = open(outfile, "w") @@ -307,7 +307,7 @@ oldarea = tempold.getArea() if name in obsnorms.keys(): # Check if we want to scale histos by a factor - if opts.multiply: + if opts.MULTIPLY: newarea = oldarea*obsnorms[name] else: # Rescale to manually given new area Modified: branches/2011-07-aida2yoda/include/Rivet/Math/MathHeader.hh ============================================================================== --- branches/2011-07-aida2yoda/include/Rivet/Math/MathHeader.hh Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/include/Rivet/Math/MathHeader.hh Tue Mar 20 14:52:46 2012 (r3637) @@ -37,6 +37,8 @@ using std::min; using std::max; using std::abs; + using std::isnan; + using std::isinf; const double MAXDOUBLE = std::numeric_limits<double>::max(); const double MAXINT = std::numeric_limits<int>::max(); Modified: branches/2011-07-aida2yoda/pyext/setup.py.in ============================================================================== --- branches/2011-07-aida2yoda/pyext/setup.py.in Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/pyext/setup.py.in Tue Mar 20 14:52:46 2012 (r3637) @@ -14,11 +14,14 @@ incdir_src = os.path.abspath('@top_srcdir@/include') incdir_build = os.path.abspath('@top_builddir@/include') libdir = os.path.abspath('@top_builddir@/src/.libs') +libdir_yaml = '@YAML_CPPLIBPATH@' +if not libdir_yaml: + libdir_yaml = '@top_builddir@/src/Tools/yaml-cpp/.libs' cxxargs = '@CXXFLAGS@'.split() ldargs = '@LDFLAGS@'.split() ext = Extension('_rivetwrap', [wrapsrc], - define_macros = [("SWIG_TYPE_TABLE", "hepmccompat")], + define_macros = [('SWIG_TYPE_TABLE', 'hepmccompat')], include_dirs=[incdir_src, incdir_build, '@HEPMCINCPATH@', '@BOOSTINCPATH@', '@GSLINCPATH@'], library_dirs=[libdir, '@HEPMCLIBPATH@'], extra_compile_args = cxxargs, Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8994773.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8994773.cc Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8994773.cc Tue Mar 20 14:52:46 2012 (r3637) @@ -55,8 +55,8 @@ Particle p_lead = particles500[0]; const double philead = p_lead.momentum().phi(); const double etalead = p_lead.momentum().eta(); - const double pTlead = p_lead.momentum().perp(); - MSG_DEBUG("Leading oject: pT = " << pTlead << ", eta = " << etalead << ", phi = " << philead); + const double pTlead = p_lead.momentum().pT(); + MSG_DEBUG("Leading object: pT = " << pTlead << ", eta = " << etalead << ", phi = " << philead); // Iterate over all > 500 MeV particles and count particles and scalar pTsum in the three regions vector<double> num500(3, 0), ptSum500(3, 0.0); Modified: branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I917009.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I917009.cc Tue Mar 20 14:47:36 2012 (r3636) +++ branches/2011-07-aida2yoda/src/Analyses/LHCB_2011_I917009.cc Tue Mar 20 14:52:46 2012 (r3637) @@ -2,6 +2,7 @@ #include "Rivet/Analysis.hh" #include "Rivet/RivetYODA.hh" #include "Rivet/Tools/Logging.hh" +#include "Rivet/Tools/ParticleIdUtils.hh" #include "Rivet/Projections/UnstableFinalState.hh" //#include "LWH/Histogram1D.h" #include "Rivet/Math/MathUtils.hh" @@ -174,9 +175,10 @@ } else { lft = (*pPartLft).second; } - if (lft < 0.0) + if (lft < 0.0 && PID::isHadron(pid)) { MSG_ERROR("Could not determine lifetime for particle with PID " << pid << "... This V^0 will be considered unprompt!"); + } return lft; }
More information about the Rivet-svn mailing list |