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

[Geometry] Move public headers to interface directory #34755

Merged
merged 2 commits into from
Aug 4, 2021
Merged

[Geometry] Move public headers to interface directory #34755

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
1251d71
[Geometry] Move public headers on to interface directory
smuzaffar Aug 4, 2021
367d8b2
use full package path to include header
smuzaffar Aug 4, 2021
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 CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Geometry/Records/interface/CSCRecoDigiParametersRcd.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.h"
#include "Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h"
#include "Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
#include "Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h"
#include "Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "Geometry/Records/interface/GEMRecoGeometryRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
#include "Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h"
#include "Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "Geometry/Records/interface/ME0RecoGeometryRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h"
#include "Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "DetectorDescription/DDCMS/interface/DDCompactView.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
Expand Down
0 ...try/CSCGeometry/src/CSCWireGroupPackage.h → ...CGeometry/interface/CSCWireGroupPackage.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/CSCGeometry/interface/CSCWireTopology.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Geometry/CSCGeometry/interface/WireTopology.h"
#include "Geometry/CSCGeometry/interface/CSCWireGeometry.h"
#include "Geometry/CSCGeometry/src/CSCWireGrouping.h"
#include "Geometry/CSCGeometry/src/CSCWireGroupPackage.h"
#include "Geometry/CSCGeometry/interface/CSCWireGroupPackage.h"
#include <utility> // for std::pair

class CSCWireTopology : public WireTopology {
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CSCGeometry/src/CSCChamberSpecs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <Geometry/CSCGeometry/interface/CSCGeometry.h>
#include <Geometry/CSCGeometry/interface/CSCChamberSpecs.h>
#include <Geometry/CSCGeometry/interface/CSCLayerGeometry.h>
#include <Geometry/CSCGeometry/src/CSCWireGroupPackage.h>
#include <Geometry/CSCGeometry/interface/CSCWireGroupPackage.h>
#include <DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h>
#include <FWCore/MessageLogger/interface/MessageLogger.h>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/CSCGeometry/src/CSCLayerGeometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <Geometry/CSCGeometry/src/CSCUngangedStripTopology.h>
#include <Geometry/CSCGeometry/src/CSCGangedStripTopology.h>
#include <Geometry/CSCGeometry/src/CSCWireGroupPackage.h>
#include <Geometry/CSCGeometry/interface/CSCWireGroupPackage.h>

#include <FWCore/MessageLogger/interface/MessageLogger.h>

Expand Down
0 ...ometryBuilder/src/CSCGeometryParsFromDD.h → ...Builder/interface/CSCGeometryParsFromDD.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <DataFormats/DetId/interface/DetId.h>
#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <Geometry/CSCGeometry/src/CSCWireGroupPackage.h>
#include <Geometry/CSCGeometry/interface/CSCWireGroupPackage.h>

#include <FWCore/MessageLogger/interface/MessageLogger.h>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

#include <DataFormats/MuonDetId/interface/CSCDetId.h>
#include <Geometry/CSCGeometry/src/CSCWireGroupPackage.h>
#include <Geometry/CSCGeometry/interface/CSCWireGroupPackage.h>
#include <CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h>
#include <CondFormats/GeometryObjects/interface/RecoIdealGeometry.h>

Expand Down
2 changes: 1 addition & 1 deletion Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//
#include "CSCGeometryBuilderFromDDD.h"
#include "CSCGeometryBuilder.h"
#include "CSCGeometryParsFromDD.h"
#include "Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h"
#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
#include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
#include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
Expand Down
4 changes: 2 additions & 2 deletions Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
// Modified: Wed, 23 December 2020
// Original author: Tim Cox
*/
#include "CSCGeometryParsFromDD.h"
#include "Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h"
#include "DetectorDescription/Core/interface/DDFilteredView.h"
#include "DetectorDescription/Core/interface/DDSolid.h"
#include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
#include "Geometry/MuonNumbering/interface/CSCNumberingScheme.h"
#include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryNumbering.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "Geometry/CSCGeometry/src/CSCWireGroupPackage.h"
#include "Geometry/CSCGeometry/interface/CSCWireGroupPackage.h"
#include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand Down
2 changes: 1 addition & 1 deletion Geometry/DTGeometry/test/DTRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "CondFormats/RecoGeometryObjects/interface/RecoIdealGeometry.h"
#include "Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h"
#include "Geometry/DTGeometryBuilderinterface/DTGeometryParsFromDD.h"
#include "Geometry/Records/interface/RecoIdealGeometryRcd.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
Expand Down
0 ...eometryBuilder/src/DTGeometryParsFromDD.h → ...yBuilder/interface/DTGeometryParsFromDD.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Created: Tue, 26 Jan 2021
*
*/
#include <Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h>
#include <Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h>
#include <Geometry/DTGeometry/interface/DTGeometry.h>
#include <Geometry/DTGeometry/interface/DTChamber.h>
#include <Geometry/DTGeometry/interface/DTLayer.h>
Expand Down
0 ...ardGeometry/src/ZdcHardcodeGeometryData.h → ...metry/interface/ZdcHardcodeGeometryData.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/ForwardGeometry/src/ZdcGeometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
#include "Geometry/ForwardGeometry/interface/ZdcGeometry.h"
#include "Geometry/ForwardGeometry/interface/IdealZDCTrapezoid.h"
#include "ZdcHardcodeGeometryData.h"
#include "Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryData.h"
#include <algorithm>

typedef CaloCellGeometry::CCGFloat CCGFloat;
Expand Down
0 ...ometryBuilder/src/GEMGeometryParsFromDD.h → ...Builder/interface/GEMGeometryParsFromDD.h
View file
Open in desktop
File renamed without changes.
0 ...ometryBuilder/src/ME0GeometryParsFromDD.h → ...Builder/interface/ME0GeometryParsFromDD.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Created: Mon, 15 Feb 2021
*
*/
#include "Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h"
#include "Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h"
#include "DataFormats/MuonDetId/interface/GEMDetId.h"

#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
Expand Down
2 changes: 1 addition & 1 deletion Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Created: Thu, 25 Feb 2021
*
*/
#include "Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h"
#include "Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h"
#include "DataFormats/MuonDetId/interface/ME0DetId.h"
#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
#include "DetectorDescription/Core/interface/DDFilter.h"
Expand Down
0 ...ometryBuilder/src/RPCGeometryParsFromDD.h → ...Builder/interface/RPCGeometryParsFromDD.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Created: Mon, 09 Nov 2020
*
*/
#include "Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h"
#include "Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h"
#include "DataFormats/MuonDetId/interface/RPCDetId.h"
#include <CondFormats/GeometryObjects/interface/RecoIdealGeometry.h>
#include <DetectorDescription/Core/interface/DDFilter.h>
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/Forward/interface/ZdcShowerLibrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/ForwardGeometry/src/ZdcHardcodeGeometryData.h"
#include "Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryData.h"

#include "G4ParticleTable.hh"
#include "G4ThreeVector.hh"
Expand Down