New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding substructure variables #10
Conversation
*DONE - Currently adding option to name the output collection from the steering file |
include/FastJetTopTagger.h
Outdated
@@ -17,15 +17,37 @@ | |||
#include <IMPL/LCCollectionVec.h> | |||
#include <EVENT/ReconstructedParticle.h> | |||
#include "IMPL/LCCollectionVec.h" | |||
#include <IMPL/ReconstructedParticleImpl.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please sort the includes. LCCollectionVec.h
is already there, twice. (please remove the one with quotes)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
src/FastJetTopTagger.cpp
Outdated
|
||
//Substructure parameters | ||
registerProcessorParameter("beta", | ||
"Beta is called angular exponent and weights the angular distances between the jet constituents compated to their pt in the calculation of the energy correlation function and subjettiness.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
compated --> compared?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
src/FastJetTopTagger.cpp
Outdated
double tau2 = nSubJettiness2(*it); lcgSubStructureTau2->setDoubleVal(index, tau2); | ||
double tau3 = nSubJettiness3(*it); lcgSubStructureTau3->setDoubleVal(index, tau3); | ||
|
||
//John-Hopkins top tagger |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Johns-Hopkins
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
src/FastJetTopTagger.cpp
Outdated
@@ -286,6 +362,22 @@ void FastJetTopTagger::processEvent(LCEvent * evt){ | |||
|
|||
} //end processEvent | |||
|
|||
double FastJetTopTagger::getECF(PseudoJet& jet, int whichECF, double beta, std::string energyCorrelator){ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pass the energyCorrelator
as constant reference (std::string const& energ...
), to avoid making copies of the object every time the function is called.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
include/FastJetTopTagger.h
Outdated
#include "fastjet/contrib/EnergyCorrelator.hh" | ||
|
||
#include <iomanip> | ||
#include <stdlib.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you need all these includes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, cleaned up
src/FastJetTopTagger.cpp
Outdated
if(!jet.has_constituents()) | ||
return -1.0; | ||
|
||
EnergyCorrelator ECF(whichECF, beta, _energyCorrMap[energyCorrelator]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The objects can be instantiated once, and then used, instead of creating one every time the function is called
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
include/FastJetTopTagger.h
Outdated
|
||
//Forward declaration | ||
using namespace fastjet; | ||
using namespace fastjet::contrib; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove using namespace from header file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
|
@lstroem @andresailer Hi, this breaks our nightly builds with:
Which version and configuration of fastjet is required for this to work ? |
This was tested in the CI with 3.2.1 |
Hi Frank,
I was using:
/cvmfs/clicdp.cern.ch/software/FastJet/3.2.1/x86_64-slc6-gcc62-opt
from
/cvmfs/clicdp.cern.ch/iLCSoft/builds/2017-05-30/x86_64-slc6-gcc62-opt/init_ilcsoft.sh
/Rickard
… On 22 May 2018, at 11:09, Frank Gaede ***@***.***> wrote:
@lstroem <https://github.com/lstroem> @andresailer <https://github.com/andresailer> Hi, this breaks our nightly builds with:
[ 75%] Building CXX object CMakeFiles/MarlinFastJet.dir/src/FastJetTopTagger.cpp.o
In file included from /scratch/nbuilds/gcc49/2018-05-21/MarlinFastJet/HEAD/src/FastJetTopTagger.cpp:13:0:
/scratch/nbuilds/gcc49/2018-05-21/MarlinFastJet/HEAD/./include/VLCAxes.h:3:45: fatal error: fastjet/contrib/AxesDefinition.hh: No such file or directory
#include <fastjet/contrib/AxesDefinition.hh>
Which version and configuration of fastjet is required for this to work ?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub <#10 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AUr0FOQB5iblhzAHTS4Rxhh1-D7pOAyVks5t09XlgaJpZM4TytQ5>.
|
As this is a contrib thing, did you build FastJetContrib with Nsubjettiness? |
I don't know - we built it with the standard ilcsoft install script and:
Which script did you use to build it ? |
I think contrib 1.017 is too old (released 2015-05-05), and approx 3 year ago this was added to Nsubjettiness https://fastjet.hepforge.org/trac/browser/contrib/contribs/Nsubjettiness/trunk Why are you mixing fastjet 3.2.0 (released 2016-03-17) with fastjet-contrib 1.017(released 2015-05-05)? Did you maybe forget to bump the contrib version when updating the fastjet version? As 3.2.0 would go with 1.022 (which has AxesDefinition.hh). We don't use iLCSoft to install external packages, they are provided independently. |
Indeed, this is a bug in our script - in the versions file we have:
but then ignore the contrib version... |
Indeed there is no "valid" pairing of the two, the releases are usually "quite" together 3.2.0 17 March 2016 but then patches are fairly random. We use 3.2.1+1.025 since the release is from 11/2016. |
Ok, thanks. Will then also use 3.2.1+1.025, to be compatible (and rely on the testing you've already done with this). |
BEGINRELEASENOTES
ENDRELEASENOTES