Merge pull request #34944 from makortel/cleanupTrackAssociatorRecord

Remove MuonToSimAssociatorBase, MuonToSimAssociatorByHits, and TrackAssociatorRecord as obsolete
cms-sw · Aug 21, 2021 · c07daee · c07daee
2 parents 58edc28 + b19bdaa
commit c07daee
Show file tree

Hide file tree

Showing 36 changed files with 3 additions and 562 deletions.
diff --git a/Calibration/IsolatedParticles/interface/MatchingSimTrack.h b/Calibration/IsolatedParticles/interface/MatchingSimTrack.h
@@ -22,7 +22,6 @@
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
 namespace spr {
 

diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc
@@ -71,7 +71,6 @@
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 // track associator
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 

diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc
@@ -101,7 +101,6 @@
 #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
 
 // tracker hit associator
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "RecoCaloTools/Navigation/interface/CaloNavigator.h"
 

diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc
@@ -92,7 +92,6 @@
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 // track associator
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"

diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc
@@ -134,7 +134,6 @@
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 // track associator
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"

diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc
@@ -35,7 +35,6 @@
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 // track associator
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 

diff --git a/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml b/MuonAnalysis/MuonAssociators/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="CommonTools/Utils"/>
 <use name="DataFormats/PatCandidates"/>
 <use name="FWCore/MessageLogger"/>
-<use name="SimTracker/Records"/>
 <use name="SimDataFormats/Associations"/>
 <use name="MuonAnalysis/MuonAssociators"/>
 <export>

diff --git a/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc b/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc
@@ -56,7 +56,6 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include <SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h>
 
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"

diff --git a/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc b/RecoMuon/GlobalTrackingTools/src/DynamicTruncation.cc
@@ -26,7 +26,6 @@
 #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h"
 #include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
 #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
 #define MAX_THR 1e7
 

diff --git a/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis b/RecoVertex/ConfigurableVertexReco/test/BuildFile.CVRAnalysis
@@ -1,5 +1,4 @@
 <use name=SimTracker/TrackAssociation>
-<use name=SimTracker/Records>
 
 <library file="CVRAnalysis.cc VertexHisto.cc TrackHisto.cc" name=CVRAnalysis>
 	<use name=FWCore/Framework>

diff --git a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
 <use name="FWCore/Framework"/>
 <use name="DataFormats/Common"/>
 <use name="SimDataFormats/TrackingAnalysis"/>
-<use name="SimTracker/Records"/>
 <use name="FWCore/ParameterSet"/>
+<use name="TrackingTools/Records"/>
 <use name="TrackingTools/TransientTrack"/>
 <use name="RecoVertex/KalmanVertexFit"/>
 <use name="clhep"/>

diff --git a/RecoVertex/KalmanVertexFit/plugins/KVFTrackUpdate.cc b/RecoVertex/KalmanVertexFit/plugins/KVFTrackUpdate.cc
@@ -9,7 +9,6 @@
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "RecoVertex/VertexPrimitives/interface/TransientVertex.h"
 #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "RecoVertex/KalmanVertexFit/interface/SingleTrackVertexConstraint.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 

diff --git a/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h b/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h
diff --git a/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h b/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h
diff --git a/SimMuon/MCTruth/plugins/BuildFile.xml b/SimMuon/MCTruth/plugins/BuildFile.xml
@@ -6,10 +6,10 @@
   <use name="DataFormats/CSCRecHit"/>
   <use name="DataFormats/MuonReco"/>
   <use name="Geometry/Records"/>
+  <use name="MagneticField/Records"/>
   <use name="SimDataFormats/Track"/>
   <use name="SimDataFormats/TrackingHit"/>
   <use name="SimDataFormats/Associations"/>
-  <use name="SimTracker/Records"/>
   <use name="SimMuon/MCTruth"/>
   <use name="clhep"/>
   <flags EDM_PLUGIN="1"/>

diff --git a/SimMuon/MCTruth/plugins/MuonSimClassifier.cc b/SimMuon/MCTruth/plugins/MuonSimClassifier.cc
@@ -61,7 +61,6 @@
 
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 

diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc