diff --git a/PhysicsTools/TensorFlow/BuildFile.xml b/PhysicsTools/TensorFlow/BuildFile.xml index e23187dee2d8c..f4f81f722a32c 100644 --- a/PhysicsTools/TensorFlow/BuildFile.xml +++ b/PhysicsTools/TensorFlow/BuildFile.xml @@ -1,4 +1,5 @@ <use name="tensorflow-cc"/> +<use name="FWCore/Framework"/> <use name="FWCore/Utilities"/> <use name="FWCore/MessageLogger"/> <export> diff --git a/RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h b/PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h similarity index 82% rename from RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h rename to PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h index 1ecee9699ed8b..03b1d54aae6f0 100644 --- a/RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h +++ b/PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_FinalTrackSelectors_TfGraphDefWrapper_h -#define RecoTracker_FinalTrackSelectors_TfGraphDefWrapper_h +#ifndef PhysicsTools_TensorFlow_TfGraphDefWrapper_h +#define PhysicsTools_TensorFlow_TfGraphDefWrapper_h #include "PhysicsTools/TensorFlow/interface/TensorFlow.h" diff --git a/TrackingTools/Records/interface/TfGraphRecord.h b/PhysicsTools/TensorFlow/interface/TfGraphRecord.h similarity index 73% rename from TrackingTools/Records/interface/TfGraphRecord.h rename to PhysicsTools/TensorFlow/interface/TfGraphRecord.h index cad4bfba9f998..63039d9aaf459 100644 --- a/TrackingTools/Records/interface/TfGraphRecord.h +++ b/PhysicsTools/TensorFlow/interface/TfGraphRecord.h @@ -1,11 +1,11 @@ -#ifndef TrackingTools_Records_TfGraphRecord_h -#define TrackingTools_Records_TfGraphRecord_h +#ifndef PhysicsTools_TensorFlow_TfGraphRecord_h +#define PhysicsTools_TensorFlow_TfGraphRecord_h // -*- C++ -*- // -// Package: TrackingTools/Records +// Package: PhysicsTools/TensorFlow // Class : TfGraphRecord // -/**\class TfGraphRecord TfGraphRecord.h TrackingTools/Records/interface/TfGraphRecord.h +/**\class TfGraphRecord TfGraphRecord.h PhysicsTools/TensorFlow/interface/TfGraphRecord.h Description: Class to hold Record of a Tensorflow GraphDef that can be used to serve a pretrained tensorflow model for inference Usage: Used by DataFormats/TrackTfGraph to produce the GraphRecord and RecoTrack/FinalTrackSelection/plugins/TrackTfClassifier.cc to evaluate a track using the graph. diff --git a/PhysicsTools/TensorFlow/plugins/BuildFile.xml b/PhysicsTools/TensorFlow/plugins/BuildFile.xml new file mode 100644 index 0000000000000..a005aba128cf6 --- /dev/null +++ b/PhysicsTools/TensorFlow/plugins/BuildFile.xml @@ -0,0 +1,9 @@ +<use name="FWCore/Framework"/> +<use name="FWCore/MessageLogger"/> +<use name="FWCore/ParameterSet"/> +<use name="FWCore/PluginManager"/> +<use name="PhysicsTools/TensorFlow"/> +<use name="TrackingTools/Records"/> +<library file="*.cc" name="PhysicsToolsTensorFlowPlugins"> + <flags EDM_PLUGIN="1"/> +</library> diff --git a/RecoTracker/FinalTrackSelectors/plugins/TfGraphDefProducer.cc b/PhysicsTools/TensorFlow/plugins/TfGraphDefProducer.cc similarity index 91% rename from RecoTracker/FinalTrackSelectors/plugins/TfGraphDefProducer.cc rename to PhysicsTools/TensorFlow/plugins/TfGraphDefProducer.cc index 22377cb7468ab..a749a9f70bfde 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TfGraphDefProducer.cc +++ b/PhysicsTools/TensorFlow/plugins/TfGraphDefProducer.cc @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Package: RecoTracker/FinalTrackSelectors +// Package: PhysicsTools/TensorFlow // Class: TFGraphDefProducer // /**\class TFGraphDefProducer @@ -20,8 +20,8 @@ #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "TrackingTools/Records/interface/TfGraphRecord.h" -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphRecord.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" // class declaration diff --git a/RecoTracker/FinalTrackSelectors/src/ES_TfGraphDefWrapper.cc b/PhysicsTools/TensorFlow/src/ES_TfGraphDefWrapper.cc similarity index 55% rename from RecoTracker/FinalTrackSelectors/src/ES_TfGraphDefWrapper.cc rename to PhysicsTools/TensorFlow/src/ES_TfGraphDefWrapper.cc index 112e741062ed4..81012b71d498c 100644 --- a/RecoTracker/FinalTrackSelectors/src/ES_TfGraphDefWrapper.cc +++ b/PhysicsTools/TensorFlow/src/ES_TfGraphDefWrapper.cc @@ -1,4 +1,4 @@ -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(TfGraphDefWrapper); diff --git a/RecoTracker/FinalTrackSelectors/src/TfGraphDefWrapper.cc b/PhysicsTools/TensorFlow/src/TfGraphDefWrapper.cc similarity index 80% rename from RecoTracker/FinalTrackSelectors/src/TfGraphDefWrapper.cc rename to PhysicsTools/TensorFlow/src/TfGraphDefWrapper.cc index cd025e2dacf12..a8951345e841f 100644 --- a/RecoTracker/FinalTrackSelectors/src/TfGraphDefWrapper.cc +++ b/PhysicsTools/TensorFlow/src/TfGraphDefWrapper.cc @@ -1,4 +1,4 @@ -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" TfGraphDefWrapper::TfGraphDefWrapper(tensorflow::Session* session, tensorflow::GraphDef* graph) : session_(session), graph_(graph) {} diff --git a/TrackingTools/Records/src/TfGraphRecord.cc b/PhysicsTools/TensorFlow/src/TfGraphRecord.cc similarity index 70% rename from TrackingTools/Records/src/TfGraphRecord.cc rename to PhysicsTools/TensorFlow/src/TfGraphRecord.cc index edcbf58893369..9abf56d7cd8e4 100644 --- a/TrackingTools/Records/src/TfGraphRecord.cc +++ b/PhysicsTools/TensorFlow/src/TfGraphRecord.cc @@ -1,12 +1,12 @@ // -*- C++ -*- // -// Package: TrackingTools/Records +// Package: PhysicsTools/TensorFlow // Class : TfGraphRecord // // Author: Joona Havukainen // Created: Fri, 24 Jul 2020 07:39:35 GMT -#include "TrackingTools/Records/interface/TfGraphRecord.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphRecord.h" #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" EVENTSETUP_RECORD_REG(TfGraphRecord); diff --git a/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc b/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc index ed6c732a04498..b76a1584f9686 100644 --- a/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc +++ b/RecoHGCal/TICL/plugins/TrackstersMergeProducer.cc @@ -14,9 +14,9 @@ #include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h" #include "RecoHGCal/TICL/interface/GlobalCache.h" -#include "TrackingTools/Records/interface/TfGraphRecord.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphRecord.h" #include "PhysicsTools/TensorFlow/interface/TensorFlow.h" -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" #include "DataFormats/HGCalReco/interface/TICLCandidate.h" diff --git a/RecoHGCal/TICL/plugins/TrackstersProducer.cc b/RecoHGCal/TICL/plugins/TrackstersProducer.cc index 9ab49a19662c3..005d19ba1ec2d 100644 --- a/RecoHGCal/TICL/plugins/TrackstersProducer.cc +++ b/RecoHGCal/TICL/plugins/TrackstersProducer.cc @@ -25,9 +25,9 @@ #include "PatternRecognitionbyCA.h" #include "PatternRecognitionbyMultiClusters.h" -#include "TrackingTools/Records/interface/TfGraphRecord.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphRecord.h" #include "PhysicsTools/TensorFlow/interface/TensorFlow.h" -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" using namespace ticl; diff --git a/RecoHGCal/TICL/python/tracksterSelectionTf_cfi.py b/RecoHGCal/TICL/python/tracksterSelectionTf_cfi.py index 8488872a93710..c57e372622cdc 100644 --- a/RecoHGCal/TICL/python/tracksterSelectionTf_cfi.py +++ b/RecoHGCal/TICL/python/tracksterSelectionTf_cfi.py @@ -1,4 +1,4 @@ -from RecoTracker.FinalTrackSelectors.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer +from PhysicsTools.TensorFlow.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer tracksterSelectionTf = _tfGraphDefProducer.clone( ComponentName = "tracksterSelectionTf", FileName = "RecoHGCal/TICL/data/tf_models/energy_id_v0.pb" diff --git a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml index 9c9bf958bda12..ed0db0add7b33 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml +++ b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml @@ -1,13 +1,15 @@ <use name="ofast-flag"/> -<use name="RecoTracker/FinalTrackSelectors"/> +<use name="CommonTools/Statistics"/> +<use name="CommonTools/Utils"/> +<use name="CondFormats/GBRForest"/> <use name="DataFormats/Common"/> <use name="DataFormats/GeometryCommonDetAlgo"/> <use name="DataFormats/Math"/> -<use name="DataFormats/TrackerCommon"/> <use name="DataFormats/SiPixelDetId"/> <use name="DataFormats/SiStripDetId"/> <use name="DataFormats/TrackCandidate"/> <use name="DataFormats/TrackReco"/> +<use name="DataFormats/TrackerCommon"/> <use name="DataFormats/TrackerRecHit2D"/> <use name="DataFormats/TrackingRecHit"/> <use name="DataFormats/TrajectorySeed"/> @@ -19,18 +21,17 @@ <use name="Geometry/CommonDetUnit" source_only="1"/> <use name="Geometry/Records"/> <use name="Geometry/TrackerGeometryBuilder"/> -<use name="TrackingTools/Records"/> <use name="MagneticField/Engine"/> <use name="MagneticField/Records"/> -<use name="TrackingTools/PatternTools"/> +<use name="PhysicsTools/TensorFlow"/> <use name="RecoLocalTracker/SiStripClusterizer"/> -<use name="TrackingTools/TransientTrack"/> +<use name="RecoTracker/FinalTrackSelectors"/> +<use name="RecoTracker/Record"/> <use name="TrackingTools/GeomPropagators"/> <use name="TrackingTools/KalmanUpdators"/> -<use name="CondFormats/GBRForest"/> -<use name="CommonTools/Utils"/> -<use name="CommonTools/Statistics"/> -<use name="RecoTracker/Record"/> +<use name="TrackingTools/PatternTools"/> +<use name="TrackingTools/Records"/> +<use name="TrackingTools/TransientTrack"/> <use name="clhep"/> <use name="roottmva"/> <use name="lwtnn"/> diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc index 47915f6342bfd..75b2e861097eb 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc @@ -7,9 +7,9 @@ #include "FWCore/Framework/interface/ConsumesCollector.h" #include "RecoTracker/FinalTrackSelectors/interface/getBestVertex.h" -#include "TrackingTools/Records/interface/TfGraphRecord.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphRecord.h" #include "PhysicsTools/TensorFlow/interface/TensorFlow.h" -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" namespace { class TfDnn { diff --git a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py index 84587df988c63..b023e25359e7e 100644 --- a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py @@ -1,4 +1,4 @@ -from RecoTracker.FinalTrackSelectors.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer +from PhysicsTools.TensorFlow.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer trackSelectionTf_CKF = _tfGraphDefProducer.clone( ComponentName = "trackSelectionTf_CKF", diff --git a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py index 0e9bfbb690323..ecdbf7cb72397 100644 --- a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py @@ -1,4 +1,4 @@ -from RecoTracker.FinalTrackSelectors.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer +from PhysicsTools.TensorFlow.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer trackSelectionTf = _tfGraphDefProducer.clone( ComponentName = "trackSelectionTf", FileName = "RecoTracker/FinalTrackSelectors/data/TrackTfClassifier/MkFit4plus3_2021Run3.pb" diff --git a/RecoTracker/MkFit/plugins/MkFitOutputConverter.cc b/RecoTracker/MkFit/plugins/MkFitOutputConverter.cc index 73ea2a7f58f31..e7f33abddd957 100644 --- a/RecoTracker/MkFit/plugins/MkFitOutputConverter.cc +++ b/RecoTracker/MkFit/plugins/MkFitOutputConverter.cc @@ -42,9 +42,9 @@ #include "RecoTracker/MkFitCore/interface/HitStructures.h" //extra for DNN with cands -#include "TrackingTools/Records/interface/TfGraphRecord.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphRecord.h" #include "PhysicsTools/TensorFlow/interface/TensorFlow.h" -#include "RecoTracker/FinalTrackSelectors/interface/TfGraphDefWrapper.h" +#include "PhysicsTools/TensorFlow/interface/TfGraphDefWrapper.h" #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" #include "DataFormats/VertexReco/interface/Vertex.h"