Skip to content

Commit 24e374e

Browse files
fwyzardfwyzard
committed
Use #include <...> for external headers
1 parent 48600da commit 24e374e

File tree

5 files changed

+97
-93
lines changed

5 files changed

+97
-93
lines changed

‎DataFormats/Candidate/interface/ParticleState.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
*
1111
*/
1212

13+
#include <Rtypes.h>
14+
1315
#include "DataFormats/Math/interface/Point3D.h"
1416
#include "DataFormats/Math/interface/Vector3D.h"
1517
#include "DataFormats/Math/interface/PtEtaPhiMass.h"
1618
#include "DataFormats/GeometryVector/interface/GlobalVector.h"
1719
#include "DataFormats/Math/interface/LorentzVector.h"
18-
#include "Rtypes.h"
1920

2021
namespace reco {
2122

‎DataFormats/Math/interface/LorentzVector.h‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
#ifndef Math_LorentzVector_h
2-
#define Math_LorentzVector_h
3-
#include "Math/PtEtaPhiE4D.h"
4-
#include "Math/PtEtaPhiM4D.h"
5-
#include "Math/LorentzVector.h"
6-
7-
namespace math {
8-
9-
/// Lorentz vector with cartesian internal representation
10-
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double> > PtEtaPhiMLorentzVectorD;
11-
/// Lorentz vector with cartesian internal representation
12-
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<double> > PtEtaPhiELorentzVectorD;
13-
/// Lorentz vector with cylindrical internal representation using pseudorapidity
14-
typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> > XYZTLorentzVectorD;
15-
/// Lorentz vector with cylindrical internal representation using pseudorapidity
16-
17-
/// Lorentz vector with cartesian internal representation
18-
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<float> > PtEtaPhiMLorentzVectorF;
19-
/// Lorentz vector with cartesian internal representation
20-
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<float> > PtEtaPhiELorentzVectorF;
21-
/// Lorentz vector with cylindrical internal representation using pseudorapidity
22-
typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<float> > XYZTLorentzVectorF;
23-
24-
/// Lorentz vector with cartesian internal representation
25-
typedef PtEtaPhiMLorentzVectorD PtEtaPhiMLorentzVector;
26-
/// Lorentz vector with cartesian internal representation
27-
typedef PtEtaPhiELorentzVectorD PtEtaPhiELorentzVector;
28-
/// Lorentz vector with cylindrical internal representation using pseudorapidity
29-
typedef XYZTLorentzVectorD XYZTLorentzVector;
30-
} // namespace math
31-
32-
#endif
1+
#ifndef Math_LorentzVector_h
2+
#define Math_LorentzVector_h
3+
4+
#include <Math/PtEtaPhiE4D.h>
5+
#include <Math/PtEtaPhiM4D.h>
6+
#include <Math/LorentzVector.h>
7+
8+
namespace math {
9+
10+
/// Lorentz vector with cartesian internal representation
11+
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double> > PtEtaPhiMLorentzVectorD;
12+
/// Lorentz vector with cartesian internal representation
13+
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<double> > PtEtaPhiELorentzVectorD;
14+
/// Lorentz vector with cylindrical internal representation using pseudorapidity
15+
typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> > XYZTLorentzVectorD;
16+
/// Lorentz vector with cylindrical internal representation using pseudorapidity
17+
18+
/// Lorentz vector with cartesian internal representation
19+
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<float> > PtEtaPhiMLorentzVectorF;
20+
/// Lorentz vector with cartesian internal representation
21+
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<float> > PtEtaPhiELorentzVectorF;
22+
/// Lorentz vector with cylindrical internal representation using pseudorapidity
23+
typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<float> > XYZTLorentzVectorF;
24+
25+
/// Lorentz vector with cartesian internal representation
26+
typedef PtEtaPhiMLorentzVectorD PtEtaPhiMLorentzVector;
27+
/// Lorentz vector with cartesian internal representation
28+
typedef PtEtaPhiELorentzVectorD PtEtaPhiELorentzVector;
29+
/// Lorentz vector with cylindrical internal representation using pseudorapidity
30+
typedef XYZTLorentzVectorD XYZTLorentzVector;
31+
} // namespace math
32+
33+
#endif

‎DataFormats/Math/interface/Point3D.h‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
#ifndef Math_Point3D_h
2-
#define Math_Point3D_h
3-
#include "Math/Point3D.h"
4-
#include "Math/GenVector/CoordinateSystemTags.h"
5-
6-
namespace math {
7-
/// point in space with cartesian internal representation
8-
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<double> > XYZPointD;
9-
/// point in space with cartesian internal representation
10-
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float> > XYZPointF;
11-
/// point in space with cartesian internal representation
12-
typedef XYZPointD XYZPoint;
13-
14-
/// point in local coordinate system
15-
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag> LocalPoint;
16-
/// point in global coordinate system
17-
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
18-
GlobalPoint;
19-
} // namespace math
20-
21-
#endif
1+
#ifndef Math_Point3D_h
2+
#define Math_Point3D_h
3+
4+
#include <Math/Point3D.h>
5+
#include <Math/GenVector/CoordinateSystemTags.h>
6+
7+
namespace math {
8+
/// point in space with cartesian internal representation
9+
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<double> > XYZPointD;
10+
/// point in space with cartesian internal representation
11+
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float> > XYZPointF;
12+
/// point in space with cartesian internal representation
13+
typedef XYZPointD XYZPoint;
14+
15+
/// point in local coordinate system
16+
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag> LocalPoint;
17+
/// point in global coordinate system
18+
typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
19+
GlobalPoint;
20+
} // namespace math
21+
22+
#endif

‎DataFormats/Math/interface/Vector3D.h‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
#ifndef Math_Vector3D_h
2-
#define Math_Vector3D_h
3-
#include "Math/Vector3D.h"
4-
5-
namespace math {
6-
7-
/// spatial vector with cartesian internal representation
8-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > XYZVectorD;
9-
/// spatial vector with cylindrical internal representation using pseudorapidity
10-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<double> > RhoEtaPhiVectorD;
11-
/// spatial vector with polar internal representation
12-
/// WARNING: ROOT dictionary not provided for the type below
13-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<double> > RThetaPhiVectorD;
14-
15-
/// spatial vector with cartesian internal representation
16-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float> > XYZVectorF;
17-
/// spatial vector with cylindrical internal representation using pseudorapidity
18-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<float> > RhoEtaPhiVectorF;
19-
/// spatial vector with polar internal representation
20-
/// WARNING: ROOT dictionary not provided for the type below
21-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<float> > RThetaPhiVectorF;
22-
23-
/// vector in local coordinate system
24-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag>
25-
LocalVector;
26-
/// vector in glovbal coordinate system
27-
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
28-
GlobalVector;
29-
30-
/// spatial vector with cartesian internal representation
31-
typedef XYZVectorD XYZVector;
32-
/// spatial vector with cylindrical internal representation using pseudorapidity
33-
typedef RhoEtaPhiVectorD RhoEtaPhiVector;
34-
/// spatial vector with polar internal representation
35-
typedef RThetaPhiVectorD RThetaPhiVector;
36-
} // namespace math
37-
38-
#endif
1+
#ifndef Math_Vector3D_h
2+
#define Math_Vector3D_h
3+
4+
#include <Math/Vector3D.h>
5+
6+
namespace math {
7+
8+
/// spatial vector with cartesian internal representation
9+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > XYZVectorD;
10+
/// spatial vector with cylindrical internal representation using pseudorapidity
11+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<double> > RhoEtaPhiVectorD;
12+
/// spatial vector with polar internal representation
13+
/// WARNING: ROOT dictionary not provided for the type below
14+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<double> > RThetaPhiVectorD;
15+
16+
/// spatial vector with cartesian internal representation
17+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float> > XYZVectorF;
18+
/// spatial vector with cylindrical internal representation using pseudorapidity
19+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<float> > RhoEtaPhiVectorF;
20+
/// spatial vector with polar internal representation
21+
/// WARNING: ROOT dictionary not provided for the type below
22+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<float> > RThetaPhiVectorF;
23+
24+
/// vector in local coordinate system
25+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag>
26+
LocalVector;
27+
/// vector in glovbal coordinate system
28+
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
29+
GlobalVector;
30+
31+
/// spatial vector with cartesian internal representation
32+
typedef XYZVectorD XYZVector;
33+
/// spatial vector with cylindrical internal representation using pseudorapidity
34+
typedef RhoEtaPhiVectorD RhoEtaPhiVector;
35+
/// spatial vector with polar internal representation
36+
typedef RThetaPhiVectorD RThetaPhiVector;
37+
} // namespace math
38+
39+
#endif

‎FWCore/Utilities/interface/Exception.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <string_view>
4242
#include <concepts>
4343

44-
#include "fmt/format.h"
44+
#include <fmt/format.h>
4545

4646
#include "FWCore/Utilities/interface/thread_safety_macros.h"
4747
#include "FWCore/Utilities/interface/Likely.h"

0 commit comments

Comments
 (0)