updated list of taggers available in PAT

cms-sw · Mar 11, 2016 · ba75325 · ba75325
1 parent ffc6406
commit ba75325
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py b/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py
@@ -33,7 +33,7 @@
 ## dictionary with all available btag discriminators and the btagInfos that they require
 supportedBtagDiscr = {
     'None'                                                  : []
-    # legacy framework (supported with RECO/AOD but not MiniAOD)
+    # legacy framework (no longer supported, work with RECO/AOD but not MiniAOD)
   , 'jetBProbabilityBJetTags'                               : ['impactParameterTagInfos']
   , 'jetProbabilityBJetTags'                                : ['impactParameterTagInfos']
   , 'positiveOnlyJetBProbabilityBJetTags'                   : ['impactParameterTagInfos']
@@ -74,10 +74,13 @@
   , 'pfNegativeTrackCountingHighPurBJetTags'                : ['pfImpactParameterTagInfos']
   , 'pfNegativeTrackCountingHighEffBJetTags'                : ['pfImpactParameterTagInfos']
   , 'pfSimpleSecondaryVertexHighEffBJetTags'                : ['pfSecondaryVertexTagInfos']
-  , 'pfSimpleInclusiveSecondaryVertexHighEffBJetTags'       : ['pfInclusiveSecondaryVertexFinderTagInfos']
   , 'pfSimpleSecondaryVertexHighPurBJetTags'                : ['pfSecondaryVertexTagInfos']
   , 'pfNegativeSimpleSecondaryVertexHighEffBJetTags'        : ['pfSecondaryVertexNegativeTagInfos']
   , 'pfNegativeSimpleSecondaryVertexHighPurBJetTags'        : ['pfSecondaryVertexNegativeTagInfos']
+  , 'pfSimpleInclusiveSecondaryVertexHighEffBJetTags'       : ['pfInclusiveSecondaryVertexFinderTagInfos']
+  , 'pfSimpleInclusiveSecondaryVertexHighPurBJetTags'       : ['pfInclusiveSecondaryVertexFinderTagInfos']
+  , 'pfNegativeSimpleInclusiveSecondaryVertexHighEffBJetTags' : ['pfInclusiveSecondaryVertexFinderNegativeTagInfos']
+  , 'pfNegativeSimpleInclusiveSecondaryVertexHighPurBJetTags' : ['pfInclusiveSecondaryVertexFinderNegativeTagInfos']
   , 'pfCombinedSecondaryVertexV2BJetTags'                   : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos']
   , 'pfPositiveCombinedSecondaryVertexV2BJetTags'           : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos']
   , 'pfNegativeCombinedSecondaryVertexV2BJetTags'           : ['pfImpactParameterTagInfos', 'pfSecondaryVertexNegativeTagInfos']
@@ -111,13 +114,11 @@
   , 'pfCombinedMVAV2BJetTags'                               : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
   , 'pfNegativeCombinedMVAV2BJetTags'                       : ['pfImpactParameterTagInfos', 'pfSecondaryVertexNegativeTagInfos', 'pfInclusiveSecondaryVertexFinderNegativeTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
   , 'pfPositiveCombinedMVAV2BJetTags'                       : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
-  , 'pfCombinedSecondaryVertexSoftLeptonBJetTags'           : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
-  , 'pfNegativeCombinedSecondaryVertexSoftLeptonBJetTags'   : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderNegativeTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
   , 'pfBoostedDoubleSecondaryVertexAK8BJetTags'             : ['pfImpactParameterTagInfosAK8', 'pfInclusiveSecondaryVertexFinderTagInfosAK8']
   , 'pfBoostedDoubleSecondaryVertexCA15BJetTags'            : ['pfImpactParameterTagInfosCA15', 'pfInclusiveSecondaryVertexFinderTagInfosCA15']
     # C-Tagging
   , 'pfCombinedCvsLJetTags'                                 : ["pfImpactParameterTagInfos", "pfInclusiveSecondaryVertexFinderCvsLTagInfos", "softPFMuonsTagInfos", "softPFElectronsTagInfos"]
   , 'pfCombinedCvsBJetTags'                                 : ["pfImpactParameterTagInfos", "pfInclusiveSecondaryVertexFinderCvsLTagInfos", "softPFMuonsTagInfos", "softPFElectronsTagInfos"]
     # ChargeTagging
-  , 'pfChargeBJetTags'                                    : ["pfImpactParameterTagInfos", "pfInclusiveSecondaryVertexFinderTagInfos", "softPFMuonsTagInfos", "softPFElectronsTagInfos"]
+  , 'pfChargeBJetTags'                                      : ["pfImpactParameterTagInfos", "pfInclusiveSecondaryVertexFinderTagInfos", "softPFMuonsTagInfos", "softPFElectronsTagInfos"]
   }
diff --git a/PhysicsTools/PatAlgos/test/patTuple_addBTagging_cfg.py b/PhysicsTools/PatAlgos/test/patTuple_addBTagging_cfg.py
@@ -13,7 +13,7 @@
 
 # b-tag discriminators
 btagDiscriminators = [
-     # legacy framework (supported with RECO/AOD but not MiniAOD)
+     # legacy framework (no longer supported, work with RECO/AOD but not MiniAOD)
      'jetBProbabilityBJetTags'
     ,'jetProbabilityBJetTags'
     ,'positiveOnlyJetBProbabilityBJetTags'
@@ -40,20 +40,28 @@
     ,'positiveCombinedInclusiveSecondaryVertexV2BJetTags'
     ,'negativeCombinedInclusiveSecondaryVertexV2BJetTags'
     ,'combinedMVAV2BJetTags'
+    ,'negativeCombinedMVAV2BJetTags'
+    ,'positiveCombinedMVAV2BJetTags'
      # new candidate-based framework (supported with RECO/AOD/MiniAOD)
     ,'pfJetBProbabilityBJetTags'
     ,'pfJetProbabilityBJetTags'
     ,'pfPositiveOnlyJetBProbabilityBJetTags'
     ,'pfPositiveOnlyJetProbabilityBJetTags'
     ,'pfNegativeOnlyJetBProbabilityBJetTags'
     ,'pfNegativeOnlyJetProbabilityBJetTags'
+    ,'pfTrackCountingHighPurBJetTags'
     ,'pfTrackCountingHighEffBJetTags'
     ,'pfNegativeTrackCountingHighPurBJetTags'
     ,'pfNegativeTrackCountingHighEffBJetTags'
     ,'pfSimpleSecondaryVertexHighEffBJetTags'
+    ,'pfSimpleSecondaryVertexHighPurBJetTags'
     ,'pfNegativeSimpleSecondaryVertexHighEffBJetTags'
     ,'pfNegativeSimpleSecondaryVertexHighPurBJetTags'
-     ,'pfCombinedSecondaryVertexV2BJetTags'
+    ,'pfSimpleInclusiveSecondaryVertexHighEffBJetTags'
+    ,'pfSimpleInclusiveSecondaryVertexHighPurBJetTags'
+    ,'pfNegativeSimpleInclusiveSecondaryVertexHighEffBJetTags'
+    ,'pfNegativeSimpleInclusiveSecondaryVertexHighPurBJetTags'
+    ,'pfCombinedSecondaryVertexV2BJetTags'
     ,'pfPositiveCombinedSecondaryVertexV2BJetTags'
     ,'pfNegativeCombinedSecondaryVertexV2BJetTags'
     ,'pfCombinedInclusiveSecondaryVertexV2BJetTags'
@@ -84,10 +92,12 @@
     ,'negativeSoftPFElectronByIP3dBJetTags'
     ,'negativeSoftPFElectronByIP2dBJetTags'
     ,'pfCombinedMVAV2BJetTags'
-    #CTagging
+    ,'pfNegativeCombinedMVAV2BJetTags'
+    ,'pfPositiveCombinedMVAV2BJetTags'
+     # CTagging
     ,'pfCombinedCvsLJetTags'
     ,'pfCombinedCvsBJetTags'
-    #ChargeTagging
+     # ChargeTagging
     ,'pfChargeBJetTags'
 ]