Move non-TF code in RecoBTag/TensorFlow to RecoBTag/FeatureTools

RecoBTag/DeepBoostedJet/plugins/BuildFile.xml

@@ -3,7 +3,7 @@
 <library file="*.cc" name="RecoBTagDeepBoostedJetPlugins">
   <use name="DataFormats/BTauReco"/>
   <use name="DataFormats/Common"/>
-  <use name="RecoBTag/TensorFlow"/>
+  <use name="RecoBTag/FeatureTools"/>
   <use name="DataFormats/PatCandidates"/>
   <use name="PhysicsTools/MXNet"/>
   <flags EDM_PLUGIN="1"/>

RecoBTag/DeepBoostedJet/plugins/DeepBoostedJetTagInfoProducer.cc

@@ -13,8 +13,8 @@
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
-#include "RecoBTag/TensorFlow/interface/TrackInfoBuilder.h"
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/TrackInfoBuilder.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
 
 #include "DataFormats/Candidate/interface/VertexCompositePtrCandidate.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"

RecoBTag/FeatureTools/BuildFile.xml

@@ -0,0 +1,6 @@
+<use name="FWCore/Utilities"/>
+<use name="TrackingTools/IPTools"/>
+<use name="CLHEP"/>
+<export>
+  <lib name="1"/>
+</export>

RecoBTag/TensorFlow/interface/BoostedDoubleSVTagInfoConverter.h → RecoBTag/FeatureTools/interface/BoostedDoubleSVTagInfoConverter.h

@@ -1,19 +1,19 @@
-#ifndef RecoBTag_TensorFlow_BoostedDoubleSVTagInfoConverter_h
-#define RecoBTag_TensorFlow_BoostedDoubleSVTagInfoConverter_h
+#ifndef RecoBTag_FeatureTools_BoostedDoubleSVTagInfoConverter_h
+#define RecoBTag_FeatureTools_BoostedDoubleSVTagInfoConverter_h
 
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
 #include "DataFormats/BTauReco/interface/BoostedDoubleSVTagInfoFeatures.h"
 
 #include "DataFormats/BTauReco/interface/BoostedDoubleSVTagInfo.h"
 #include "DataFormats/BTauReco/interface/TaggingVariable.h"
 
 namespace btagbtvdeep {
-  
+
   void doubleBTagToFeatures(const reco::TaggingVariableList & tag_info_vars,
 			    BoostedDoubleSVTagInfoFeatures & tag_info_features) ;
-  
+
 }
 
-#endif //RecoBTag_TensorFlow_BoostedDoubleSVTagInfoConverter_h
+#endif //RecoBTag_FeatureTools_BoostedDoubleSVTagInfoConverter_h
 
 

RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h → RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h

