Merge pull request #4 from andrzejnovak/switch

Switch
lgray · Nov 10, 2018 · e42d295 · e42d295
2 parents 81b0d65 + d3b1b86
commit e42d295
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 38 deletions.
diff --git a/DataFormats/BTauReco/src/classes.h b/DataFormats/BTauReco/src/classes.h
@@ -56,6 +56,7 @@
 #include "DataFormats/BTauReco/interface/DeepFlavourTagInfo.h"
 #include "DataFormats/BTauReco/interface/DeepDoubleXFeatures.h"
 #include "DataFormats/BTauReco/interface/DeepDoubleXTagInfo.h"
+#include "DataFormats/BTauReco/interface/DeepDoubleBTagInfo.h"  // for posterity
 #include "DataFormats/BTauReco/interface/DeepBoostedJetTagInfo.h"
 
 

diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml
@@ -463,6 +463,7 @@
   <class name="reco::DeepFlavourTagInfoRefVector"/>
   <class name="edm::Wrapper<reco::DeepFlavourTagInfoCollection>"/>
 
+  <class name="reco::DeepDoubleBTagInfo"/> 
   <class name="reco::DeepDoubleXTagInfo"/>
   <class name="reco::DeepDoubleXTagInfoCollection"/>
   <class name="reco::DeepDoubleXTagInfoRef"/>

diff --git a/RecoBTag/TensorFlow/python/pfDeepDoubleX_cff.py b/RecoBTag/TensorFlow/python/pfDeepDoubleX_cff.py
@@ -2,7 +2,5 @@
 from RecoBTag.TensorFlow.pfDeepDoubleCvBJetTags_cfi import pfDeepDoubleCvBJetTags
 from RecoBTag.TensorFlow.pfDeepDoubleCvLJetTags_cfi import pfDeepDoubleCvLJetTags
 
-from RecoBTag.TensorFlow.pfMassIndependentDeepDoubleBvLJetTags_cfi import pfMassIndependentDeepDoubleBvLJetTags
-from RecoBTag.TensorFlow.pfMassIndependentDeepDoubleCvBJetTags_cfi import pfMassIndependentDeepDoubleCvBJetTags
-from RecoBTag.TensorFlow.pfMassIndependentDeepDoubleCvLJetTags_cfi import pfMassIndependentDeepDoubleCvLJetTags
+from RecoBTag.TensorFlow.pfMassIndependentDeepDoubleXJetTags_cff import *
 
diff --git a/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleBvLJetTags_cfi.py b/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleBvLJetTags_cfi.py
diff --git a/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleCvBJetTags_cfi.py b/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleCvBJetTags_cfi.py
diff --git a/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleCvLJetTags_cfi.py b/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleCvLJetTags_cfi.py
diff --git a/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleXJetTags_cff.py b/RecoBTag/TensorFlow/python/pfMassIndependentDeepDoubleXJetTags_cff.py
@@ -0,0 +1,15 @@
+import FWCore.ParameterSet.Config as cms
+from pfDeepDoubleBvLJetTags_cfi import pfDeepDoubleBvLJetTags
+from pfDeepDoubleCvLJetTags_cfi import pfDeepDoubleCvLJetTags
+from pfDeepDoubleCvBJetTags_cfi import pfDeepDoubleCvBJetTags
+
+pfMassIndependentDeepDoubleBvLJetTags = pfDeepDoubleBvLJetTags.clone(
+    graph_path = cms.FileInPath('RecoBTag/Combined/data/DeepDoubleX/94X/V01/DDB_mass_independent.pb')
+)
+pfMassIndependentDeepDoubleCvLJetTags = pfDeepDoubleCvLJetTags.clone(
+    graph_path = cms.FileInPath('RecoBTag/Combined/data/DeepDoubleX/94X/V01/DDC_mass_independent.pb')
+)
+pfMassIndependentDeepDoubleCvBJetTags = pfDeepDoubleCvBJetTags.clone(
+    graph_path = cms.FileInPath('RecoBTag/Combined/data/DeepDoubleX/94X/V01/DDCvB_mass_independent.pb')
+)
+