Merge pull request #5 from andrzejnovak/switch

Making sure of backwards compatibility for DDBFeatures&JetTags
lgray · Nov 12, 2018 · 5d8e94f · 5d8e94f
2 parents e42d295 + d17215a
commit 5d8e94f
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/DataFormats/BTauReco/interface/DeepDoubleBFeatures.h b/DataFormats/BTauReco/interface/DeepDoubleBFeatures.h
@@ -0,0 +1,29 @@
+#ifndef DataFormats_BTauReco_DeepDoubleBFeatures_h
+#define DataFormats_BTauReco_DeepDoubleBFeatures_h
+
+#include <vector>
+
+#include "DataFormats/BTauReco/interface/JetFeatures.h"
+#include "DataFormats/BTauReco/interface/SecondaryVertexFeatures.h"
+#include "DataFormats/BTauReco/interface/BoostedDoubleSVTagInfoFeatures.h"
+#include "DataFormats/BTauReco/interface/ChargedCandidateFeatures.h"
+
+namespace btagbtvdeep {
+
+class DeepDoubleBFeatures {
+
+  public:
+    JetFeatures jet_features;
+    BoostedDoubleSVTagInfoFeatures tag_info_features;
+
+    std::vector<SecondaryVertexFeatures> sv_features;
+
+    std::vector<ChargedCandidateFeatures> c_pf_features;
+
+    std::size_t npv; // used by deep flavour     
+};    
+
+
+}  
+
+#endif //DataFormats_BTauReco_DeepDoubleBFeatures_h
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/DeepDoubleBFeatures.h"  // for posterity
 #include "DataFormats/BTauReco/interface/DeepDoubleBTagInfo.h"  // for posterity
 #include "DataFormats/BTauReco/interface/DeepBoostedJetTagInfo.h"
 
@@ -428,6 +429,15 @@ namespace DataFormats_BTauReco {
     reco::DeepDoubleXTagInfoRefProd deep_doublex_tag_info_collection_ref_prod;
     reco::DeepDoubleXTagInfoRefVector deep_doublex_tag_info_collection_ref_vector;
     edm::Wrapper<reco::DeepDoubleXTagInfoCollection> deep_doublex_tag_info_collection_edm_wrapper;
+    // for posterity
+    btagbtvdeep::DeepDoubleBFeatures deep_doubleb_features;
+    reco::DeepDoubleBTagInfo deep_doubleb_tag_info;
+    reco::DeepDoubleBTagInfoCollection deep_doubleb_tag_info_collection;
+    reco::DeepDoubleBTagInfoRef deep_doubleb_tag_info_collection_ref;
+    reco::DeepDoubleBTagInfoFwdRef deep_doubleb_tag_info_collection_fwd_ref;
+    reco::DeepDoubleBTagInfoRefProd deep_doubleb_tag_info_collection_ref_prod;
+    reco::DeepDoubleBTagInfoRefVector deep_doubleb_tag_info_collection_ref_vector;
+    edm::Wrapper<reco::DeepDoubleBTagInfoCollection> deep_doubleb_tag_info_collection_edm_wrapper;
 
     btagbtvdeep::DeepBoostedJetFeatures deep_boosted_jet_tag_info_features;
     reco::DeepBoostedJetTagInfo deep_boosted_jet_tag_info;

diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml
@@ -450,6 +450,9 @@
   <class name="btagbtvdeep::DeepDoubleXFeatures" ClassVersion="3">
     <version ClassVersion="3" checksum="2789036018"/>
   </class>
+  <class name="btagbtvdeep::DeepDoubleBFeatures" ClassVersion="3">
+    <version ClassVersion="3" checksum="2060552560"/>
+  </class>
   <class name="btagbtvdeep::BoostedDoubleSVTagInfoFeatures" ClassVersion="3">
     <version ClassVersion="3" checksum="683471882"/>
   </class>
@@ -462,8 +465,15 @@
   <class name="reco::DeepFlavourTagInfoRefProd"/>
   <class name="reco::DeepFlavourTagInfoRefVector"/>
   <class name="edm::Wrapper<reco::DeepFlavourTagInfoCollection>"/>
+
+  <class name="reco::DeepDoubleBTagInfo"/>
+  <class name="reco::DeepDoubleBTagInfoCollection"/>
+  <class name="reco::DeepDoubleBTagInfoRef"/>
+  <class name="reco::DeepDoubleBTagInfoFwdRef"/>
+  <class name="reco::DeepDoubleBTagInfoRefProd"/>
+  <class name="reco::DeepDoubleBTagInfoRefVector"/>
+  <class name="edm::Wrapper<reco::DeepDoubleBTagInfoCollection>"/>
 
-  <class name="reco::DeepDoubleBTagInfo"/> 
   <class name="reco::DeepDoubleXTagInfo"/>
   <class name="reco::DeepDoubleXTagInfoCollection"/>
   <class name="reco::DeepDoubleXTagInfoRef"/>