Skip to content
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.

Sign up for GitHub

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

Updating to latest fastjet contrib Nsubjettiness #11791

Merged
merged 2 commits into from
Dec 10, 2015
Merged

Updating to latest fastjet contrib Nsubjettiness #11791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22eecfd
Updating to latest fastjet contrib Nsubjettiness
rappoccio Oct 14, 2015
31a54c1
For some reason njettiness now checks the sign of the default values
rappoccio Nov 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RecoJets/JetProducers/interface/NjettinessAdder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class NjettinessAdder : public edm::one::EDProducer<> {
enum MeasureDefinition_t {
NormalizedMeasure=0, // (beta,R0)
UnnormalizedMeasure, // (beta)
GeometricMeasure, // (beta)
OriginalGeometricMeasure, // (beta)
NormalizedCutoffMeasure, // (beta,R0,Rcutoff)
UnnormalizedCutoffMeasure, // (beta,Rcutoff)
GeometricCutoffMeasure, // (beta,Rcutoff)
Expand Down
8 changes: 4 additions & 4 deletions RecoJets/JetProducers/plugins/NjettinessAdder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ NjettinessAdder::NjettinessAdder(const edm::ParameterSet& iConfig) :
// Get the measure definition
fastjet::contrib::NormalizedMeasure normalizedMeasure (beta_,R0_);
fastjet::contrib::UnnormalizedMeasure unnormalizedMeasure (beta_);
fastjet::contrib::GeometricMeasure geometricMeasure (beta_);
fastjet::contrib::OriginalGeometricMeasure geometricMeasure (beta_);// changed in 1.020
fastjet::contrib::NormalizedCutoffMeasure normalizedCutoffMeasure (beta_,R0_,Rcutoff_);
fastjet::contrib::UnnormalizedCutoffMeasure unnormalizedCutoffMeasure(beta_,Rcutoff_);
fastjet::contrib::GeometricCutoffMeasure geometricCutoffMeasure (beta_,Rcutoff_);
//fastjet::contrib::GeometricCutoffMeasure geometricCutoffMeasure (beta_,Rcutoff_); // removed in 1.020

fastjet::contrib::MeasureDefinition const * measureDef = 0;
switch ( measureDefinition_ ) {
case UnnormalizedMeasure : measureDef = &unnormalizedMeasure; break;
case GeometricMeasure : measureDef = &geometricMeasure; break;
case OriginalGeometricMeasure : measureDef = &geometricMeasure; break;// changed in 1.020
case NormalizedCutoffMeasure : measureDef = &normalizedCutoffMeasure; break;
case UnnormalizedCutoffMeasure : measureDef = &unnormalizedCutoffMeasure; break;
case GeometricCutoffMeasure : measureDef = &geometricCutoffMeasure; break;
//case GeometricCutoffMeasure : measureDef = &geometricCutoffMeasure; break; // removed in 1.020
case NormalizedMeasure : default : measureDef = &normalizedMeasure; break;
}

Expand Down
6 changes: 3 additions & 3 deletions RecoJets/JetProducers/python/nJettinessAdder_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
measureDefinition = cms.uint32( 0 ), # CMS default is normalized measure
beta = cms.double(1.0), # CMS default is 1
R0 = cms.double( 0.8 ), # CMS default is jet cone size
Rcutoff = cms.double( -999.0), # not used by default
Rcutoff = cms.double( 999.0), # not used by default
# variables for axes definition :
axesDefinition = cms.uint32( 6 ), # CMS default is 1-pass KT axes
nPass = cms.int32(-999), # not used by default
akAxesR0 = cms.double(-999.0) # not used by default
nPass = cms.int32(999), # not used by default
akAxesR0 = cms.double(999.0) # not used by default
)