Merge pull request #9039 from yslai/voronoi_subtract_negative

Switch Voronoi subtraction from equalization based recovery of negative fluctuation to ghost-particle based clustering and energy resumming
cms-sw · May 21, 2015 · e929f44 · e929f44
2 parents d8b6243 + f5bf763
commit e929f44
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/RecoHI/HiJetAlgos/interface/VoronoiSubtractor.h b/RecoHI/HiJetAlgos/interface/VoronoiSubtractor.h
@@ -25,6 +25,7 @@ class VoronoiSubtractor : public PileUpSubtractor {
     edm::EDGetTokenT<edm::ValueMap<reco::VoronoiBackground> > srcVor_;
     std::vector<int> droppedCandidates_;
     bool dropZeroTowers_;
+    bool addNegative_;
     bool addNegativesFromCone_;
     double infinitesimalPt_; 
     double rParam_;

diff --git a/RecoHI/HiJetAlgos/python/HiCaloJetParameters_cff.py b/RecoHI/HiJetAlgos/python/HiCaloJetParameters_cff.py
@@ -21,6 +21,7 @@
     puWidth = cms.double(0.8),
     nExclude = cms.uint32(2),
     dropZeros = cms.bool(True),
+    addNegative = cms.bool(True),
     addNegativesFromCone = cms.bool(False),
     infinitesimalPt = cms.double(0.005)
 )

diff --git a/RecoHI/HiJetAlgos/python/HiPFJetParameters_cff.py b/RecoHI/HiJetAlgos/python/HiPFJetParameters_cff.py
@@ -21,6 +21,7 @@
     puWidth = cms.double(0.8),
     nExclude = cms.uint32(2),
     dropZeros = cms.bool(True),
+    addNegative = cms.bool(True),
     addNegativesFromCone = cms.bool(False),
     infinitesimalPt = cms.double(0.005)    
 )

diff --git a/RecoHI/HiJetAlgos/python/HiRecoJets_cff.py b/RecoHI/HiJetAlgos/python/HiRecoJets_cff.py
@@ -25,7 +25,7 @@
 voronoiBackgroundCalo = cms.EDProducer('VoronoiBackgroundProducer',
                                        src = cms.InputTag('towerMaker'),
                                        tableLabel = cms.string("UETable_Calo"),
-                                       doEqualize = cms.bool(True),
+                                       doEqualize = cms.bool(False),
                                        equalizeThreshold0 = cms.double(5.0),
                                        equalizeThreshold1 = cms.double(35.0),
                                        equalizeR = cms.double(0.4),

diff --git a/RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py b/RecoHI/HiJetAlgos/python/HiRecoPFJets_cff.py
@@ -14,7 +14,7 @@
 voronoiBackgroundPF = cms.EDProducer('VoronoiBackgroundProducer',
                                      src = cms.InputTag('particleFlowTmp'),
                                      tableLabel = cms.string("UETable_PF"),
-                                     doEqualize = cms.bool(True),
+                                     doEqualize = cms.bool(False),
                                      equalizeThreshold0 = cms.double(5.0),
                                      equalizeThreshold1 = cms.double(35.0),
                                      equalizeR = cms.double(0.3),

diff --git a/RecoHI/HiJetAlgos/src/VoronoiSubtractor.cc b/RecoHI/HiJetAlgos/src/VoronoiSubtractor.cc
@@ -15,6 +15,7 @@ VoronoiSubtractor::VoronoiSubtractor(const edm::ParameterSet& iConfig, edm::Cons
   srcCand_(iC.consumes<reco::CandidateView>(iConfig.getParameter<edm::InputTag>("src"))),
   srcVor_(iC.consumes<edm::ValueMap<reco::VoronoiBackground> >(iConfig.getParameter<edm::InputTag>("bkg"))), 
   dropZeroTowers_(iConfig.getParameter<bool>("dropZeros")),
+  addNegative_(iConfig.getParameter<bool>("addNegative")),
   addNegativesFromCone_(iConfig.getParameter<bool>("addNegativesFromCone")),
   infinitesimalPt_(iConfig.getParameter<double>("infinitesimalPt")),
   rParam_(iConfig.getParameter<double>("rParam"))
@@ -68,8 +69,8 @@ void VoronoiSubtractor::offsetCorrectJets()
 	fastjet::PseudoJet candidate(ref->px(),ref->py(),ref->pz(),ref->energy());
 	double orpt = candidate.perp();
 	unsubtracted += candidate;
-	if(voronoi.pt() > 0){
-	  candidate.reset_PtYPhiM(voronoi.pt(),ref->rapidity(),ref->phi(),ref->mass());
+	if(addNegative_ || voronoi.pt() > 0){
+	  candidate.reset_PtYPhiM(addNegative_ ? voronoi.pt_subtracted() : voronoi.pt(),ref->rapidity(),ref->phi(),ref->mass());
 	  LogDebug("VoronoiSubtractor")<<"candidate "<<index
 				       <<" --- original pt : "<<orpt
 				       <<" ---  voronoi pt : "<<voronoi.pt()