Merge pull request #963 from ktf/fix-892-conflict

Reco updates -- Backport btagging changes to 62X.

.gitignore

@@ -1,2 +1,3 @@
-__init__.py
+__init__.*
 *.pyc
+*.log

FastSimulation/Configuration/python/FamosSequences_cff.py

@@ -65,14 +65,24 @@
 from RecoMET.Configuration.RecoMET_cff import *
 metreco.remove(BeamHaloId)
 
-caloJetMet = cms.Sequence(
+caloJets = cms.Sequence(
     recoJets+
     recoJetIds+
-    recoTrackJets+
-    recoJetAssociations+recoJPTJets+
-    metreco
+    recoTrackJets
 )
 
+jetTrackAssoc = cms.Sequence (
+    recoJetAssociations
+    )
+
+jetPlusTracks = cms.Sequence(
+    recoJPTJets
+    )
+
+metReco = cms.Sequence(
+    metreco
+    )
+
 
 
 # Gen Jets
@@ -250,7 +260,6 @@
 
 # B tagging
 from RecoJets.JetAssociationProducers.ak5JTA_cff import *
-ak5JetTracksAssociatorAtVertex.tracks = 'generalTracks'
 from RecoVertex.Configuration.RecoVertex_cff import *
 from RecoVertex.BeamSpotProducer.BeamSpot_cff import *
 from RecoBTag.Configuration.RecoBTag_cff import *
@@ -412,10 +421,11 @@
         muonshighlevelreco+
         particleFlowLinks+
         caloJetMetGen+
-        caloJetMet+
+        caloJets+
         PFJetMet+
-        ic5JetTracksAssociatorAtVertex+
-        ak5JetTracksAssociatorAtVertex+
+        jetTrackAssoc+
+        recoJPTJets+
+        metreco+
         reducedRecHits+
         famosBTaggingSequence+
         famosPFTauTaggingSequence
@@ -438,10 +448,11 @@
         muonshighlevelreco+
         particleFlowLinks+
         caloJetMetGen+
-        caloJetMet+
+        caloJets+
         PFJetMet+
-        ic5JetTracksAssociatorAtVertex+
-        ak5JetTracksAssociatorAtVertex+
+        jetTrackAssoc+
+        recoJPTJets+
+        metreco+
         reducedRecHits+
         famosBTaggingSequence+
         famosPFTauTaggingSequence
@@ -475,10 +486,11 @@
     muonshighlevelreco+
     particleFlowLinks+
     caloJetMetGen+
-    caloJetMet+
+    caloJets+
     PFJetMet+
-    ic5JetTracksAssociatorAtVertex+
-    ak5JetTracksAssociatorAtVertex+
+    jetTrackAssoc+
+    recoJPTJets+
+    metreco+
     reducedRecHits+
     famosBTaggingSequence+
     famosPFTauTaggingSequence
@@ -570,7 +582,8 @@
     famosWithTracksAndCaloTowers+
     vertexreco+
     caloJetMetGen+
-    caloJetMet
+    caloJets+
+    metreco
 )
 
 ### Standard Jets _cannot_ be done without many other things...
@@ -586,7 +599,8 @@
     famosParticleFlowSequence+
     gsfElectronSequence+	
     caloJetMetGen+
