moving DataFormats/RecoCandidate/interface/TrackAssociation.h -> SimD…

…ataFormats/Associations/interface/TrackAssociation.h
cms-sw · Mar 16, 2021 · d60f967 · d60f967
1 parent 8da12e8
commit d60f967
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 31 deletions.
diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
@@ -3,7 +3,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/DataFormats/RecoCandidate/BuildFile.xml b/DataFormats/RecoCandidate/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="DataFormats/EgammaReco"/>
 <use name="DataFormats/GsfTrackReco"/>
 <use name="clhep"/>
-<use name="SimDataFormats/TrackingAnalysis"/>
 <use name="DataFormats/Math"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>

diff --git a/DataFormats/RecoCandidate/src/classes.h b/DataFormats/RecoCandidate/src/classes.h
@@ -17,7 +17,6 @@
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateIsolation.h"
 #include "DataFormats/RecoCandidate/interface/FitResult.h"
 #include "DataFormats/RecoCandidate/interface/CaloRecHitCandidate.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 #include "DataFormats/RecoCandidate/interface/TrackCandidateAssociation.h"
 #include "DataFormats/Common/interface/RefProd.h"
 #include "DataFormats/Common/interface/Wrapper.h"

diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml
@@ -82,22 +82,9 @@
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::Track> >,edm::RefProd<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> > > >" />
   <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,unsigned int> > >" />
 
-  <class name="edm::Wrapper<reco::SimToRecoCollection>" />
-  <class name="edm::Wrapper<reco::RecoToSimCollection>" />
-
-  <class name="reco::SimToRecoCollection" >
-   <field name="transientMap_" transient="true"/>
-  </class>
-  <class name="reco::RecoToSimCollection" >
-   <field name="transientMap_" transient="true"/>
-  </class>
-
-
   <class name="edm::ValueMap<reco::IsoDeposit>" />
   <class name="edm::ValueMap<reco::FitQuality>" />
   <!-- <class pattern="edm::Wrapper<edm::ValueMap<*>" /> -->
-  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<edm::View<reco::Track>,vector<TrackingParticle>,double,unsigned int,edm::RefToBaseProd<reco::Track>,edm::RefProd<vector<TrackingParticle> >,edm::RefToBase<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> > > > >" />
-<class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<vector<TrackingParticle>,edm::View<reco::Track>,double,unsigned int,edm::RefProd<vector<TrackingParticle> >,edm::RefToBaseProd<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> >,edm::RefToBase<reco::Track> > > >" />
 <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<vector<reco::Track>,edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,unsigned int> > >" />
 <class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::RecoChargedCandidate>,float,unsigned int> > >" />
 <class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::RecoEcalCandidate>,float,unsigned int> > >" />

diff --git a/RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h b/RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h
@@ -10,7 +10,7 @@
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include <vector>
 

diff --git a/...ecoCandidate/interface/TrackAssociation.h → ...Associations/interface/TrackAssociation.h b/...ecoCandidate/interface/TrackAssociation.h → ...Associations/interface/TrackAssociation.h
diff --git a/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h b/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
@@ -11,7 +11,7 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 

diff --git a/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
@@ -11,7 +11,7 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 

diff --git a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
@@ -23,7 +23,7 @@
 #include <memory>
 
 // user include files
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"

diff --git a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
@@ -10,7 +10,7 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"

diff --git a/SimDataFormats/Associations/src/classes.h b/SimDataFormats/Associations/src/classes.h
@@ -8,6 +8,7 @@
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
 #include "SimDataFormats/Associations/interface/LayerClusterToCaloParticleAssociator.h"
 #include "SimDataFormats/Associations/interface/LayerClusterToSimClusterAssociator.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 namespace SimDataFormats_Associations {
   struct SimDataFormats_Associations {

diff --git a/SimDataFormats/Associations/src/classes_def.xml b/SimDataFormats/Associations/src/classes_def.xml
@@ -49,4 +49,19 @@
 
   <class name="edm::helpers::KeyVal<edm::RefProd<vector<SimCluster> >,edm::RefProd<vector<reco::CaloCluster> > >" />
   <class name="edm::helpers::KeyVal<edm::RefProd<vector<reco::CaloCluster> >,edm::RefProd<vector<SimCluster> > >" />
+
+  <class name="edm::Wrapper<reco::SimToRecoCollection>" />
+  <class name="edm::Wrapper<reco::RecoToSimCollection>" />
+
+  <class name="reco::SimToRecoCollection" >
+   <field name="transientMap_" transient="true"/>
+  </class>
+  <class name="reco::RecoToSimCollection" >
+   <field name="transientMap_" transient="true"/>
+  </class>
+  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<edm::View<reco::Track>,vector<TrackingParticle>,double,unsigned int,edm::RefToBaseProd<reco::Track>,edm::RefProd<vector<TrackingParticle> >,edm::RefToBase<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> > > > >" />
+<class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<vector<TrackingParticle>,edm::View<reco::Track>,double,unsigned int,edm::RefProd<vector<TrackingParticle> >,edm::RefToBaseProd<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> >,edm::RefToBase<reco::Track> > > >" />
+
+
+
 </lcgdict>
diff --git a/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h b/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
@@ -3,13 +3,13 @@
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"

diff --git a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
@@ -1,5 +1,5 @@
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h"
 #include <memory>

diff --git a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
@@ -1,7 +1,7 @@
 #ifndef MCTruth_MuonAssociatorEDProducer_h
 #define MCTruth_MuonAssociatorEDProducer_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"

diff --git a/SimMuon/MCTruth/test/testReader.cc b/SimMuon/MCTruth/test/testReader.cc
@@ -1,4 +1,4 @@
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"

diff --git a/SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h b/SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h
@@ -15,7 +15,7 @@
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h"
 
 #include <map>

diff --git a/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h b/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
@@ -1,7 +1,7 @@
 #ifndef SimTracker_VertexAssociation_VertexAssociatorByPositionAndTracks_h
 #define SimTracker_VertexAssociation_VertexAssociatorByPositionAndTracks_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 
 /**

diff --git a/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h b/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
@@ -1,7 +1,7 @@
 #ifndef VertexAssociatorByTracks_h
 #define VertexAssociatorByTracks_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 
 class TrackingParticleSelector;

diff --git a/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h b/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
@@ -1,7 +1,7 @@
 #ifndef SimTracker_VertexAssociation_calculateVertexSharedTracks_h
 #define SimTracker_VertexAssociation_calculateVertexSharedTracks_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 

diff --git a/Validation/RecoMuon/plugins/MuonTrackValidator.h b/Validation/RecoMuon/plugins/MuonTrackValidator.h
@@ -11,7 +11,7 @@
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 class MuonTrackValidator : public DQMEDAnalyzer, protected MuonTrackValidatorBase {

diff --git a/Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc b/Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc
@@ -31,7 +31,7 @@
 #include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
 
 #include "DataFormats/Math/interface/deltaPhi.h"