From 03fc1967378a88965a17ad97cc4a3d6c4014bde9 Mon Sep 17 00:00:00 2001 From: Huilin Qu Date: Mon, 13 Aug 2018 02:50:51 +0200 Subject: [PATCH] Move non-TF code in `RecoBTag/TensorFlow` to `RecoBTag/FeatureTools` --- RecoBTag/DeepBoostedJet/plugins/BuildFile.xml | 2 +- .../plugins/DeepBoostedJetTagInfoProducer.cc | 4 +-- RecoBTag/FeatureTools/BuildFile.xml | 6 ++++ .../BoostedDoubleSVTagInfoConverter.h | 12 +++---- .../interface/ChargedCandidateConverter.h | 34 +++++++++--------- .../interface/JetConverter.h | 14 ++++---- .../interface/NeutralCandidateConverter.h | 36 +++++++++---------- .../interface/SecondaryVertexConverter.h | 16 ++++----- .../interface/ShallowTagInfoConverter.h | 12 +++---- .../interface/TrackInfoBuilder.h | 6 ++-- .../interface/deep_helpers.h | 6 ++-- .../interface/sorting_modules.h | 8 ++--- .../src/BoostedDoubleSVTagInfoConverter.cc | 12 +++---- .../src/ChargedCandidateConverter.cc | 2 +- RecoBTag/FeatureTools/src/JetConverter.cc | 4 +++ .../src/NeutralCandidateConverter.cc | 30 ++++++++-------- .../src/SecondaryVertexConverter.cc | 16 ++++----- .../src/ShallowTagInfoConverter.cc | 14 ++++---- .../src/TrackInfoBuilder.cc | 2 +- .../src/deep_helpers.cc | 2 +- .../src/sorting_modules.cc | 2 +- RecoBTag/TensorFlow/BuildFile.xml | 2 -- RecoBTag/TensorFlow/plugins/BuildFile.xml | 1 + .../plugins/DeepDoubleBTagInfoProducer.cc | 14 ++++---- .../plugins/DeepFlavourTagInfoProducer.cc | 24 ++++++------- RecoBTag/TensorFlow/src/JetConverter.cc | 4 --- 26 files changed, 145 insertions(+), 140 deletions(-) create mode 100644 RecoBTag/FeatureTools/BuildFile.xml rename RecoBTag/{TensorFlow => FeatureTools}/interface/BoostedDoubleSVTagInfoConverter.h (59%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/ChargedCandidateConverter.h (87%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/JetConverter.h (74%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/NeutralCandidateConverter.h (83%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/SecondaryVertexConverter.h (66%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/ShallowTagInfoConverter.h (59%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/TrackInfoBuilder.h (92%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/deep_helpers.h (95%) rename RecoBTag/{TensorFlow => FeatureTools}/interface/sorting_modules.h (93%) rename RecoBTag/{TensorFlow => FeatureTools}/src/BoostedDoubleSVTagInfoConverter.cc (95%) rename RecoBTag/{TensorFlow => FeatureTools}/src/ChargedCandidateConverter.cc (96%) create mode 100644 RecoBTag/FeatureTools/src/JetConverter.cc rename RecoBTag/{TensorFlow => FeatureTools}/src/NeutralCandidateConverter.cc (90%) rename RecoBTag/{TensorFlow => FeatureTools}/src/SecondaryVertexConverter.cc (90%) rename RecoBTag/{TensorFlow => FeatureTools}/src/ShallowTagInfoConverter.cc (90%) rename RecoBTag/{TensorFlow => FeatureTools}/src/TrackInfoBuilder.cc (98%) rename RecoBTag/{TensorFlow => FeatureTools}/src/deep_helpers.cc (98%) rename RecoBTag/{TensorFlow => FeatureTools}/src/sorting_modules.cc (87%) delete mode 100644 RecoBTag/TensorFlow/src/JetConverter.cc diff --git a/RecoBTag/DeepBoostedJet/plugins/BuildFile.xml b/RecoBTag/DeepBoostedJet/plugins/BuildFile.xml index fa7a7cf8bcc61..0b15cd13b46d7 100644 --- a/RecoBTag/DeepBoostedJet/plugins/BuildFile.xml +++ b/RecoBTag/DeepBoostedJet/plugins/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/RecoBTag/DeepBoostedJet/plugins/DeepBoostedJetTagInfoProducer.cc b/RecoBTag/DeepBoostedJet/plugins/DeepBoostedJetTagInfoProducer.cc index 3188032661ee8..5b1290e084082 100644 --- a/RecoBTag/DeepBoostedJet/plugins/DeepBoostedJetTagInfoProducer.cc +++ b/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" diff --git a/RecoBTag/FeatureTools/BuildFile.xml b/RecoBTag/FeatureTools/BuildFile.xml new file mode 100644 index 0000000000000..af9ecf390f336 --- /dev/null +++ b/RecoBTag/FeatureTools/BuildFile.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/RecoBTag/TensorFlow/interface/BoostedDoubleSVTagInfoConverter.h b/RecoBTag/FeatureTools/interface/BoostedDoubleSVTagInfoConverter.h similarity index 59% rename from RecoBTag/TensorFlow/interface/BoostedDoubleSVTagInfoConverter.h rename to RecoBTag/FeatureTools/interface/BoostedDoubleSVTagInfoConverter.h index 9edec9a8d198d..0781da30a7724 100644 --- a/RecoBTag/TensorFlow/interface/BoostedDoubleSVTagInfoConverter.h +++ b/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 diff --git a/RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h b/RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h similarity index 87% rename from RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h rename to RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h index c4b24254f5cf0..9c0f3f261e565 100644 --- a/RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h +++ b/RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h @@ -1,8 +1,8 @@ -#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" @@ -10,7 +10,7 @@ #include "DataFormats/PatCandidates/interface/Jet.h" namespace btagbtvdeep { - + template void commonCandidateToFeatures(const CandidateType * c_pf, const reco::Jet & jet, @@ -18,7 +18,7 @@ namespace btagbtvdeep { 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 diff --git a/RecoBTag/TensorFlow/interface/JetConverter.h b/RecoBTag/FeatureTools/interface/JetConverter.h similarity index 74% rename from RecoBTag/TensorFlow/interface/JetConverter.h rename to RecoBTag/FeatureTools/interface/JetConverter.h index a12c40072296e..faf8f2b087d66 100644 --- a/RecoBTag/TensorFlow/interface/JetConverter.h +++ b/RecoBTag/FeatureTools/interface/JetConverter.h @@ -1,15 +1,15 @@ -#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 @@ -17,9 +17,9 @@ namespace btagbtvdeep { jet_features.mass = jet.mass(); jet_features.energy = jet.energy(); } - }; - + }; + } -#endif //RecoBTag_TensorFlow_JetConverter_h +#endif //RecoBTag_FeatureTools_JetConverter_h diff --git a/RecoBTag/TensorFlow/interface/NeutralCandidateConverter.h b/RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h similarity index 83% rename from RecoBTag/TensorFlow/interface/NeutralCandidateConverter.h rename to RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h index 63394184bbed8..99a620e3d5e67 100644 --- a/RecoBTag/TensorFlow/interface/NeutralCandidateConverter.h +++ b/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 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 diff --git a/RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h b/RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h similarity index 66% rename from RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h rename to RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h index cd5eda1fecd12..361a2c8e89e1c 100644 --- a/RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h +++ b/RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h @@ -1,7 +1,7 @@ -#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" @@ -9,14 +9,14 @@ #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 diff --git a/RecoBTag/TensorFlow/interface/ShallowTagInfoConverter.h b/RecoBTag/FeatureTools/interface/ShallowTagInfoConverter.h similarity index 59% rename from RecoBTag/TensorFlow/interface/ShallowTagInfoConverter.h rename to RecoBTag/FeatureTools/interface/ShallowTagInfoConverter.h index 70c216b673a5d..5d942f6012069 100644 --- a/RecoBTag/TensorFlow/interface/ShallowTagInfoConverter.h +++ b/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 diff --git a/RecoBTag/TensorFlow/interface/TrackInfoBuilder.h b/RecoBTag/FeatureTools/interface/TrackInfoBuilder.h similarity index 92% rename from RecoBTag/TensorFlow/interface/TrackInfoBuilder.h rename to RecoBTag/FeatureTools/interface/TrackInfoBuilder.h index 68bd9c627063d..033a6db606618 100644 --- a/RecoBTag/TensorFlow/interface/TrackInfoBuilder.h +++ b/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 diff --git a/RecoBTag/TensorFlow/interface/deep_helpers.h b/RecoBTag/FeatureTools/interface/deep_helpers.h similarity index 95% rename from RecoBTag/TensorFlow/interface/deep_helpers.h rename to RecoBTag/FeatureTools/interface/deep_helpers.h index e26a5d8c90233..e4a215b38039e 100644 --- a/RecoBTag/TensorFlow/interface/deep_helpers.h +++ b/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 diff --git a/RecoBTag/TensorFlow/interface/sorting_modules.h b/RecoBTag/FeatureTools/interface/sorting_modules.h similarity index 93% rename from RecoBTag/TensorFlow/interface/sorting_modules.h rename to RecoBTag/FeatureTools/interface/sorting_modules.h index 9b8fc37844440..310b93b6bc0e1 100644 --- a/RecoBTag/TensorFlow/interface/sorting_modules.h +++ b/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 #include @@ -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 invertSortingVector(const std::vector > & in); } -#endif //RecoBTag_TensorFlow_sorting_modules_h +#endif //RecoBTag_FeatureTools_sorting_modules_h diff --git a/RecoBTag/TensorFlow/src/BoostedDoubleSVTagInfoConverter.cc b/RecoBTag/FeatureTools/src/BoostedDoubleSVTagInfoConverter.cc similarity index 95% rename from RecoBTag/TensorFlow/src/BoostedDoubleSVTagInfoConverter.cc rename to RecoBTag/FeatureTools/src/BoostedDoubleSVTagInfoConverter.cc index e2260a8826636..adfc412ddc9fe 100644 --- a/RecoBTag/TensorFlow/src/BoostedDoubleSVTagInfoConverter.cc +++ b/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); - - } - + + } + } diff --git a/RecoBTag/TensorFlow/src/ChargedCandidateConverter.cc b/RecoBTag/FeatureTools/src/ChargedCandidateConverter.cc similarity index 96% rename from RecoBTag/TensorFlow/src/ChargedCandidateConverter.cc rename to RecoBTag/FeatureTools/src/ChargedCandidateConverter.cc index 28660ecd30ee2..fe2723da687dd 100644 --- a/RecoBTag/TensorFlow/src/ChargedCandidateConverter.cc +++ b/RecoBTag/FeatureTools/src/ChargedCandidateConverter.cc @@ -1,4 +1,4 @@ -#include "RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h" +#include "RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h" namespace btagbtvdeep { diff --git a/RecoBTag/FeatureTools/src/JetConverter.cc b/RecoBTag/FeatureTools/src/JetConverter.cc new file mode 100644 index 0000000000000..3fc02477f43cb --- /dev/null +++ b/RecoBTag/FeatureTools/src/JetConverter.cc @@ -0,0 +1,4 @@ +#include "RecoBTag/FeatureTools/interface/JetConverter.h" + + + diff --git a/RecoBTag/TensorFlow/src/NeutralCandidateConverter.cc b/RecoBTag/FeatureTools/src/NeutralCandidateConverter.cc similarity index 90% rename from RecoBTag/TensorFlow/src/NeutralCandidateConverter.cc rename to RecoBTag/FeatureTools/src/NeutralCandidateConverter.cc index 716960db602cc..371612f5c948e 100644 --- a/RecoBTag/TensorFlow/src/NeutralCandidateConverter.cc +++ b/RecoBTag/FeatureTools/src/NeutralCandidateConverter.cc @@ -1,29 +1,29 @@ -#include "RecoBTag/TensorFlow/interface/NeutralCandidateConverter.h" +#include "RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h" namespace btagbtvdeep { - - - + + + void packedCandidateToFeatures(const pat::PackedCandidate * n_pf, const pat::Jet & jet, const float drminpfcandsv, const float jetR, NeutralCandidateFeatures & n_pf_features) { - + commonCandidateToFeatures(n_pf, jet, drminpfcandsv, jetR, n_pf_features); - + n_pf_features.hadFrac = n_pf->hcalFraction(); n_pf_features.puppiw = n_pf->puppiWeight(); - - } - + + } + void recoCandidateToFeatures(const reco::PFCandidate * n_pf, const reco::Jet & jet, const float drminpfcandsv, const float jetR, const float puppiw, NeutralCandidateFeatures & n_pf_features) { - + commonCandidateToFeatures(n_pf, jet, drminpfcandsv, jetR, n_pf_features); n_pf_features.puppiw = puppiw; - + // need to get a value map and more stuff to do properly // otherwise will be different than for PackedCandidates // https://github.com/cms-sw/cmssw/blob/master/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py @@ -32,9 +32,9 @@ namespace btagbtvdeep { } else { n_pf_features.hadFrac = 0; } - - } - - + + } + + } diff --git a/RecoBTag/TensorFlow/src/SecondaryVertexConverter.cc b/RecoBTag/FeatureTools/src/SecondaryVertexConverter.cc similarity index 90% rename from RecoBTag/TensorFlow/src/SecondaryVertexConverter.cc rename to RecoBTag/FeatureTools/src/SecondaryVertexConverter.cc index 1770e7c423487..1ab62f0d43580 100644 --- a/RecoBTag/TensorFlow/src/SecondaryVertexConverter.cc +++ b/RecoBTag/FeatureTools/src/SecondaryVertexConverter.cc @@ -1,20 +1,20 @@ -#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" -#include "RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h" +#include "RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h" namespace btagbtvdeep { - - + + void svToFeatures( const reco::VertexCompositePtrCandidate & sv, const reco::Vertex & pv, const reco::Jet & jet, SecondaryVertexFeatures & sv_features, const bool flip) { - + math::XYZVector jet_dir = jet.momentum().Unit(); sv_features.pt = sv.pt(); sv_features.deltaR = catch_infs_and_bound(std::fabs(reco::deltaR(sv, jet_dir))-0.5, @@ -34,8 +34,8 @@ namespace btagbtvdeep { 0,-1,800); sv_features.costhetasvpv = (flip ? -1.f : 1.f)* vertexDdotP(sv,pv); sv_features.enratio = sv.energy()/jet.energy(); - - } - + + } + } diff --git a/RecoBTag/TensorFlow/src/ShallowTagInfoConverter.cc b/RecoBTag/FeatureTools/src/ShallowTagInfoConverter.cc similarity index 90% rename from RecoBTag/TensorFlow/src/ShallowTagInfoConverter.cc rename to RecoBTag/FeatureTools/src/ShallowTagInfoConverter.cc index e1c63c7f3c613..e069bc3e2b87c 100644 --- a/RecoBTag/TensorFlow/src/ShallowTagInfoConverter.cc +++ b/RecoBTag/FeatureTools/src/ShallowTagInfoConverter.cc @@ -1,19 +1,19 @@ -#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" -#include "RecoBTag/TensorFlow/interface/ShallowTagInfoConverter.h" +#include "RecoBTag/FeatureTools/interface/ShallowTagInfoConverter.h" namespace btagbtvdeep { - + static constexpr std::size_t max_jetNSelectedTracks =100; - - + + void bTagToFeatures(const reco::TaggingVariableList & tag_info_vars, ShallowTagInfoFeatures & tag_info_features) { - + tag_info_features.trackSumJetEtRatio = tag_info_vars.get(reco::btau::trackSumJetEtRatio, -999); tag_info_features.trackSumJetDeltaR = tag_info_vars.get(reco::btau::trackSumJetDeltaR, -999); tag_info_features.vertexCategory = tag_info_vars.get(reco::btau::vertexCategory, -999); @@ -24,7 +24,7 @@ namespace btagbtvdeep { tag_info_features.jetNTracksEtaRel = tag_info_vars.get(reco::btau::jetNTracksEtaRel, -1); tag_info_features.jetNSelectedTracks = std::min(tag_info_vars.getList(reco::btau::trackMomentum, false).size(), max_jetNSelectedTracks); - + } } diff --git a/RecoBTag/TensorFlow/src/TrackInfoBuilder.cc b/RecoBTag/FeatureTools/src/TrackInfoBuilder.cc similarity index 98% rename from RecoBTag/TensorFlow/src/TrackInfoBuilder.cc rename to RecoBTag/FeatureTools/src/TrackInfoBuilder.cc index 7c7c939b39ba8..09f8e32e1704c 100644 --- a/RecoBTag/TensorFlow/src/TrackInfoBuilder.cc +++ b/RecoBTag/FeatureTools/src/TrackInfoBuilder.cc @@ -1,4 +1,4 @@ -#include "RecoBTag/TensorFlow/interface/TrackInfoBuilder.h" +#include "RecoBTag/FeatureTools/interface/TrackInfoBuilder.h" #include "DataFormats/PatCandidates/interface/PackedCandidate.h" #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h" #include "DataFormats/BTauReco/interface/JetTagInfo.h" diff --git a/RecoBTag/TensorFlow/src/deep_helpers.cc b/RecoBTag/FeatureTools/src/deep_helpers.cc similarity index 98% rename from RecoBTag/TensorFlow/src/deep_helpers.cc rename to RecoBTag/FeatureTools/src/deep_helpers.cc index 25657ce7611c3..0bdfeae8fd79d 100644 --- a/RecoBTag/TensorFlow/src/deep_helpers.cc +++ b/RecoBTag/FeatureTools/src/deep_helpers.cc @@ -1,4 +1,4 @@ -#include "RecoBTag/TensorFlow/interface/deep_helpers.h" +#include "RecoBTag/FeatureTools/interface/deep_helpers.h" #include "DataFormats/PatCandidates/interface/PackedCandidate.h" namespace btagbtvdeep { diff --git a/RecoBTag/TensorFlow/src/sorting_modules.cc b/RecoBTag/FeatureTools/src/sorting_modules.cc similarity index 87% rename from RecoBTag/TensorFlow/src/sorting_modules.cc rename to RecoBTag/FeatureTools/src/sorting_modules.cc index f58348bc47bf6..6be6db5a7de2d 100644 --- a/RecoBTag/TensorFlow/src/sorting_modules.cc +++ b/RecoBTag/FeatureTools/src/sorting_modules.cc @@ -1,5 +1,5 @@ -#include "RecoBTag/TensorFlow/interface/sorting_modules.h" +#include "RecoBTag/FeatureTools/interface/sorting_modules.h" #include "FWCore/Utilities/interface/Exception.h" #include diff --git a/RecoBTag/TensorFlow/BuildFile.xml b/RecoBTag/TensorFlow/BuildFile.xml index 5d19d8d637294..808744497ceb7 100644 --- a/RecoBTag/TensorFlow/BuildFile.xml +++ b/RecoBTag/TensorFlow/BuildFile.xml @@ -1,7 +1,5 @@ - - diff --git a/RecoBTag/TensorFlow/plugins/BuildFile.xml b/RecoBTag/TensorFlow/plugins/BuildFile.xml index b4787e210de56..b5ad53314db8e 100644 --- a/RecoBTag/TensorFlow/plugins/BuildFile.xml +++ b/RecoBTag/TensorFlow/plugins/BuildFile.xml @@ -4,6 +4,7 @@ + diff --git a/RecoBTag/TensorFlow/plugins/DeepDoubleBTagInfoProducer.cc b/RecoBTag/TensorFlow/plugins/DeepDoubleBTagInfoProducer.cc index d3cf94f6be533..b69b23a762035 100644 --- a/RecoBTag/TensorFlow/plugins/DeepDoubleBTagInfoProducer.cc +++ b/RecoBTag/TensorFlow/plugins/DeepDoubleBTagInfoProducer.cc @@ -21,18 +21,18 @@ #include "DataFormats/BTauReco/interface/DeepDoubleBFeatures.h" #include "DataFormats/BTauReco/interface/DeepDoubleBTagInfo.h" -#include "RecoBTag/TensorFlow/interface/BoostedDoubleSVTagInfoConverter.h" -#include "RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h" -#include "RecoBTag/TensorFlow/interface/JetConverter.h" -#include "RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h" +#include "RecoBTag/FeatureTools/interface/BoostedDoubleSVTagInfoConverter.h" +#include "RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h" +#include "RecoBTag/FeatureTools/interface/JetConverter.h" +#include "RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h" -#include "RecoBTag/TensorFlow/interface/TrackInfoBuilder.h" -#include "RecoBTag/TensorFlow/interface/sorting_modules.h" +#include "RecoBTag/FeatureTools/interface/TrackInfoBuilder.h" +#include "RecoBTag/FeatureTools/interface/sorting_modules.h" #include "DataFormats/Candidate/interface/VertexCompositePtrCandidate.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "RecoBTag/TensorFlow/interface/deep_helpers.h" +#include "RecoBTag/FeatureTools/interface/deep_helpers.h" class DeepDoubleBTagInfoProducer : public edm::stream::EDProducer<> { diff --git a/RecoBTag/TensorFlow/plugins/DeepFlavourTagInfoProducer.cc b/RecoBTag/TensorFlow/plugins/DeepFlavourTagInfoProducer.cc index 20e27736b3ba5..97a2d3e07f30d 100644 --- a/RecoBTag/TensorFlow/plugins/DeepFlavourTagInfoProducer.cc +++ b/RecoBTag/TensorFlow/plugins/DeepFlavourTagInfoProducer.cc @@ -19,19 +19,19 @@ #include "DataFormats/BTauReco/interface/DeepFlavourTagInfo.h" #include "DataFormats/BTauReco/interface/DeepFlavourFeatures.h" -#include "RecoBTag/TensorFlow/interface/JetConverter.h" -#include "RecoBTag/TensorFlow/interface/ShallowTagInfoConverter.h" -#include "RecoBTag/TensorFlow/interface/SecondaryVertexConverter.h" -#include "RecoBTag/TensorFlow/interface/NeutralCandidateConverter.h" -#include "RecoBTag/TensorFlow/interface/ChargedCandidateConverter.h" +#include "RecoBTag/FeatureTools/interface/JetConverter.h" +#include "RecoBTag/FeatureTools/interface/ShallowTagInfoConverter.h" +#include "RecoBTag/FeatureTools/interface/SecondaryVertexConverter.h" +#include "RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h" +#include "RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h" -#include "RecoBTag/TensorFlow/interface/TrackInfoBuilder.h" -#include "RecoBTag/TensorFlow/interface/sorting_modules.h" +#include "RecoBTag/FeatureTools/interface/TrackInfoBuilder.h" +#include "RecoBTag/FeatureTools/interface/sorting_modules.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/Candidate/interface/VertexCompositePtrCandidate.h" -#include "RecoBTag/TensorFlow/interface/deep_helpers.h" +#include "RecoBTag/FeatureTools/interface/deep_helpers.h" #include "FWCore/ParameterSet/interface/Registry.h" #include "FWCore/Common/interface/Provenance.h" @@ -276,8 +276,8 @@ void DeepFlavourTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSet const edm::Provenance *prov = shallow_tag_infos.provenance(); const edm::ParameterSet& psetFromProvenance = edm::parameterSet(*prov); - double negative_cut = ( ( psetFromProvenance.getParameter("computer") - ).getParameter("trackSelection") + double negative_cut = ( ( psetFromProvenance.getParameter("computer") + ).getParameter("trackSelection") ).getParameter("sip3dSigMax"); for (unsigned int i = 0; i < jet.numberOfDaughters(); i++){ @@ -320,7 +320,7 @@ void DeepFlavourTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSet auto & c_pf_features = features.c_pf_features.at(entry); // fill feature structure if (packed_cand) { - btagbtvdeep::packedCandidateToFeatures(packed_cand, jet, trackinfo, + btagbtvdeep::packedCandidateToFeatures(packed_cand, jet, trackinfo, drminpfcandsv, static_cast (jet_radius_), c_pf_features, flip_); } else if (reco_cand) { // get vertex association quality @@ -346,7 +346,7 @@ void DeepFlavourTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSet const reco::VertexRef & PV_orig = (*pvas)[reco_ptr]; if(PV_orig.isNonnull()) PV = reco::VertexRef(vtxs, PV_orig.key()); } - btagbtvdeep::recoCandidateToFeatures(reco_cand, jet, trackinfo, + btagbtvdeep::recoCandidateToFeatures(reco_cand, jet, trackinfo, drminpfcandsv, static_cast (jet_radius_), puppiw, pv_ass_quality, PV, c_pf_features, flip_); } diff --git a/RecoBTag/TensorFlow/src/JetConverter.cc b/RecoBTag/TensorFlow/src/JetConverter.cc deleted file mode 100644 index 1c798b48c382a..0000000000000 --- a/RecoBTag/TensorFlow/src/JetConverter.cc +++ /dev/null @@ -1,4 +0,0 @@ -#include "RecoBTag/TensorFlow/interface/JetConverter.h" - - -