Fix dependency of meta taggers.

cms-sw · Sep 11, 2018 · fc1fd12 · fc1fd12
1 parent 6aa6cca
commit fc1fd12
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py b/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py
@@ -231,22 +231,24 @@
 
 #meta-taggers are simple arithmetic on top of other taggers, they are stored here
 #such that in case you want them re-run also the parent tagger is re-run as well
+_pfDeepBoostedJetTagsProbs = ['pfDeepBoostedJetTags:probTbcq', 'pfDeepBoostedJetTags:probTbqq', 'pfDeepBoostedJetTags:probTbc', 'pfDeepBoostedJetTags:probTbq', 'pfDeepBoostedJetTags:probWcq', 'pfDeepBoostedJetTags:probWqq', 'pfDeepBoostedJetTags:probZbb', 'pfDeepBoostedJetTags:probZcc', 'pfDeepBoostedJetTags:probZqq', 'pfDeepBoostedJetTags:probHbb', 'pfDeepBoostedJetTags:probHcc', 'pfDeepBoostedJetTags:probHqqqq', 'pfDeepBoostedJetTags:probQCDbb', 'pfDeepBoostedJetTags:probQCDcc', 'pfDeepBoostedJetTags:probQCDb', 'pfDeepBoostedJetTags:probQCDc', 'pfDeepBoostedJetTags:probQCDothers']
+_pfMassDecorrelatedDeepBoostedJetTagsProbs = ['pfMassDecorrelatedDeepBoostedJetTags:probTbcq', 'pfMassDecorrelatedDeepBoostedJetTags:probTbqq', 'pfMassDecorrelatedDeepBoostedJetTags:probTbc', 'pfMassDecorrelatedDeepBoostedJetTags:probTbq', 'pfMassDecorrelatedDeepBoostedJetTags:probWcq', 'pfMassDecorrelatedDeepBoostedJetTags:probWqq', 'pfMassDecorrelatedDeepBoostedJetTags:probZbb', 'pfMassDecorrelatedDeepBoostedJetTags:probZcc', 'pfMassDecorrelatedDeepBoostedJetTags:probZqq', 'pfMassDecorrelatedDeepBoostedJetTags:probHbb', 'pfMassDecorrelatedDeepBoostedJetTags:probHcc', 'pfMassDecorrelatedDeepBoostedJetTags:probHqqqq', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers']
 supportedMetaDiscr = {
    'pfDeepCSVDiscriminatorsJetTags:BvsAll' : ['pfDeepCSVJetTags:probudsg', 'pfDeepCSVJetTags:probb', 'pfDeepCSVJetTags:probc', 'pfDeepCSVJetTags:probbb'],
    'pfDeepCSVDiscriminatorsJetTags:CvsB' : ['pfDeepCSVJetTags:probudsg', 'pfDeepCSVJetTags:probb', 'pfDeepCSVJetTags:probc', 'pfDeepCSVJetTags:probbb'],
    'pfDeepCSVDiscriminatorsJetTags:CvsL' : ['pfDeepCSVJetTags:probudsg', 'pfDeepCSVJetTags:probb', 'pfDeepCSVJetTags:probc', 'pfDeepCSVJetTags:probbb'],
    'pfDeepCMVADiscriminatorsJetTags:BvsAll' : ['pfDeepCMVAJetTags:probudsg', 'pfDeepCMVAJetTags:probb', 'pfDeepCMVAJetTags:probc', 'pfDeepCMVAJetTags:probbb'],   
    'pfDeepCMVADiscriminatorsJetTags:CvsB' : ['pfDeepCMVAJetTags:probudsg', 'pfDeepCMVAJetTags:probb', 'pfDeepCMVAJetTags:probc', 'pfDeepCMVAJetTags:probbb'],   
    'pfDeepCMVADiscriminatorsJetTags:CvsL' : ['pfDeepCMVAJetTags:probudsg', 'pfDeepCMVAJetTags:probb', 'pfDeepCMVAJetTags:probc', 'pfDeepCMVAJetTags:probbb'],
-   'pfDeepBoostedDiscriminatorsJetTags:TvsQCD' : ['pfDeepBoostedJetTags:probTbcq', 'pfDeepBoostedJetTags:probTbqq', 'pfDeepBoostedJetTags:probQCDbb', 'pfDeepBoostedJetTags:probQCDcc', 'pfDeepBoostedJetTags:probQCDb', 'pfDeepBoostedJetTags:probQCDc', 'pfDeepBoostedJetTags:probQCDothers'],
-   'pfDeepBoostedDiscriminatorsJetTags:WvsQCD' : ['pfDeepBoostedJetTags:probWcq',  'pfDeepBoostedJetTags:probWqq',  'pfDeepBoostedJetTags:probQCDbb', 'pfDeepBoostedJetTags:probQCDcc', 'pfDeepBoostedJetTags:probQCDb', 'pfDeepBoostedJetTags:probQCDc', 'pfDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:TvsQCD'    : ['pfMassDecorrelatedDeepBoostedJetTags:probTbcq', 'pfMassDecorrelatedDeepBoostedJetTags:probTbqq', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:WvsQCD'    : ['pfMassDecorrelatedDeepBoostedJetTags:probWcq',  'pfMassDecorrelatedDeepBoostedJetTags:probWqq',  'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvsQCD'   : ['pfMassDecorrelatedDeepBoostedJetTags:probZbb',  'pfMassDecorrelatedDeepBoostedJetTags:probHbb',  'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsQCD' : ['pfMassDecorrelatedDeepBoostedJetTags:probZbb',  'pfMassDecorrelatedDeepBoostedJetTags:probHbb',  'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ccvsQCD'   : ['pfMassDecorrelatedDeepBoostedJetTags:probZcc',  'pfMassDecorrelatedDeepBoostedJetTags:probHcc',  'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHccvsQCD' : ['pfMassDecorrelatedDeepBoostedJetTags:probZcc',  'pfMassDecorrelatedDeepBoostedJetTags:probHcc',  'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDc', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvscc'    : ['pfMassDecorrelatedDeepBoostedJetTags:probZbb',  'pfMassDecorrelatedDeepBoostedJetTags:probHbb',  'pfMassDecorrelatedDeepBoostedJetTags:probZcc',   'pfMassDecorrelatedDeepBoostedJetTags:probHcc',   'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb', 'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc'],
-   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsZHcc': ['pfMassDecorrelatedDeepBoostedJetTags:probZbb',  'pfMassDecorrelatedDeepBoostedJetTags:probHbb',  'pfMassDecorrelatedDeepBoostedJetTags:probZcc',   'pfMassDecorrelatedDeepBoostedJetTags:probHcc'],
+   'pfDeepBoostedDiscriminatorsJetTags:TvsQCD' : _pfDeepBoostedJetTagsProbs,
+   'pfDeepBoostedDiscriminatorsJetTags:WvsQCD' : _pfDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:TvsQCD'    : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:WvsQCD'    : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvsQCD'   : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsQCD' : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ccvsQCD'   : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHccvsQCD' : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvscc'    : _pfMassDecorrelatedDeepBoostedJetTagsProbs,
+   'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsZHcc': _pfMassDecorrelatedDeepBoostedJetTagsProbs,
 }
 
diff --git a/RecoBTag/DeepBoostedJet/python/pfDeepBoostedJet_cff.py b/RecoBTag/DeepBoostedJet/python/pfDeepBoostedJet_cff.py
@@ -28,4 +28,5 @@
 # This task is not used, useful only if we run DeepFlavour from RECO
 # jets (RECO/AOD)
 pfDeepBoostedJetTask = cms.Task(puppi, primaryVertexAssociation,
-                             pfDeepBoostedJetTagInfos, pfDeepBoostedJetTags, pfMassDecorrelatedDeepBoostedJetTags)
+                             pfDeepBoostedJetTagInfos, pfDeepBoostedJetTags, pfMassDecorrelatedDeepBoostedJetTags,
+                             pfDeepBoostedDiscriminatorsJetTags, pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags)