Merge pull request cms-sw#15421 from cms-btv-pog/bTagHIPMitigation-PR…

…_from-CMSSW_8_1_X_2016-08-10-1100 btag HIP mitigation + ctag bugfix
lgray · Aug 30, 2016 · 7e2b68e · 7e2b68e
2 parents d5eb24d + 633bf1f
commit 7e2b68e
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 99 deletions.
diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -148,6 +148,30 @@ def miniAOD_customizeCommon(process):
     process.patJets.userData.userFunctionLabels = cms.vstring('vtxMass','vtxNtracks','vtx3DVal','vtx3DSig','vtxPx','vtxPy','vtxPz','vtxPosX','vtxPosY','vtxPosZ')
     process.patJets.tagInfoSources = cms.VInputTag(cms.InputTag("pfSecondaryVertexTagInfos"))
     process.patJets.addTagInfos = cms.bool(True)
+
+    ## Legacy tight b-tag track selection
+    ## (this will run below-specified taggers with the tight b-tag track selection enabled
+    ## and will add an extra set of b-tag discriminators to 'selectedPatJets'
+    ## with the 'tight' prefix added to the usual discriminator names)
+    from PhysicsTools.PatAlgos.tools.jetTools import updateJetCollection
+    updateJetCollection(
+        process,
+        jetSource = cms.InputTag('selectedPatJets'),
+        ## updateJetCollection defaults to MiniAOD inputs. Here, this needs to be changed to RECO/AOD inputs
+        pvSource = cms.InputTag('offlinePrimaryVertices'),
+        pfCandidates = cms.InputTag('particleFlow'),
+        svSource = cms.InputTag('inclusiveCandidateSecondaryVertices'),
+        muSource = cms.InputTag('muons'),
+        elSource = cms.InputTag('gedGsfElectrons'),
+        ##
+        jetCorrections = ('AK4PFchs', ['L1FastJet', 'L2Relative', 'L3Absolute'], ''),
+        btagDiscriminators = ["pfCombinedSecondaryVertexV2BJetTags", "pfCombinedInclusiveSecondaryVertexV2BJetTags",
+                              "pfCombinedCvsLJetTags", "pfCombinedCvsBJetTags"],
+        runIVF = True,
+        tightBTagNTkHits = True,
+        btagPrefix = 'tight',
+        postfix = 'BTAG' # added to avoid problems with unrunnable schedule
+    )
     #
     ## PU JetID
     process.load("RecoJets.JetProducers.PileupJetID_cfi")

diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedJets_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedJets_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 slimmedJets = cms.EDProducer("PATJetSlimmer",
-   src = cms.InputTag("selectedPatJets"),
+   src = cms.InputTag("selectedUpdatedPatJetsBTAG"),
    packedPFCandidates = cms.InputTag("packedPFCandidates"),
    dropJetVars = cms.string("1"),
    dropDaughters = cms.string("0"),

diff --git a/PhysicsTools/PatAlgos/python/tools/helpers.py b/PhysicsTools/PatAlgos/python/tools/helpers.py
@@ -15,13 +15,19 @@ def addESProducers(process,config):
 			if 'ESProducer' in item.type_():
 				setattr(process,name,item)
 
+def loadWithPrefix(process,moduleName,prefix=''):
+        loadWithPrePostfix(process,moduleName,prefix,'')
+
 def loadWithPostfix(process,moduleName,postfix=''):
+        loadWithPrePostfix(process,moduleName,'',postfix)
+
+def loadWithPrePostfix(process,moduleName,prefix='',postfix=''):
 	moduleName = moduleName.replace("/",".")
         module = __import__(moduleName)
 	#print module.PatAlgos.patSequences_cff.patDefaultSequence
-        extendWithPostfix(process,sys.modules[moduleName],postfix)
+        extendWithPrePostfix(process,sys.modules[moduleName],prefix,postfix)
 
-def extendWithPostfix(process,other,postfix,items=()):
+def extendWithPrePostfix(process,other,prefix,postfix,items=()):
         """Look in other and find types which we can use"""
         # enable explicit check to avoid overwriting of existing objects
         #__dict__['_Process__InExtendCall'] = True
@@ -46,26 +52,26 @@ def extendWithPostfix(process,other,postfix,items=()):
             	elif isinstance(item,cms._Labelable):
                 	if not item.hasLabel_():
                    		item.setLabel(name)
-			if postfix != '':
+			if prefix != '' or postfix != '':
 				newModule = item.clone()
 				if isinstance(item,cms.ESProducer):
 					newLabel = item.label()
 					newName =name
 				else:
 				        if 'TauDiscrimination' in name:
 				                       process.__setattr__(name,item)
-					newLabel = item.label()+postfix
-					newName = name+postfix
+					newLabel = prefix+item.label()+postfix
+					newName = prefix+name+postfix
 				process.__setattr__(newName,newModule)
 				if isinstance(newModule, cms._Sequenceable) and not newName == name:
 					sequence +=getattr(process,newName)
 					sequence._moduleLabels.append(item.label())
 			else:
 				process.__setattr__(name,item)
 
-	if postfix != '':
+	if prefix != '' or postfix != '':
 		for label in sequence._moduleLabels:
-			massSearchReplaceAnyInputTag(sequence, label, label+postfix,verbose=False,moduleLabelOnly=True)
+			massSearchReplaceAnyInputTag(sequence, label, prefix+label+postfix,verbose=False,moduleLabelOnly=True)
 
 def applyPostfix(process, label, postfix):
     result = None

diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py
diff --git a/PhysicsTools/RecoAlgos/python/btvTracks_cfi.py b/PhysicsTools/RecoAlgos/python/btvTracks_cfi.py
@@ -11,8 +11,8 @@
     maxRapidity = 9.0,
     quality = [],
     minLayer = 0,
-    minHit = 8,
-    minPixelHit = 2,
+    minHit = 0,
+    minPixelHit = 1,
     usePV = True,
 )
 

