diff --git a/DataFormats/L1TrackTrigger/BuildFile.xml b/DataFormats/L1TrackTrigger/BuildFile.xml index 81cd982c6b40d..8498c87b2b9dc 100644 --- a/DataFormats/L1TrackTrigger/BuildFile.xml +++ b/DataFormats/L1TrackTrigger/BuildFile.xml @@ -7,7 +7,6 @@ - diff --git a/DataFormats/L1TrackTrigger/src/TTTrackTruthPair.cc b/DataFormats/L1TrackTrigger/src/TTTrackTruthPair.cc deleted file mode 100644 index 8b75d2354fbc2..0000000000000 --- a/DataFormats/L1TrackTrigger/src/TTTrackTruthPair.cc +++ /dev/null @@ -1 +0,0 @@ -#include "DataFormats/L1TrackTrigger/interface/TTTrackTruthPair.h" diff --git a/DataFormats/L1TrackTrigger/src/classes.h b/DataFormats/L1TrackTrigger/src/classes.h index 5693d6f89f49f..f798e6288252f 100644 --- a/DataFormats/L1TrackTrigger/src/classes.h +++ b/DataFormats/L1TrackTrigger/src/classes.h @@ -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" diff --git a/DataFormats/L1TrackTrigger/src/classes_def.xml b/DataFormats/L1TrackTrigger/src/classes_def.xml index b6dc09f469cee..b7185b6e76860 100644 --- a/DataFormats/L1TrackTrigger/src/classes_def.xml +++ b/DataFormats/L1TrackTrigger/src/classes_def.xml @@ -24,10 +24,6 @@ - - - - diff --git a/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml index 7cc4346fe1660..316e3225f8d14 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml +++ b/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml @@ -14,6 +14,7 @@ + diff --git a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc index 20fe50d39ce60..3a6bd628b79a2 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTPhase2ExtraProducer.cc @@ -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" diff --git a/SimDataFormats/Associations/BuildFile.xml b/SimDataFormats/Associations/BuildFile.xml index e37183b230928..f060052c1bfd0 100644 --- a/SimDataFormats/Associations/BuildFile.xml +++ b/SimDataFormats/Associations/BuildFile.xml @@ -1,6 +1,7 @@ + diff --git a/DataFormats/L1TrackTrigger/interface/L1TrackTruthPair.h b/SimDataFormats/Associations/interface/L1TrackTruthPair.h similarity index 55% rename from DataFormats/L1TrackTrigger/interface/L1TrackTruthPair.h rename to SimDataFormats/Associations/interface/L1TrackTruthPair.h index 1e936536c1ecf..4f10fb23e347c 100644 --- a/DataFormats/L1TrackTrigger/interface/L1TrackTruthPair.h +++ b/SimDataFormats/Associations/interface/L1TrackTruthPair.h @@ -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 diff --git a/DataFormats/L1TrackTrigger/interface/TTTrackTruthPair.h b/SimDataFormats/Associations/interface/TTTrackTruthPair.h similarity index 93% rename from DataFormats/L1TrackTrigger/interface/TTTrackTruthPair.h rename to SimDataFormats/Associations/interface/TTTrackTruthPair.h index f0f70daf8d7a2..21313a427e13e 100644 --- a/DataFormats/L1TrackTrigger/interface/TTTrackTruthPair.h +++ b/SimDataFormats/Associations/interface/TTTrackTruthPair.h @@ -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" diff --git a/SimDataFormats/Associations/src/TTTrackTruthPair.cc b/SimDataFormats/Associations/src/TTTrackTruthPair.cc new file mode 100644 index 0000000000000..16726063a6d2f --- /dev/null +++ b/SimDataFormats/Associations/src/TTTrackTruthPair.cc @@ -0,0 +1 @@ +#include "SimDataFormats/Associations/interface/TTTrackTruthPair.h" diff --git a/SimDataFormats/Associations/src/classes.h b/SimDataFormats/Associations/src/classes.h index 6e12db392a0a9..7f09758b1d166 100644 --- 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/TTTrackTruthPair.h" namespace SimDataFormats_Associations { struct SimDataFormats_Associations { diff --git a/SimDataFormats/Associations/src/classes_def.xml b/SimDataFormats/Associations/src/classes_def.xml index 3c66509430337..116402321d6c1 100644 --- a/SimDataFormats/Associations/src/classes_def.xml +++ b/SimDataFormats/Associations/src/classes_def.xml @@ -49,4 +49,9 @@ + + + + +