Merge pull request cms-sw#7978 from jdolen/add-softdrop-normalization…

…-parameter Add softdrop normalization parameter
hufnagel · Mar 5, 2015 · 8782246 · 8782246
2 parents 1989a3e + b816f31
commit 8782246
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/RecoJets/Configuration/python/RecoPFJets_cff.py b/RecoJets/Configuration/python/RecoPFJets_cff.py
@@ -133,7 +133,8 @@
 
 ak8PFJetsCHSSoftDrop = ak5PFJetsCHSSoftDrop.clone(
     rParam = 0.8,
-    jetPtMin = 100.0
+    jetPtMin = 100.0,
+    R0 = 0.8
     )
 
 

diff --git a/RecoJets/JetProducers/plugins/FastjetJetProducer.cc b/RecoJets/JetProducers/plugins/FastjetJetProducer.cc
@@ -75,7 +75,8 @@ FastjetJetProducer::FastjetJetProducer(const edm::ParameterSet& iConfig)
     RcutFactor_(-1.0),
     csRho_EtaMax_(-1.0),
     csRParam_(-1.0),
-    beta_(-1.0)
+    beta_(-1.0),
+    R0_(-1.0)
 {
 
   if ( iConfig.exists("UseOnlyVertexTracks") )
@@ -142,6 +143,7 @@ FastjetJetProducer::FastjetJetProducer(const edm::ParameterSet& iConfig)
     csRho_EtaMax_ = -1.0;
     csRParam_ = -1.0;
     beta_ = -1.0;
+    R0_ = -1.0;
     useExplicitGhosts_ = true;
 
     if ( iConfig.exists("useMassDropTagger") ) {
@@ -207,6 +209,7 @@ FastjetJetProducer::FastjetJetProducer(const edm::ParameterSet& iConfig)
       useSoftDrop_ = iConfig.getParameter<bool>("useSoftDrop");
       zCut_ = iConfig.getParameter<double>("zcut");
       beta_ = iConfig.getParameter<double>("beta");
+      R0_ = iConfig.getParameter<double>("R0");
     }
 
   }
@@ -455,7 +458,7 @@ void FastjetJetProducer::runAlgorithm( edm::Event & iEvent, edm::EventSetup cons
     }
 
     if ( useSoftDrop_ ) {
-      fastjet::contrib::SoftDrop * sd = new fastjet::contrib::SoftDrop(beta_, zCut_ );
+      fastjet::contrib::SoftDrop * sd = new fastjet::contrib::SoftDrop(beta_, zCut_, R0_ );
       transformers.push_back( transformer_ptr(sd) );
     }
 

diff --git a/RecoJets/JetProducers/plugins/FastjetJetProducer.h b/RecoJets/JetProducers/plugins/FastjetJetProducer.h
@@ -96,6 +96,7 @@ class FastjetJetProducer : public VirtualJetProducer
   double csRho_EtaMax_;       /// for constituent subtraction : maximum rapidity for ghosts
   double csRParam_;           /// for constituent subtraction : R parameter for KT alg in jet median background estimator
   double beta_;               /// for soft drop : beta (angular exponent)
+  double R0_;                 /// for soft drop : R0 (angular distance normalization - should be set to jet radius in most cases)
 
 
   double subjetPtMin_;        /// for CMSBoostedTauSeedingAlgorithm : subjet pt min

diff --git a/RecoJets/JetProducers/python/ak4PFJetsSoftDrop_cfi.py b/RecoJets/JetProducers/python/ak4PFJetsSoftDrop_cfi.py
@@ -8,6 +8,7 @@
     useSoftDrop = cms.bool(True),
     zcut = cms.double(0.1),
     beta = cms.double(0.0),
+    R0   = cms.double(0.4),
     useExplicitGhosts = cms.bool(True),
     writeCompound = cms.bool(True),
     jetCollInstanceName=cms.string("SubJets")

diff --git a/RecoJets/JetProducers/python/ak5PFJetsSoftDrop_cfi.py b/RecoJets/JetProducers/python/ak5PFJetsSoftDrop_cfi.py
@@ -8,6 +8,7 @@
     useSoftDrop = cms.bool(True),
     zcut = cms.double(0.1),
     beta = cms.double(0.0),
+    R0   = cms.double(0.5),
     useExplicitGhosts = cms.bool(True),
     writeCompound = cms.bool(True),
     jetCollInstanceName=cms.string("SubJets")