diff --git a/RecoJets/JetProducers/interface/NjettinessAdder.h b/RecoJets/JetProducers/interface/NjettinessAdder.h index 0380b694ec118..89f7a8b350ed8 100644 --- a/RecoJets/JetProducers/interface/NjettinessAdder.h +++ b/RecoJets/JetProducers/interface/NjettinessAdder.h @@ -18,7 +18,7 @@ class NjettinessAdder : public edm::stream::EDProducer<> { enum MeasureDefinition_t { NormalizedMeasure=0, // (beta,R0) UnnormalizedMeasure, // (beta) - GeometricMeasure, // (beta) + OriginalGeometricMeasure, // (beta) NormalizedCutoffMeasure, // (beta,R0,Rcutoff) UnnormalizedCutoffMeasure, // (beta,Rcutoff) GeometricCutoffMeasure, // (beta,Rcutoff) diff --git a/RecoJets/JetProducers/plugins/NjettinessAdder.cc b/RecoJets/JetProducers/plugins/NjettinessAdder.cc index cc2eb97ab2cb9..e7b221a907824 100644 --- a/RecoJets/JetProducers/plugins/NjettinessAdder.cc +++ b/RecoJets/JetProducers/plugins/NjettinessAdder.cc @@ -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; } diff --git a/RecoJets/JetProducers/python/nJettinessAdder_cfi.py b/RecoJets/JetProducers/python/nJettinessAdder_cfi.py index 6e61b034d2a5e..b61829c6d2029 100644 --- a/RecoJets/JetProducers/python/nJettinessAdder_cfi.py +++ b/RecoJets/JetProducers/python/nJettinessAdder_cfi.py @@ -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 )