-    caloJetMet
+    caloJets+
+    metreco
 )
 
 famosWithCaloTowersAndParticleFlow = cms.Sequence(
@@ -630,8 +644,10 @@
 famosWithBTagging = cms.Sequence(
     famosWithTracksAndCaloTowers+
     vertexreco+
-    ak5CaloJets+
-    ak5JetTracksAssociatorAtVertex+
+    ak5PFJetsCHS+
+    PFJetMet+
+    jetTrackAssoc+
+    metreco+
     ecalClustersNoPFBox+
     famosMuonSequence+
     reducedRecHits+ 
@@ -675,10 +691,12 @@
     egammaHighLevelRecoPostPF+
     muonshighlevelreco+
     caloJetMetGen+
-    caloJetMet+
+    caloJets+
+    metreco+
     PFJetMet+
-    ic5JetTracksAssociatorAtVertex+
-    ak5JetTracksAssociatorAtVertex+
+    jetTrackAssoc+
+    recoJPTJets+
+    metreco+
     reducedRecHits+
     famosBTaggingSequence+
     famosPFTauTaggingSequence

PhysicsTools/PatAlgos/test/patTuple_addBTagging_cfg.py

@@ -6,10 +6,22 @@
 ## to run in un-scheduled mode uncomment the following lines
 process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
 process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
-from PhysicsTools.PatAlgos.tools.metTools import addMETCollection
 
-addMETCollection(process, labelName='patMETTC', metSource='tcMet')
-addMETCollection(process, labelName='patMETPF', metSource='pfType1CorrectedMet')
+# FIXME BEGIN: needed as long as new input not available in input RelVals
+process.load("RecoJets.JetAssociationProducers.ak5JTA_cff")
+process.load("RecoJets.JetAssociationProducers.ak7JTA_cff")
+process.patJets.discriminatorSources = cms.VInputTag(
+        cms.InputTag("jetBProbabilityBJetTags::RECO"),
+        cms.InputTag("jetProbabilityBJetTags::RECO"),
+        cms.InputTag("trackCountingHighPurBJetTags::RECO"),
+        cms.InputTag("trackCountingHighEffBJetTags::RECO"),
+        cms.InputTag("simpleSecondaryVertexHighEffBJetTags::RECO"),
+        cms.InputTag("simpleSecondaryVertexHighPurBJetTags::RECO"),
+        cms.InputTag("combinedSecondaryVertexBJetTags::RECO")
+    )
+process.patJets.trackAssociationSource = cms.InputTag("ak5JetTracksAssociatorAtVertex::RECO")
+process.patJets.jetIDMap = cms.InputTag("ak5JetID::RECO")
+# FIXME END
 
 ## uncomment the following line to add different jet collections
 ## to the event content

RecoBTag/ImpactParameter/python/impactParameter_cfi.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 impactParameterTagInfos = cms.EDProducer("TrackIPProducer",
-    jetTracks = cms.InputTag("ak5JetTracksAssociatorAtVertex"),
+    jetTracks = cms.InputTag("ak5JetTracksAssociatorAtVertexPF"),
     primaryVertex = cms.InputTag("offlinePrimaryVertices"),
     computeProbabilities = cms.bool(True),
     computeGhostTrack = cms.bool(True),

RecoBTag/SoftLepton/python/softMuonTagInfos_cfi.py

@@ -4,7 +4,7 @@
 # SoftLeptonTagInfo producer for tagging caloJets with global muons 
 softMuonTagInfos = cms.EDProducer("SoftLepton",
     primaryVertex = cms.InputTag("offlinePrimaryVertices"),
-    jets = cms.InputTag("ak5CaloJets"),
+    jets = cms.InputTag("ak5PFJetsCHS"),
     leptons = cms.InputTag("muons"),
     leptonCands = cms.InputTag(""),         # optional
     leptonId = cms.InputTag(""),            # optional

RecoBTag/SoftLepton/python/softPFElectronTagInfos_cfi.py

@@ -2,5 +2,5 @@
 
 softPFElectronsTagInfos = cms.EDProducer("SoftPFElectronTagInfoProducer",
     primaryVertex = cms.InputTag("offlinePrimaryVertices"),
-    jets = cms.InputTag("ak5PFJets")
+    jets = cms.InputTag("ak5PFJetsCHS")
 )

RecoBTag/SoftLepton/python/softPFMuonTagInfos_cfi.py

@@ -2,6 +2,6 @@
 
 softPFMuonsTagInfos = cms.EDProducer("SoftPFMuonTagInfoProducer",
     primaryVertex = cms.InputTag("offlinePrimaryVertices"),
-    jets = cms.InputTag("ak5PFJets"),
+    jets = cms.InputTag("ak5PFJetsCHS"),
     MuonId =cms.int32(0)
 )

RecoJets/Configuration/python/RecoJetsGlobal_cff.py

@@ -8,4 +8,4 @@
 from RecoJets.Configuration.RecoJPTJets_cff import *
 
 jetGlobalReco = cms.Sequence(recoJets*recoJetIds*recoTrackJets)
-jetHighLevelReco = cms.Sequence(recoJetAssociations*recoPFJets*recoJetAssociationsExplicit*recoJPTJets)
+jetHighLevelReco = cms.Sequence(recoPFJets*recoJetAssociations*recoJetAssociationsExplicit*recoJPTJets)

RecoJets/Configuration/python/RecoJets_EventContent_cff.py

@@ -17,12 +17,13 @@
                                            'keep *_kt4JetTracksAssociatorAtVertex_*_*', 
                                            'keep *_kt4JetTracksAssociatorAtCaloFace_*_*', 
                                            'keep *_kt4JetExtender_*_*',
-                                           'keep *_ak5JetTracksAssociatorAtVertex_*_*', 
-                                           'keep *_ak5JetTracksAssociatorAtCaloFace_*_*', 
+                                           'keep *_ak5JetTracksAssociatorAtVertex*_*_*',
+                                           'keep *_ak5JetTracksAssociatorAtVertexPF*_*_*', 
+                                           'keep *_ak5JetTracksAssociatorAtCaloFace*_*_*', 
                                            'keep *_ak5JetExtender_*_*',
                                            'keep *_ak5JetTracksAssociatorExplicit_*_*',
-                                           'keep *_ak7JetTracksAssociatorAtVertex_*_*', 
-                                           'keep *_ak7JetTracksAssociatorAtCaloFace_*_*', 
+                                           'keep *_ak7JetTracksAssociatorAtVertex*_*_*', 
+                                           'keep *_ak7JetTracksAssociatorAtCaloFace*_*_*', 
                                            'keep *_ak7JetExtender_*_*',
                                            'keep *_ak5JetID_*_*','keep *_ak7JetID_*_*',
                                            'keep *_sc5JetID_*_*','keep *_sc7JetID_*_*',
@@ -80,12 +81,13 @@
                                            'keep *_kt4JetTracksAssociatorAtVertex_*_*', 
                                            'keep *_kt4JetTracksAssociatorAtCaloFace_*_*', 
                                            'keep *_kt4JetExtender_*_*',
-                                           'keep *_ak5JetTracksAssociatorAtVertex_*_*', 
-                                           'keep *_ak5JetTracksAssociatorAtCaloFace_*_*', 
+                                           'keep *_ak5JetTracksAssociatorAtVertex_*_*',
+                                           'keep *_ak5JetTracksAssociatorAtVertexPF_*_*',
+                                           'keep *_ak5JetTracksAssociatorAtCaloFace_*_*',
                                            'keep *_ak5JetTracksAssociatorExplicit_*_*',
                                            'keep *_ak5JetExtender_*_*',
-                                           'keep *_ak7JetTracksAssociatorAtVertex_*_*', 
-                                           'keep *_ak7JetTracksAssociatorAtCaloFace_*_*', 
+                                           'keep *_ak7JetTracksAssociatorAtVertex*_*_*', 
+                                           'keep *_ak7JetTracksAssociatorAtCaloFace*_*_*', 
                                            'keep *_ak7JetExtender_*_*',        
                                            'keep *_ak5JetID_*_*','keep *_ak7JetID_*_*',
                                            'keep *_ic5JetID_*_*',
@@ -138,7 +140,8 @@
                                            #        'keep *_towerMaker_*_*',
                                            'keep *_CastorTowerReco_*_*',                                           
                                            #        'keep *_ic5JetTracksAssociatorAtVertex_*_*',
-                                           'keep *_ak5JetTracksAssociatorAtVertex_*_*', 
+                                           'keep *_ak5JetTracksAssociatorAtVertex_*_*',
+                                           'keep *_ak5JetTracksAssociatorAtVertexPF_*_*', 
                                            'keep *_ak5JetTracksAssociatorExplicit_*_*',
                                            #'keep *_ak7JetTracksAssociatorAtVertex_*_*', 
                                            #        'keep *_iterativeCone5JetExtender_*_*', 

RecoJets/JetAssociationProducers/python/ak5JTA_cff.py

@@ -1,32 +1,40 @@
-import FWCore.ParameterSet.Config as cms
-
-# $Id: ak5JTA_cff.py,v 1.4 2012/07/11 14:12:14 srappocc Exp $
-from TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi import * ##propagator
-
-from RecoJets.JetAssociationProducers.j2tParametersCALO_cfi import *
-from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import *
-ak5JetTracksAssociatorAtVertex = cms.EDProducer("JetTracksAssociatorAtVertex",
-    j2tParametersVX,
-    jets = cms.InputTag("ak5CaloJets")
-)
-
-ak5JetTracksAssociatorExplicit = cms.EDProducer("JetTracksAssociatorExplicit",
-    j2tParametersVX,
-    jets = cms.InputTag("ak5PFJets")
-)
-
-ak5JetTracksAssociatorAtCaloFace = cms.EDProducer("JetTracksAssociatorAtCaloFace",
-    j2tParametersCALO,
-    jets = cms.InputTag("ak5CaloJets")
-)
-
-ak5JetExtender = cms.EDProducer("JetExtender",
-    jets = cms.InputTag("ak5CaloJets"),
-    jet2TracksAtCALO = cms.InputTag("ak5JetTracksAssociatorAtCaloFace"),
-    jet2TracksAtVX = cms.InputTag("ak5JetTracksAssociatorAtVertex"),
-    coneSize = cms.double(0.5)
-)
-
-ak5JTA = cms.Sequence(ak5JetTracksAssociatorAtVertex*ak5JetTracksAssociatorAtCaloFace*ak5JetExtender)
-
-ak5JTAExplicit = cms.Sequence(ak5JetTracksAssociatorExplicit)
+import FWCore.ParameterSet.Config as cms
+
+# $Id: ak5JTA_cff.py,v 1.4 2012/07/11 14:12:14 srappocc Exp $
+from TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi import * ##propagator
+
+from RecoJets.JetAssociationProducers.j2tParametersCALO_cfi import *
+from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import *
+ak5JetTracksAssociatorAtVertex = cms.EDProducer("JetTracksAssociatorAtVertex",
+    j2tParametersVX,
+    jets = cms.InputTag("ak5CaloJets")
+)
+
+ak5JetTracksAssociatorAtVertexPF = cms.EDProducer("JetTracksAssociatorAtVertex",
+    j2tParametersVX,
+    jets = cms.InputTag("ak5PFJetsCHS")
+)
+
+
+ak5JetTracksAssociatorExplicit = cms.EDProducer("JetTracksAssociatorExplicit",
+    j2tParametersVX,
+    jets = cms.InputTag("ak5PFJetsCHS")
+)
+
+ak5JetTracksAssociatorAtCaloFace = cms.EDProducer("JetTracksAssociatorAtCaloFace",
+    j2tParametersCALO,
+    jets = cms.InputTag("ak5CaloJets")
+)
+
+ak5JetExtender = cms.EDProducer("JetExtender",
+    jets = cms.InputTag("ak5CaloJets"),
+    jet2TracksAtCALO = cms.InputTag("ak5JetTracksAssociatorAtCaloFace"),
+    jet2TracksAtVX = cms.InputTag("ak5JetTracksAssociatorAtVertex"),
+    coneSize = cms.double(0.5)
+)
+
+ak5JTA = cms.Sequence(ak5JetTracksAssociatorAtVertexPF*
+                      ak5JetTracksAssociatorAtVertex*
+                      ak5JetTracksAssociatorAtCaloFace*ak5JetExtender)
+
+ak5JTAExplicit = cms.Sequence(ak5JetTracksAssociatorExplicit)

RecoJets/JetAssociationProducers/python/ak7JTA_cff.py

@@ -5,6 +5,11 @@
 
 from RecoJets.JetAssociationProducers.j2tParametersCALO_cfi import *
 from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import *
+ak7JetTracksAssociatorAtVertexPF = cms.EDProducer("JetTracksAssociatorAtVertex",
+    j2tParametersVX,
+    jets = cms.InputTag("ak7PFJetsCHS")
+)
+
 ak7JetTracksAssociatorAtVertex = cms.EDProducer("JetTracksAssociatorAtVertex",
     j2tParametersVX,
     jets = cms.InputTag("ak7CaloJets")
@@ -22,5 +27,5 @@
     coneSize = cms.double(0.7)
 )
 
-ak7JTA = cms.Sequence(ak7JetTracksAssociatorAtVertex*ak7JetTracksAssociatorAtCaloFace*ak7JetExtender)
+ak7JTA = cms.Sequence(ak7JetTracksAssociatorAtVertexPF*ak7JetTracksAssociatorAtVertex*ak7JetTracksAssociatorAtCaloFace*ak7JetExtender)