Index: contrib/contribs/LundPlane/trunk/NEWS =================================================================== --- contrib/contribs/LundPlane/trunk/NEWS (revision 1321) +++ contrib/contribs/LundPlane/trunk/NEWS (revision 1322) @@ -1,13 +1,16 @@ +2022/08/20: release of version 2.0.2 +- fixed missing header for g++-12 +- fixed missing Makefile dependencies 2021/12/06: release of version 2.0.1 - fixed some compilation warnings (signed/unsigned) - fixed up missing info in AUTHORS - fixed commented python example lines 2021/11/08: release of version 2.0.0 - Recursive e+e- generator with spin-correlation observables with the RecursiveLundEEGenerator - See example_dpsi_collinear.cc (implements analysis of arXiv:2103.16526) - and example_dpsi_slice.cc (implements analysis of arXiv:2111.01161) 2020/02/23: release of version 1.0.3 - fixes issue with C++98 compatibility 2018/10/29: release of version 1.0.2 2018/08/30: release of version 1.0.1 Index: contrib/contribs/LundPlane/trunk/Makefile =================================================================== --- contrib/contribs/LundPlane/trunk/Makefile (revision 1321) +++ contrib/contribs/LundPlane/trunk/Makefile (revision 1322) @@ -1,88 +1,91 @@ # If you are using this Makefile standalone and fastjet-config is not # in your path, edit this line to specify the full path FASTJETCONFIG=fastjet-config PREFIX=`$(FASTJETCONFIG) --prefix` CXX=g++ CXXFLAGS= -O3 -Wall -g install_script = $(SHELL) ../utils/install-sh check_script = ../utils/check.sh # global contrib-wide Makefile include may override some of the above # variables (leading "-" means don't give an error if you can't find # the file) -include ../.Makefile.inc #------------------------------------------------------------------------ # things that are specific to this contrib NAME=LundPlane SRCS=LundGenerator.cc LundWithSecondary.cc SecondaryLund.cc RecursiveLundEEGenerator.cc EXAMPLES=example example_secondary example_dpsi_collinear example_dpsi_slice INSTALLED_HEADERS=LundGenerator.hh LundWithSecondary.hh SecondaryLund.hh RecursiveLundEEGenerator.hh LundJSON.hh #------------------------------------------------------------------------ CXXFLAGS+= $(shell $(FASTJETCONFIG) --cxxflags) LDFLAGS += -lm $(shell $(FASTJETCONFIG) --libs) -lfastjetplugins OBJS = $(SRCS:.cc=.o) EXAMPLES_SRCS = $(EXAMPLES:=.cc) install_HEADER = $(install_script) -c -m 644 install_LIB = $(install_script) -c -m 644 install_DIR = $(install_script) -d install_DATA = $(install_script) -c -m 644 install_PROGRAM = $(install_script) -c -s install_SCRIPT = $(install_script) -c .PHONY: clean distclean examples check install # compilation of the code (default target) all: lib$(NAME).a lib$(NAME).a: $(OBJS) ar cru lib$(NAME).a $(OBJS) ranlib lib$(NAME).a # building the examples examples: $(EXAMPLES) # the following construct makes it possible to automatically build # each of the examples listed in $EXAMPLES $(EXAMPLES): % : %.o all $(CXX) $(CXXFLAGS) -o $@ $< -L. -l$(NAME) $(LDFLAGS) # check that everything went fine check: examples @for prog in $(EXAMPLES); do\ if [ "$${prog}" = "example_dpsi_collinear" ] || [ "$${prog}" = "example_dpsi_slice" ]; then \ $(check_script) $${prog} ../data/single-ee-event.dat || exit 1; \ else \ $(check_script) $${prog} ../data/single-event.dat || exit 1; \ fi; \ done @echo "All tests successful" # cleaning the directory clean: rm -f *~ *.o distclean: clean rm -f lib$(NAME).a $(EXAMPLES) # install things in PREFIX/... install: all $(install_DIR) $(PREFIX)/include/fastjet/contrib for header in $(INSTALLED_HEADERS); do\ $(install_HEADER) $$header $(PREFIX)/include/fastjet/contrib/;\ done $(install_DIR) $(PREFIX)/lib $(install_LIB) lib$(NAME).a $(PREFIX)/lib depend: makedepend -Y -- -- $(SRCS) $(EXAMPLES_SRCS) # DO NOT DELETE LundGenerator.o: LundGenerator.hh LundWithSecondary.o: LundWithSecondary.hh LundGenerator.hh SecondaryLund.hh SecondaryLund.o: SecondaryLund.hh LundGenerator.hh -example.o: LundGenerator.hh SecondaryLund.hh LundJSON.hh +RecursiveLundEEGenerator.o: RecursiveLundEEGenerator.hh EEHelpers.hh +example.o: LundGenerator.hh LundJSON.hh example_secondary.o: LundWithSecondary.hh LundGenerator.hh SecondaryLund.hh +example_dpsi_collinear.o: RecursiveLundEEGenerator.hh EEHelpers.hh +example_dpsi_slice.o: RecursiveLundEEGenerator.hh EEHelpers.hh Index: contrib/contribs/LundPlane/trunk/VERSION =================================================================== --- contrib/contribs/LundPlane/trunk/VERSION (revision 1321) +++ contrib/contribs/LundPlane/trunk/VERSION (revision 1322) @@ -1 +1 @@ -2.0.1 +2.0.2 Index: contrib/contribs/LundPlane/trunk/ChangeLog =================================================================== --- contrib/contribs/LundPlane/trunk/ChangeLog (revision 1321) +++ contrib/contribs/LundPlane/trunk/ChangeLog (revision 1322) @@ -1,74 +1,87 @@ +2022-08-20 Gavin Salam + + * VERSION: + * NEWS: + prepared for release 2.0.2 + + * Makefile: + updated some dependencies + + * EEHelpers.hh: + added #include , as per request from Andy Buckley + for compilation with g++-12 on some systems + 2021-12-06 Gavin Salam * NEWS: * VERSION: prepared for release 2.0.1 * AUTHORS: fixed missing names and publication info 2021-12-06 Gregory Soyez * SecondaryLund.cc: fixed int v. unsigned int in loop over vector indices 2021-12-06 Gavin Salam * example.py: fixed name of executable in comments about how to execute this (thanks to Matteo Cacciari) 2021-11-09 Ludovic Scyboz * VERSION: preparing for release of 2.0.0 * RecursiveLundEEGenerator.hh: * RecursiveLundEEGenerator.cc: class for recursive Lund declustering in e+e- * example_dpsi_collinear.cc: spin-sensitive collinear observable from 2103.16526 * example_dpsi_slice.cc: spin-sensitive non-global observable from 2111.01161 2020-02-23 Gavin Salam * NEWS: * VERSION: preparing for release of 1.0.3 * example.cc: changed outfile open(filename) to outfile.open(filename.c_str()); to attempt to solve issue reported by Steven Schramm. 2018-10-26 Gavin Salam * read_lund_json.py: removed extraneous normalisation of zeroth bin in the LundImage class. Added documentation. 2018-08-30 Gavin Salam * VERSION: * NEWS: Release of version 1.0.1 2018-08-23 Gavin Salam * LundWithSecondary.hh: * LundWithSecondary.cc: added secondary_index(...), removed virtual qualifier from various functions * example_secondary.cc: * example_secondary.ref: example now prints out index of the primary declustering being used for the secondary. Referemce file updated accordingly. 2018-08-09 Frédéric Dreyer First version of LundPlane.