Merge remote branch 'origin/CMSSW_7_6_X_V2' into CMSSW_7_6_X_V2

Author: dmajumder

python/b2gedmntuples_cff.py

@@ -1172,13 +1172,14 @@
 jetsAK8Puppi.src = cms.InputTag( 'boostedJetUserDataAK8Puppi' )
 jetKeysAK8Puppi = jetKeysAK8CHS.clone( jetLabel = 'boostedJetUserDataAK8Puppi' )
 
-###subjetsAK8 with CHS
-subjetsAK8CHS = copy.deepcopy(basic)
-subjetsAK8CHS.variables += jetVars
-subjetsAK8CHS.variables += jetToolboxAK8SubjetVars
-subjetsAK8CHS.prefix = cms.untracked.string("subjetAK8CHS")
-subjetsAK8CHS.src = cms.InputTag("selectedPatJetsAK8PFCHSSoftDropPacked", "SubJets")
-subjetKeysAK8CHS = copy.deepcopy( jetKeys )
+
+###subjetsAK8 with CHS		
+subjetsAK8CHS = copy.deepcopy(basic)		
+subjetsAK8CHS.variables += jetVars		
+subjetsAK8CHS.variables += jetToolboxAK8SubjetVars		
+subjetsAK8CHS.prefix = cms.untracked.string("subjetAK8CHS")		
+subjetsAK8CHS.src = cms.InputTag("selectedPatJetsAK8PFCHSSoftDropPacked", "SubJets")		
+subjetKeysAK8CHS = copy.deepcopy( jetKeys )		
 subjetKeysAK8CHS.jetLabel = cms.InputTag("selectedPatJetsAK8PFCHSSoftDropPacked", "SubJets")
 
 ###subjetsAK8Puppi
@@ -1188,7 +1189,7 @@
 subjetsAK8Puppi.prefix = cms.untracked.string("subjetAK8Puppi")
 subjetsAK8Puppi.src = cms.InputTag("selectedPatJetsAK8PFPuppiSoftDropPacked", "SubJets")
 subjetKeysAK8Puppi = copy.deepcopy( jetKeys )
-subjetKeysAK8Puppi = subjetKeysAK8CHS.clone( jetLabel = cms.InputTag('selectedPatJetsAK8PFPuppiSoftDropPacked', "SubJets") )
+subjetKeysAK8Puppi.jetLabel = cms.InputTag('selectedPatJetsAK8PFPuppiSoftDropPacked', "SubJets")
 
 
 ###genPart
@@ -1207,6 +1208,12 @@
 genJetsAK8SoftDrop.prefix = cms.untracked.string("genJetsAK8SoftDrop")
 genJetsAK8SoftDrop.src = cms.InputTag("ak8GenJetsNoNuSoftDrop")
 
+###genJetsAK8 subjets
+genJetsAK8SoftDropSubjets = copy.deepcopy(basic)
+genJetsAK8SoftDropSubjets.prefix = cms.untracked.string("genJetsAK8SoftDropSubJets")
+genJetsAK8SoftDropSubjets.src = cms.InputTag("ak8GenJetsNoNuSoftDrop", "SubJets")
+
+
 ###event variables
 eventShapeVar = (
     cms.PSet(

test/b2gedmntuples_cfg.py

@@ -680,7 +680,7 @@
       'keep *_generator_*_*',
       "keep *_genPart_*_*",
       "keep *_genJetsAK8*_*_*",
-      "keep *_genJetsAK8SoftDrop*_*_*",
+      "keep *_genJetsAK8SoftDrop*_*_*",      
       "keep LHEEventProduct_*_*_*",
       "keep LHERunInfoProduct_*_*_*"
       )