@@ -1,24 +1,24 @@
-#ifndef RecoBTag_TensorFlow_ChargedCandidateConverter_h
-#define RecoBTag_TensorFlow_ChargedCandidateConverter_h
+#ifndef RecoBTag_FeatureTools_ChargedCandidateConverter_h
+#define RecoBTag_FeatureTools_ChargedCandidateConverter_h
 
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
-#include "RecoBTag/TensorFlow/interface/TrackInfoBuilder.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/TrackInfoBuilder.h"
 #include "DataFormats/BTauReco/interface/ChargedCandidateFeatures.h"
 
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 #include "DataFormats/PatCandidates/interface/Jet.h"
 
 namespace btagbtvdeep {
-  
+
   template <typename CandidateType>
     void commonCandidateToFeatures(const CandidateType * c_pf,
 				   const reco::Jet & jet,
 				   const TrackInfoBuilder & track_info,
 				   const float & drminpfcandsv, const float & jetR,
 				   ChargedCandidateFeatures & c_pf_features,
 				   const bool flip = false) {
-    
+
 
     float trackSip2dVal = track_info.getTrackSip2dVal();
     float trackSip2dSig = track_info.getTrackSip2dSig();
@@ -33,7 +33,7 @@ namespace btagbtvdeep {
 
     c_pf_features.ptrel = catch_infs_and_bound(c_pf->pt()/jet.pt(),
 					       0,-1,0,-1);
-    
+
     c_pf_features.btagPf_trackEtaRel     =catch_infs_and_bound(track_info.getTrackEtaRel(),  0,-5,15);
     c_pf_features.btagPf_trackPtRel      =catch_infs_and_bound(track_info.getTrackPtRel(),   0,-1,4);
     c_pf_features.btagPf_trackPPar       =catch_infs_and_bound(track_info.getTrackPPar(),    0,-1e5,1e5 );
@@ -45,29 +45,29 @@ namespace btagbtvdeep {
     c_pf_features.btagPf_trackSip2dVal   =catch_infs_and_bound(trackSip2dVal, 0, -1,70 );
     c_pf_features.btagPf_trackSip2dSig   =catch_infs_and_bound(trackSip2dSig, 0, -1,4e4 );
     c_pf_features.btagPf_trackJetDistVal =catch_infs_and_bound(track_info.getTrackJetDistVal(),0,-20,1 );
-    
+
     c_pf_features.drminsv = catch_infs_and_bound(drminpfcandsv,0,-1.*jetR,0,-1.*jetR);
-    
+
   }
-  
+
   void packedCandidateToFeatures(const pat::PackedCandidate * c_pf,
 				 const pat::Jet & jet,
 				 const TrackInfoBuilder & track_info,
-				 const float drminpfcandsv, const float jetR, 
+				 const float drminpfcandsv, const float jetR,
 				 ChargedCandidateFeatures & c_pf_features,
 				 const bool flip = false) ;
-  
-  
+
+
   void recoCandidateToFeatures(const reco::PFCandidate * c_pf,
 			       const reco::Jet & jet,
 			       const TrackInfoBuilder & track_info,
 			       const float drminpfcandsv, const float jetR, const float puppiw,
 			       const int pv_ass_quality,
-			       const reco::VertexRef & pv, 
+			       const reco::VertexRef & pv,
 			       ChargedCandidateFeatures & c_pf_features,
 			       const bool flip = false) ;
-  
-  
+
+
 }
 
-#endif //RecoBTag_TensorFlow_ChargedCandidateConverter_h
+#endif //RecoBTag_FeatureTools_ChargedCandidateConverter_h

RecoBTag/TensorFlow/interface/JetConverter.h → RecoBTag/FeatureTools/interface/JetConverter.h

@@ -1,25 +1,25 @@
-#ifndef RecoBTag_TensorFlow_JetConverter_h
-#define RecoBTag_TensorFlow_JetConverter_h
+#ifndef RecoBTag_FeatureTools_JetConverter_h
+#define RecoBTag_FeatureTools_JetConverter_h
 
 #include "DataFormats/BTauReco/interface/JetFeatures.h"
 
 #include "DataFormats/JetReco/interface/Jet.h"
 
 namespace btagbtvdeep {
-  
+
   class JetConverter {
   public:
-    
+
     static void jetToFeatures(const reco::Jet & jet,
 			      JetFeatures & jet_features) {
       jet_features.pt = jet.pt(); // uncorrected
       jet_features.eta = jet.eta();
       jet_features.mass = jet.mass();
       jet_features.energy = jet.energy();
     }
-  }; 
-  
+  };
+
 }
 
-#endif //RecoBTag_TensorFlow_JetConverter_h
+#endif //RecoBTag_FeatureTools_JetConverter_h
 

RecoBTag/TensorFlow/interface/NeutralCandidateConverter.h → RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h

@@ -1,7 +1,7 @@
-#ifndef RecoBTag_TensorFlow_NeutralCandidateConverter_h
-#define RecoBTag_TensorFlow_NeutralCandidateConverter_h
+#ifndef RecoBTag_FeatureTools_NeutralCandidateConverter_h
+#define RecoBTag_FeatureTools_NeutralCandidateConverter_h
 
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
 #include "DataFormats/BTauReco/interface/NeutralCandidateFeatures.h"
 
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
@@ -11,42 +11,42 @@
 
 
 namespace btagbtvdeep {
-  
-  
-  
+
+
+
   void packedCandidateToFeatures(const pat::PackedCandidate * n_pf,
 				 const pat::Jet & jet,
 				 const float drminpfcandsv, const float jetR,
 				 NeutralCandidateFeatures & n_pf_features) ;
-  
-  
+
+
   void recoCandidateToFeatures(const reco::PFCandidate * n_pf,
 			       const reco::Jet & jet,
 			       const float drminpfcandsv, const float jetR, const float puppiw,
 			       NeutralCandidateFeatures & n_pf_features) ;
-  
-  
+
+
   template <typename CandidateType>
     static void commonCandidateToFeatures(const CandidateType * n_pf,
 					  const reco::Jet & jet,
 					  const float & drminpfcandsv, const float & jetR,
 					  NeutralCandidateFeatures & n_pf_features) {
-    
+
     n_pf_features.ptrel = catch_infs_and_bound(n_pf->pt()/jet.pt(),
 					       0,-1,0,-1);
     n_pf_features.deltaR = catch_infs_and_bound(reco::deltaR(*n_pf,jet),
 						0,-0.6,0,-0.6);
     n_pf_features.isGamma = 0;
     if(std::abs(n_pf->pdgId())==22)  n_pf_features.isGamma = 1;
-    
-    
+
+
     n_pf_features.drminsv = catch_infs_and_bound(drminpfcandsv,
 						 0,-1.*jetR,0,-1.*jetR);
-    
+
   }
-  
-  
-  
+
+
+
 }
 
-#endif //RecoBTag_TensorFlow_NeutralCandidateConverter_h
+#endif //RecoBTag_FeatureTools_NeutralCandidateConverter_h

RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h → RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h

@@ -1,22 +1,22 @@
-#ifndef RecoBTag_TensorFlow_SecondaryVertexConverter_h
-#define RecoBTag_TensorFlow_SecondaryVertexConverter_h
+#ifndef RecoBTag_FeatureTools_SecondaryVertexConverter_h
+#define RecoBTag_FeatureTools_SecondaryVertexConverter_h
 
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
 #include "DataFormats/BTauReco/interface/SecondaryVertexFeatures.h"
 
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/Candidate/interface/VertexCompositePtrCandidate.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 
 namespace btagbtvdeep {
-  
-  
+
+
   void svToFeatures( const reco::VertexCompositePtrCandidate & sv,
 		     const reco::Vertex & pv, const reco::Jet & jet,
 		     SecondaryVertexFeatures & sv_features,
 		     const bool flip = false) ;
-    
-  
+
+
 }
 
-#endif //RecoSV_DeepFlavour_SecondaryVertexConverter_h
+#endif //RecoBTag_FeatureTools_SecondaryVertexConverter_h

RecoBTag/TensorFlow/interface/ShallowTagInfoConverter.h → RecoBTag/FeatureTools/interface/ShallowTagInfoConverter.h

@@ -1,19 +1,19 @@
-#ifndef RecoBTag_TensorFlow_ShallowTagInfoConverter_h
-#define RecoBTag_TensorFlow_ShallowTagInfoConverter_h
+#ifndef RecoBTag_FeatureTools_ShallowTagInfoConverter_h
+#define RecoBTag_FeatureTools_ShallowTagInfoConverter_h
 
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
 #include "DataFormats/BTauReco/interface/ShallowTagInfoFeatures.h"
 
 #include "DataFormats/BTauReco/interface/ShallowTagInfo.h"
 #include "DataFormats/BTauReco/interface/TaggingVariable.h"
 
 namespace btagbtvdeep {
-  
+
   void bTagToFeatures(const reco::TaggingVariableList & tag_info_vars,
 		      ShallowTagInfoFeatures & tag_info_features);
-  
+
 }
 
-#endif //RecoBTag_TensorFlow_ShallowTagInfoConverter_h
+#endif //RecoBTag_FeatureTools_ShallowTagInfoConverter_h
 
 

RecoBTag/TensorFlow/interface/TrackInfoBuilder.h → RecoBTag/FeatureTools/interface/TrackInfoBuilder.h

@@ -1,5 +1,5 @@
-#ifndef RecoBTag_TensorFlow_TrackInfoBuilder_h
-#define RecoBTag_TensorFlow_TrackInfoBuilder_h
+#ifndef RecoBTag_FeatureTools_TrackInfoBuilder_h
+#define RecoBTag_FeatureTools_TrackInfoBuilder_h
 
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/VertexCompositePtrCandidate.h"
@@ -53,4 +53,4 @@ class TrackInfoBuilder{
 
 }
 
-#endif //RecoBTag_TensorFlow_TrackInfoBuilder_h
+#endif //RecoBTag_FeatureTools_TrackInfoBuilder_h

RecoBTag/TensorFlow/interface/deep_helpers.h → RecoBTag/FeatureTools/interface/deep_helpers.h

@@ -1,5 +1,5 @@
-#ifndef RecoBTag_TensorFlow_deep_helpers_h
-#define RecoBTag_TensorFlow_deep_helpers_h
+#ifndef RecoBTag_FeatureTools_deep_helpers_h
+#define RecoBTag_FeatureTools_deep_helpers_h
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h"
 #include "DataFormats/BTauReco/interface/TaggingVariable.h"
@@ -76,4 +76,4 @@ namespace btagbtvdeep {
   float quality_from_pfcand(const reco::PFCandidate &pfcand);
   float lost_inner_hits_from_pfcand(const reco::PFCandidate &pfcand);
 }
-#endif //RecoBTag_TensorFlow_deep_helpers_h
+#endif //RecoBTag_FeatureTools_deep_helpers_h

RecoBTag/TensorFlow/interface/sorting_modules.h → RecoBTag/FeatureTools/interface/sorting_modules.h

@@ -1,5 +1,5 @@
-#ifndef RecoBTag_TensorFlow_sorting_modules_h
-#define RecoBTag_TensorFlow_sorting_modules_h
+#ifndef RecoBTag_FeatureTools_sorting_modules_h
+#define RecoBTag_FeatureTools_sorting_modules_h
 
 #include <algorithm>
 #include <cmath>
@@ -25,7 +25,7 @@ class SortingClass{
       t_(t), sortValA(sortA), sortValB(sortB), sortValC(sortC) {}
 
     const T& get() const {return t_;}
- 
+
     enum compareResult{cmp_smaller,cmp_greater,cmp_invalid};
 
     static inline compareResult compare(const SortingClass& a, const SortingClass& b,int validx=0){
@@ -81,4 +81,4 @@ class SortingClass{
 std::vector<std::size_t> invertSortingVector(const std::vector<SortingClass<std::size_t> > & in);
 
 }
-#endif //RecoBTag_TensorFlow_sorting_modules_h
+#endif //RecoBTag_FeatureTools_sorting_modules_h

RecoBTag/TensorFlow/src/BoostedDoubleSVTagInfoConverter.cc → RecoBTag/FeatureTools/src/BoostedDoubleSVTagInfoConverter.cc

@@ -1,5 +1,5 @@
-#include "RecoBTag/TensorFlow/interface/BoostedDoubleSVTagInfoConverter.h"
-#include "RecoBTag/TensorFlow/interface/deep_helpers.h"
+#include "RecoBTag/FeatureTools/interface/BoostedDoubleSVTagInfoConverter.h"
+#include "RecoBTag/FeatureTools/interface/deep_helpers.h"
 #include "DataFormats/BTauReco/interface/BoostedDoubleSVTagInfoFeatures.h"
 
 #include "DataFormats/BTauReco/interface/BoostedDoubleSVTagInfo.h"
@@ -9,7 +9,7 @@ namespace btagbtvdeep {
 
   void doubleBTagToFeatures(const reco::TaggingVariableList & tag_info_vars,
 			    BoostedDoubleSVTagInfoFeatures & tag_info_features) {
-    
+
     tag_info_features.jetNTracks = tag_info_vars.get(reco::btau::jetNTracks, -999);
     tag_info_features.jetNSecondaryVertices = tag_info_vars.get(reco::btau::jetNSecondaryVertices, -999);
     tag_info_features.trackSip3dSig_0 = tag_info_vars.get(reco::btau::trackSip3dSig_0, -999);
@@ -38,9 +38,9 @@ namespace btagbtvdeep {
     tag_info_features.tau2_flightDistance2dSig = tag_info_vars.get(reco::btau::tau2_flightDistance2dSig, -999);
     tag_info_features.tau2_vertexDeltaR = tag_info_vars.get(reco::btau::tau2_vertexDeltaR, -999); // not used
     tag_info_features.z_ratio = tag_info_vars.get(reco::btau::z_ratio, -999);
-    
-  } 
-  
+
+  }
+
 }
 
 

RecoBTag/TensorFlow/src/ChargedCandidateConverter.cc → RecoBTag/FeatureTools/src/ChargedCandidateConverter.cc

@@ -1,4 +1,4 @@
-#include "RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h"
+#include "RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h"
 
 
 namespace btagbtvdeep {

RecoBTag/FeatureTools/src/JetConverter.cc

@@ -0,0 +1,4 @@
+#include "RecoBTag/FeatureTools/interface/JetConverter.h"
+
+
+