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

move TTTrackTruthPair to SimDataFormats/Associations #33188

Merged
merged 2 commits into from
Mar 20, 2021
Merged

move TTTrackTruthPair to SimDataFormats/Associations #33188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ec9b44
move TTTrackTruthPair to SimDataFormats/Associations
davidlange6 Mar 16, 2021
93a7d33
also move L1TrackTruthPair
davidlange6 Mar 16, 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
1 change: 0 additions & 1 deletion DataFormats/L1TrackTrigger/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<use name="DataFormats/TrackerCommon"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="SimDataFormats/TrackingAnalysis"/>
<export>
<lib name="1"/>
</export>
1 change: 0 additions & 1 deletion DataFormats/L1TrackTrigger/src/TTTrackTruthPair.cc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion DataFormats/L1TrackTrigger/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
#include "DataFormats/L1TrackTrigger/interface/TTDTC.h"
#include "DataFormats/L1TrackTrigger/interface/TTTrackTruthPair.h"
#include "DataFormats/Common/interface/RefVector.h"
#include "DataFormats/Common/interface/RefProd.h"

Expand Down
4 changes: 0 additions & 4 deletions DataFormats/L1TrackTrigger/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
<class name="std::vector<TTTrack_TrackWord>"/>
<class name="edm::Wrapper<std::vector<TTTrack_TrackWord> >"/>
<class name="edm::Ptr<TTTrack<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > >" />
<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> > > > >" />
<class name="edm::Wrapper<std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > > >" />
<class name="TTDTC"/>
<class name="edm::Wrapper<TTDTC>"/>
<class name="TTDTC::Streams"/>
Expand Down
1 change: 1 addition & 0 deletions RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/L1TrackTrigger"/>
<use name="SimDataFormats/Associations"/>
<use name="SimDataFormats/TrackingAnalysis"/>
<use name="SimTracker/TrackTriggerAssociation"/>
<use name="TrackingTools/GsfTools"/>
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/L1TrackTrigger/interface/L1Track.h"
#include "DataFormats/L1TrackTrigger/interface/L1TrackTruthPair.h"
#include "DataFormats/Math/interface/deltaR.h"
#include "DataFormats/Common/interface/RefToPtr.h"
#include "DataFormats/HGCRecHit/interface/HGCRecHit.h"
#include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"
#include "DataFormats/Common/interface/ValueMap.h"

#include "SimDataFormats/Associations/interface/L1TrackTruthPair.h"
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
Expand Down
1 change: 1 addition & 0 deletions SimDataFormats/Associations/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<use name="DataFormats/CaloRecHit"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/HepMCCandidate"/>
<use name="DataFormats/L1TrackTrigger"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/RecoCandidate"/>
Expand Down
6 changes: 3 additions & 3 deletions ...TrackTrigger/interface/L1TrackTruthPair.h → ...Associations/interface/L1TrackTruthPair.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef DataFormats_L1TrackTrigger_L1TrackTruthPair_h
#define DataFormats_L1TrackTrigger_L1TrackTruthPair_h
#ifndef SimDataFormats_Associations_L1TrackTruthPair_h
#define SimDataFormats_Associations_L1TrackTruthPair_h

#include "DataFormats/L1TrackTrigger/interface/TTTrackTruthPair.h"
#include "SimDataFormats/Associations/interface/TTTrackTruthPair.h"
#include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions ...TrackTrigger/interface/TTTrackTruthPair.h → ...Associations/interface/TTTrackTruthPair.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DataFormats_L1TrackTrigger_TTrackTruthPair_h
#define DataFormats_L1TrackTrigger_TTrackTruthPair_h
#ifndef SimDataFormats_Associations_TTrackTruthPair_h
#define SimDataFormats_Associations_TTrackTruthPair_h

#include "DataFormats/L1TrackTrigger/interface/TTTrack.h"
#include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
Expand Down
1 change: 1 addition & 0 deletions SimDataFormats/Associations/src/TTTrackTruthPair.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "SimDataFormats/Associations/interface/TTTrackTruthPair.h"
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/TTTrackTruthPair.h"

namespace SimDataFormats_Associations {
struct SimDataFormats_Associations {
Expand Down
5 changes: 5 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 @@ -49,4 +49,9 @@

<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="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> > > > >" />
<class name="edm::Wrapper<std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > > >" />
</lcgdict>