Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moving DataFormats/RecoCandidate/interface/TrackAssociation.h into SimDataFormats #33186

Merged
merged 8 commits into from
Apr 26, 2021
Merged

moving DataFormats/RecoCandidate/interface/TrackAssociation.h into SimDataFormats #33186

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d60f967
moving DataFormats/RecoCandidate/interface/TrackAssociation.h -> SimD…
davidlange6 Mar 16, 2021
bf1efcb
add missing dependencies
davidlange6 Mar 16, 2021
cc84fcf
Merge branch 'master' into dl210316rc
davidlange6 Mar 22, 2021
62fe7a4
fix dependencies
davidlange6 Mar 31, 2021
9fd7093
fix more buildfiles
davidlange6 Mar 31, 2021
64e8872
adding missing dep on SimDataFormats/TrackingAnalysis
davidlange6 Apr 9, 2021
e1fda72
Merge branch 'master' into dl210316rc
davidlange6 Apr 16, 2021
c75d0d0
Merge branch 'master' into dl210316rc
davidlange6 Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
14 changes: 13 additions & 1 deletion DQMOffline/RecoB/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
<use name="root"/>
<use name="CommonTools/Statistics"/>
<use name="DQMOffline/RecoB"/>
<use name="DQMServices/Core"/>
<use name="CommonTools/Statistics"/>
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/VertexReco"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="JetMETCorrections/JetCorrector"/>
<use name="SimDataFormats/GeneratorProducts"/>
<library file="BTagPerformanceAnalyzerOnData.cc PrimaryVertexMonitor.cc BTagPerformanceHarvester.cc" name="DQMOfflineRecoBPlugins">
<flags EDM_PLUGIN="1"/>
</library>

1 change: 0 additions & 1 deletion DataFormats/RecoCandidate/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<use name="DataFormats/EgammaReco"/>
<use name="DataFormats/GsfTrackReco"/>
<use name="clhep"/>
<use name="SimDataFormats/TrackingAnalysis"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apparently CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h (and CommonTools/RecoAlgos/BuildFile.xml ) depended on this to pull in the dependence on SimDataFormats/TrackingAnalysis .

So, we need to get it added to CommonTools/RecoAlgos/BuildFile.xml

