No OneTemporary
Actions

Size

42 KB

Subscribers

None

View Options

	Index: contrib/contribs/RecursiveTools/trunk/NEWS
	===================================================================
	--- contrib/contribs/RecursiveTools/trunk/NEWS (revision 1385)
	+++ contrib/contribs/RecursiveTools/trunk/NEWS (revision 1386)
	@@ -1,14 +1,15 @@
	+2024/02/22: release of version 2.0.2, addressing rounding issue in recursive soft drop example
	2021/08/21: release of version 2.0.1, addressing rare divide-by-zero in calculation of mu2
	2020/03/03: release of version 2.0.0 with updated readme

	2018/05/31: release of version 2.0.0-beta2 with corrected syntax

	2017/10/10: release of version 2.0.0-beta1 including implementations of

	* RecursiveSoftDrop (see example_rsd.hh for usage)
	* IteratedSoftDrop (see example_isd.hh for usage)
	* e+e- version of the recursive tools (see example_mmdt_ee.hh for usage)
	* BottomUpSoftDrop (see example_bottomup_softdrop.cc for usage)

	2014/07/09: release of version 1.0.0 of RecursiveTools including
	ModifiedMassDropTagger and SoftDrop (as well as Recluster)
	Index: contrib/contribs/RecursiveTools/trunk/Makefile
	===================================================================
	--- contrib/contribs/RecursiveTools/trunk/Makefile (revision 1385)
	+++ contrib/contribs/RecursiveTools/trunk/Makefile (revision 1386)
	@@ -1,109 +1,109 @@
	# 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=RecursiveTools
	SRCS=Recluster.cc RecursiveSymmetryCutBase.cc ModifiedMassDropTagger.cc SoftDrop.cc IteratedSoftDrop.cc RecursiveSoftDrop.cc BottomUpSoftDrop.cc
	EXAMPLES=example_mmdt example_mmdt_sub example_mmdt_ee example_recluster example_softdrop example_recursive_softdrop example_advanced_usage example_isd example_bottomup_softdrop
	INSTALLED_HEADERS=Recluster.hh RecursiveSymmetryCutBase.hh ModifiedMassDropTagger.hh SoftDrop.hh IteratedSoftDrop.hh RecursiveSoftDrop.hh BottomUpSoftDrop.hh
	#------------------------------------------------------------------------

	CXXFLAGS+= $(shell $(FASTJETCONFIG) --cxxflags)
	-LDFLAGS += -lm $(shell $(FASTJETCONFIG) --libs)
	+LDFLAGS += $(shell $(FASTJETCONFIG) --libs)

	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) -o $@ $< -L. -l$(NAME) $(LDFLAGS)

	# check that everything went fine
	check: examples
	@$(check_script) example_mmdt ../data/single-event.dat \|\| exit 1
	@$(check_script) example_mmdt_sub ../data/Pythia-Zp2jets-lhc-pileup-1ev.dat \|\| exit 1
	@$(check_script) example_mmdt_ee ../data/single-ee-event.dat \|\| exit 1
	@$(check_script) example_recluster ../data/single-event.dat \|\| exit 1
	@$(check_script) example_softdrop ../data/single-event.dat \|\| exit 1
	@$(check_script) example_advanced_usage ../data/single-event.dat \|\| exit 1
	@$(check_script) example_recursive_softdrop ../data/single-event.dat \|\| exit 1
	@$(check_script) example_bottomup_softdrop ../data/single-event.dat \|\| exit 1
	@$(check_script) example_isd ../data/single-event.dat \|\| exit 1
	# @for prog in $(EXAMPLES); do\
	# $(check_script) $${prog} ../data/single-event.dat \|\| exit 1; \
	# 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

	Recluster.o: Recluster.hh
	RecursiveSymmetryCutBase.o: RecursiveSymmetryCutBase.hh Recluster.hh
	ModifiedMassDropTagger.o: ModifiedMassDropTagger.hh
	ModifiedMassDropTagger.o: RecursiveSymmetryCutBase.hh Recluster.hh
	SoftDrop.o: SoftDrop.hh RecursiveSymmetryCutBase.hh Recluster.hh
	IteratedSoftDrop.o: IteratedSoftDrop.hh
	RecursiveSoftDrop.o: RecursiveSoftDrop.hh Recluster.hh SoftDrop.hh
	RecursiveSoftDrop.o: RecursiveSymmetryCutBase.hh
	BottomUpSoftDrop.o: BottomUpSoftDrop.hh
	example_mmdt.o: ModifiedMassDropTagger.hh RecursiveSymmetryCutBase.hh
	example_mmdt.o: Recluster.hh
	example_mmdt_sub.o: ModifiedMassDropTagger.hh RecursiveSymmetryCutBase.hh
	example_mmdt_sub.o: Recluster.hh
	example_recluster.o: Recluster.hh
	example_softdrop.o: SoftDrop.hh RecursiveSymmetryCutBase.hh Recluster.hh
	example_recursive_softdrop.o: RecursiveSoftDrop.hh Recluster.hh SoftDrop.hh
	example_recursive_softdrop.o: RecursiveSymmetryCutBase.hh
	example_bottomup_softdrop.o: BottomUpSoftDrop.hh
	example_advanced_usage.o: SoftDrop.hh RecursiveSymmetryCutBase.hh
	example_advanced_usage.o: Recluster.hh
	example_isd.o: IteratedSoftDrop.hh
	Index: contrib/contribs/RecursiveTools/trunk/VERSION
	===================================================================
	--- contrib/contribs/RecursiveTools/trunk/VERSION (revision 1385)
	+++ contrib/contribs/RecursiveTools/trunk/VERSION (revision 1386)
	@@ -1 +1 @@
	-2.0.1
	+2.0.2-beta
	Index: contrib/contribs/RecursiveTools/trunk/example_recursive_softdrop.ref
	===================================================================
	--- contrib/contribs/RecursiveTools/trunk/example_recursive_softdrop.ref (revision 1385)
	+++ contrib/contribs/RecursiveTools/trunk/example_recursive_softdrop.ref (revision 1386)
	@@ -1,83 +1,83 @@
	# read an event with 354 particles
	#--------------------------------------------------------------------------
	-# FastJet release 3.3.1-devel
	+# FastJet release 3.4.2
	# M. Cacciari, G.P. Salam and G. Soyez
	# A software package for jet finding and analysis at colliders
	# http://fastjet.fr
	#
	# Please cite EPJC72(2012)1896 [arXiv:1111.6097] if you use this package
	# for scientific work and optionally PLB641(2006)57 [hep-ph/0512210].
	#
	-# FastJet is provided without warranty under the terms of the GNU GPLv2.
	+# FastJet is provided without warranty under the GNU GPL v2 or higher.
	# It uses T. Chan's closest pair algorithm, S. Fortune's Voronoi code
	# and 3rd party plugin jet algorithms. See COPYING file for details.
	#--------------------------------------------------------------------------
	RecursiveSoftDrop groomer is: recursive application of [Recursive Groomer with a symmetry cut scalar_z > 0.2 (theta/1)^0.5 [SoftDrop], no mass-drop requirement, recursion into the subjet with larger pt], applied N=4 times, with R0 dynamically scaled

	original jet: pt = 983.387 m = 39.9912 y = -0.867307 phi = 2.90511
	RecursiveSoftDropped jet: pt = 811.261 m = 6.45947 y = -0.87094 phi = 2.9083

	Prongs with clustering information
	----------------------------------
	branch branch N_groomed max loc substructure
	pt mass loc tot zdrop zg thetag
	+--> 811.261 6.45947 13 13 0.0294298 0.154333 0.0200353
	+--> 669.635 1.98393 2 2 0
	+--> 141.627 0.765329 0 0 0 0.199906 0.00734861
	+--> 113.316 0.462946 0 0 0 0.208947 0.00550512
	\| +--> 89.6387 0.211913 0 0 0
	\| +--> 23.6769 0.13957 0 0 0
	+--> 28.3123 0.170026 0 0 0 0.248173 0.00447786
	+--> 21.286 0.13957 0 0 0
	- +--> 7.02636 -3.21461e-05 0 0 0
	+ +--> 7.02636 -3.2146e-05 0 0 0

	Prongs without clustering information
	-------------------------------------
	(Raw) list of prongs:
	pt mass
	- 0 669.635 1.98393
	- 1 89.6387 0.211913
	- 2 21.286 0.13957
	- 3 23.6769 0.13957
	- 4 7.02636 -3.21461e-05
	+ 0 669.635374 1.983927
	+ 1 89.638730 0.211913
	+ 2 21.285962 0.139570
	+ 3 23.676940 0.139570
	+ 4 7.026365 -0.000032

	Groomed prongs information:
	index zg thetag
	- 1 0.154333 0.0200353
	- 2 0.199906 0.00734861
	- 3 0.208947 0.00550512
	- 4 0.248173 0.00447786
	+ 1 0.154333 0.020035
	+ 2 0.199906 0.007349
	+ 3 0.208947 0.005505
	+ 4 0.248173 0.004478

	-original jet: pt = 908.098 m = 87.7124 y = 0.219482 phi = 6.03487
	-RecursiveSoftDropped jet: pt = 830.517 m = 4.91035 y = 0.223054 phi = 6.02995
	+original jet: pt = 908.097875 m = 87.712381 y = 0.219482 phi = 6.034867
	+RecursiveSoftDropped jet: pt = 830.517293 m = 4.910352 y = 0.223054 phi = 6.029946

	Prongs with clustering information
	----------------------------------
	branch branch N_groomed max loc substructure
	pt mass loc tot zdrop zg thetag
	- +--> 830.517 4.91035 12 13 0.0232056 0.060784 0.0153863
	- +--> 778.731 3.66481 0 1 0 0.235041 0.0101382
	- \| +--> 599.106 0.403809 1 1 0
	- \| +--> 179.628 0.853363 0 1 0 0.25773 0.00871739
	- \| +--> 131.15 0.378456 1 1 0.0606587 0.315246 0.00417298
	- \| \| +--> 89.8058 0.107191 0 0 0
	- \| \| +--> 41.3448 0.13957 0 0 0
	- \| +--> 48.4785 0.13957 0 0 0
	- +--> 51.7916 0.13957 0 0 0
	+ +--> 830.517293 4.910352 12 13 0.023206 0.060784 0.015386
	+ +--> 778.731354 3.664810 0 1 0.000000 0.235041 0.010138
	+ \| +--> 599.106323 0.403809 1 1 0.000000
	+ \| +--> 179.627749 0.853363 0 1 0.000000 0.257730 0.008717
	+ \| +--> 131.150402 0.378456 1 1 0.060659 0.315246 0.004173
	+ \| \| +--> 89.805823 0.107191 0 0 0.000000
	+ \| \| +--> 41.344752 0.139570 0 0 0.000000
	+ \| +--> 48.478456 0.139570 0 0 0.000000
	+ +--> 51.791642 0.139570 0 0 0.000000

	Prongs without clustering information
	-------------------------------------
	(Raw) list of prongs:
	pt mass
	- 0 599.106 0.403809
	- 1 51.7916 0.13957
	- 2 89.8058 0.107191
	- 3 48.4785 0.13957
	- 4 41.3448 0.13957
	+ 0 599.106323 0.403809
	+ 1 51.791642 0.139570
	+ 2 89.805823 0.107191
	+ 3 48.478456 0.139570
	+ 4 41.344752 0.139570

	Groomed prongs information:
	index zg thetag
	- 1 0.060784 0.0153863
	- 2 0.235041 0.0101382
	- 3 0.25773 0.00871739
	- 4 0.315246 0.00417298
	+ 1 0.060784 0.015386
	+ 2 0.235041 0.010138
	+ 3 0.257730 0.008717
	+ 4 0.315246 0.004173
	Index: contrib/contribs/RecursiveTools/trunk/example_recursive_softdrop.cc
	===================================================================
	--- contrib/contribs/RecursiveTools/trunk/example_recursive_softdrop.cc (revision 1385)
	+++ contrib/contribs/RecursiveTools/trunk/example_recursive_softdrop.cc (revision 1386)
	@@ -1,240 +1,240 @@
	//----------------------------------------------------------------------
	/// \file example_recursive_softdrop.cc
	///
	/// This example program is meant to illustrate how the
	/// fastjet::contrib::RecursiveSoftDrop class is used.
	///
	/// Run this example with
	///
	/// \verbatim
	/// ./example_recursive_softdrop < ../data/single-event.dat
	/// \endverbatim
	//----------------------------------------------------------------------

	// $Id$
	//
	// Copyright (c) 2017-, Gavin P. Salam, Gregory Soyez, Jesse Thaler,
	// Kevin Zhou, Frederic Dreyer
	//
	//----------------------------------------------------------------------
	// This file is part of FastJet contrib.
	//
	// It 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.
	//
	// It 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 code. If not, see <http://www.gnu.org/licenses/>.
	//----------------------------------------------------------------------

	#include <iostream>
	#include <sstream>

	#include <iomanip>
	#include <cmath>
	#include "fastjet/ClusterSequence.hh"
	#include "RecursiveSoftDrop.hh" // In external code, this should be fastjet/contrib/RecursiveSoftDrop.hh

	using namespace std;
	using namespace fastjet;

	// forward declaration to make things clearer
	void read_event(vector<PseudoJet> &event);

	void print_prongs_with_clustering_info(const PseudoJet &jet, const string &pprefix);
	void print_raw_prongs(const PseudoJet &jet);

	ostream & operator<<(ostream &, const PseudoJet &);

	//----------------------------------------------------------------------
	int main(){

	//----------------------------------------------------------
	// read in input particles
	vector<PseudoJet> event;
	read_event(event);
	cout << "# read an event with " << event.size() << " particles" << endl;

	// first get some anti-kt jets
	double R = 1.0, ptmin = 100.0;
	JetDefinition jet_def(antikt_algorithm, R);
	ClusterSequence cs(event, jet_def);
	vector<PseudoJet> jets = sorted_by_pt(cs.inclusive_jets(ptmin));

	//----------------------------------------------------------------------
	// give the soft drop groomer a short name
	// Use a symmetry cut z > z_cut R^beta
	// By default, there is no mass-drop requirement
	double z_cut = 0.2;
	double beta = 0.5;
	int n=4; // number of layers (-1 <> infinite)
	contrib::RecursiveSoftDrop rsd(beta, z_cut, n, R);

	// keep addittional structure info (used below)
	rsd.set_verbose_structure(true);

	// (optionally) use the same-depth variant
	//
	// instead of recursing into the largest Delta R branch until "n+1"
	// branches hav ebeen found, the same-depth variant recurses n times
	// into all the branches found in the previous iteration
	//
	//rsd.set_fixed_depth_mode();

	// (optionally) use a dynamical R0
	//
	// Instead of being normalised by the initial jet radios R0, angles
	// are notrmalised by the delta R of the previous iteration
	//
	rsd.set_dynamical_R0();

	// (optionally) recurse only in the hardest branch
	//
	// Instead of recursing into both branches found by the previous
	// iteration, only keep recursing into the hardest one
	//
	//rsd.set_hardest_branch_only();


	//----------------------------------------------------------------------
	cout << "RecursiveSoftDrop groomer is: " << rsd.description() << endl;

	for (unsigned ijet = 0; ijet < jets.size(); ijet++) {
	// Run SoftDrop and examine the output
	PseudoJet rsd_jet = rsd(jets[ijet]);
	cout << endl;
	cout << "original jet: " << jets[ijet] << endl;
	cout << "RecursiveSoftDropped jet: " << rsd_jet << endl;

	assert(rsd_jet != 0); //because soft drop is a groomer (not a tagger), it should always return a soft-dropped jet

	// print the prong structure of the jet
	//
	// This can be done in 2 ways:
	//
	// - either keeping the clustering information and get the
	// branches as a succession of 2->1 recombinations (this is
	// done calling "pieces" recursively)
	cout << endl
	<< "Prongs with clustering information" << endl
	<< "----------------------------------" << endl;
	print_prongs_with_clustering_info(rsd_jet, " ");
	//
	// - or getting all the branches in a single go (done directly
	// through the jet associated structure)
	cout << endl
	<< "Prongs without clustering information" << endl
	<< "-------------------------------------" << endl;
	print_raw_prongs(rsd_jet);

	cout << "Groomed prongs information:" << endl;
	cout << "index zg thetag" << endl;
	vector<pair<double, double> > ztg = rsd_jet.structure_of<contrib::RecursiveSoftDrop>().sorted_zg_and_thetag();
	for (unsigned int i=0; i<ztg.size();++i)
	cout << setw(5) << i+1
	<< setw(14) << ztg[i].first << setw(14) << ztg[i].second << endl;

	}

	return 0;
	}

	//----------------------------------------------------------------------
	// print the prongs inside the jet, showing the clustering info
	void print_prongs_with_clustering_info(const PseudoJet &jet, const string &prefix){
	if (prefix.size() == 1){
	cout << " " << setw(14) << " "
	<< setw(8) << "branch" << setw(14) << "branch"
	<< setw(10) << "N_groomed"
	<< setw(11) << "max loc"
	<< setw(22) << "substructure" << endl;
	cout << " " << setw(14) << " "
	<< setw(8) << "pt" << setw(14) << "mass"
	<< setw(5) << "loc"
	<< setw(5) << "tot"
	<< setw(11) << "zdrop"
	<< setw(11) << "zg"
	<< setw(11) << "thetag"<< endl;
	}
	const contrib::RecursiveSoftDrop::StructureType &structure = jet.structure_of<contrib::RecursiveSoftDrop>();
	double dR = structure.delta_R();
	cout << " " << left << setw(14) << (prefix.substr(0, prefix.size()-1)+"+--> ") << right
	<< setw(8) << jet.pt() << setw(14) << jet.m()
	<< setw(5) << structure.dropped_count(false)
	<< setw(5) << structure.dropped_count()
	<< setw(11) << structure.max_dropped_symmetry(false);

	if (structure.has_substructure()){
	cout << setw(11) << structure.symmetry()
	<< setw(11) << structure.delta_R();
	}
	cout << endl;

	if (dR>=0){
	vector<PseudoJet> pieces = jet.pieces();
	assert(pieces.size()==2);
	print_prongs_with_clustering_info(pieces[0], prefix+" \|");
	print_prongs_with_clustering_info(pieces[1], prefix+" ");
	}
	}

	//----------------------------------------------------------------------
	// print all the prongs inside the jet (no clustering info)
	void print_raw_prongs(const PseudoJet &jet){
	cout << "(Raw) list of prongs:" << endl;
	if (!jet.has_structure_of<contrib::RecursiveSoftDrop>()){
	cout << " None (bad structure)" << endl;
	return;
	}

	cout << setw(5) << " " << setw(11) << "pt" << setw(14) << "mass" << endl;

	vector<PseudoJet> prongs = contrib::recursive_soft_drop_prongs(jet);
	for (unsigned int iprong=0; iprong<prongs.size(); ++iprong){
	const PseudoJet & prong = prongs[iprong];
	const contrib::RecursiveSoftDrop::StructureType &structure = prong.structure_of<contrib::RecursiveSoftDrop>();
	- cout << setw(5) << iprong << setw(11) << prong.pt() << setw(14) << prong.m() << endl;
	+ cout << fixed << setw(5) << iprong << setw(11) << prong.pt() << setw(14) << prong.m() << endl;

	assert(!structure.has_substructure());
	}
	cout << endl;
	}

	//----------------------------------------------------------------------
	/// read in input particles
	void read_event(vector<PseudoJet> &event){
	string line;
	while (getline(cin, line)) {
	istringstream linestream(line);
	// take substrings to avoid problems when there are extra "pollution"
	// characters (e.g. line-feed).
	if (line.substr(0,4) == "#END") {return;}
	if (line.substr(0,1) == "#") {continue;}
	double px,py,pz,E;
	linestream >> px >> py >> pz >> E;
	PseudoJet particle(px,py,pz,E);

	// push event onto back of full_event vector
	event.push_back(particle);
	}
	}

	//----------------------------------------------------------------------
	/// overloaded jet info output
	ostream & operator<<(ostream & ostr, const PseudoJet & jet) {
	if (jet == 0) {
	ostr << " 0 ";
	} else {
	ostr << " pt = " << jet.pt()
	<< " m = " << jet.m()
	<< " y = " << jet.rap()
	<< " phi = " << jet.phi();
	}
	return ostr;
	}
	Index: contrib/contribs/RecursiveTools/trunk/ChangeLog
	===================================================================
	--- contrib/contribs/RecursiveTools/trunk/ChangeLog (revision 1385)
	+++ contrib/contribs/RecursiveTools/trunk/ChangeLog (revision 1386)
	@@ -1,705 +1,718 @@
	+2024-02-22 Jesse Thaler <jthaler@jthaler.net>
	+
	+ * Makefile
	+ Removing extraneous "-lm"
	+
	+ * NEWS:
	+ * VERSION:
	+ Changed version to 2.0.1 in preparation for release.
	+
	+ * example_recursive_softdrop.cc
	+ * example_recursive_softdrop.ref
	+ Added "fixed"
	+
	2021-08-21 Sat <gavin.salam@physics.ox.ac.uk>

	* NEWS:
	* VERSION:
	Changed version to 2.0.1 in preparation for release.

	2021-08-16 Mon <gavin.salam@physics.ox.ac.uk>

	* RecursiveSymmetryCutBase.cc:
	added fix for issue signalled by Pierre-Antoine Delsart
	(rare divide by zero in calculation of mu2; now mu2 gets set to -1
	when the parent mass is <= 0)

	2018-11-02 Jesse Thaler <jthaler@jthaler.net>

	* AUTHORS: updated journal for RecursiveSoftDrop

	2018-10-30 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc:
	fixed a few typos in comments

	* RecursiveSoftDrop.hh:
	used the native FJ Recluster tool when available (did create
	conflicts in some cases)

	2018-06-18 Jesse Thaler <jthaler@jthaler.net>

	* README
	Fixed incorrect order of zcut and beta in the README for SoftDrop example.

	2018-05-29 Jesse Thaler <jthaler@jthaler.net>

	* VERSION
	* NEWS
	Changed to 2.0.0-beta2, noted in news

	2018-04-21 Jesse Thaler <jthaler@jthaler.net>

	* AUTHORS: updated arxiv number for RecursiveSoftDrop

	2018-04-21 Gavin Salam <gavin.salam@cern.ch>

	* README: updated arxiv number for RecursiveSoftDrop & Bottom-up
	Soft Drop.

	2018-04-04 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc (contrib):
	fixed syntax of calls to structure_of<...>
	(thanks to Attila Krasznahorkay)

	2018-01-24 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc:
	for the (dafault) dynamical R0 implementation, the dynamical R0 is
	evolved independently in each branch.

	2017-10-10 Jesse Thaler <jthaler@jthaler.net>
	* AUTHORS
	Added mention of BUSD

	* README
	Some tweaks to the wording

	2017-10-11 Gregory Soyez <soyez@fastjet.fr>

	* IteratedSoftDrop.hh:
	IteratedSoftDropInfo::size() and multiplicity() now return an
	unsigned int instead of a double

	2017-10-10 Jesse Thaler <jthaler@jthaler.net>
	* AUTHORS
	Updated journal reference for ISD

	* example_isd.{cc,ref}:
	Included soft drop multiplicity in example

	* README
	Added warning at top that documentation has not been updated

	* VERSION
	Changed to 2.0.0-beta1

	2017-10-10 Gregory Soyez <soyez@fastjet.fr>

	* example_isd.ref:
	updated to reflect the bugfix below

	* IteratedSoftDrop.cc:
	fixed issue in description (was taking sqrt of -ve number when
	there were no angular cut)

	* NEWS:
	drafted for RecursiveTools-2.0.0-beta1

	* TODO:
	updated list in view of a beta release

	* example_isd.cc:
	pointed to the right header for IteratedSoftDrop

	* RecursiveSoftDrop.{hh,cc}:
	* IteratedSoftDrop.{hh,cc}:
	moved IteratedSoftDrop to its own file (replacing the old
	implementation)

	* example_advanced_usage.ref:
	updated reference file following the fix below.

	2017-09-28 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSymmetryCutBase.cc:
	when no substructure is found, keep the _symmetry, _delta_R and
	_mu structure variables at -1. This for example allows one to
	trigger on substructure by checking if delta_R>=0.

	Note: we could set it to 0 (as it was before) and trigger using
	_delta_R>0 but there might be some genuine substructure exactly
	collinear.

	2017-09-19 Gregory Soyez <soyez@fastjet.fr>

	* example_isd.ref:
	updated to the latest version of the example

	2017-09-18 Gregory Soyez <soyez@fastjet.fr>

	* Makefile:
	updating make check to use all the examples (failing on ISD as
	expected, see below)

	* example_bottomup_softdrop.cc:
	fixed typo

	* example_bottomup_softdrop.ref:
	* example_recursive_softdrop.ref:
	added reference output for this example

	* RecursiveSoftDrop.{hh,cc}:
	* RecursiveSymmetryCutBase.{cc,hh}:
	moved the "all_prongs" method from the base structure t oa
	standalone function in RecursiveSoftDrop.hh

	In practice, this is irrelevant for mMDT and SD (since pieces()
	gets the job done, and the substructure class does not have (as
	is) reliable info to get the full structure)

	* RecursiveSymmetryCutBase.cc:
	revamped a series of requests for substructure info to better
	handle possible recursion into deeper jet substructure.

	* RecursiveSoftDrop.{hh,cc}:
	updated "description" to reuse the info from the base class

	* example_isd.cc:
	updated to use the newer implementation of ISD. Checked that it
	gives the same results as the former implementation.

	Note: make check still needs fixing because the example now
	computes a different set of angularities

	* RecursiveSoftDrop.hh:
	added a few helpers to IteratedSoftDropInfo ([] operator and size,
	meaning it can be used as a vector<pair<double,double> >)

	* RecursiveSymmetryCutBase.cc:
	. fixed bugs in the calculation of the geometric distances for ee
	coordinates
	. fixed bug in the computation of the (zg,thetag) pairs [it was
	returning the groomed ones instead of the ones passing the
	condition]

	* example_recursive_softdrop.cc:
	set the R0 parameter to the original jet radius

	2017-09-13 Gregory Soyez <soyez@fastjet.fr>

	* example_recursive_softdrop.cc:
	tied up a few comments and the code output

	* RecursiveSymmetryCutBase.{hh,cc}:
	removed the unneeded _is_composite

	* RecursiveSoftDrop.cc:
	fixed issue with "verbose" dropped info on branches with no
	further substructure

	2017-09-11 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.{hh,cc}:
	have IteratedSoftDDrop returning by default an object of type
	IteratedSoftDropInfo; added several helpers

	2017-09-08 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.{hh,cc}:
	updated IteratedSoftDrop to give it the flexibility of
	RecursiveSoftDrop

	* RecursiveSymmetryCutBase.hh:
	fixed typo in comment

	* example_mmdt_ee.cc: * ADDED *
	added an example to illustrat usage in ee collisions

	* example_isd.cc:
	* BottomUpSoftDrop.cc:
	* IteratedSoftDrop.cc:
	* RecursiveSoftDrop.cc:
	Fixed compilation issues with FJ 3.0 (mostly the usage of features
	introduced only in FJ3.1)

	* RecursiveSymmetryCutBase.{hh,cc}:
	used the internal Recluster class for FJ<3.1.0 and the FJ antive
	one for FJ>=3.1.0

	* BottomUpSoftDrop.{hh,cc}:
	moved the implementation of global_grooming to the source file and
	fixed a few trivial compilation errors

	2017-09-08 Frédéric Dreyer <frederic.dreyer@gmail.com>

	* BottomUpSoftDrop.hh:
	added the global_grooming method to process full event

	2017-09-07 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc:
	cleaned (mostly by removing older commented-out code)

	* RecursiveSoftDrop.{hh,cc}:
	* RecursiveSymmetryCutBase.{hh,cc}:
	* SoftDrop.cc:

	added support for ee coordinates. For that, the symmetry measure
	has to be set to either theta_E (which uses the 3-vector angle
	theta) or to cos_theta_E which uses sqrt(2*[1-cos(theta)])

	Accordingly, the recursion_choice can be set to larger_E to
	recurse into the branch with the largest energy. The larger_m
	mode, recorsing into the larger-mass branch is also possible but
	not advised (for the same reason as the pp version).

	* RecursiveSymmetryCutBase.{hh,cc}:
	switched to the Recluster class provided with FastJet. ASlso
	included the recluster description to RecursiveSymmetryCutBase
	when it is user-defined.

	2017-09-06 Gregory Soyez <soyez@fastjet.fr>

	* BottomUpSoftDrop.{hh,cc}:
	. renamed SoftDropStructure -> BottomUpSoftDropStructure
	SoftDropRecombiner -> BottomUpSoftDropRecombiner
	SoftDropPlugin -> BottomUpSoftDropPlugin
	. moved 'description' to source file (instead of header)
	. kept the "area" information when available (jets will just
	appear as having a 0 area)
	. added most class description (main class still missing)

	* RecursiveSoftDrop.cc:
	. put internal classes to handle CS history in an internal namespace
	. replaced the "switch" in the mail loop by a series of if (allows
	us a few simplificatins/cleaning)
	. more uniform treatment of issues in the presence of an angular cut
	(as part of the above reorganisation)

	* example_advanced_usage.ref:
	updated reference output file following the bugfix (missing
	"grooming mode" initialisation in one of the SoftDrop ctors) on
	2017-08-01

	* RecursiveSymmetryCutBase.cc:
	removed redundent code

	2017-08-10 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc:
	fixed trivial typo in variable name

	>>>>>>> .r1071
	2017-08-04 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc:
	do not impose an angular cut in IterativeSD if it is -ve.

	2017-08-01 Gregory Soyez <soyez@fastjet.fr>

	* example_recursive_softdrop.cc:
	added a series of optional flags

	* RecursiveSoftDrop.cc:
	fixed a few issues with the fixed depth version

	* RecursiveSymmetryCutBase.hh:
	a jet is now considered as havig substructure if deltaR>0
	(coherent with released version)

	* SoftDrop.hh:
	bugfix: set the "grooming mode" by default in all ctors
	EDIT: caused issue with make check, fixed on 2017-09-069 (see
	above)

	* RecursiveSoftDrop.{hh,cc}:
	added support for the "same depth" variant

	* RecursiveSymmetryCutBase.cc:
	also associate a RecursiveSymmetryCutBase::StructureType structure
	to the result jet in case it is just a single particle (in
	grooming mode)

	2017-07-31 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSymmetryCutBase.{hh,cc}:
	added the option to pass an extra parameter to the symmetry cut
	function

	* RecursiveSymmetryCutBase.{hh,cc}:
	* ModifiedMassDropTagger.hh
	* SoftDrop.hh:
	minor adaptions due to the above change + added a few methods to
	query the class information (symmetry cut, beta, ...)

	* RecursiveSoftDrop.{hh,cc}:
	Added support for
	- a dynamical R0
	- recursing only in the hardest branch
	- imposing a min deltaR cut

	Added a tentative IterativeSoftDrop class

	2017-07-28 Gregory Soyez <soyez@fastjet.fr>

	* RecursiveSoftDrop.cc:
	adapted to the latest changes in RecursiveSymmetryCutBase

	* RecursiveSymmetryCutBase.{hh,cc}:
	reorganised the output of the recursion step (recurse_one_step)
	using an enum to make iot more readable (and to fix issues where
	the dropped prong is actually 0, e.g. after subtraction)

	2017-07-26 Gregory Soyez <soyez@fastjet.fr>

	* example_recursive_softdrop.cc: * ADDED *
	added a draft example for the use of RecursiveSoftDrop

	* RecursiveSoftDrop.{hh,cc}: * ADDED *
	added a first pass at an implementation of RecursiveSoftDrop.

	This is based on Frederic's initial version but keeps the
	branching structure of the jet. Some of the features, like
	dynamical R0, direct access to the substructure or the same depth
	variant, are still unsupported.

	* SoftDrop.hh:
	declared _beta, _symmetry_cut and _R0sqr as protected (was
	private) so they ca n be used by RecursiveSoftDrop

	* RecursiveSymmetryCutBase.{hh,cc}:
	extracted from result() the part that performs one step of the
	resursion (implemented as recurse_one_step()). This is repeatedly
	called by result(). It has specific conventions to indicate
	whether or not some substructure has been found or if one ran into
	some issue.

	2017-04-25 Kevin Zhou <knzhou@mit.edu>

	* IteratedSoftDrop.hh
	. Added Doxygen documentation

	* RecursiveSymmetryCutBase.hh
	. Added references to ISD

	2017-04-25 Jesse Thaler <jthaler@jthaler.net>
	* AUTHORS, COPYING:
	. Added ISD arXiv number

	* example_isd.{cc,ref}
	. Added ISD arXiv number
	. Changing z_cut to be optimal value (with Lambda = 1 GeV)
	. Tweaked formatting

	* IteratedSoftDrop.{hh,cc}
	. Added ISD arXiv number
	. Assert added if recluster does not return one jet.

	* README
	. Added ISD arXiv number and tweaked wording


	2017-04-20 Kevin Zhou <knzhou@mit.edu>

	* example_isd.{cc,ref} ADDED
	* IteratedSoftDrop.{cc,hh} ADDED

	* Makefile
	. Added IteratedSoftDrop (ISD) as appropriate

	* AUTHORS
	. Added myself to author list
	. Added placeholder for ISD paper

	* COPYING
	. Added placeholder for ISD paper

	* README
	. Added description of ISD

	* TODO
	. Added tasks to integrate ISD with other classes, e.g. SD,
	Recluster, and the future RecursiveSoftDrop (RSD)

	* NEWS
	. Added dummy for release of 1.1.0

	* VERSION:
	. Switched version number to 1.1.0-dev

	* example_advanced_usage.cc:
	. Added $Id$ tag, didn't change anything else

	2014-07-30 Gregory Soyez <soyez@fastjet.fr>

	* Recluster.hh: fixed the name of the #define for the header

	2014-07-09 Gregory Soyez <soyez@fastjet.fr> + Jesse

	* NEWS:
	release of RecursiveTools v1.0.0

	* VERSION:
	switched version number to 1.0.0

	2014-07-08 Gavin Salam <gavin.salam@cern.ch>

	* README (RecursionChoice):
	added ref to .hh for constness specs of virtual functions (to
	reduce risk of failed overloading due to wrong constness).

	2014-07-08 Gregory Soyez <soyez@fastjet.fr> + Jesse

	* README:
	partially rewrote the description of set_subtractor

	2014-07-07 Gregory Soyez <soyez@fastjet.fr> + Jesse

	* example_advanced_usage.cc:
	* example_softdrop.cc:
	a few small fixed in the header of the files

	* VERSION:
	switched over to 1.0.0-alpha2-devel

	* README:
	Reordered a few things and added a few details.

	* Makefile (check):
	Be quiter during "make check"

	* Recluster.cc (contrib):
	Documented the "single" ctor argument

	* RecursiveSymmetryCutBase.cc (contrib):
	If the user sets himself the reclustering, disable the "non-CA"
	warning (we assume that he knows what he is doing). Mentioned in
	the comments that non-CA reclustering has to be used at the user's
	risk. Also throw when th input jet has no constituents or when
	there is no cluster sequence after reclustering.

	* Recluster.cc (contrib):
	replaced a remaining mention to "filtering" by reclustering

	2014-07-04 Jesse Thaler <jthaler@jthaler.net>
	* VERSION
	. Ready for alpha release

	2014-06-17 Jesse Thaler <jthaler@jthaler.net>
	* example_advanced_usage.{cc,ref} ADDED
	* Makefile
	. New example file to test a bunch of soft drop options
	. Put in makefile as well
	. Fixed nasty memory bug with pointers to Recluster

	* RecursiveSymmetryCutBase.cc
	* example_softdrop.ref
	. description() now says Groomer vs. Tagger

	* RecursiveSymmetryCutBase.{cc,hh}
	. Added optional verbose logging information about
	kinematics of dropped branches

	* example_softdrop.cc
	* example_advanced_usage.cc
	. Fixed


	2014-06-16 Gregory Soyez <soyez@fastjet.fr>

	* Makefile:
	also install the RecursiveSymmetryuCutBase.hh header

	2014-06-13 Jesse Thaler <jthaler@jthaler.net>
	* AUTHORS
	. Added myself to author list
	. Put complete bibliographic details on papers

	* COPYING
	. Added boilerplate MC/GPLv2 statement

	* example.cc: REMOVED renamed to...
	* example_mmdt.cc ADDED
	* Makefile
	. Made name change for consistency
	. Made corresponding changes in Makefile

	* example_mmdt_sub.cc:
	* example_mmdt.cc:
	* example_recluster.cc:
	. light editing of comments

	* example_softdrop.cc:
	. light editing of comments
	. added assert for sdjet != 0, since SoftDrop is a groomer

	* ModifiedMassDropTagger.hh
	* Recluster.{cc,hh}
	* RecursiveSymmetryCutBase.{cc,hh}
	* SoftDrop.hh
	. Updated some comments

	* README
	. Updated to include basic usage description and some
	technical details

	* TODO:
	. Added some discussion points.

	2014-06-13 Gregory Soyez <soyez@fastjet.fr>

	* example_softdrop.{cc,ref}:
	added an example for SoftDrop

	* SoftDrop.{hh,cc}:
	* ModifiedMassDropTagger.{hh,cc}:
	* RecursiveSymmetryCutBase.{hh,cc}: * ADDED *
	. added a base class for both the mMDT and SoftDrop
	. made mMDT and SoftDrop inherit from RecursiveSymmetryCutBase
	. moved the reclustering to the base class. By default, both
	mMDT and SoftDrop now recluster the jet with C/A
	. added set_grooming_mode and set_tagging_mode methods to the
	base class

	* Merging the development branch 1.0-beta1-softdrop-addition back
	into the trunk (will correspond to revision 682)

	* VERSION:
	switched back to 1.0.0-devel

	* SoftDrop.{hh,cc}:
	added support for re-clustering through set_reclustering(bool,
	Recluster*). By default, reclustering is done with
	Cambridge/Aachen.

	* example_recluster.{cc,ref}: * ADDED *
	added an example of reclustering

	* Recluster.{hh,cc}:
	added a 'single' ctor argument [true by default]. When true, the
	hardest jet after reclustering is returned, otherwise, the result
	is a composite jet with all the subjets as its pieces.

	2014-05-15 Gregory Soyez <soyez@fastjet.fr>

	* VERSION:
	set version number to 1.0-alpha-PUWS14.1 in preparation for a
	fastjet-contrib release for the pileup-workshop at CERN on May
	2014.

	2014-04-25 Gregory Soyez <soyez@fastjet.fr>

	* ModifiedMassDropTagger.hh:
	* ModifiedMassDropTagger.cc:
	Added comments at various places

	* AUTHORS:
	* README:
	Updated info about what is now included in this contrib

	* SoftDrop.hh: * ADDED *
	* SoftDrop.cc: * ADDED *
	* Recluster.hh: * ADDED *
	* Recluster.cc; * ADDED *
	Added tools for reclustering and softDrop

	2014-04-25 Gregory Soyez <soyez@fastjet.fr>

	branch started at revision 611 to start including SoftDrop in the
	Recursivetols contrib

	2014-04-24 Gregory Soyez <soyez@fastjet.fr>

	* ModifiedMassDropTagger.hh:
	added a mention of the fact that when result is called in the
	presence of a subtractor, then the output is a subtracted
	PseudoJet.

	* ModifiedMassDropTagger.hh:
	declared _symmetry_cut as protected (rather than provate) so it
	can be accessed if symmetry_cut_description() is overloaded.

	* example.cc:
	trivial typo fixed in a comment

	2014-02-04 Gavin Salam <gavin.salam@cern.ch>

	* VERSION:
	upped it to 1.0-beta1

	* example_mmdt_sub.cc (main):
	added an #if to make sure FJ3.1 features are only used if FJ3.1
	is available. (Currently FJ3.1 is only available to FJ developers).

	2014-01-26 Gavin Salam <gavin.salam@cern.ch>

	* VERSION:
	renamed to 1.0-beta0

	* ModifiedMassDropTagger.hh:
	* README:
	added info on author names

	* example_mmdt_sub.ref: * ADDED *
	added reference output for the pileup test.

	2014-01-25 Gavin Salam <gavin.salam@cern.ch>

	* example_mmdt_sub.cc:
	* Makefile:
	added an extra example illustrating functionality with pileup
	subtraction.

	2014-01-24 Gavin Salam <gavin.salam@cern.ch>

	* ModifiedMassDropTagger.cc:

	Reorganised code so that (sub)jet.m2()>0 check is only used when
	absolutely necessary: so if using a scalar_z symmetry measure,
	whenever scalar_z < zcut, then there is no point checking the mu
	condition. This means that there's no issue if the (sub)jet mass
	is negative, and one simply recurses down into the jet. (Whereas
	before it would bail out, reducing the tagging efficiency).

	Also removed the verbose code.

	2014-01-23 Gavin Salam <gavin.salam@cern.ch>

	* ModifiedMassDropTagger.cc\|hh:
	* example.cc
	replaced "asymmetry" with "symmetry" in a number of places;
	implemented the structural information and added it to the example;
	added a new simplified constructor;
	improved doxygen documentation;
	started renaming -> RecursiveTools

	* README
	some tidying

	* VERSION
	1.0-b0

	2014-01-22 Gavin Salam <gavin.salam@cern.ch>

	* ModifiedMassDropTagger.cc (contrib):
	-ve mass now bails out also when using the "y" asymmetry measure.
	Also, default my is now infinite.

	2014-01-20 Gavin Salam <gavin.salam@cern.ch> + Gregory


	* ModifiedMassDropTagger.cc\|hh:
	introduced a virtual asymmetry_cut_fn (essentially a
	dummy function returning a constant), to allow for derived classes
	to do fancier things.

	added warning about non-C/A clustering.
	explicitly labelled some (inherited) virtual functions as
	virtual.

	2014-01-20 Gavin Salam <gavin.salam@cern.ch>

	* example.ref:
	* example.cc (main):
	got a first working example and make check setup.

	* ModifiedMassDropTagger.cc\|hh:
	improved doxygen comments;
	added option whereby input jet is assumed already subtracted

	2014-01-19 Gavin Salam <gavin.salam@cern.ch>

	* ModifiedMassDropTagger.cc\|hh:
	* many other files

	Initial creation, with basic code for MMDT

File Metadata

Mime Type: text/x-diff
Expires: Tue, Nov 19, 5:46 PM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3805447
Default Alt Text: (42 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions