Skip to content

Commit 677d522

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45567 from makortel/fixDictionariesTrackTriggerAssociation
Move dictionaries (and some classes) defined in `SimTracker/TrackTriggerAssociation` and `SimGeneral/TrackingAnalysis` to more proper packages
2 parents 3d8aa9e + 03c8500 commit 677d522

File tree

58 files changed

+155
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+155
-182
lines changed

‎DQMOffline/L1Trigger/BuildFile.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<use name="HLTrigger/HLTcore"/>
1717
<use name="DQM/L1TMonitor"/>
1818
<use name="MuonAnalysis/MuonAssociators"/>
19+
<use name="SimDataFormats/Associations"/>
1920
<use name="SimDataFormats/TrackingAnalysis"/>
2021
<flags EDM_PLUGIN="1"/>

‎DQMOffline/L1Trigger/src/L1TPhase2OuterTrackerTkMET.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
2929
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
3030
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
31-
#include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
32-
#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
33-
#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
31+
#include "SimDataFormats/Associations/interface/TTStubAssociationMap.h"
32+
#include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h"
33+
#include "SimDataFormats/Associations/interface/TTClusterAssociationMap.h"
3434

3535
#include "DQMOffline/L1Trigger/interface/L1TPhase2OuterTrackerTkMET.h"
3636

‎DataFormats/StdDictionaries/src/classes_def_map.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<class name="std::map<short,unsigned int>"/>
1010
<class name="std::map<std::basic_string<char>,bool>"/>
1111
<class name="std::map<std::basic_string<char>,int>"/>
12+
<class name="std::map<std::basic_string<char>,unsigned long long>"/>
1213
<class name="std::map<std::basic_string<char>,std::basic_string<char> >"/>
1314
<class name="std::map<std::basic_string<char>,std::map<std::basic_string<char>,std::basic_string<char> > >"/>
1415
<class name="std::map<std::basic_string<char>,std::pair<unsigned int,unsigned int> >"/>

‎L1Trigger/L1TTrackMatch/plugins/BuildFile.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<use name="Geometry/TrackerGeometryBuilder"/>
77
<use name="Geometry/Records"/>
88
<use name="L1Trigger/L1TTrackMatch"/>
9-
<use name="SimTracker/TrackTriggerAssociation"/>
9+
<use name="SimDataFormats/Associations"/>
1010
<use name="FWCore/Utilities"/>
1111
<use name="fastjet"/>
1212
<use name="hls"/>

‎L1Trigger/L1TTrackMatch/plugins/L1FastTrackingJetProducer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
3535

3636
//mc
37-
#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
37+
#include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h"
3838
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
3939

4040
#include <fastjet/JetDefinition.hh>

‎L1Trigger/L1TTrackMatch/plugins/L1TruthTrackFastJetProducer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "DataFormats/L1Trigger/interface/Vertex.h"
3232

3333
// MC
34-
#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
34+
#include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h"
3535
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
3636

3737
// geometry

‎L1Trigger/L1TTrackMatch/plugins/TPFastJetProducer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
// truth object
3535
#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
36-
#include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
36+
#include "SimDataFormats/Associations/interface/TTStubAssociationMap.h"
3737

3838
// geometry
3939
#include "Geometry/Records/interface/TrackerTopologyRcd.h"

‎L1Trigger/L1TTrackMatch/test/BuildFile.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<use name="Geometry/Records"/>
2020
<use name="Geometry/TrackerGeometryBuilder"/>
2121
<use name="SimTracker/TrackTriggerAssociation"/>
22+
<use name="SimDataFormats/Associations"/>
2223
<use name="SimDataFormats/TrackingHit"/>
2324
<use name="SimDataFormats/TrackingAnalysis"/>
2425
<use name="hls"/>

‎L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
3131
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
3232
#include "SimDataFormats/Vertex/interface/SimVertex.h"
33-
#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
34-
#include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
35-
#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
33+
#include "SimDataFormats/Associations/interface/TTClusterAssociationMap.h"
34+
#include "SimDataFormats/Associations/interface/TTStubAssociationMap.h"
35+
#include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h"
3636
#include "Geometry/Records/interface/StackedTrackerGeometryRecord.h"
3737

3838
#include "DataFormats/JetReco/interface/GenJetCollection.h"

‎L1Trigger/TrackFindingTMTT/BuildFile.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<use name="FWCore/Utilities"/>
1010
<use name="Geometry/Records"/>
1111
<use name="Geometry/TrackerGeometryBuilder"/>
12+
<use name="SimDataFormats/Associations"/>
1213
<use name="SimDataFormats/EncodedEventId"/>
1314
<use name="SimDataFormats/Track"/>
1415
<use name="SimDataFormats/TrackingAnalysis"/>
15-
<use name="SimTracker/TrackTriggerAssociation"/>
1616
<use name="DataFormats/JetReco"/>
1717
<use name="L1Trigger/TrackTrigger"/>
1818
<use name="roothistmatrix"/>

0 commit comments

Comments
 (0)