Merge

Workaround for bug in HepMC-3.1.0.

CompressedAscii now seems to work.

Continued looking at compressed hepmc files.

Fixes related to HepMC beam problems.

Minor mods to configure.ac. If HepMC3 exists no attempts to find

Fixed proper peeking into a stream to check HepMC file type.

Fixed omissions in RivetHepMC_3.cc. Fixed testApi.cc and testNaN.cc. Included…

Changed GeV to GeV2 in several places for consistent notation.

merge

Added MC_DIS_Check to test new DISLepton. Added DISDiffHadron DISRapidityGap…

Projections now have a flag _isValid that can be tested with valid() and failed…

Fixed problem with uninitialized pointer in CMS_2016_PAS_TOP_15_006.cc. Also…

Allowed Vector3 to produce a unit vector even for miniscule momenta.

Made DISLepton more versatile allowing for several options.

Introduced options() function to return the full map of options.

Preparing for release 2.7.0

I obviously don't understand this thing with "new remote head"

Changed the order of include paths in rivet-buildplugin so that the path to…

Percentile<>::init is now bool and retruns false if no bins were selected.

I did this change before but it was lost somehow.

Minor improvements.

strange merge

Fix for change to phabricator.

Modified to avoid warnings in newer g++ versions.

Modified to avoid warnings in newer g++ versions.

ThePEG now runs with either HepMC2 or HepMC3 (thanks to Andrii

Modified to avoid warnings in newer g++ versions.

Modified to avoid warnings in newer g++ versions.

Modified to avoid warnings in newer g++ versions.

Merged in changes from trunk.

Merging

Avoid dumping the state of the generator if debug level is zero.

Added a SimplePhaseSpace::checkMagnitude() which does the same as getMagnitude…

*** empty log message ***

Cleanup could go on forever. Maybe This is enough.

Continueed clean-up of PxCone

Continueed clean-up of PxCone

Started clean-up of PxCone

PxCone seems to work now and gives exactly the same results as the Fortran…

Started implementing c++ version of PxCone. Not quite working yet.

merge from repo.

All Analysis::book{data object} will now try to bind to previously added object.

Fixed (another) bug where the sows vector was not filled in mergeYodas.

Fixed bug where the sows vector was not filled in mergeYodas.

Modified make-plots to handle multiple options.

Just testing pretty-printing ov options.

Changed isnan to std::isnan to avoid compiler problems.

Added handling of ReplaceOption[opt=val]=pretty val. Seems to work.

Ok. reentrant finalize and Percentile histos seems to work. More testing…

Recovering from a conflicted merge.

Added reentrant finalize and rivet-merge script. It seems to work, but needs…

Make sure we have the same sorting if several options in the same file (always…

Strip option string when checking that an analysis exists in the "rivet" script.

Reordered options in the analysis names to avoid duplicate identical analyes if…

Implemented an option system for analysis. Example mod of ATLAS_2013_I1230812…

Fixed bug reported by Carsten Bittrich where the weights in the old

Just adding the basic files to check that everything is working