diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,27 +1,28 @@
0704eccbbae770dd2df2e8145a5dd46e4cb29b66 java-merge
0704eccbbae770dd2df2e8145a5dd46e4cb29b66 pre-cuts-merge
2763da36e168c75a5b48d63a5f44836eb521b343 herwig-2-0-alpha1
337e051dcffc653cd0429988f12806758c183472 release-1-6-1
3f01c180519e15200a4de8e0e9b7f298ab145d57 pre-java-merge
432bd5d28ebdf0c95e737452ac068515c589872f pre-libtool-merge
57f60f2e143afcc16543173ce59601fded4b8247 release-1-7-0
5830e4eb9afe3ba3705341778a40d0fe2dc6567c release-1-8-0
67c66b02adf69f650c77c50d89b698d8ed54c929 release-1-7-2
7e8967c704d1f8a551637a300130587154e9028b LHA-merge
825d126ced6f38223a9b378ba9b09dba4f48751e pre-LHA-merge
8cab12da53be26a852e6a407f53db5e1997fd0b1 release-1-7-1
8d298cf18309cdbded5344990a4955699afff04b cuts-merge
b6a8110c61f6226e9a8e0c7f3fa73ec3638bc9c1 herwig-2-0-alpha3
b6a8110c61f6226e9a8e0c7f3fa73ec3638bc9c1 herwig-2-0-beta
d063c89add007af8bcff8d8b166576b6b1c091ba release-1-6-0
f4f74476f4db925446c84b54e90c0ef27b82a3d6 libtool-merge
d6ba7d425e3ae8b01157223638cbcf0dac939904 release-1-8-1
813a7eb367a9a119998aaf74682a5543bf570da1 release-1-8-2
52eeb52c35cf8b1ceed0e754ef47dd4af282cfa3 release-1-8-3
9ac24d1eb03b6286038402b3420b2520846ce9f0 release-1-9-0
f0ef8fb93d924e1c01a30eeaf172f9fd82d0b4d2 release-1-9-1
2d8e0f74b65ef7f5acdf0128e7280fff535d1f82 release-1-9-2
4cf20ed60ecd8c9016cdaf9e3f6cd0347cee8185 release-2-0-0
7346f289aba9116f5b2327b98adb4b4e8b6a76dc release-2-0-1
16491c05f54af0c4c02cbf40fc3e77120eba8374 release-2-0-2
b08a997136055e39cac6187eeb3c3f84ddc148bc release-2-0-3
+9772c45ac9a165f4c30764e1ba1df43d778d6932 release-2-0-4
diff --git a/Analysis/Makefile.am b/Analysis/Makefile.am
--- a/Analysis/Makefile.am
+++ b/Analysis/Makefile.am
@@ -1,67 +1,67 @@
AIDAWRAPPERS = LWH/AIAnalysisFactory.h LWH/AIAxis.h LWH/AIHistogram1D.h LWH/AIHistogram2D.h \
LWH/AIHistogramFactory.h LWH/AITree.h LWH/AITreeFactory.h \
LWH/AIManagedObject.h LWH/AIDataPoint.h LWH/AIDataPointSet.h \
LWH/AIDataPointSetFactory.h LWH/AIMeasurement.h
LWHHEADERS = LWH/AnalysisFactory.h LWH/Axis.h LWH/Tree.h LWH/TreeFactory.h \
LWH/Histogram1D.h LWH/Histogram2D.h LWH/HistogramFactory.h LWH/ManagedObject.h \
LWH/VariAxis.h LWH/DataPoint.h LWH/DataPointSet.h LWH/DataPointSetFactory.h \
LWH/Measurement.h
mySOURCES = LWHFactory.cc
pkglib_LTLIBRARIES = LWHFactory.la XSecCheck.la ProgressLog.la
if HAVE_RIVET
DOCFILES = RivetAnalysis.h NLORivetAnalysis.h
pkglib_LTLIBRARIES += RivetAnalysis.la
RivetAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(RIVETINCLUDE) $(HEPMCINCLUDE)
RivetAnalysis_la_LIBADD = $(HEPMCLIBS) $(RIVETLIBS)
RivetAnalysis_la_SOURCES = RivetAnalysis.cc NLORivetAnalysis.cc $(INCLUDEFILES)
- RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 20:1:0
+ RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 20:2:0
else
DOCFILES = $(AIDAWRAPPERS) $(LWHHEADERS)
endif
DOCFILES += LWHFactory.h
INCLUDEFILES = $(DOCFILES)
LWHINCLUDE = -I$(top_builddir)/include/ThePEG/Analysis/LWH
LWHFactory_la_SOURCES = $(mySOURCES) $(INCLUDEFILES)
LWHFactory_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
LWHFactory_la_CPPFLAGS = $(AM_CPPFLAGS) $(LWHINCLUDE)
XSecCheck_la_SOURCES = XSecCheck.cc XSecCheck.h
XSecCheck_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
ProgressLog_la_SOURCES = ProgressLog.cc ProgressLog.h
ProgressLog_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
noinst_LTLIBRARIES = libThePEGHist.la
libThePEGHist_la_SOURCES = \
FactoryBase.cc FactoryBase.fh FactoryBase.h AIDA_helper.h
libThePEGHist_la_CPPFLAGS = $(AM_CPPFLAGS) $(LWHINCLUDE)
if HAVE_HEPMC
pkglib_LTLIBRARIES += HepMCAnalysis.la
- HepMCAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
+ HepMCAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 20:1:0
HepMCAnalysis_la_SOURCES = HepMCFile.h HepMCFile.cc NLOHepMCFile.h NLOHepMCFile.cc HIHepMCFile.h HIHepMCFile.cc
HepMCAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(HEPMCINCLUDE)
HepMCAnalysis_la_LIBADD = $(HEPMCLIBS)
endif
pkglib_LTLIBRARIES += GraphvizPlot.la
GraphvizPlot_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
GraphvizPlot_la_SOURCES = GraphvizPlot.h GraphvizPlot.cc
LWH.tgz: $(AIDAWRAPPERS) $(LWHHEADERS)
tar czf LWH.tgz $(AIDAWRAPPERS) $(LWHHEADERS)
include $(top_srcdir)/Config/Makefile.aminclude
diff --git a/Config/std.h b/Config/std.h
--- a/Config/std.h
+++ b/Config/std.h
@@ -1,180 +1,185 @@
// -*- C++ -*-
//
// std.h is a part of ThePEG - Toolkit for HEP Event Generation
// Copyright (C) 1999-2011 Leif Lonnblad
//
// ThePEG is licenced under version 2 of the GPL, see COPYING for details.
// Please respect the MCnet academic guidelines, see GUIDELINES for details.
//
#ifndef ThePEG_std_H
#define ThePEG_std_H
/** \file
* This file introduces a number of std::
classes into
* the ThePEG namespace. Also introduces some useful functions for
* standard library classes.
*
* Do not make changes in this file. If you want to use alternatives
* to the std::
classes in ThePEG, edit a copy of this
* file and include it in an alternative config file which can be
* included in the main ThePEG.h config file using the macro
* ThePEG_ALTERNATE_CONFIG
.
*/
#include