diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,17 +1,22 @@ -.hgignore -Core/Makefile.in -Examples/Makefile.in -Makefile.in -Matchbox/Makefile.in -Test/Makefile.in -aclocal.m4 -autom4te.cache/ -config/ -configure -include/Makefile.in -m4/libtool.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 -m4/lt~obsolete.m4 -CopyEclipseFiles +Makefile +Makefile\.in +\.deps +\.libs +\.l[ao] +\.so +\.so\. +\.o +~ +^aclocal.m4 +^autom4te.cache/ +^config/ +^configure +^m4/libtool.m4 +^m4/ltoptions.m4 +^m4/ltsugar.m4 +^m4/ltversion.m4 +^m4/lt~obsolete.m4 +^CopyEclipseFiles +^config.log +^config.status +^libtool diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,20 @@ ColorFull ChangeLog (emacs -*- outline -*- format) +* ColorFull release 1.1 +** Added functions split_gluon, default_parton_numbers, rename_partons in Col_functions. These functions are used for g -> qqbar splitting. +** Removed Matchbox interface to Herwig, since ColorFull along with the interface, is shipped with Herwig from version 7.0. +** Included various minor updates from Herwig version. + * ColorFull release 1.0 ** Fixed Monomial.h to build using --std=c++11 and --std=c++14. ** Fixed all warnings appearing with -Wextra for g++ and clang using --std=c++11 and c++14. This required removing some arguments in private functions. * ColorFull release 0.99 ** Added class member functions for reading in/writing out files ** Added operators like comparison operators, == and !=, arithmetic operators, +, - and *, as well as stream operators << ** Changed name of Col_gamma to color_gamma in the Col_basis class ** Removed the dummy gluon number argument from the color_correlator function in the Col_functions ** Removed unused versions of the leading and double_num member functions in the Col_functions class ** Consistently renamed append and push_back member functions to append diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -1,21 +1,27 @@ ColorFull News (emacs -*- outline -*- format) + +* ColorFull release 1.1 +** Added functions split_gluon, default_parton_numbers, rename_partons in Col_functions. These functions are used for g -> qqbar splitting. +** Removed Matchbox interface to Herwig, since ColorFull along with the interface, is shipped with Herwig from version 7.0. +** Included various minor updates from Herwig version. + * ColorFull release 1.0 ** Fixed code to build with c++11 and c++14 standards. * ColorFull release 0.99 ** Added class member functions for reading in/writing out files ** Added operators like comparison operators == and !=, arithmetic operators, +, - and *, as well as stream operators << ** Changed name of Col_gamma to color_gamma in the Col_basis class ** Removed the dummy gluon number argument from the color_correlator function in the Col_functions ** Removed unused versions of the leading and double_num member functions in the Col_functions class ** Consistently renamed append and push_back member functions to append * ColorFull release 0.9 ** Core ColorFull library with trace and orthogonal bases ** Herwig::ColourBasis interface to Herwig++ Matchbox diff --git a/README b/README --- a/README +++ b/README @@ -1,104 +1,102 @@ -This is the README file for ColorFull 1.0 +This is the README file for ColorFull 1.1 ColorFull is a C++ program for color summed calculations in QCD color space. =============================== Install =============================== -To compile and install ColorFull follow these steps: +To compile and install ColorFull in stand-alone mode follow these steps: 1) Run the configure script: ./configure --prefix=[installation prefix, defaults to /usr/local] - --with-matchbox=[path to Herwig++ (>= 2.7) installation, optional] For example, to install to a different path, run: ./configure --prefix="/dir/to/install/to" - If you do not give a prefix, you will probably get errors due to - lacking privileges in the install step. However, for only trying - ColorFull, you need can skip the install step, see below. + If you do not give a prefix, you may get errors due to lacking + privileges in the install step. However, for only trying + ColorFull, you can skip the install step, see "Run" below. (Try ./configure --help for more options.) 2) Build: make 3) Install to the path specified by prefix in the configure step: make install (Specifying a prefix and running "make install", is not needed for trying ColorFull in stand-alone mode, see Run below.) +Since ColorFull is included in Herwig from version 7.0, no special +action is needed to use ColorFull from within Herwig. ================================ Run ================================= To try out the functionality of ColorFull, test to run ColorPlay in the Examples directory and try commenting in and out lines in ColorPlay.cc. -ColorFull ships an interface to Herwig++'s Matchbox module. - - ============================== Manual ================================= The ColorFull manual is available at http://arxiv.org/abs/1412.3967, and published in Eur.Phys.J. C75 (2015) no.5, 236. For full details, see the Doxygen-generated documentation of the classes at http://colorfull.hepforge.org/doxygen/. Very briefly ColorFull is built on the classes: * Monomial: Nc^pow_Nc*CF^pow_CF*TR^pow_TR*int_part*cnum_part * Polynomial: a sum of Monomials * Poly_vec: a vector of Polynomials * Poly_matr: a matrix of Polynomials * Quark_line: a Polynomial times a closed (1,2,3,4) or an open {1,3,4,2} quark-line. * Col_str: a Polynomial*(product of Quark_lines). * Col_amp: a sum of Col_strs + Scalar. Scalar is a Polynomial and is used for containing the Polynomial resulting after having contracted all color indices. * Col_basis, Trace_basis, Tree_level_gluon_basis, Orthogonal_basis: These are basis classes for containing QCD color bases. * Col_functions: This is a library class with functions for: - numerical evaluation - leading Nc evaluation - scalar products - gluon exchange - gluon emission - color correlator < c | T_i T_j | c > - soft anomalous dimension color matrices ============================ License ================================== ColorFull - Copyright (C) 2010-2016 Malin Sjödahl, Simon Plätzer + Copyright (C) 2010-2017 Malin Sjödahl, Simon Plätzer This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. This program 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. diff --git a/Test/Makefile.am b/Test/Makefile.am --- a/Test/Makefile.am +++ b/Test/Makefile.am @@ -1,12 +1,15 @@ bin_PROGRAMS = ColorFull_test ColorFull_test_SOURCES = ColorFull_test.cc ColorFull_test_CPPFLAGS = $(AM_CPPFLAGS) -I $(top_builddir)/include ColorFull_test_LDADD = $(top_builddir)/Core/libColorFull.la all: check$(EXEEXT): mkdir -p ColorResults @echo ./ColorFull_test @./ColorFull_test && echo "# $@ OK #" \ || (echo "###### $@ BAD ######"; false) + +DISTCLEANFILES = $(top_builddir)/Test/ColorResults/CF_TB_q_1_g_3 + diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1,36 +1,35 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.59]) -AC_INIT([ColorFull],[hg],[malin.sjodahl@thep.lu.se],[ColorFull]) +AC_INIT([ColorFull],[1.1],[malin.sjodahl@thep.lu.se],[ColorFull]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR(["m4/$PACKAGE_TARNAME.m4"]) AC_CANONICAL_HOST AC_LANG([C++]) AM_INIT_AUTOMAKE([1.9 gnu dist-bzip2 -Wall]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Checks for programs. AC_PROG_CXX AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory]) AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_LN_S AM_PROG_AR AC_DISABLE_STATIC AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL AM_CPPFLAGS="-I\$(top_builddir)/include" AC_SUBST(AM_CPPFLAGS) AC_CONFIG_FILES([Core/Makefile Examples/Makefile Test/Makefile include/Makefile Makefile]) AC_OUTPUT