Page MenuHomeHEPForge
Files F10881583

No OneTemporary
Actions

View Options

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.
Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac (revision 726)
+++ trunk/configure.ac (revision 727)
@@ -1,158 +1,188 @@
## Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([AGILe],[1.1.5],[rivet@projects.hepforge.org],[AGILe])
AC_CONFIG_SRCDIR([src/Core/Loader.cc])
AC_CONFIG_HEADER([include/AGILe/AGILeConfig.hh include/AGILe/FortranWrappers.hh])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE(dist-bzip2)
AC_CONFIG_MACRO_DIR([m4])
## Library version flags (increment these for each new version)
VERSIONFLAGS="-version-info 4:0:2" ## set for 1.1.5
AC_SUBST(VERSIONFLAGS)
## Cache PATH variable
AC_ARG_VAR(PATH, [we grab the PATH variable, since various generator config scripts may need to be called repeatably])
## Set default compiler flags
if test "x$CXXFLAGS" == "x"; then CXXFLAGS="-O3"; fi
## More comprehensible error messages if possible. See:
## http://www.bdsoft.com/tools/stlfilt.html
if test "x$CXXFLAGS" == "x"; then
AC_PATH_PROG(GFILT, gfilt, $CXX, $PATH:$HOME/bin:$HOME/local/bin)
CXX=$GFILT
fi
## Declare language
AC_LANG(C++)
## OS X
AC_CEDAR_OSX
## LCG platform tag
AC_LCG_TAG
## Checks for programs.
AC_PROG_CXX
AC_PROG_FC(gfortran g95 g77)
AC_FC_LIBRARY_LDFLAGS
AC_FC_WRAPPERS
AC_PROG_INSTALL
AC_PROG_LN_S
AC_DISABLE_STATIC
## Hack to make libtool use the FC Fortran compiler via F77, since
## libtool < 2.x doesn't understand --tag=FC
F77=$FC
AM_FFLAGS=$AM_FCFLAGS
AC_SUBST(F77)
AC_SUBST(AM_FFLAGS)
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
## Work out library suffix for the build
LIB_SUFFIX=\\\"$shrext_cmds\\\"
AC_SUBST([LIB_SUFFIX])
## System libraries
AC_CEDAR_HEADERS([Boost], , , [AC_MSG_ERROR([Boost is required])])
oldCPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$BOOSTINCPATH"
BOOSTERRMSG="You need at least version 1.34.0 of Boost for this installation."
BOOSTERRMSG="$BOOSTERRMSG If you want to use Boost from a non-standard location,"
BOOSTERRMSG="$BOOSTERRMSG please specify '--with-boost-incpath=/path/to/boost_1_35/include'"
BOOSTERRMSG="$BOOSTERRMSG as option to the configure script or run 'export"
BOOSTERRMSG="$BOOSTERRMSG BOOSTFLAGS=--with-boost-incpath=/path/to/boost_1_35/include'"
BOOSTERRMSG="$BOOSTERRMSG before you run the rivet-bootstrap script."
AC_CHECK_HEADER([boost/foreach.hpp], [], [AC_MSG_ERROR([Boost foreach not found. $BOOSTERRMSG])])
AC_CHECK_HEADER([boost/smart_ptr.hpp], [], [AC_MSG_ERROR([Boost smart_ptr not found. $BOOSTERRMSG])])
AC_CHECK_HEADER([boost/lexical_cast.hpp], [], [AC_MSG_ERROR([Boost lexical_cast not found. $BOOSTERRMSG])])
AC_CHECK_HEADER([boost/assign.hpp], [], [AC_MSG_ERROR([Boost assign not found. $BOOSTERRMSG])])
CPPFLAGS=$oldCPPFLAGS
## Testing HepMC
AC_CEDAR_LIBRARYANDHEADERS([HepMC], , , [AC_MSG_ERROR([HepMC is required])])
#AC_CEDAR_LIBRARY([HepMCfio], , , [AC_MSG_ERROR([HepMCfio is required])])
## Standard build flags
AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include "
AM_CPPFLAGS="$AM_CPPFLAGS -I\$(BOOSTINCPATH) \$(BOOST_CPPFLAGS)"
AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH) "
AM_LDFLAGS="-L\$(top_builddir)/src/Tools -L\$(top_builddir)/src"
AM_CXXFLAGS="$AM_CXXFLAGS -DLIB_SUFFIX=$LIB_SUFFIX "
AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic "])
AC_CEDAR_CHECKCXXFLAG([-ansi], [AM_CXXFLAGS="$AM_CXXFLAGS -ansi "])
AC_CEDAR_CHECKCXXFLAG([-Wall], [AM_CXXFLAGS="$AM_CXXFLAGS -Wall "])
## Debug flag (default=none)
AC_ARG_ENABLE([debug], [AC_HELP_STRING(--enable-debug,
[build with debugging symbols @<:@default=no@:>@])], [], [enable_debug=no])
if test x$enable_debug == xyes; then
AC_CEDAR_CHECKCXXFLAG([-g], [AM_CXXFLAGS="$AM_CXXFLAGS -g "])
fi
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_SUBST(AM_CXXFLAGS)
## Fortran build flags
FORTRANLDFLAGS="-L$HEPMCLIBPATH" # -L$HEPMCFIOLIBPATH"
FORTRANLIBADD="$FCLIBS" # -l$HEPMCFIOLIBNAME
AC_SUBST(FORTRANLDFLAGS)
AC_SUBST(FORTRANLIBADD)
## Dlopen export flags
DLOPENFLAGS="-export-dynamic"
AC_SUBST(DLOPENFLAGS)
-## Decide whether to build the Python extension
+## Python extension
+AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--disable-pyext,
+ [don't build Python module (default=build)])],
+ [], [enable_pyext=yes])
AZ_PYTHON_DEFAULT
-AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--enable-pyext,
- [build AGILe Python module @<:@default=yes@:>@])], [], [enable_pyext=yes])
-AM_CONDITIONAL(ENABLE_PYTHON, [test x$enable_pyext == xyes])
+## Basic Python checks
if test x$enable_pyext == xyes; then
AZ_PYTHON_PATH
AZ_PYTHON_VERSION_ENSURE([2.3])
+ ## Test for Python header
+ if test -x "$PYTHON"; then
+ AC_MSG_CHECKING([for Python include path])
+ python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
+ AC_MSG_RESULT([$python_incpath])
+ python_header="$python_incpath/Python.h"
+ if test -z "$python_incpath"; then
+ AC_MSG_WARN([Can't build Python extension since include directory cannot be determined from distutils])
+ enable_pyext=no
+ elif test ! -e "$python_header"; then
+ AC_MSG_WARN([Can't build Python extension since header file $python_header cannot be found])
+ enable_pyext=no
+ fi
+ fi
fi
+## SWIG version checks
+if test x$enable_pyext == xyes; then
+ AC_PROG_SWIG
+ if test x$SWIG == x; then
+ AC_MSG_WARN([Can't build Python extension since swig could not be found])
+ ## TODO: Test that SWIG makes a compilable source file...
+ ## cf. g++ 4.x requires that string literal is "_const_ char*"
+ enable_pyext=no
+ fi
+fi
+## Finish
+if test x$enable_pyext == xyes; then
+ AC_MSG_NOTICE([All Python build checks successful: 'rivet' Python extension will be built])
+fi
+AM_CONDITIONAL(ENABLE_PYEXT, [test x$enable_pyext == xyes])
AC_EMPTY_SUBST
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(include/Makefile include/AGILe/Makefile)
AC_CONFIG_FILES(src/Makefile src/Core/Makefile src/Tools/Makefile src/IO/Makefile)
AC_CONFIG_FILES(src/FPythia/Makefile)
AC_CONFIG_FILES(src/FHerwig/Makefile)
AC_CONFIG_FILES(src/AlpGen/Makefile)
AC_CONFIG_FILES(src/Charybdis/Makefile)
AC_CONFIG_FILES(src/Rapgap/Makefile)
AC_CONFIG_FILES(src/Cascade/Makefile)
AC_CONFIG_FILES(bin/Makefile bin/agile-config)
AC_CONFIG_FILES(pyext/Makefile pyext/setup.py)
AC_CONFIG_FILES(data/Makefile)
#AC_CONFIG_FILES(src/Test/Makefile)
AC_OUTPUT
if test x$enable_python == xyes; then
cat <<EOF
************************************************************
AGILe CONFIGURED!
Now build and install (to the $prefix tree) with e.g.
make -j2 && make -j2 install
To use AGILe, either link against the AGILe library with
your own main program, or use the agile-runmc command line
program.
For a more pleasant command line experience, you can include
the data/agile-completion file into your .bashrc file
(or your bash_completion.d directory if you have one.)
************************************************************
EOF
fi
Index: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog (revision 726)
+++ trunk/ChangeLog (revision 727)
@@ -1,575 +1,589 @@
+2010-06-01 Andy Buckley <andy@insectnation.org>
+
+ * Upgrading the Python and SWIG checks to the cleverer ones from
+ recent Rivet releases.
+
+ * Fixing Loader to pick up Herwig, Charybdis and Cascade from
+ changed Genser locations, and to ensure that Jimmy and Herwig are
+ both picked from the ".3" Genser sub-version, and hence have the
+ same HEPEVT common block size: this fixes a memory corruption
+ issue which was making HW+JM exit with an error after only a small
+ number of events. Note that as a result of fixing these Genser
+ versions, the AGILe command-line name for Herwig has changed from
+ "Herwig:6510" to "Herwig:6.510".
+
2010-05-07 Andy Buckley <andy@insectnation.org>
* Adding params files for ALEPH and DELPHI PYTHIA tunes, thanks to
Sarka Todorova.
* Fix missing usage message on agile-runmc.
* Changing generator search path to only fall back to hard-coded
Genser AFS area if AGILE_GEN_PATH is not set. Spurred by wanting
to avoid AFS timeouts on systems with /afs mounted where there is
no valid token... the initialisation slowdown from this timeout
puzzled me for a *long* time, before I worked out that it was
connected to me having added AFS mounting to my laptop!
2010-04-22 Andy Buckley <andy@insectnation.org>
* Using unit conversion for all generators reading from
HEPEVT (i.e. all generators!).
* Adding HepMCTools.hh internal header, containing units
conversion routine for converting HEPEVT-dumped events in GeV/mm
convention to the current event's units if required.
* Holger added Cascade interface.
2010-03-15 Andy Buckley <andy@insectnation.org>
* Adding build of omitted libAGILeAlpGen.so library.
* Moved core components into src/Core to improve build flexibility.
* Holger added RapGap interface.
2009-11-11 Andy Buckley <andy@insectnation.org>
* Making params evaluate in order given on the command line / in
param files. The first occurence position is used if a parameter
is specified more than once, but the last-specified _value_ will
be used.
2009-11-10 Andy Buckley <andy@insectnation.org>
* Removing all traces of C++ generators, since I don't want to
give anyone the impression that this is a good way to run them.
* Adding --filter option to strip unphysical particles out of the
event record.
* Using shared_ptr to automatically manage the Run I/O pointers.
2009-11-08 Andy Buckley <andy@insectnation.org>
* Splitting Charybdis processing as for AlpGen, and hence adding a
proper CharybdisJimmy interface (and registering it in the Loader).
* Adding proper AlpGenJimmy library support to Loader.
2009-10-23 Andy Buckley <andy@insectnation.org>
* Writing event weights (and estimated errors) into HepMC (if
supported) for Fortran HERWIG.
2009-10-21 Andy Buckley <andy@insectnation.org>
* Completing documentation of HERWIG params.
* Adding errors to Pythia 6 cross-section estimate filling.
2009-10-16 Andy Buckley <andy@insectnation.org>
* Creating new Run object, to allow removal of Python HepMC
interface (which is no bad thing, but if forces a SWIG dependence
on the HepMC version, and SL doesn't have a sufficiently
functional copy of SWIG to be relied on.
* Using AlpGen interface by composition rather than inheritance:
AlpGenHerwigJimmy should now work.
2009-06-10 Andy Buckley <andy@insectnation.org>
* Using "embedded" hepmc.i in AGILe.i, as for rivet.i, to make an
1.1.4 alpha tarball which will work on lxplus and can be
bootstrapped with Rivet.
2009-06-03 Andy Buckley <andy@insectnation.org>
* Putting SWIG-generated source files under version control, to
make life easier for people who check out the SVN head but don't
have an up to date (or any) copy of SWIG.
2009-04-07 Andy Buckley <andy@insectnation.org>
* Adding $(DESTDIR) prefix to call to Python module "setup.py
install"
2009-03-04 Andy Buckley <andy@insectnation.org>
* Adding AGILE_DEBUG environment variable.
* Fixing SWIG build to allow reliable interchange of HepMC objects.
2009-02-25 Andy Buckley <andy@insectnation.org>
* Make Python extension etc. build by default.
2009-01-22 Andy Buckley <andy@insectnation.org>
* agile-runmc: added handling of an RG:Generator param, and hence
the ability to dump out a whole gen config, including run
conditions and generator name, using --list-used-analyses.
2009-01-15 Andy Buckley <andy@insectnation.org>
* Converting Python build system to bundle SWIG output in tarball.
2009-01-05 Andy Buckley <andy@insectnation.org>
* Python: replaced Python extension build process with a more
portable version based on distutils and newer m4 macros. Breaks
distcheck until distutils SWIG support is improved to support
multi-dir builds.
2008-11-28 Andy Buckley <andy@insectnation.org>
* Replaced binreloc with an upgraded and symbol-independent copy.
2008-11-21 Andy Buckley <andy@insectnation.org>
* Pre-emptively recognise Pythia 6.420, since we know there will
be one (it will include the Skands + Professor tune + Peter's
other 'Perugia' tunes).
* Moved RivetGun params into AGILe.
* Various command line tweaks, bug fixes and cosmetic improvements.
2008-11-18 Hendrik Hoeth <hendrik.hoeth@cern.ch>
* Recognise Pythia 6.419
2008-11-04 Andy Buckley <andy@insectnation.org>
* Added bash completion file, minor UI bug fixes, and more
complete beam string handling.
2008-10-30 Andy Buckley <andy@insectnation.org>
* Added param file search path handling ("." + AGILE_PARAM_PATH),
and also support for an "include" statement in param files.
2008-10-28 Andy Buckley <andy@insectnation.org>
* Added Python access to AGILe log system, param dumping, RNG seed
control and flexible initial state energy, num events and beam
specification.
2008-10-21 Andy Buckley <andy@insectnation.org>
* Making Herwig++ call its initial-state setting before any params
are passed, since the AGILeGenerator object must be set up first.
* All generators will now try to load a "HEAD" version if
available.
2008-10-09 Andy Buckley <andy@insectnation.org>
* Fixed bug in FHerwigJimmy which meant that the event loop was
infinite.
2008-10-07 Andy Buckley <andy@insectnation.org>
* Added SWIG Python interface --- just mapping Loader and
Generator (ignoring GeneratorState). Seems to work!
* Added missing TinyXML source files --- Python refused to load
the library since the symbols weren't defined.
2008-08-24 Andy Buckley <andy@insectnation.org>
* Fixed Sherpa detection --- boostrapping now works on lxplus.
* Added unindexed MODPDF and AUTPDF param names to FHerwig, since
you usually want both particles to have the same PDF setup, and
this is a nice bit of syntactic sugar.
* Herwig++ setup now uses the flags suggested by the herwig-config
script, and --with-thepeg is no longer used.
* Set default FHerwig process to be QCD 2->2.
* Removed FHerwig MAXEV and MAXER param handling, since their role
is irrelevant within AGILe.
* Added error-handling loops to FHerwig and FHerwigJimmy, so that
Herwig errors are caught and the event is re-generated until it
behaves itself.
2008-08-12 Andy Buckley <andy@insectnation.org>
* Added a AGILE_USE_AFS variable which can be set to "no" to stop
AGILe's generator loader from automatically inserting GENSER's AFS
path into the gen search path.
* Removed default matrix elements from Herwig++.
2008-08-11 Andy Buckley <andy@insectnation.org>
* src/Loader.cc: Every call to getenv now uses a separate "const
char*" return variable. CMTCONFIG env variable no longer used,
since it was not there unless using an ATLAS/LHCb build shell and
was in the wrong tag format anyway.
* src/CCHerwig/CCHerwig.cc: Added handling of a special INFILE
parameter, which is used as the argument to a ThePEG "read"
command.
* src/Loader.cc: Factorized findGenLib function into several
smaller functions to aid memory problem investigation.
2008-08-08 Andy Buckley <abuckley@cern.ch>
* C++ generator configure now fails gracefully.
* AlpGen and Charybdis now work with both Herwig and Pythia from
the Genser versions. Hurrah!
2008-08-05 Andy Buckley <andy@insectnation.org>
* Removed setting of Sherpa EVENT_MODE and ANALYSIS switches, as
recommended by Frank Siegert.
2008-08-04 Andy Buckley <andy@insectnation.org>
* Changed AlpGen and Charybdis to load using the Genser names. Get
segfaults at the moment, but the libs are at least detected on
lxplus.
* Loader tries to find LHAPDF library in both the Genser structure
and as a fallback to the normal $prefix type area.
2008-07-29 Andy Buckley <andy@insectnation.org>
* Loader now prefers the '.2' versions of Genser gens if possible,
since for the Fortran gens these are compiled with the larger
10000-entry HEPEVT common blocks (as opposed to the default 4000)
* Automated Herwig and Pythia's acquiring common block sizes -
fixes a problem with CERN Pythia installations.
* Fixed wrong flags on agile-config
2008-07-27 Andy Buckley <andy@insectnation.org>
* Added better tests for Boost headers.
* Added testing for -ansi, -pedantic and -Wall compiler flags.
* Removed Status returns from the interface.
2008-07-23 Andy Buckley <andy@insectnation.org>
* Added explicit Boost header checks, since old versions may not
have all the necessary headers.
2008-07-16 Andy Buckley <andy@insectnation.org>
* Improved debug info in the loader (again!)
* Tries to fall back to more Genser directories, such as
$GENSER/MCGenerators (for forward compatibility with Genser
boostrap script with mkGenserArea), and also to try the old
lib<gen><version>.<ext> convention.
* Now uses Boost foreach (if Rivet can, so can AGILe!)
2008-07-09 Andy Buckley <andy@insectnation.org>
* Loader improvements: LHAPDF availability is now tested as for
generators, and is done only once.
* Upgraded Sherpa to use new HepMC interface fixes. This requires
the unreleased Sherpa 1.1.2, either from trunk or beta tarball.
* Replaced cout and cerr with proper logging classes.
2008-07-07 Andy Buckley <andy@insectnation.org>
* Added "AGILE_" namespacing to all header guards.
* Added flag to Sherpa build to disable warnings about deprecated
"const char*" to "char*" implicit conversions. We can't do
anything about this and it's not a "real" problem at the binary
level.
* Compatibility fixes for GCC 4.3.
2008-07-04 Andy Buckley <andy@insectnation.org>
* Loader now only tests that libraries are present rather than
dlopen/dlclosing them when building the "available gens"
list. This solves the problems we've seen where Sherpa being
present breaks all the other generators (for reasons not fully
understood.)
* More Sherpa improvements: SHERPA_CPP_PATH and RESULTS_DIRECTORY
are now created if they weren't already present.
2008-06-19 Andy Buckley <andy@insectnation.org>
* Fix to Sherpa interface - changed header name in Sherpa version
1.1.1.
2008-06-11 Andy Buckley <andy@insectnation.org>
* AGILe 1.1.1 release.
2008-06-11 Jon Butterworth <jmb@hep.ucl.ac.uk>
* Fixed dynamic loader for "enhanced" Herwigs to also load the
basic libAGILeFHerwig AGILe module.
* Added HWBEAM and HWUIDT param wrappers.
2008-06-10 Andy Buckley <andy@insectnation.org>
* Re-added assigning of the agilehandler variable in the library
loader. This had been accidentally removed but worked as a fluke
on Linux systems because dlsym seems to treat a null pointer as
meaning RTLD_DEFAULT: it broke on Mac OS X.
2008-06-06 Andy Buckley <andy@insectnation.org>
* Changed generator names to use a closer match to the Genser
convention, which means that Genser-convention version numbers can
be extracted. This fixes the problem with loading Pythia6 and
Pythia8 on CERN AFS.
2008-06-03 Andy Buckley <andy@insectnation.org>
* 1.1.0 release.
2008-05-28 Andy Buckley <andy@insectnation.org>
* Added conditional compilation of C++ generator Loader.cc entries
based on configure results, to avoid problems with AFS version of
SHERPA.
2008-05-15 Andy Buckley <andy@insectnation.org>
* Disabled loading f(py/hw)_dummies for AlgGen and Charybdis
interfaces, since they specialise the up* routines.
* Added LHAPDF loading to C++ gens.
* Fixed loading of LHAPDF in FHerwig and FPythia with fallback to
PDF dummy libs.
2008-05-13 Andy Buckley <andy@insectnation.org>
* Improved logging interface: log levels are now integers (for
cross-library compatibility and level setting also applies to
existing loggers.
2008-05-09 Andy Buckley <andy@insectnation.org>
* Added agile-config script.
* Merged Herwig++ 2.1 -> 2.2 implementation changes.
2008-04-23 Andy Buckley <andy@insectnation.org>
* Added a hack to make libtool able to use gfortran, thinking that
it's the F77 compiler.
2008-03-19 Andy Buckley <andy@insectnation.org>
* Added library versioning flags in the configure.ac file.
* Re-organised directory structure to allow builds of single
generators by "cd"ing to the appropriate subdirectory, and to
remove the redundant "Generators" layer.
2008-03-19 Andy Buckley <andy@insectnation.org>
* FPythia parameter passing now converts the param name to upper
case before passing to PYGIVE, since weird behaviour has been
noticed when passing the MDME params with lower-case names.
2008-03-18 Andy Buckley <andy@insectnation.org>
* Fixes to the Sherpa interface to make the paths work, to handle
the "normal makelibs exception" a bit better, and other general
tweaks. It now works, but SHERPA itself needs a patch to enable
the HepMC filling - this will be in the next version. HepMC >=
2.3.6 is required for the GenEvent copying to work properly.
2008-02-08 Andy Buckley <andy@insectnation.org>
* Fixes and extensions for HERA running added to FPythia and
FHerwig.
2008-01-22 Andy Buckley <andy@insectnation.org>
* FPythia now changed to use the Genser HEPEVT size of 10000 (the
mismatch with the previous default value of 4000 resulted in
generating lots of events with no momenta)
2008-01-17 Andy Buckley <andy@insectnation.org>
* Loader now tries to use the Genser liblinks area by default,
using a precomputed value and the CMTCONFIG variable as guesses
for the non-programmatic 'LGC platform tag'
* Fixed loader so that the FHerwig dummy HWAEND symbol gets
exported - FHerwig now works again.
* Added more configurable generator library loading, including new
AGILE_GEN_PATH variable.
* Added binreloc path detection.
2007-11-26 Andy Buckley <andy@insectnation.org>
* Removing RivetGun components and re-branding this project as
pure AGILe.
* Splitting generator library detection into AGIle
2007-10-31 Andy Buckley <andy@insectnation.org>
* Tagging as 1.0b3 for HERA-LHC meeting.
* Now dlopening LHAPDF all the time - this is because LHADF uses
some FPythia common blocks and the loading order is therefore
significant.
2007-10-29 Andy Buckley <andy@insectnation.org>
* Fixed FHerwigJimmy event loop: this aborted at the wrong point
and didn't handle MSPARM == 0 properly (it trapped it in an
infinite loop until the failure counter overflowed).
* Fixed istringstream handling of params by introducing the
templated as<T> functions and their asInt/Double/Bool wrappers in
Utils.hh. Previously the stream was being used many times, often
through stream failures, which led to nonsense results. The new
approach makes a new inline stream each time.
* Now linking LHAPDF against rivetgun executable.
* Got Charybdis working with FHerwig and loading properly (but not
running correctly) with FPythia.
2007-10-28 Andy Buckley <andy@insectnation.org>
* Using a vector of dlopen handles to allow arbitrary numbers of
libs to be dynamically loaded (dlopened).
2007-10-23 Andy Buckley <andy@insectnation.org>
* rivetgun now throws an error if it can't read a specified config
file.
2007-10-18 Andy Buckley <andy@insectnation.org>
* Removed default build of rivetgun-static.
* Using HepMC::GenEvent::clear() method.
* Removed defunct tests.
* Conversion of setParam methods to only implement the
string-valued one and to use stringstreams for type conversions
where needed.
* Added methods to Generator to perform common functionality:
these are conventionally called as utility functions by the
derived class implementations.
* Huge overhaul of generator classes: renames of Herwig++ class to
CCHerwig, introduction of AGILe namespace and header area, removal
of *Mod libraries, reworking of AlpGen, Jimmy and Charybdis
interfaces via inheritance, interface improvements to rivetgun.
2007-10-16 James Monk
* Fixed dynamic loading for Mac OS X.
2007-10-03 Andy Buckley <andy@insectnation.org>
* Added more Herwig++ features: now works but leaks memory per
event.
2007-10-02 Andy Buckley <andy@insectnation.org>
* Removed explicit FPythia::setParam and Herwig::setParam methods,
except for inlined versions to call the Generator::setParam
defaults.
* Made Generator::makeEvent and Generator::setSeed methods pure
virtual, since throwing a runtime_error by default wasn't
producing any helpful hints to interface implementers.
2007-09-28 Andy Buckley <andy@insectnation.org>
* Added portable paths to the Herwig++ tester and moved the new
Herwig++ control code into the existing Herwig class, which
doesn't really do what we want.
2007-09-26 Andy Buckley <andy@insectnation.org>
* Added autoconf Fortran portability features to RivetGun
executables and the Fortran Herwig, Pythia, AlpGen and Charybdis
generators.
2007-09-21 Andy Buckley <andy@insectnation.org>
* rivetgun executable now tests for ability to dlopen() each
potential generator library when building the command line list of
valid generators.
2007-06-24 Andy Buckley <andy@insectnation.org>
* Changed the logging of event numbers to use a specific logger
and to assign different log levels to every 100th and 1000th
event. Most event numbers are now at the DEBUG level and so won't
be shown by default.
* src/Test/RivetGunInterfaceStatic.cc: Moved the available
generators code into a new include/RivetGun/AvailableGenerators.hh
2007-06-16 Jon Butterworth <jmb@hep.ucl.ac.uk>
* Make Pythia 6.411 the latest default.
2007-06-01 Doug Gingrich <gingrich@ualberta.ca>
* Added Charybdis interfaces, not yet linking them.
2007-05-23 Jon Butterworth <jmb@hep.ucl.ac.uk>
* Added a local event counter for FPythia.
2007-05-17 Andy Buckley <andy@insectnation.org>
* Added convenience LTDL library, based on instructions at
http://www.gnu.org/software/libtool/manual.html#Distributing-libltdl
2007-02-09 Leif Lönnblad <Leif.Lonnblad@thep.lu.se>
* src/Test/RivetGunInterfaceStatic.cc: Now includes Generator.hh
to avoid compilation errors if stupid people try to compile
without any generators.
2006-12-19 Andy Buckley <andy.buckley@durham.ac.uk>
* Added src/Test/RivetGunInterfaceStatic.cc with command line
parsing handled by TCLAP (Templated Command Line Argument Parser).
2005-12-27 Leif Lönnblad <Leif.Lonnblad@thep.lu.se>
* configure.ac: Added -I$THEPEGPATH/include to AM_CPPFLAGS.
* Config/Rivet.h: Added some std incudes and using std::
declaration.
* Analysis/RivetInfo.*: Fixed some bugs. The RivetInfo facility
now works, although it has not been thoroughly tested.
* Analysis/Examples/TestMultiplicity.*: Re-introduced
FinalStateHCM for testing purposes but commented it away again.
* .: Made a number of changes to implement handling of RivetInfo
objects.
Index: trunk/bin/Makefile.am
===================================================================
--- trunk/bin/Makefile.am (revision 726)
+++ trunk/bin/Makefile.am (revision 727)
@@ -1,8 +1,8 @@
bin_SCRIPTS = agile-config
EXTRA_DIST =
-if ENABLE_PYTHON
+if ENABLE_PYEXT
dist_bin_SCRIPTS = agile-runmc
else
EXTRA_DIST += agile-runmc
endif
Index: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am (revision 726)
+++ trunk/data/Makefile.am (revision 727)
@@ -1,82 +1,82 @@
EXTRA_DIST =
dist_pkgdata_DATA = \
params/lep1.params \
params/lhc.params \
params/tevatron1800.params \
params/tevatron1960.params \
params/tevatron630.params \
params/rhic-pp200.params \
params/hera296.params
dist_pkgdata_DATA += \
params/fpythia-atlas.params \
params/fpythia-atlas-mc09.params \
params/fpythia-atlas-mc09c.params \
params/fpythia-atlas-ambt1.params \
params/fpythia-aleph.params \
params/fpythia-delphi.params \
params/fpythia-atlaspdf.params \
params/fpythia-Zee.params \
params/fpythia-Zmumu.params \
params/fpythia-Wenu.params \
params/fpythia-default.params \
params/fpythia-Zhadronic.params \
params/fpythia-Zhadronic-delphi.params \
params/fpythia-Zhadronic-aleph.params \
params/fpythia-gammajet.params \
params/fpythia-longlife-stable.params \
params/fpythia-minbias.params \
params/fpythia-zerobias.params \
params/fpythia-dd.params \
params/fpythia-nd.params \
params/fpythia-sd.params \
params/fpythia-nsd.params
dist_pkgdata_DATA += \
params/fpythia-ALEPH_1996_S3196992.params \
params/fpythia-CDF_2000_S4155203.params \
params/fpythia-CDF_2001_S4751469.params \
params/fpythia-CDF_2002_S4796047.params \
params/fpythia-CDF_2004_S5839831.params \
params/fpythia-CDF_2008_LEADINGJETS.params \
params/fpythia-CDF_2008_NOTE_9351.params \
params/fpythia-CDF_2009_S8233977.params \
params/fpythia-D0_2001_S4674421.params \
params/fpythia-D0_2004_S5992206.params \
params/fpythia-D0_2006_S6438750.params \
params/fpythia-D0_2007_S7075677.params \
params/fpythia-D0_2008_S7719523.params \
params/fpythia-D0_2008_S7837160.params \
params/fpythia-D0_2008_S7554427.params \
params/fpythia-D0_2008_S7863608.params
dist_pkgdata_DATA += \
params/ccpythia-default.params \
params/charybdisher-default.params \
params/charybdispyt-default.params \
params/falpher-default.params \
params/falppyt-default.params \
params/fherwig-atlas-default.params \
params/fherwig-default.params \
params/fherwig-qcd.params \
params/fherwig.qcd.params
## bash completion
-if ENABLE_PYTHON
+if ENABLE_PYEXT
dist_pkgdata_DATA += agile-completion
bashcomp_dir = $(prefix)/etc/bash_completion.d
install-data-local:
if [[ -d "$(bashcomp_dir)" && -w "$(bashcomp_dir)" ]]; then \
install --mode 644 agile-completion $(bashcomp_dir)/; fi
uninstall-local:
rm -f $(bashcomp_dir)/agile-completion
else
EXTRA_DIST += agile-completion
endif
Index: trunk/pyext/Makefile.am
===================================================================
--- trunk/pyext/Makefile.am (revision 726)
+++ trunk/pyext/Makefile.am (revision 727)
@@ -1,32 +1,31 @@
EXTRA_DIST = AGILe.i ez_setup.py
## Bundling SWIG-built sources with the tarball for SL4 compat
EXTRA_DIST += AGILe_wrap.cc AGILe.py
AGILe_wrap.cc AGILe.py: AGILe.i
swig -c++ -python -I$(top_srcdir)/include -o AGILe_wrap.cc $<
-#if PYTHON_USE
-if ENABLE_PYTHON
+if ENABLE_PYEXT
all-local: AGILe_wrap.cc
$(PYTHON) setup.py build
install-exec-local:
$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
uninstall-local:
rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/*AGILe*
clean-local:
$(PYTHON) setup.py clean --all
@rm -f $(top_builddir)/*.pyc
@rm -rf $(builddir)/build
@rm -rf dist
@rm -f AGILe.py
@rm -f AGILe_wrap.cc
distclean-local:
@rm -rf AGILe.egg-info
endif

File Metadata

Mime Type
text/x-diff
Expires
Sat, May 3, 6:34 AM (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4983078
Default Alt Text
(30 KB)

Event Timeline