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

Jump to bottom

undo cyclic dependency between DataFormats/TrackerCommon and DataFormats/SiStripDetId #31377

Merged
merged 4 commits into from Sep 9, 2020
Merged

undo cyclic dependency between DataFormats/TrackerCommon and DataFormats/SiStripDetId #31377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e72b39f
move header to avoid circular deps
davidlange6 Sep 7, 2020
a73f3b9
move headers around to avoid circular dependencies
davidlange6 Sep 7, 2020
eca3143
moving headers in SiStripDetId and TrackerCommon to avoid circular de…
davidlange6 Sep 7, 2020
308b1fb
straighten out buildfiles
davidlange6 Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripCommon/src/TkDetMap.cc
View file
Open in desktop
@@ -1,5 +1,5 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"

#include "CalibTracker/SiStripCommon/interface/TkDetMap.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripCommon/test/plugins/testTkHistoMap.cc
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@

#include "DQMServices/Core/interface/DQMStore.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
#include "DataFormats/SiStripCluster/interface/SiStripClusterCollection.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"

#include "DPGAnalysis/SiStripTools/interface/APVCyclePhaseCollection.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "DataFormats/Common/interface/DetSetVector.h"
#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
#include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
#include "DQM/SiStripCommon/interface/SiStripHistoId.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc
View file
Open in desktop
@@ -1,6 +1,6 @@
#include "DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "TCanvas.h"

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc
View file
Open in desktop
@@ -1,6 +1,6 @@
#include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"

#include "TCanvas.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc
View file
Open in desktop
@@ -1,7 +1,7 @@
#include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "TCanvas.h"

Expand Down
1 change: 0 additions & 1 deletion DataFormats/SiStripDetId/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,4 @@
<use name="DataFormats/DetId"/>
<use name="DataFormats/TrackerCommon"/>
<export>
<lib name="1"/>
</export>
2 changes: 1 addition & 1 deletion DataFormats/SiStripDetId/interface/SiStripDetId.h
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
#define DataFormats_SiStripDetId_SiStripDetId_h

#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/TrackerCommon/interface/SiStripEnums.h"
#include "DataFormats/SiStripDetId/interface/SiStripEnums.h"
#include <ostream>

class SiStripDetId;
Expand Down
0 ...ts/TrackerCommon/interface/SiStripEnums.h → ...ats/SiStripDetId/interface/SiStripEnums.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DataFormats/SiStripDetId/interface/StripSubdetector.h
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
*/

#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/TrackerCommon/interface/SiStripEnums.h"
#include "DataFormats/SiStripDetId/interface/SiStripEnums.h"

class StripSubdetector : public DetId {
public:
Expand Down
1 change: 1 addition & 0 deletions DataFormats/TrackerCommon/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,7 @@
<use name="DataFormats/Common"/>
<use name="DataFormats/SiStripCluster"/>
<use name="DataFormats/SiPixelDetId"/>
<use name="DataFormats/SiStripDetId"/>
<use name="DataFormats/DetId"/>
<use name="DataFormats/SiPixelCluster"/>
<use name="DataFormats/SiStripDigi"/>
Expand Down
6 changes: 3 additions & 3 deletions ...tripDetId/interface/SiStripSubStructure.h → ...kerCommon/interface/SiStripSubStructure.h
View file
Open in desktop
@@ -1,12 +1,12 @@
#ifndef SiStripDetId_SiStripSubStructure_h
#define SiStripDetId_SiStripSubStructure_h
#ifndef DataFormats_TrackerCommon_SiStripSubStructure_h
#define DataFormats_TrackerCommon_SiStripSubStructure_h
// -*- C++ -*-
//
// Package: SiStripDetId
// Class : SiStripSubStructure
//
/**\class SiStripSubStructure SiStripSubStructure.h
DataFormats/SiStripDetId/interface/SiStripSubStructure.h
DataFormats/TrackerCommon/interface/SiStripSubStructure.h

Description: <Assign detector Ids to different substructures of the
SiStripTracker: TOB, TIB, etc>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TrackerCommon/interface/TrackerTopology.h
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "DataFormats/TrackerCommon/interface/SiStripEnums.h"
#include "DataFormats/SiStripDetId/interface/SiStripEnums.h"

#include <vector>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion ...s/SiStripDetId/src/SiStripSubStructure.cc → .../TrackerCommon/src/SiStripSubStructure.cc
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include <algorithm>

#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"

void SiStripSubStructure::getTIBDetectors(const std::vector<uint32_t> &inputDetRawIds,
std::vector<uint32_t> &tibDetRawIds,
Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerNumberingBuilder/src/utils.cc
View file
Open in desktop
@@ -1,5 +1,5 @@
#include "Geometry/TrackerNumberingBuilder/interface/utils.h"
#include "DataFormats/TrackerCommon/interface/SiStripEnums.h"
#include "DataFormats/SiStripDetId/interface/SiStripEnums.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"

std::vector<uint32_t> TrackerGeometryUtils::getSiStripDetIds(const GeometricDet& geomDet) {
Expand Down
2 changes: 1 addition & 1 deletion Validation/RecoTrack/src/SiStripTrackingRecHitsValid.cc
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
#include "DQMServices/Core/interface/DQMStore.h"
#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"

using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion Validation/TrackerRecHits/src/SiStripRecHitsValid.cc
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
#include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
#include "DataFormats/TrackerCommon/interface/SiStripSubStructure.h"
#include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "DataFormats/GeometryVector/interface/LocalPoint.h"
Expand Down