<use name="DataFormats/Math"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/RecoCandidate/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 0 additions & 13 deletions DataFormats/RecoCandidate/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> > >" />
Expand Down
10 changes: 10 additions & 0 deletions EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
<use name="Geometry/Records"/>
<use name="EgammaAnalysis/ElectronTools"/>
<use name="TrackingTools/Records"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/GBRForest"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/RecoCandidate"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CaloEventSetup"/>
<use name="Geometry/CaloGeometry"/>
<use name="TrackingTools/IPTools"/>
<library name="EgammaAnalysisElectronToolsPlugins" file="*.cc">
<flags EDM_PLUGIN="1"/>
</library>
Expand Down
1 change: 1 addition & 0 deletions EgammaAnalysis/ElectronTools/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<use name="FWCore/ParameterSet"/>
<use name="EgammaAnalysis/ElectronTools"/>
<use name="TrackingTools/Records"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="clhep"/>
<use name="root"/>
<use name="roottmva"/>
Expand Down
26 changes: 26 additions & 0 deletions L1Trigger/L1TNtuples/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,32 @@
<use name="L1Trigger/GlobalTriggerAnalyzer"/>
<use name="HLTrigger/HLTcore"/>
<use name="L1Trigger/L1TNtuples"/>
<use name="CondFormats/AlignmentRecord"/>
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/HLTReco"/>
<use name="DataFormats/HepMCCandidate"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/MuonDetId"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/TauReco"/>
<use name="EventFilter/L1TRawToDigi"/>
<use name="FWCore/Common"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/Records"/>
<use name="JetMETCorrections/JetCorrector"/>
<use name="MagneticField/Engine"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="SimDataFormats/PileupSummaryInfo"/>
<use name="TrackingTools/GeomPropagators"/>
<use name="TrackingTools/PatternTools"/>
<use name="TrackingTools/Records"/>
<library file="*.cc" name="L1TriggerL1TNtuplePlugins">
<flags EDM_PLUGIN="1"/>
</library>
11 changes: 9 additions & 2 deletions RecoHI/HiTracking/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/TrackerCommon"/>
<use name="DataFormats/ParticleFlowReco"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/VertexReco"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="TrackingTools/PatternTools"/>
<use name="RecoPixelVertexing/PixelTrackFitting"/>
<use name="RecoPixelVertexing/PixelLowPtUtilities"/>
<use name="DataFormats/ParticleFlowReco"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="SimDataFormats/TrackingAnalysis"/>
<export>
<lib name="1"/>
</export>
26 changes: 25 additions & 1 deletion RecoHI/HiTracking/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
<use name="RecoHI/HiTracking"/>
<use name="CommonTools/UtilAlgos"/>
<use name="CommonTools/Utils"/>
<use name="CondFormats/GBRForest"/>
<use name="DataFormats/BeamSpot"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/SiPixelCluster"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/TrackerCommon"/>
<use name="DataFormats/TrackerRecHit2D"/>
<use name="DataFormats/VertexReco"/>
<use name="CondFormats/DataRecord"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/CommonTopologies"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="RecoPixelVertexing/PixelTrackFitting"/>
<use name="RecoTracker/TkTrackingRegions"/>
<use name="RecoHI/HiTracking"/>
<use name="SimDataFormats/Vertex"/>
<use name="TrackingTools/PatternTools"/>
<use name="rootminuit"/>
<library file="*.cc" name="RecoHIHiTrackingPlugins">
<flags EDM_PLUGIN="1"/>
Expand Down
2 changes: 2 additions & 0 deletions RecoJets/JetProducers/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<use name="Geometry/Records"/>
<use name="Geometry/CommonDetUnit"/>
<use name="SimDataFormats/CaloHit"/>
<use name="SimDataFormats/Vertex"/>
<use name="SimDataFormats/Track"/>
<use name="RecoJets/JetAlgorithms"/>
<use name="JetMETCorrections/JetCorrector"/>
<use name="DataFormats/CastorReco"/>
Expand Down
2 changes: 1 addition & 1 deletion RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
0 ...ecoCandidate/interface/TrackAssociation.h → ...Associations/interface/TrackAssociation.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions SimDataFormats/Associations/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
#include "SimDataFormats/Associations/interface/TTTrackTruthPair.h"

namespace SimDataFormats_Associations {
Expand Down
12 changes: 12 additions & 0 deletions SimDataFormats/Associations/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,18 @@
<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> > > >" />

<class name="TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > >" />
<class name="std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > >" />
<class name="edm::Ref<std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > > >" />
Expand Down
2 changes: 1 addition & 1 deletion SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SimMuon/MCTruth/test/testReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

/**
Expand Down
2 changes: 1 addition & 1 deletion SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
1 change: 1 addition & 0 deletions TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<use name="TrackingTools/TrackAssociator"/>
<use name="DataFormats/TrackReco"/>
<use name="CondFormats/BeamSpotObjects"/>
<use name="SimDataFormats/GeneratorProducts"/>
<flags EDM_PLUGIN="1"/>
8 changes: 8 additions & 0 deletions TopQuarkAnalysis/TopEventProducers/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,13 @@
<use name="TopQuarkAnalysis/TopJetCombination"/>
<use name="TopQuarkAnalysis/TopEventSelection"/>
<use name="RecoJets/JetProducers"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/HepMCCandidate"/>
<use name="DataFormats/Math"/>
<use name="FWCore/Common"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="TopQuarkAnalysis/TopTools"/>
<use name="fastjet"/>
<flags EDM_PLUGIN="1"/>
1 change: 1 addition & 0 deletions Validation/RecoJets/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<use name="DataFormats/PatCandidates"/>
<use name="DataFormats/HeavyIonEvent"/>
<use name="JetMETCorrections/JetCorrector"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="root"/>
<library file="*.cc" name="ValidationRecoJetsPlugins">
<flags EDM_PLUGIN="1"/>
Expand Down
2 changes: 1 addition & 1 deletion Validation/RecoMuon/plugins/MuonTrackValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down