[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.0-1-gff82cd4
Lifeng Sun
lifongsun at gmail.com
Tue Jun 5 10:01:15 UTC 2012
The following commit has been merged in the master branch:
commit ff82cd448563c6c3527e3c0c8bf553824fd30e7c
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Jun 5 17:46:01 2012 +0800
Debianize.
diff --git a/debian/aida2flat.1 b/debian/aida2flat.1
new file mode 100644
index 0000000..996c9e1
--- /dev/null
+++ b/debian/aida2flat.1
@@ -0,0 +1,53 @@
+.TH AIDA2FLAT "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+aida2flat \- Convert AIDA data files to a flat format
+.SH SYNOPSIS
+.B aida2flat
+[\fIoptions\fR] \fIaidafile \fR[\fIaidafile2 \fR...]
+.SH DESCRIPTION
+Convert AIDA data files to a flat format which is more human\-readable then the
+XML (and by default also plottable directly using make\-plots). The output is by
+default written out to standard output unless the \fB\-\-split\fR, \fB\-\-smart\-output\fR,
+\fB\-\-gnuplot\fR, or \fB\-\-output\fR options are specified. When specifying either input or
+output filenames, a '\-' is used to refer to stdin or stdout as appropriate.
+.PP
+Histograms can also be filtered by AIDA path, using the \fB\-m\fR or \fB\-M\fR options for a
+positive or negative regex pattern patch respectively.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-o\fR OUTPUT, \fB\-\-output\fR=\fIOUTPUT\fR
+Write all histos to a single output file, rather than
+the default writing to stdout. stdout can be
+explicitly specified by setting '\-' as the output
+filename. This option will be disregarded if \fB\-\-split\fR,
+\fB\-\-smart\-output\fR, or \fB\-\-gnuplot\fR is specified.
+.TP
+\fB\-s\fR, \fB\-\-split\fR
+Write each histo to a separate output file, with names
+based on the histo path
+.TP
+\fB\-S\fR, \fB\-\-smart\-output\fR
+Write to output files with names based on the
+corresponding input filename. This option will be
+disregarded if \fB\-\-split\fR is specified.
+.TP
+\fB\-g\fR, \fB\-\-gnuplot\fR
+Provide output suitable for Gnuplot's 'plot "foo.dat"
+with xye'. This option implies \fB\-\-split\fR and will
+override \fB\-\-output\fR or \fB\-\-smart\-output\fR
+.TP
+\fB\-\-plotinfodir\fR=\fIPLOTINFODIR\fR
+directory which may contain plot header information
+.TP
+\fB\-m\fR PATHPATTERNS, \fB\-\-match\fR=\fIPATHPATTERNS\fR
+Only write out histograms whose $path/$name string
+matches these regexes
+.TP
+\fB\-M\fR PATHUNPATTERNS, \fB\-\-unmatch\fR=\fIPATHUNPATTERNS\fR
+Exclude histograms whose $path/$name string matches
+these regexes
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/aida2root.1 b/debian/aida2root.1
new file mode 100644
index 0000000..e016a2a
--- /dev/null
+++ b/debian/aida2root.1
@@ -0,0 +1,33 @@
+.TH AIDA2ROOT "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+aida2root \- Convert AIDA XML format to ROOT TGraph object
+.SH SYNOPSIS
+.B aida2root
+[\fIoptions\fR]
+\fIaidafile\fR
+[\fIaidafile2\fR ...]
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-s\fR, \fB\-\-smart\-output\fR
+Write to output files with names based on the
+corresponding input filename
+.TP
+\fB\-m\fR PATHPATTERNS, \fB\-\-match\fR=\fIPATHPATTERNS\fR
+Only write out histograms whose $path/$name string
+matches these regexes
+.TP
+\fB\-g\fR, \fB\-\-tgraph\fR
+Store output as ROOT TGraphAsymmErrors or
+TGraph2DErrors
+.TP
+\fB\-t\fR, \fB\-\-thisto\fR
+Store output as ROOT TH1 or TH2
+.SH "SEE ALSO"
+.BR root2flat (1),
+.BR aida2flat (1),
+.BR flat2aida (1)
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a104171
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+rivet (1.8.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #636983)
+
+ -- Lifeng Sun <lifongsun at gmail.com> Mon, 04 Jun 2012 00:23:54 +0800
diff --git a/debian/compare-histos.1 b/debian/compare-histos.1
new file mode 100644
index 0000000..ceeec57
--- /dev/null
+++ b/debian/compare-histos.1
@@ -0,0 +1,101 @@
+.TH COMPARE-HISTOS "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+compare-histos \- generate comparison histograms
+.SH SYNOPSIS
+compare\-histos [\fIoptions\fR] aidafile1[:'PlotOption1=Value':'PlotOption2=Value'] [aidafile2 ...]
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-R\fR, \fB\-\-rivet\-refs\fR
+use Rivet reference data files (default)
+.TP
+\fB\-\-no\-rivet\-refs\fR
+don't use Rivet reference data files
+.TP
+\fB\-o\fR OUTDIR, \fB\-\-outdir\fR=\fIOUTDIR\fR
+write data files into this directory
+.TP
+\fB\-\-hier\-out\fR
+write output dat files into a directory hierarchy
+which matches the analysis paths
+.TP
+\fB\-\-plotinfodir\fR=\fIPLOTINFODIR\fR
+directory which may contain plot header information
+(in addition to standard Rivet search paths)
+.TP
+\fB\-\-no\-rmgapbins\fR
+disable attempting to remove 'gap' bins from MC histos
+when they don't appear in the ref file
+.TP
+\fB\-\-refid\fR=\fIREF_ID\fR
+ID of reference data set (file path for non\-REF data)
+.TP
+\fB\-\-linear\fR
+plot with linear scale
+.TP
+\fB\-\-logarithmic\fR
+plot with logarithmic scale (default behaviour)
+.TP
+\fB\-\-mc\-errs\fR
+show vertical error bars on the MC lines
+.TP
+\fB\-\-no\-ratio\fR
+disable the ratio plot
+.TP
+\fB\-\-rel\-ratio\fR
+show the ratio plots scaled to the ref error
+.TP
+\fB\-\-abs\-ratio\fR
+show the ratio plots with an absolute scale
+.TP
+\fB\-\-no\-plottitle\fR
+don't show the plot title on the plot (useful when the
+plot description should only be given in a caption)
+.TP
+\fB\-\-style\fR=\fISTYLE\fR
+change plotting style: default|bw|talk
+.TP
+\fB\-c\fR CONFIGFILES, \fB\-\-config\fR=\fICONFIGFILES\fR
+additional plot config file(s). Settings will be
+included in the output configuration.
+.TP
+\fB\-\-show\-single\fR=\fISHOW_SINGLE\fR
+control if a plot file is made if there is only one
+dataset to be plotted [default=mc]. If the value is
+\&'no', single plots are always skipped, for 'ref' and
+\&'mc', the plot will be written only if the single plot
+is a reference plot or an MC plot respectively, and
+\&'all' will always create single plot files. The 'ref'
+and 'all' values should be used with great care, as
+they will also write out plot files for all reference
+histograms without MC traces: combined with the \fB\-R\fR
+/\-\-rivet\-refs flag, this is a great way to write out
+several thousand irrelevant reference data histograms!
+.TP
+\fB\-\-show\-mc\-only\fR, \fB\-\-all\fR
+make a plot file even if there is only one dataset to
+be plotted and it is an MC one. Deprecated and will be
+removed: use \fB\-\-show\-single\fR instead, which overrides
+this.
+.TP
+\fB\-m\fR PATHPATTERNS, \fB\-\-match\fR=\fIPATHPATTERNS\fR
+Only write out histograms whose $path/$name string
+matches these regexes. The argument may also be a text
+file.
+.TP
+\fB\-M\fR PATHUNPATTERNS, \fB\-\-unmatch\fR=\fIPATHUNPATTERNS\fR
+Exclude histograms whose $path/$name string matches
+these regexes
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+Suppress normal messages
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Add extra debug messages
+.PP
+The plot options are described in the make\-plots manual in the
+HISTOGRAM section.
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d215cfd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,155 @@
+Source: rivet
+Section: science
+Priority: optional
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Lifeng Sun <lifongsun at gmail.com>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, libhepmc-dev, libfastjet-dev, libfastjetplugins-dev, libfastjettools-dev, libyaml-cpp-dev, dh-autoreconf, libgsl0-dev, libtinyxml-dev, chrpath, texlive-science, doxygen-latex, libboost-dev, python-dev, python-support, swig, gfortran
+Standards-Version: 3.9.3
+Homepage: http://rivet.hepforge.org/
+Vcs-Git: git://git.debian.org/git/debian-science/packages/rivet.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/rivet.git
+
+Package: rivet
+Architecture: all
+Depends: python, python-rivet (>= ${source:Version}), ${misc:Depends}
+Recommends: rivet-plugins
+Suggests: rivet-user-manual
+Description: Robust Independent Validation of Experiment and Theory
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides program files of Rivet.
+
+Package: rivet-user-manual
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: rivet
+Description: Rivet User Manual
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides user manual of Rivet.
+
+Package: rivet-reference
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: rivet
+Description: Rivet code reference
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides code reference of Rivet.
+
+Package: rivet-plugins
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: rivet-plugins-data (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: rivet-plugins-doc
+Description: Analysis plugins of Rivet
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides analysis plugins of Rivet. Note that ATLASCone and
+ CDFCones are not supported in Debian due to license issues of FastJet.
+
+Package: rivet-plugins-dev
+Architecture: all
+Depends: python, librivet-dev (>= ${source:Version}), rivet-plugins (>= ${source:Version}), ${misc:Depends}
+Suggests: rivet-plugins-doc
+Description: Template generator of Rivet analysis plugin
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides template generator of Rivet analysis plugin.
+
+Package: rivet-plugins-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: HTML documentation for Rivet analysis plugins
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides HTML documentation for analysis plugins of Rivet.
+
+Package: rivet-plugins-data
+Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}
+Description: Data files of Rivet analysis plugins
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides data files of Rivet analysis plugins.
+
+Package: librivet11
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Run-time library of Rivet
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides run-time library of Rivet.
+
+Package: librivet-dev
+Section: libdevel
+Architecture: any
+Depends: librivet11 (= ${binary:Version}), ${misc:Depends}
+Suggests: rivet-reference
+Description: Development files of Rivet
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides development files of Rivet.
+
+Package: rivet-root-converter
+Architecture: all
+Depends: python, libroot-bindings-python5.34, ${misc:Depends}
+Description: Rivet and ROOT file format converter
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides format converter between Rivet and ROOT files.
+
+Package: python-rivet
+Section: python
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
+Architecture: any
+Depends: python-support (>= 0.90), ${shlibs:Depends}, ${misc:Depends}
+Description: Python bindings of Rivet
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
+ a computationally efficient model for observable computations, Rivet
+ provides a set of experimental analyses useful for generator sanity checks,
+ as well as a convenient infrastructure for adding your own analysis.
+ .
+ This package provides Python bindings of Rivet.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..b7f4c87
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,201 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: rivet
+Source: http://www.hepforge.org/archive/rivet/
+
+Files: *
+Copyright: Leif Lonnblad <Leif.Lonnblad at thep.lu.se>
+ Andy Buckley <andy.buckley at durham.ac.uk>
+ Jon Butterworth <J.Butterworth at ucl.ac.uk>
+License: GPL-2.0+
+
+Files: doc/rivet-manual.tex
+Copyright: Andy Buckley
+ Jonathan Butterworth
+ Leif Lonnblad
+ Hendrik Hoeth
+ James Monk
+ Holger Schulz
+ Jan Eike von Seggern
+ Frank Siegert
+ Lars Sonnenschein
+License: GPL-2.0+
+
+Files: include/Rivet/Projections/Spherocity.hh
+ src/Analyses/ALEPH_1996_S3486095.cc
+Copyright: Holger Schulz
+License: GPL-2.0+
+
+Files: include/Rivet/Tools/ParticleIdUtils.hh
+Copyright: Lynn Garren
+ Andy Buckley
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2010_S8591806.cc
+ src/Analyses/CDF_2008_S7540469.cc
+ src/Analyses/D0_2007_S7075677.cc
+ src/Analyses/D0_2008_S7554427.cc
+ src/Analyses/JADE_OPAL_2000_S4300807.cc
+Copyright: Frank Siegert
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2011_I926145.cc
+Copyright: Paul Bell
+ Holger Schulz
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2011_S8924791.cc
+Copyright: Andy Buckley
+ Judith Katzy
+ Francesc Vives
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2011_S8994773.cc
+Copyright: Jinlong Zhang
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2011_S9120807.cc
+Copyright: Giovanni Marchiori
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2011_S9131140.cc
+Copyright: Yatsenko
+ Judith Katzy
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2011_S9212183.cc
+Copyright: Chris Wymant
+License: GPL-2.0+
+
+Files: src/Analyses/ATLAS_2012_I1084540.cc
+Copyright: Tim Martin <tim.martin at cern.ch>
+License: GPL-2.0+
+
+Files: src/Analyses/BELLE_2006_S6265367.cc
+Copyright: Eike von Seggern
+License: GPL-2.0+
+
+Files: src/Analyses/CDF_1994_S2952106.cc
+ src/Analyses/CDF_2006_S6653332.cc
+ src/Analyses/D0_2001_S4674421.cc
+ src/Analyses/D0_2004_S5992206.cc
+Copyright: Lars Sonnenschein
+License: GPL-2.0+
+
+Files: src/Analyses/CDF_2000_S4155203.cc
+ src/Analyses/CDF_2002_S4796047.cc
+ src/Analyses/CDF_2008_LEADINGJETS.cc
+ src/Analyses/CDF_2008_NOTE_9351.cc
+ src/Analyses/CDF_2009_S8233977.cc
+ src/Analyses/DELPHI_1995_S3137023.cc
+ src/Analyses/CDF_2010_S8591881_DY.cc
+ src/Analyses/CDF_2010_S8591881_QCD.cc
+ src/Analyses/DELPHI_1995_S3137023.cc
+ src/Analyses/DELPHI_1996_S3430090.cc
+ src/Analyses/DELPHI_2002_069_CONF_603.cc
+ src/Analyses/DELPHI_2003_WUD_03_11.cc
+ src/Analyses/OPAL_1998_S3780481.cc
+ src/Analyses/PDG_HADRON_MULTIPLICITIES.cc
+ src/Analyses/STAR_2009_UE_HELEN.cc
+Copyright: Hendrik Hoeth
+License: GPL-2.0+
+
+Files: src/Analyses/D0_2006_S6438750.cc
+ src/Analyses/D0_2007_S7075677.cc
+ src/Analyses/D0_2008_S7554427.cc
+ src/Analyses/D0_2008_S7662670.cc
+ src/Analyses/D0_2008_S7719523.cc
+ src/Analyses/D0_2008_S7837160.cc
+Copyright: Gavin Hesketh
+License: GPL-2.0+
+
+Files: src/Analyses/D0_2008_S7863608.cc
+Copyright: Gavin Hesketh
+ Andy Buckley
+ Frank Siegert
+License: GPL-2.0+
+
+Files: src/Analyses/D0_2010_S8671338.cc
+Copyright: Flavia Dias
+License: GPL-2.0+
+
+Files: src/Analyses/CMS_2011_S8978280.cc
+Copyright: Kevin Stenson
+License: GPL-2.0+
+
+Files: src/Analyses/H1_1994_S2919893.cc
+ src/Analyses/H1_2000_S4129130.cc
+ src/Analyses/OPAL_1993_S2692198.cc
+Copyright: Peter Richardson
+License: GPL-2.0+
+
+Files: src/Analyses/PDG_HADRON_MULTIPLICITIES_RATIOS.cc
+Copyright: Holger Schulz
+License: GPL-2.0+
+
+Files: src/Analyses/ZEUS_2001_S4815815.cc
+Copyright: Jon Butterworth
+License: GPL-2.0+
+
+Files: src/Tools/mt2_bisect.cc
+ src/Tools/mt2_bisect.hh
+Copyright: Hsin-Chia Cheng
+ Zhenyu Han
+License: GPL-2.0+
+
+Files: src/Tools/TinyXML/tinyxmlparser.cpp
+ src/Tools/TinyXML/tinyxml.cpp
+ src/Tools/TinyXML/tinyxmlerror.cpp
+Copyright: 2000-2002 Lee Thomason
+License:
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+Files: src/Tools/binreloc.c
+ src/Tools/binreloc.h
+Copyright: Hongli Lai <h.lai at chello.nl>
+License:
+ This source code is public domain. You can relicense this code under
+ whatever license you want.
+
+Files: doc/compare-histos.html doc/make-plots.html
+Copyright: 2002 Mihai Bazon
+ 2006 Troy D. Hanson
+ 2006, 2009 Stuart Rackham
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: 2012 Lifeng Sun <lifongsun at gmail.com>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..d3fd28c
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+GUIDELINES
diff --git a/debian/flat2aida.1 b/debian/flat2aida.1
new file mode 100644
index 0000000..c5299c9
--- /dev/null
+++ b/debian/flat2aida.1
@@ -0,0 +1,44 @@
+.TH FLAT2AIDA "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+flat2aida \- Convert make\-plots data files to AIDA XML format.
+.SH SYNOPSIS
+.B flat2aida
+[\fIoptions\fR] \fIflatfile \fR[\fIflatfile2 \fR...]
+.SH DESCRIPTION
+Convert make\-plots data files to AIDA XML format. The output is by default
+written out to a file with the same name as the input (out.aida in the case of
+stdin) unless the \fB\-\-output\fR option is specified. When specifying either input or
+output filenames, a '\-' is used to refer to stdin or stdout as appropriate.
+.PP
+Histograms can also be filtered by histo path, using the \fB\-m\fR or \fB\-M\fR options for a
+positive or negative regex pattern patch respectively.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-o\fR OUTPUT, \fB\-\-output\fR=\fIOUTPUT\fR
+Write all histos to a single output file. stdout can
+be explicitly specified by setting '\-' as the output
+filename. This option will be disregarded if \fB\-\-split\fR
+is specified.
+.TP
+\fB\-s\fR, \fB\-\-split\fR
+Split histograms into individual files
+.TP
+\fB\-\-plotinfodir\fR=\fIPLOTINFODIR\fR
+directory which may contain plot header information
+.TP
+\fB\-m\fR PATHPATTERNS, \fB\-\-match\fR=\fIPATHPATTERNS\fR
+Only write out histograms whose $path/$name string
+matches these regexes
+.TP
+\fB\-M\fR PATHUNPATTERNS, \fB\-\-unmatch\fR=\fIPATHUNPATTERNS\fR
+Exclude histograms whose $path/$name string matches
+these regexes
+.SH "SEE ALSO"
+.BR root2flat (1),
+.BR aida2flat (1),
+.BR aida2root (1)
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..94b7a04
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+[ $# == 3 ]
+
+url="http://www.hepforge.org/archive/rivet"
+ver="$2"
+
+pkgdir="rivet-$ver.orig"
+pkg="rivet_$ver.orig.tar.gz"
+
+uppkgdir="Rivet-$ver"
+uppkg="Rivet-$ver.tar.gz"
+
+[ ! -f "../$uppkg" ] && wget "$url/$uppkg" -O "../$uppkg"
+
+[ -d "$uppkgdir" ] && rm -rf "$uppkgdir"
+tar xf "../$uppkg"
+
+[ -d "$pkgdir" ] && rm -rf "$pkgdir"
+
+mv "$uppkgdir" "$pkgdir"
+rm -f "../$pkg"
+tar -zcf "../$pkg" "$pkgdir"
+
+rm -rf "$pkgdir"
diff --git a/debian/librivet-dev.install b/debian/librivet-dev.install
new file mode 100644
index 0000000..12f9ed2
--- /dev/null
+++ b/debian/librivet-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libRivet.so
+usr/include/
diff --git a/debian/librivet11.install b/debian/librivet11.install
new file mode 100644
index 0000000..4a31d3d
--- /dev/null
+++ b/debian/librivet11.install
@@ -0,0 +1 @@
+usr/lib/*/libRivet.so.*
diff --git a/debian/make-plots.1 b/debian/make-plots.1
new file mode 100644
index 0000000..c2b2695
--- /dev/null
+++ b/debian/make-plots.1
@@ -0,0 +1,68 @@
+.TH MAKE-PLOTS "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+make\-plots \- Plots histograms in FLAT format
+.SH SYNOPSIS
+.B make-plots
+[\fIoptions\fR] \fIfile.dat \fR[\fIfile2.dat \fR...]
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-n\fR NUM_THREADS, \fB\-j\fR NUM_THREADS, \fB\-\-num\-threads\fR=\fINUM_THREADS\fR
+max number of threads to be used [8]
+.TP
+\fB\-\-palatino\fR
+Use Palatino as font (default).
+.TP
+\fB\-\-cm\fR
+Use Computer Modern as font.
+.TP
+\fB\-\-times\fR
+Use Times as font.
+.TP
+\fB\-\-minion\fR
+Use Adobe Minion Pro as font. Note: You need to set
+TEXMFHOME first.
+.TP
+\fB\-\-ps\fR
+Create PostScript output (default).
+.TP
+\fB\-\-pdf\fR
+Create PDF output.
+.TP
+\fB\-\-eps\fR
+Create Encapsulated PostScript output.
+.TP
+\fB\-\-png\fR
+Create PNG output.
+.TP
+\fB\-\-pspng\fR
+Create PS and PNG output.
+.TP
+\fB\-\-pdfpng\fR
+Create PDF and PNG output.
+.TP
+\fB\-\-epspng\fR
+Create EPS and PNG output.
+.TP
+\fB\-\-tex\fR
+Create TeX/LaTeX output.
+.TP
+\fB\-\-no\-cleanup\fR
+Keep temporary directory and print its filename.
+.TP
+\fB\-\-full\-range\fR
+Plot full y range in LogY plots.
+.TP
+\fB\-c\fR CONFIGFILES, \fB\-\-config\fR=\fICONFIGFILES\fR
+Plot config file to be used. Overrides internal config
+blocks.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+print debug (very verbose) messages
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+be very quiet
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/patches/doc-building.patch b/debian/patches/doc-building.patch
new file mode 100644
index 0000000..fc56a32
--- /dev/null
+++ b/debian/patches/doc-building.patch
@@ -0,0 +1,20 @@
+--- a/Doxyfile.in
++++ b/Doxyfile.in
+@@ -615,7 +615,7 @@
+ # excluded from the INPUT source files. This way you can easily exclude a
+ # subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+-EXCLUDE =
++EXCLUDE = debian
+
+ # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+ # directories that are symbolic links (a Unix filesystem feature) are excluded
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = src pyext data include bin doc test
++SUBDIRS = src pyext data include bin test
+
+ #dist_pkgdata_DATA = rivetenv.sh rivetenv.csh
+ EXTRA_DIST = GUIDELINES
diff --git a/debian/patches/fix-analysis-plugin-path.patch b/debian/patches/fix-analysis-plugin-path.patch
new file mode 100644
index 0000000..5171372
--- /dev/null
+++ b/debian/patches/fix-analysis-plugin-path.patch
@@ -0,0 +1,161 @@
+--- a/src/Tools/Makefile.am
++++ b/src/Tools/Makefile.am
+@@ -21,7 +21,7 @@
+ $(AM_CPPFLAGS) \
+ -DENABLE_BINRELOC \
+ -DDEFAULTDATADIR=\"$(datadir)\" \
+- -DDEFAULTLIBDIR=\"$(libdir)\"
++ -DDEFAULTLIBDIR=\"$(pkglibdir)\"
+
+ ## NB. Using $(top_builddir)/src/Tools rather than $(builddir) because of SL4 automake bug
+ if WITH_YAML_CPP
+--- a/src/Analyses/Makefile.am
++++ b/src/Analyses/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Flags for building all plugins
+ AM_LDFLAGS = $(LDFLAGS) -module -avoid-version -L$(FASTJETLIBPATH)
+ LIBS = $(FASTJETCONFIGLIBADD)
+-lib_LTLIBRARIES =
++pkglib_LTLIBRARIES =
+
+ noinst_LTLIBRARIES = libRivetAnalysisTools.la
+ libRivetAnalysisTools_la_SOURCES = \
+@@ -34,7 +34,7 @@
+ ## --disable-obsolete configure flag.
+
+
+-lib_LTLIBRARIES += RivetALICEAnalyses.la
++pkglib_LTLIBRARIES += RivetALICEAnalyses.la
+ RivetALICEAnalyses_la_SOURCES = \
+ ALICE_2010_S8624100.cc \
+ ALICE_2010_S8625980.cc \
+@@ -43,7 +43,7 @@
+ ALICE_2011_S8945144.cc
+
+
+-lib_LTLIBRARIES += RivetATLASAnalyses.la
++pkglib_LTLIBRARIES += RivetATLASAnalyses.la
+ RivetATLASAnalyses_la_SOURCES = \
+ ATLAS_2010_S8591806.cc \
+ ATLAS_2010_S8817804.cc \
+@@ -79,7 +79,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetCMSAnalyses.la
++pkglib_LTLIBRARIES += RivetCMSAnalyses.la
+ RivetCMSAnalyses_la_SOURCES = \
+ CMS_2010_S8547297.cc \
+ CMS_2010_S8656010.cc \
+@@ -99,7 +99,7 @@
+ CMS_QCD_10_024.cc
+ endif
+
+-lib_LTLIBRARIES += RivetLHCbAnalyses.la
++pkglib_LTLIBRARIES += RivetLHCbAnalyses.la
+ RivetLHCbAnalyses_la_SOURCES =
+ if ENABLE_UNVALIDATED
+ RivetLHCbAnalyses_la_SOURCES += \
+@@ -109,7 +109,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetCDFAnalyses.la
++pkglib_LTLIBRARIES += RivetCDFAnalyses.la
+ RivetCDFAnalyses_la_SOURCES = \
+ CDF_1988_S1865951.cc \
+ CDF_1990_S2089246.cc \
+@@ -157,7 +157,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetD0Analyses.la
++pkglib_LTLIBRARIES += RivetD0Analyses.la
+ RivetD0Analyses_la_SOURCES = \
+ D0_2000_S4480767.cc \
+ D0_2001_S4674421.cc \
+@@ -184,7 +184,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetHERAAnalyses.la
++pkglib_LTLIBRARIES += RivetHERAAnalyses.la
+ RivetHERAAnalyses_la_SOURCES = \
+ H1_1994_S2919893.cc \
+ H1_2000_S4129130.cc
+@@ -194,12 +194,12 @@
+ ZEUS_2001_S4815815.cc
+ endif
+
+-lib_LTLIBRARIES += RivetPetraAnalyses.la
++pkglib_LTLIBRARIES += RivetPetraAnalyses.la
+ RivetPetraAnalyses_la_SOURCES = \
+ JADE_1998_S3612880.cc \
+ TASSO_1990_S2148048.cc
+
+-lib_LTLIBRARIES += RivetLEPAnalyses.la
++pkglib_LTLIBRARIES += RivetLEPAnalyses.la
+ RivetLEPAnalyses_la_SOURCES = \
+ ALEPH_1991_S2435284.cc \
+ ALEPH_1996_S3486095.cc \
+@@ -222,7 +222,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetRHICAnalyses.la
++pkglib_LTLIBRARIES += RivetRHICAnalyses.la
+ RivetRHICAnalyses_la_SOURCES = \
+ STAR_2006_S6500200.cc \
+ STAR_2006_S6860818.cc \
+@@ -238,7 +238,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetSPSAnalyses.la
++pkglib_LTLIBRARIES += RivetSPSAnalyses.la
+ RivetSPSAnalyses_la_SOURCES = \
+ UA1_1990_S2044935.cc \
+ UA5_1982_S875503.cc \
+@@ -248,7 +248,7 @@
+ UA5_1989_S1926373.cc
+
+
+-lib_LTLIBRARIES += RivetMiscAnalyses.la
++pkglib_LTLIBRARIES += RivetMiscAnalyses.la
+ RivetMiscAnalyses_la_SOURCES = \
+ PDG_HADRON_MULTIPLICITIES.cc \
+ PDG_HADRON_MULTIPLICITIES_RATIOS.cc \
+@@ -261,7 +261,7 @@
+ endif
+
+
+-lib_LTLIBRARIES += RivetMCAnalyses.la
++pkglib_LTLIBRARIES += RivetMCAnalyses.la
+ RivetMCAnalyses_la_SOURCES = \
+ EXAMPLE.cc \
+ MC_DIPHOTON.cc \
+--- a/src/Tools/RivetPaths.cc
++++ b/src/Tools/RivetPaths.cc
+@@ -22,20 +22,12 @@
+
+
+ string getLibPath() {
+- BrInitError error;
+- br_init_lib(&error);
+- char* temp = br_find_lib_dir(DEFAULTLIBDIR);
+- const string libdir(temp);
+- free (temp);
++ const string libdir(DEFAULTLIBDIR);
+ return libdir;
+ }
+
+ string getDataPath() {
+- BrInitError error;
+- br_init_lib(&error);
+- char* temp = br_find_data_dir(DEFAULTDATADIR);
+- const string sharedir(temp);
+- free (temp);
++ const string sharedir(DEFAULTDATADIR);
+ return sharedir;
+ }
+
diff --git a/debian/patches/purge-convenient-tinyxml-lib.patch b/debian/patches/purge-convenient-tinyxml-lib.patch
new file mode 100644
index 0000000..dc8a486
--- /dev/null
+++ b/debian/patches/purge-convenient-tinyxml-lib.patch
@@ -0,0 +1,25 @@
+--- a/src/Tools/Makefile.am
++++ b/src/Tools/Makefile.am
+@@ -11,9 +11,6 @@
+ binreloc.c \
+ Utils.cc \
+ ParticleIdUtils.cc \
+- TinyXML/tinyxml.cpp \
+- TinyXML/tinyxmlerror.cpp \
+- TinyXML/tinyxmlparser.cpp \
+ BinnedHistogram.cc \
+ mt2_bisect.cc \
+ RivetMT2.cc
+@@ -22,7 +19,6 @@
+
+ libRivetTools_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+- -I$(top_srcdir)/include/TinyXML \
+ -DENABLE_BINRELOC \
+ -DDEFAULTDATADIR=\"$(datadir)\" \
+ -DDEFAULTLIBDIR=\"$(libdir)\"
+@@ -34,3 +30,4 @@
+ else
+ libRivetTools_la_LIBADD = $(top_builddir)/src/Tools/yaml-cpp/libyaml-cpp.la
+ endif
++libRivetTools_la_LIBADD += -ltinyxml
diff --git a/debian/patches/purge-non-free-fastjet-plugins.patch b/debian/patches/purge-non-free-fastjet-plugins.patch
new file mode 100644
index 0000000..1c23709
--- /dev/null
+++ b/debian/patches/purge-non-free-fastjet-plugins.patch
@@ -0,0 +1,38 @@
+--- a/include/Rivet/Projections/FastJets.hh
++++ b/include/Rivet/Projections/FastJets.hh
+@@ -15,10 +15,7 @@
+ #include "fastjet/PseudoJet.hh"
+
+ #include "fastjet/SISConePlugin.hh"
+-#include "fastjet/ATLASConePlugin.hh"
+ #include "fastjet/CMSIterativeConePlugin.hh"
+-#include "fastjet/CDFJetCluPlugin.hh"
+-#include "fastjet/CDFMidPointPlugin.hh"
+ #include "fastjet/D0RunIIConePlugin.hh"
+ #include "fastjet/TrackJetPlugin.hh"
+ #include "fastjet/JadePlugin.hh"
+--- a/src/Projections/FastJets.cc
++++ b/src/Projections/FastJets.cc
+@@ -29,16 +29,16 @@
+ throw Error(msg);
+ //_plugin.reset(new fastjet::PxConePlugin(rparameter));
+ } else if (alg == ATLASCONE) {
+- const double OVERLAP_THRESHOLD = 0.5;
+- _plugin.reset(new fastjet::ATLASConePlugin(rparameter, seed_threshold, OVERLAP_THRESHOLD));
++ string msg = "ATLASCone currently not supported in Debian due to license issue of FastJet. ";
++ throw Error(msg);
+ } else if (alg == CMSCONE) {
+ _plugin.reset(new fastjet::CMSIterativeConePlugin(rparameter, seed_threshold));
+ } else if (alg == CDFJETCLU) {
+- const double OVERLAP_THRESHOLD = 0.75;
+- _plugin.reset(new fastjet::CDFJetCluPlugin(rparameter, OVERLAP_THRESHOLD, seed_threshold));
++ string msg = "CDFCones currently not supported in Debian due to license issue of FastJet. ";
++ throw Error(msg);
+ } else if (alg == CDFMIDPOINT) {
+- const double OVERLAP_THRESHOLD = 0.5;
+- _plugin.reset(new fastjet::CDFMidPointPlugin(rparameter, OVERLAP_THRESHOLD, seed_threshold));
++ string msg = "CDFCones currently not supported in Debian due to license issue of FastJet. ";
++ throw Error(msg);
+ } else if (alg == D0ILCONE) {
+ const double min_jet_Et = 6.0;
+ _plugin.reset(new fastjet::D0RunIIConePlugin(rparameter, min_jet_Et));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e06f2fa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+doc-building.patch
+purge-convenient-tinyxml-lib.patch
+purge-non-free-fastjet-plugins.patch
+yaml-cpp.patch
+siscone.patch
+fix-analysis-plugin-path.patch
diff --git a/debian/patches/siscone.patch b/debian/patches/siscone.patch
new file mode 100644
index 0000000..bc90d51
--- /dev/null
+++ b/debian/patches/siscone.patch
@@ -0,0 +1,31 @@
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -20,5 +20,5 @@
+ noinst_PROGRAMS = rivet-nopy
+ rivet_nopy_SOURCES = rivet-nopy.cc
+ rivet_nopy_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
+-rivet_nopy_LDADD = $(top_builddir)/src/libRivet.la -lHepMC
++rivet_nopy_LDADD = $(top_builddir)/src/libRivet.la -lHepMC -lsiscone_spherical -lsiscone
+ rivet_nopy_LDFLAGS = -L$(HEPMCLIBPATH)
+--- a/pyext/setup.py.in
++++ b/pyext/setup.py.in
+@@ -26,7 +26,7 @@
+ library_dirs=[libdir, libdir_yaml, '@HEPMCLIBPATH@'],
+ extra_compile_args = cxxargs,
+ extra_link_args = ldargs,
+- libraries=['HepMC', 'Rivet'])
++ libraries=['HepMC', 'Rivet', 'siscone_spherical', 'siscone'])
+
+ ## Setup definition
+ setup(name = 'Rivet',
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -15,7 +15,7 @@
+
+ testApi_SOURCES = testApi.cc
+ testApi_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
+-testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS)
++testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS) -lsiscone_spherical -lsiscone
+
+ TESTS_ENVIRONMENT = \
+ RIVET_REF_PATH=$(top_builddir)/data/refdata \
diff --git a/debian/patches/yaml-cpp.patch b/debian/patches/yaml-cpp.patch
new file mode 100644
index 0000000..9ec3f8e
--- /dev/null
+++ b/debian/patches/yaml-cpp.patch
@@ -0,0 +1,80 @@
+diff --git a/include/Rivet/Math/eigen/ludecomposition.h b/include/Rivet/Math/eigen/ludecomposition.h
+index 28e9aea..c2b0bcf 100644
+--- a/include/Rivet/Math/eigen/ludecomposition.h
++++ b/include/Rivet/Math/eigen/ludecomposition.h
+@@ -85,7 +85,7 @@ class LUDecomposition
+ public:
+
+ /** Performs the LU Decomposition of mat. Use this constructor. */
+- LUDecomposition( const Matrix<T, Size> & mat ) { perform( mat ); }
++ LUDecomposition( const Matrix<T, Size> & mat ) { this->perform( mat ); }
+
+ protected:
+ /** Default constructor. Does nothing. \internal
+diff --git a/include/Rivet/Math/eigen/matrix.h b/include/Rivet/Math/eigen/matrix.h
+index 2b68510..7c1d6fd 100644
+--- a/include/Rivet/Math/eigen/matrix.h
++++ b/include/Rivet/Math/eigen/matrix.h
+@@ -170,7 +170,7 @@ public:
+ */
+ Matrix( const Matrix & other )
+ {
+- readArray( other.array() );
++ this->readArray( other.array() );
+ }
+
+ /**
+diff --git a/include/Rivet/Math/eigen/vector.h b/include/Rivet/Math/eigen/vector.h
+index 9ac8626..f52ad44 100644
+--- a/include/Rivet/Math/eigen/vector.h
++++ b/include/Rivet/Math/eigen/vector.h
+@@ -141,7 +141,7 @@ public:
+ */
+ Vector( const Vector &v )
+ {
+- readArray( v.array() );
++ this->readArray( v.array() );
+ }
+
+ /**
+diff --git a/src/Core/AnalysisInfo.cc b/src/Core/AnalysisInfo.cc
+index 9aa03f2..b6eacb7 100644
+--- a/src/Core/AnalysisInfo.cc
++++ b/src/Core/AnalysisInfo.cc
+@@ -64,8 +64,8 @@ namespace Rivet {
+ const YAML::Node& beampairs = it.second();
+ vector<PdgIdPair> beam_pairs;
+ if (beampairs.size() == 2 &&
+- beampairs[0].GetType() == YAML::CT_SCALAR &&
+- beampairs[1].GetType() == YAML::CT_SCALAR) {
++ beampairs[0].Type() == YAML::NodeType::Scalar &&
++ beampairs[1].Type() == YAML::NodeType::Scalar) {
+ string bstr0, bstr1;
+ beampairs[0] >> bstr0;
+ beampairs[1] >> bstr1;
+@@ -74,8 +74,8 @@ namespace Rivet {
+ for (YAML::Iterator bpi = beampairs.begin(); bpi != beampairs.end(); ++bpi) {
+ const YAML::Node& bp = *bpi;
+ if (bp.size() == 2 &&
+- bp[0].GetType() == YAML::CT_SCALAR &&
+- bp[1].GetType() == YAML::CT_SCALAR) {
++ bp[0].Type() == YAML::NodeType::Scalar &&
++ bp[1].Type() == YAML::NodeType::Scalar) {
+ string bstr0, bstr1;
+ bp[0] >> bstr0;
+ bp[1] >> bstr1;
+@@ -91,12 +91,12 @@ namespace Rivet {
+ const YAML::Node& energies = it.second();
+ vector<pair<double,double> > beam_energy_pairs;
+ for (YAML::Iterator be = energies.begin(); be != energies.end(); ++be) {
+- if (be->GetType() == YAML::CT_SCALAR) {
++ if (be->Type() == YAML::NodeType::Scalar) {
+ // If beam energy is a scalar, then assume symmetric beams each with half that energy
+ double sqrts;
+ *be >> sqrts;
+ beam_energy_pairs += make_pair(sqrts/2.0, sqrts/2.0);
+- } else if (be->GetType() == YAML::CT_SEQUENCE) {
++ } else if (be->Type() == YAML::NodeType::Sequence) {
+ const YAML::Node& beseq = *be;
+ // If the sub-sequence is of length 1, then it's another scalar sqrt(s)!
+ if (beseq.size() == 1) {
diff --git a/debian/python-rivet.install b/debian/python-rivet.install
new file mode 100644
index 0000000..607c065
--- /dev/null
+++ b/debian/python-rivet.install
@@ -0,0 +1 @@
+usr/lib/python*
diff --git a/debian/rivet-buildplugin.1 b/debian/rivet-buildplugin.1
new file mode 100644
index 0000000..b78ec0e
--- /dev/null
+++ b/debian/rivet-buildplugin.1
@@ -0,0 +1,22 @@
+.TH RIVET-BUILDPLUGIN "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet\-buildplugin \- compilation helper for Rivet analysis plugins
+.SH SYNOPSIS
+.B rivet-buildplugin
+[\fI<libname>\fR] \fI<source1> \fR[\fI<source2> \fR[\fIcompiler_flags\fR] ...]
+.SH DESCRIPTION
+.PP
+<libname> can be a path, provided the filename is of the form 'Rivet*.so'
+If <libname> is not specified, the default name is 'RivetAnalysis.so'.
+.PP
+To make special build variations you can add appropriate compiler flags
+to the arguments and these will be passed directly to the compiler. For
+example, for a debug build of your plugin library, add '\-g', and for a
+32 bit build on a 64 bit system add '\-m32'.
+.SH OPTIONS
+.HP
+\fB\-h\fR | \fB\-\-help\fR: display this help message
+.HP
+\fB\-\-with\-root\fR: add ROOT link options (requires root\-config on system)
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-chopbins.1 b/debian/rivet-chopbins.1
new file mode 100644
index 0000000..d201868
--- /dev/null
+++ b/debian/rivet-chopbins.1
@@ -0,0 +1,38 @@
+.TH RIVET-CHOPBINS "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet-chopbins \- Strip specified bins from data sets.
+.SH SYNOPSIS
+.B rivet-chopbins
+\fI-b <HISTO/PATH:min:max> \fR[ \fI-b \fR... ] \fI<AIDAFILE> \fR[...]
+.SH DESCRIPTION
+Strip specified bins from data sets. Histograms not specified will be passed
+through without any chopping. Bins to be kept can be specified on command
+line `\-b' options.
+.PP
+To chop bins from different observables can be achieved by using the `\-b'
+option multiple times.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-b\fR BINS, \fB\-\-bins\fR=\fIBINS\fR
+Specify a histogram and bin range that is to be kept.
+The format is `AIDAPATH:start:stop'.
+.TP
+\fB\-O\fR OBSFILE, \fB\-\-obsfile\fR=\fIOBSFILE\fR
+Specify a file with bin\-definitions to chop
+.TP
+\fB\-o\fR OUTDIR, \fB\-\-out\fR=\fIOUTDIR\fR
+output directory (default: .)
+.TP
+\fB\-i\fR, \fB\-\-in\-place\fR
+Overwrite input file rather than making inputchop.aida
+.SH "Example:"
+.IP
+rivet\-chopbins \fB\-b\fR /ALEPH_1996_S3486095/d03\-x01\-y01:0.095:0.27 out.aida
+.PP
+This will give you the all bins of the ALEPH 1\-T distribution that are
+between the bins that contain the x\-values 0.095 and 0.27.
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-config.1 b/debian/rivet-config.1
new file mode 100644
index 0000000..d868b90
--- /dev/null
+++ b/debian/rivet-config.1
@@ -0,0 +1,39 @@
+.TH RIVET-CONFIG "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet-config \- configuration tool for Rivet
+.SH SYNOPSIS
+.B rivet-config
+[\fIoption\fR]
+.SH OPTIONS
+.TP
+\fB\-\-help\fR, \fB\-h\fR
+show this help message
+.TP
+\fB\-\-prefix\fR
+show the installation prefix (cf. autoconf)
+.TP
+\fB\-\-includedir\fR
+show the path to the directory containing the Rivet headers
+.TP
+\fB\-\-libdir\fR
+show the path to the directory containing the Rivet libraries
+.TP
+\fB\-\-datadir\fR
+show the path to the directory containing Rivet data
+.TP
+\fB\-\-pythonpath\fR
+show the path(s) to the directory containing Rivet Python modules
+.TP
+\fB\-\-cppflags\fR
+returns a Rivet '\-I' string for insertion into CPPFLAGS
+.TP
+\fB\-\-ldflags\fR
+returns a Rivet '\-L' string for insertion into LDFLAGS
+.TP
+\fB\-\-libs\fR
+returns a Rivet '\-l' string for insertion into LIBS or LIBADD
+.TP
+\fB\-\-version\fR
+returns Rivet release version number
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-mergeruns.1 b/debian/rivet-mergeruns.1
new file mode 100644
index 0000000..5c0df25
--- /dev/null
+++ b/debian/rivet-mergeruns.1
@@ -0,0 +1,40 @@
+.TH RIVET-MERGERUNS "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet\-mergeruns \- Merge Rivet histo files into one
+.SH SYNOPSIS
+rivet-mergeruns \fIaidafile:sqrts:minpt aidafile2:sqrts:minpt \fR[...]
+.SH DESCRIPTION
+Script for merging parts of multiple histo files made with different
+run params (kinematic pT cuts and energies) into one histo file for
+plotting or further analysis.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-o\fR OUTFILE, \fB\-\-out\fR=\fIOUTFILE\fR
+.TP
+\fB\-\-append\fR
+append to file
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+print debug (very verbose) messages
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+be very quiet
+.SH EXAMPLES
+.IP
+rivet\-mergeruns \\\fR
+ hwpp/hpp\-1800\-030.aida:1800:30 \\\fR
+ hwpp/hpp\-1800\-090.aida:1800:90 \\\fR
+ > hpp\-hists.dat
+.IP
+flat2aida hpp-hists.dat
+.IP
+mkdir plots && cd plots
+.IP
+compare\-histos ../ref04.aida ../hpp\-hists.aida
+.IP
+make\-plots \-\-pdf *.dat
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-mkanalysis.1 b/debian/rivet-mkanalysis.1
new file mode 100644
index 0000000..c263030
--- /dev/null
+++ b/debian/rivet-mkanalysis.1
@@ -0,0 +1,31 @@
+.TH RIVET-MKANALYSIS "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet\-mkanalysis \- Make templates of analysis source files for Rivet
+.SH SYNOPSIS
+rivet\-mkanalysis [\-\-help|\-h] [\-\-srcroot=<srcrootdir>] <analysisname>
+.SH DESCRIPTION
+Make templates of analysis source files for Rivet.
+.PP
+Without the \fB\-\-srcroot\fR flag, the analysis files will be created in the current
+directory.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-\-srcroot\fR=\fIDIR\fR
+install the templates into the Rivet source tree (rooted
+at directory DIR) rather than just creating all in the
+current dir
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+only write out warning and error messages
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+provide extra debugging messages
+.TP
+\fB\-i\fR, \fB\-\-inline\-info\fR
+Put analysis info into source file instead of separate
+data file.
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-mkhtml.1 b/debian/rivet-mkhtml.1
new file mode 100644
index 0000000..a2c977f
--- /dev/null
+++ b/debian/rivet-mkhtml.1
@@ -0,0 +1,87 @@
+.TH RIVET-MKHTML "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet\-mkhtml \- Make web pages from histogram files written out by Rivet
+.SH SYNOPSIS
+.B rivet-mkhtml
+[\fIoptions\fR] \fI<aidafile1> \fR[\fI<aidafile2> <aidafile3>\fR...]
+.SH DESCRIPTION
+Make web pages from histogram files written out by Rivet. You can specify
+multiple Monte Carlo AIDA files to be compared in the same syntax as for
+compare\-histos, i.e. including plotting options.
+.PP
+Reference data, analysis metadata, and plot style information should be found
+automatically (if not, set the RIVET_ANALYSIS_PATH or similar variables
+appropriately).
+.PP
+You can overwrite an existing output directory.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-o\fR OUTPUTDIR, \fB\-\-outputdir\fR=\fIOUTPUTDIR\fR
+directory for webpage output
+.TP
+\fB\-t\fR TITLE, \fB\-\-title\fR=\fITITLE\fR
+title to be displayed on the main web page
+.TP
+\fB\-c\fR CONFIGFILES, \fB\-\-config\fR=\fICONFIGFILES\fR
+plot config file(s) to be used with compare\-histos.
+.TP
+\fB\-s\fR, \fB\-\-single\fR
+display plots on single webpage.
+.TP
+\fB\-\-no\-ratio\fR
+don't draw a ratio plot under each main plot.
+.TP
+\fB\-\-mc\-errs\fR
+plot error bars.
+.TP
+\fB\-\-refid\fR=\fIREF_ID\fR
+ID of reference data set (file path for non\-REF data)
+.TP
+\fB\-n\fR NUMTHREADS, \fB\-\-num\-threads\fR=\fINUMTHREADS\fR
+request make\-plots to use a specific number of
+threads.
+.TP
+\fB\-\-pdf\fR
+use PDF as the vector plot format.
+.TP
+\fB\-\-ps\fR
+use PostScript as the vector plot format.
+.TP
+\fB\-\-booklet\fR
+create booklet (currently only available for PDF with
+pdftk).
+.TP
+\fB\-i\fR, \fB\-\-ignore\-unvalidated\fR
+ignore unvalidated analyses.
+.TP
+\fB\-\-ignore\-missing\fR
+ignore missing AIDA files.
+.TP
+\fB\-m\fR PATHPATTERNS, \fB\-\-match\fR=\fIPATHPATTERNS\fR
+only write out histograms from analyses whose name
+matches any of these regexes
+.TP
+\fB\-M\fR PATHUNPATTERNS, \fB\-\-unmatch\fR=\fIPATHUNPATTERNS\fR
+Exclude histograms whose $path/$name string matches
+these regexes
+.TP
+\fB\-\-palatino\fR
+Use Palatino as font (default).
+.TP
+\fB\-\-cm\fR
+Use Computer Modern as font.
+.TP
+\fB\-\-times\fR
+Use Times as font.
+.TP
+\fB\-\-minion\fR
+Use Adobe Minion Pro as font. Note: You need to set
+TEXMFHOME first.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Add extra debug messages
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-plugins-data.install b/debian/rivet-plugins-data.install
new file mode 100644
index 0000000..52316c5
--- /dev/null
+++ b/debian/rivet-plugins-data.install
@@ -0,0 +1,3 @@
+usr/share/Rivet/*.plot
+usr/share/Rivet/*.aida
+usr/share/Rivet/*.info
diff --git a/debian/rivet-plugins-dev.install b/debian/rivet-plugins-dev.install
new file mode 100644
index 0000000..565612f
--- /dev/null
+++ b/debian/rivet-plugins-dev.install
@@ -0,0 +1,2 @@
+usr/bin/rivet-buildplugin
+usr/bin/rivet-mkanalysis
diff --git a/debian/rivet-plugins-dev.manpages b/debian/rivet-plugins-dev.manpages
new file mode 100644
index 0000000..663d289
--- /dev/null
+++ b/debian/rivet-plugins-dev.manpages
@@ -0,0 +1,2 @@
+debian/rivet-buildplugin.1
+debian/rivet-mkanalysis.1
diff --git a/debian/rivet-plugins-doc.doc-base b/debian/rivet-plugins-doc.doc-base
new file mode 100644
index 0000000..96dcdf5
--- /dev/null
+++ b/debian/rivet-plugins-doc.doc-base
@@ -0,0 +1,9 @@
+Document: rivet-analyses-reference
+Title: Rivet Analyses Reference Manual
+Author: Leif Lonnblad, Andy Buckley, Jon Butterworth
+Abstract: Paper reference for Rivet analyses plugins.
+Section: Science/Physics
+
+Format: HTML
+Index: /usr/share/doc/rivet-plugins-doc/html/analyses.html
+Files: /usr/share/doc/rivet-plugins-doc/html/*.html
diff --git a/debian/rivet-plugins-doc.install b/debian/rivet-plugins-doc.install
new file mode 100644
index 0000000..739b2b0
--- /dev/null
+++ b/debian/rivet-plugins-doc.install
@@ -0,0 +1 @@
+doc/analyses.html usr/share/doc/rivet-plugins-doc/html
diff --git a/debian/rivet-plugins.install b/debian/rivet-plugins.install
new file mode 100644
index 0000000..029d11f
--- /dev/null
+++ b/debian/rivet-plugins.install
@@ -0,0 +1 @@
+usr/lib/*/Rivet/*.so
diff --git a/debian/rivet-reference.doc-base b/debian/rivet-reference.doc-base
new file mode 100644
index 0000000..59a5a83
--- /dev/null
+++ b/debian/rivet-reference.doc-base
@@ -0,0 +1,9 @@
+Document: rivet-reference
+Title: Rivet Reference Manual
+Author: Leif Lonnblad, Andy Buckley, Jon Butterworth
+Abstract: Developer's reference manual of Rivet.
+Section: Science/Physics
+
+Format: HTML
+Index: /usr/share/doc/rivet-reference/html/index.html
+Files: /usr/share/doc/rivet-reference/html/*.html
diff --git a/debian/rivet-reference.install b/debian/rivet-reference.install
new file mode 100644
index 0000000..0a01a04
--- /dev/null
+++ b/debian/rivet-reference.install
@@ -0,0 +1 @@
+doxy/html/* /usr/share/doc/rivet-reference/html
diff --git a/debian/rivet-rescale.1 b/debian/rivet-rescale.1
new file mode 100644
index 0000000..2aefeff
--- /dev/null
+++ b/debian/rivet-rescale.1
@@ -0,0 +1,80 @@
+.TH RIVET-RESCALE "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet\-rescale \- Rescale histos in observable\-file of AIDAFILE to
+the area of the corresponding histos in REFDATAPATH
+.SH SYNOPSIS
+.B rivet-rescale
+[\fI-r <REFDATAPATH>\fR] [\fI-O <observable-file>\fR] [\fI-b <bindef> \fR[\fI-b \fR...]] \fI<AIDAFILE> \fR[\fI<OUTFILE>\fR]
+.SH DESCRIPTION
+Rescale histos in observable\-file of AIDAFILE to the area of the
+corresponding histos in REFDATAPATH. REFDATAPATH can either be
+a single AIDA\-file or a directory containing AIDA\-files. By default
+the standard Rivet reference files are used.
+.PP
+Observable definitions of the form
+/CDF_2000_S4155203/d01\-x01\-y01 1.0
+can be used to specify an absolute normalisation (1.0, here) for a
+histogram rather than using the reference histo. If the \fB\-\-multiply\fR
+switch is used, the ref histo area will be scaled by the given factor
+to give the target normalisation.
+.PP
+You can also define bins to chop out in the observable\-file in the
+same way as in chop_bins:
+/CDF_2000_S4155203/d01\-x01\-y01:0:35 1.0
+This will chop the bins with Z\-pT > 35 GeV and obtain a rescaling factor
+from that restricted bin range: note that the output histograms will
+be rescaled but *unchopped*.
+.PP
+Only one bin definition can be used for each histogram, so the last bindef
+specified for that histo path will be the one which is applied. The bindefs
+are constructed in order from those in the obsfile, and then those given on
+the command line with the \fB\-b\fR flag, like this:
+.HP
+\fB\-b\fR "/CDF_2000_S4155203/d01\-x01\-y01:5:135 2.0"
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-O\fR OBSFILE, \fB\-\-obsfile\fR=\fIOBSFILE\fR
+Specify a file with histograms (and bin ranges) that
+are to be normalised.
+.TP
+\fB\-b\fR BINRANGES, \fB\-\-bins\fR=\fIBINRANGES\fR
+Specify a histogram and bin range that is to be used.
+The format is `AIDAPATH:start:stop'.
+.TP
+\fB\-r\fR REFDIR, \fB\-\-refdir\fR=\fIREFDIR\fR
+File of folder with reference histos
+.TP
+\fB\-a\fR
+Produce AIDA output rather than FLAT
+.TP
+\fB\-f\fR
+Produce FLAT output rather than AIDA
+.TP
+\fB\-\-multiply\fR
+Rescale histos using weight given as factor rather
+than new area
+.TP
+\fB\-i\fR, \fB\-\-in\-place\fR
+Overwrite input file rather than making inputrescaled.aida
+.TP
+\fB\-\-fast\fR
+Try loading only reference files from refpath that
+match analyses in input\-file
+.SH EXAMPLES
+.TP
+rivet\-rescale out.aida
+This will return the histos in out.aida, scaled to match the overall
+normalisations of the Rivet ref data.
+.TP
+rivet\-rescale \fB\-O\fR observables.obs out.aida
+This will return the histos in out.aida, scaled by the bin definitions
+specified in observables.obs (and using the Rivet ref data again)
+.TP
+rivet\-rescale \fB\-r\fR path/to/CDF_2000_S4155203.aida \fB\-b\fR "/CDF_2000_S4155203/d01\-x01\-y01:2:5" out.aida
+For this Z\-boson pT\-distribution, the normalisation to the provided ref
+data file is only applied between 2 < x < 5 GeV.
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-rmgaps.1 b/debian/rivet-rmgaps.1
new file mode 100644
index 0000000..1ef9a44
--- /dev/null
+++ b/debian/rivet-rmgaps.1
@@ -0,0 +1,31 @@
+.TH RIVET-RMGAPS "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet-rmgaps \- Remove binnning gaps in Rivet-generated MC AIDA files.
+.SH SYNOPSIS
+.B rivet-rmgaps
+\fIdatafile.aida mcfile.aida \fR[\fIoutputfile.aida\fR]
+.SH DESCRIPTION
+Remove bins in Rivet\-generated MC AIDA files which are actually binning gaps in
+the reference histogram. Rivet's histogramming system currently has no way to
+leave gaps between bins, hence this clean\-up script.
+.PP
+If the output file is not specified, the input MC file will be overwritten.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-R\fR, \fB\-\-rivet\-refs\fR
+use the Rivet reference data files for comparison
+(default)
+.TP
+\fB\-\-no\-rivet\-refs\fR
+don't use the Rivet reference data files for comparison
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+print debug (very verbose) messages
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+be very quiet
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet-root-converter.install b/debian/rivet-root-converter.install
new file mode 100644
index 0000000..ff87509
--- /dev/null
+++ b/debian/rivet-root-converter.install
@@ -0,0 +1,2 @@
+usr/bin/aida2root
+usr/bin/root2flat
diff --git a/debian/rivet-root-converter.manpages b/debian/rivet-root-converter.manpages
new file mode 100644
index 0000000..7b67ab2
--- /dev/null
+++ b/debian/rivet-root-converter.manpages
@@ -0,0 +1,2 @@
+debian/aida2root.1
+debian/root2flat.1
diff --git a/debian/rivet-user-manual.doc-base b/debian/rivet-user-manual.doc-base
new file mode 100644
index 0000000..adbec29
--- /dev/null
+++ b/debian/rivet-user-manual.doc-base
@@ -0,0 +1,8 @@
+Document: rivet-user-manual
+Title: Rivet User Manual
+Author: Andy Buckley, Jonathan Butterworth, Leif Lonnblad, Hendrik Hoeth, James Monk, Holger Schulz, Jan Eike von Seggern, Frank Siegert, Lars Sonnenschein
+Abstract: This manual contains user manual of Rivet.
+Section: Science/Physics
+
+Format: pdf
+Files: /usr/share/doc/rivet-user-manual/pdf/rivet-manual.pdf.gz
diff --git a/debian/rivet-user-manual.install b/debian/rivet-user-manual.install
new file mode 100644
index 0000000..c5d6089
--- /dev/null
+++ b/debian/rivet-user-manual.install
@@ -0,0 +1 @@
+doc/rivet-manual.pdf usr/share/doc/rivet-user-manual/pdf
diff --git a/debian/rivet.1 b/debian/rivet.1
new file mode 100644
index 0000000..0172ce8
--- /dev/null
+++ b/debian/rivet.1
@@ -0,0 +1,104 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.10.
+.TH RIVET "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+rivet \- Robust Independent Validation of Experiment and Theory
+.SH SYNOPSIS
+rivet [\fIoptions\fR] myfifo
+.SH OPTIONS
+.TP
+\fB\-\-version\fR
+show program's version number and exit.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit.
+.TP
+\fB\-l\fR NATIVE_LOG_STRS
+set a log level in the Rivet library.
+.TP
+\fB\-a\fR ANA, \fB\-\-analysis\fR=\fIANA\fR
+add an analysis to the processing list.
+.TP
+\fB\-\-list\-analyses\fR
+show the list of available analyses' names. With \fB\-v\fR,
+it shows the descriptions, too.
+.TP
+\fB\-\-list\-used\-analyses\fR
+list the analyses used by this command (after
+subtraction of inappropriate ones).
+.TP
+\fB\-\-show\-analysis\fR=\fISHOW_ANALYSES\fR, \fB\-\-show\-analyses\fR=\fISHOW_ANALYSES\fR
+show the details of an analysis.
+.TP
+\fB\-\-analysis\-path\fR=\fIPATH\fR
+specify the analysis search path (cf.
+$RIVET_ANALYSIS_PATH).
+.TP
+\fB\-\-analysis\-path\-append\fR=\fIPATH\fR
+append to the analysis search path (cf.
+$RIVET_ANALYSIS_PATH).
+.TP
+\fB\-\-pwd\fR
+append the current directory (pwd) to the analysis
+search path (cf. $RIVET_ANALYSIS_PATH).
+.TP
+\fB\-H\fR HISTOFILE, \fB\-\-histo\-file\fR=\fIHISTOFILE\fR
+specify the output histo file path (default =
+Rivet.aida).
+.TP
+\fB\-x\fR XS, \fB\-\-cross\-section\fR=\fIXS\fR
+specify the signal process cross\-section in pb.
+.TP
+\fB\-n\fR NUM, \fB\-\-nevts\fR=\fINUM\fR
+restrict the max number of events to read.
+.TP
+\fB\-\-runname\fR=\fINAME\fR
+give an optional run name, to be prepended as a 'top
+level directory' in histo paths.
+.TP
+\fB\-\-ignore\-beams\fR
+Ignore input event beams when checking analysis
+compatibility.
+.TP
+\fB\-\-event\-timeout\fR=\fINSECS\fR
+max time in whole seconds to wait for an event to be
+generated from the specified source (default = 21600)
+.TP
+\fB\-\-run\-timeout\fR=\fINSECS\fR
+max time in whole seconds to wait for the run to
+finish. This can be useful on batch systems such as
+the LCG Grid where tokens expire on a fixed wall\-clock
+and can render long Rivet runs unable to write out the
+final histogram file (default = unlimited).
+.TP
+\fB\-\-histo\-interval\fR=\fIHISTO_WRITE_INTERVAL\fR
+[experimental!] specify the number of events between
+histogram file updates. Default is to only write out
+at the end of the run. Note that intermediate
+histograms will be those from the analyze step only:
+analysis finalizing is currently not executed until
+the end of the run.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+print debug (very verbose) messages.
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+be very quiet.
+.SH EXAMPLES
+.IP
+mkfifo hepmc.fifo
+.IP
+my\-generator \fB\-o\fR myfifo &
+.IP
+rivet \-\-analysis=ANALYSIS_NAME hepmc.fifo
+.SH "ENVIRONMENT:"
+.TP
+\fBRIVET_ANALYSIS_PATH\fR
+list of paths to be searched for plugin analysis libraries at runtime.
+.TP
+\fBRIVET_REF_PATH\fR
+list of paths to be searched for reference data files.
+.TP
+\fBRIVET_INFO_PATH\fR
+list of paths to be searched for analysis metadata files.
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rivet.install b/debian/rivet.install
new file mode 100644
index 0000000..576b500
--- /dev/null
+++ b/debian/rivet.install
@@ -0,0 +1,12 @@
+usr/bin/aida2flat
+usr/bin/flat2aida
+usr/bin/compare-histos
+usr/bin/make-plots
+usr/bin/rivet
+usr/bin/rivet-chopbins
+usr/bin/rivet-config
+usr/bin/rivet-mergeruns
+usr/bin/rivet-mkhtml
+usr/bin/rivet-rescale
+usr/bin/rivet-rmgaps
+usr/share/Rivet/rivet-completion /etc/bash_completion.d/
diff --git a/debian/rivet.manpages b/debian/rivet.manpages
new file mode 100644
index 0000000..4829d1b
--- /dev/null
+++ b/debian/rivet.manpages
@@ -0,0 +1,11 @@
+debian/aida2flat.1
+debian/flat2aida.1
+debian/compare-histos.1
+debian/make-plots.1
+debian/rivet.1
+debian/rivet-chopbins.1
+debian/rivet-config.1
+debian/rivet-mergeruns.1
+debian/rivet-mkhtml.1
+debian/rivet-rescale.1
+debian/rivet-rmgaps.1
diff --git a/debian/root2flat.1 b/debian/root2flat.1
new file mode 100644
index 0000000..6e74ba5
--- /dev/null
+++ b/debian/root2flat.1
@@ -0,0 +1,32 @@
+.TH ROOT2FLAT "1" "June 2012" "Rivet" "User Commands"
+.SH NAME
+root2flat \- Read in .root files and write out the histograms in FLAT format
+.SH SYNOPSIS
+.B root2flat
+[\fIoptions\fR]
+file1.root
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-a\fR ANALYSIS
+Optionally add analysis name to histogram keys
+.TP
+\fB\-e\fR
+Enumerate histos hepdata style
+.TP
+\fB\-f\fR FILENAME
+Force output of all histos in single file
+.TP
+\fB\-x\fR XCLUDE
+Exclude histos from conversion based on string pattern
+.TP
+\fB\-o\fR OUTDIR
+specify directory in which to write out converted files
+.SH "SEE ALSO"
+.BR aida2root (1),
+.BR aida2flat (1),
+.BR flat2aida (1)
+.SH AUTHOR
+This manual page was written by Lifeng Sun <lifongsun at gmail.com> for the Debian system (but may be used by others).
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4aedfa3
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,80 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS :=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS :=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS)
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+ NUMJOBS := 1
+endif
+
+export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
+
+# package name
+PKGNAME=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f1))
+
+# current Debian package version
+DEBVER=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f2 | tr -d '()'))
+
+# current upstream version (remove any epoch and Debian release number)
+UPVER=$(shell echo $(DEBVER) | sed -e 's/-[^-]*$$//' -e 's/^[^:]*://')
+
+../$(PKGNAME)_$(UPVER).orig.tar.gz:
+ ./debian/get-orig-source --upstream-version $(UPVER) $@
+
+get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
+
+configure-stamp:
+ dh_autoreconf
+ dh_auto_configure -- \
+ --prefix=/usr \
+ --with-hepmc-incpath=/usr/include \
+ --with-hepmc-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --with-fastjet-incpath=/usr/include \
+ --with-fastjet-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --with-yaml_cpp-incpath=/usr/include \
+ --with-yaml_cpp-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ touch $@
+
+install: build-arch
+ dh_testdir
+ dh_auto_install
+ chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libRivet.so
+
+build-indep: configure-stamp
+ $(MAKE) -C doc
+ $(MAKE) dox
+
+build-arch: configure-stamp
+ dh_testdir
+ $(MAKE) -j$(NUMJOBS)
+
+build: build-arch
+
+binary-indep: build-arch build-indep
+ dh $@
+
+binary-arch: install
+ dh $@
+
+binary: binary-arch binary-indep
+
+clean:
+ dh_testdir
+ dh_autoreconf_clean
+ dh_auto_clean
+ dh_clean
+
+.PHONY: binary binary-arch binary-indep build build-arch build-indep install clean
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..4c897c5
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+http://www.hepforge.org/archive/rivet/ Rivet-(.*)\.tar\.gz debian ./debian/get-orig-source
+
--
Rivet: Robust Independent Validation of Experiment and Theory
More information about the debian-science-commits
mailing list