diff --git a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfos_cfi.py b/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfos_cfi.py
@@ -5,8 +5,8 @@
     computeProbabilities = cms.bool(True),
     computeGhostTrack = cms.bool(True),
     ghostTrackPriorDeltaR = cms.double(0.03),
-    minimumNumberOfPixelHits = cms.int32(2),
-    minimumNumberOfHits = cms.int32(8),
+    minimumNumberOfPixelHits = cms.int32(1),
+    minimumNumberOfHits = cms.int32(0),
     maximumTransverseImpactParameter = cms.double(0.2),
     minimumTransverseMomentum = cms.double(1.0),
     maximumChiSquared = cms.double(5.0),

diff --git a/RecoBTag/SecondaryVertex/python/secondaryVertexTagInfos_cfi.py b/RecoBTag/SecondaryVertex/python/secondaryVertexTagInfos_cfi.py
@@ -21,3 +21,6 @@
         extSVDeltaRToJet    = cms.double(0.3)
 
 )
+
+secondaryVertexTagInfos.trackSelection.pixelHitsMin = cms.uint32(2)
+secondaryVertexTagInfos.trackSelection.totalHitsMin = cms.uint32(8)
diff --git a/RecoBTag/SecondaryVertex/python/vertexTrackSelection_cff.py b/RecoBTag/SecondaryVertex/python/vertexTrackSelection_cff.py
@@ -5,10 +5,10 @@
 vertexTrackSelectionBlock = cms.PSet(
 	trackSelection = cms.PSet(
                 variableJTAPars,
-		totalHitsMin = cms.uint32(8),
+		totalHitsMin = cms.uint32(0),
 		jetDeltaRMax = cms.double(0.3),
 		qualityClass = cms.string('any'),
-		pixelHitsMin = cms.uint32(2),
+		pixelHitsMin = cms.uint32(1),
 		maxDistToAxis = cms.double(0.2),
 		maxDecayLen = cms.double(99999.9),
 		sip3dSigMin = cms.double(-99999.9),

diff --git a/RecoVertex/AdaptiveVertexFinder/python/inclusiveCandidateVertexFinder_cfi.py b/RecoVertex/AdaptiveVertexFinder/python/inclusiveCandidateVertexFinder_cfi.py
@@ -4,7 +4,7 @@
        beamSpot = cms.InputTag("offlineBeamSpot"),
        primaryVertices = cms.InputTag("offlinePrimaryVertices"),
        tracks = cms.InputTag("particleFlow"),
-       minHits = cms.uint32(8),
+       minHits = cms.uint32(0),
        maximumLongitudinalImpactParameter = cms.double(0.3),
        minPt = cms.double(0.8),
        maxNTracks = cms.uint32(30),