Changeset 667a02a in git for external/fastjet/contribs/Nsubjettiness/AxesDefinition.hh
- Timestamp:
- Jun 8, 2018, 3:23:13 PM (6 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- e57c062
- Parents:
- 001ee95 (diff), 17d0ab8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
external/fastjet/contribs/Nsubjettiness/AxesDefinition.hh
r001ee95 r667a02a 5 5 // Jesse Thaler, Ken Van Tilburg, Christopher K. Vermilion, and TJ Wilkason 6 6 // 7 // $Id: AxesDefinition.hh 833 2015-07-23 14:35:23Z jthaler $7 // $Id: AxesDefinition.hh 1130 2018-06-06 12:09:46Z jthaler $ 8 8 //---------------------------------------------------------------------- 9 9 // This file is part of FastJet contrib. … … 508 508 /// \brief Wrapper for jet definitions (for memory management) 509 509 /// 510 /// This class was introduced to avoid issue of a FastJet bug when using genKT clustering511 /// Now using this for all AxesDefinition with a manual recombiner to use the delete_recombiner_when_unused function510 /// This class is used by all AxesDefinition with a manual recombiner to 511 /// ensure that the delete_recombiner_when_unused function is always called 512 512 ///------------------------------------------------------------------------ 513 513 class JetDefinitionWrapper { … … 549 549 : ExclusiveJetAxes(JetDefinitionWrapper(fastjet::kt_algorithm, 550 550 fastjet::JetDefinition::max_allowable_R, //maximum jet radius constant 551 _recomb =new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper)551 new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper) 552 552 fastjet::Best).getJetDef() 553 553 ) { … … 571 571 virtual WTA_KT_Axes* create() const {return new WTA_KT_Axes(*this);} 572 572 573 private:574 const WinnerTakeAllRecombiner *_recomb; ///< Internal recombiner575 576 573 }; 577 574 … … 588 585 : ExclusiveJetAxes(JetDefinitionWrapper(fastjet::cambridge_algorithm, 589 586 fastjet::JetDefinition::max_allowable_R, //maximum jet radius constant 590 _recomb =new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper)587 new WinnerTakeAllRecombiner(), // Needs to be explicitly declared (this will be deleted by JetDefinitionWrapper) 591 588 fastjet::Best).getJetDef()) { 592 589 setNPass(NO_REFINING); … … 608 605 /// For copying purposes 609 606 virtual WTA_CA_Axes* create() const {return new WTA_CA_Axes(*this);} 610 611 private: 612 const WinnerTakeAllRecombiner *_recomb; ///< Internal recombiner 613 607 614 608 }; 615 609 … … 674 668 R0, 675 669 p, 676 _recomb =new WinnerTakeAllRecombiner()670 new WinnerTakeAllRecombiner() 677 671 ).getJetDef()), _p(p), _R0(R0) { 678 672 if (p < 0) throw Error("WTA_GenKT_Axes: Currently only p >=0 is supported."); … … 702 696 double _p; ///< genkT power 703 697 double _R0; ///< jet radius 704 const WinnerTakeAllRecombiner *_recomb; ///< Internal recombiner705 698 }; 706 699 … … 717 710 /// Constructor 718 711 GenET_GenKT_Axes(double delta, double p, double R0 = fastjet::JetDefinition::max_allowable_R) 719 : ExclusiveJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, _recomb =new GeneralEtSchemeRecombiner(delta))).getJetDef() ),712 : ExclusiveJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, new GeneralEtSchemeRecombiner(delta))).getJetDef() ), 720 713 _delta(delta), _p(p), _R0(R0) { 721 714 if (p < 0) throw Error("GenET_GenKT_Axes: Currently only p >=0 is supported."); … … 750 743 double _p; ///< GenkT power 751 744 double _R0; ///< jet radius 752 const GeneralEtSchemeRecombiner *_recomb; ///< Internal recombiner753 745 }; 754 746 … … 1201 1193 /// Constructor 1202 1194 Comb_WTA_GenKT_Axes(int nExtra, double p, double R0 = fastjet::JetDefinition::max_allowable_R) 1203 : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, _recomb =new WinnerTakeAllRecombiner())).getJetDef(), nExtra),1195 : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, new WinnerTakeAllRecombiner())).getJetDef(), nExtra), 1204 1196 _p(p), _R0(R0) { 1205 1197 if (p < 0) throw Error("Comb_WTA_GenKT_Axes: Currently only p >=0 is supported."); … … 1227 1219 double _p; ///< GenkT power 1228 1220 double _R0; ///< jet radius 1229 const WinnerTakeAllRecombiner *_recomb; ///< Internal recombiner1230 1221 }; 1231 1222 … … 1241 1232 /// Constructor 1242 1233 Comb_GenET_GenKT_Axes(int nExtra, double delta, double p, double R0 = fastjet::JetDefinition::max_allowable_R) 1243 : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, _recomb =new GeneralEtSchemeRecombiner(delta))).getJetDef(), nExtra),1234 : ExclusiveCombinatorialJetAxes((JetDefinitionWrapper(fastjet::genkt_algorithm, R0, p, new GeneralEtSchemeRecombiner(delta))).getJetDef(), nExtra), 1244 1235 _delta(delta), _p(p), _R0(R0) { 1245 1236 if (p < 0) throw Error("Comb_GenET_GenKT_Axes: Currently only p >=0 is supported."); … … 1271 1262 double _p; ///< GenkT power 1272 1263 double _R0; ///< jet radius 1273 const GeneralEtSchemeRecombiner *_recomb; ///< Internal recombiner1274 1264 }; 1275 1265
Note:
See TracChangeset
for help on using the changeset viewer.