Merge pull request #6817 from ahinzmann/FixSoftdrop

Add subjets to softdrop
cms-sw · Dec 10, 2014 · 8a0d657 · 8a0d657
2 parents 34aef42 + 5c83701
commit 8a0d657
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/DQM/Physics/src/B2GDQM.cc b/DQM/Physics/src/B2GDQM.cc
@@ -382,7 +382,7 @@ void B2GDQM::analyzeJets(const Event& iEvent, const edm::EventSetup& iSetup) {
           }
 
           // For W-tagging, check the mass drop
-        } else if (jetLabels_[icoll].label() == "ak8PFJetsCHSPruned") {
+        } else if ((jetLabels_[icoll].label() == "ak8PFJetsCHSPruned")||(jetLabels_[icoll].label() == "ak8PFJetsCHSSoftdrop")) {
           if (jet->numberOfDaughters() > 1) {
             reco::Candidate const* da0 = jet->daughter(0);
             reco::Candidate const* da1 = jet->daughter(1);

diff --git a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py
@@ -63,7 +63,6 @@
                                            'keep *_ak4PFJetsCHS_*_*',
                                            'keep *_ak5PFJetsCHS_*_*',
                                            'keep *_ak8PFJetsCHS_*_*',
-                                           'keep *_ak8PFJetsCHS_*_*',
                                            'keep *_ak8PFJetsCHSPruned_*_*',                                           
                                            'keep *_ak8PFJetsCHSSoftDrop_*_*',                                           
                                            'keep *_cmsTopTagPFJetsCHS_*_*',

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