Merge pull request #46874 from fwyzard/fix_some_includes

Use #include <...> for external headers

DataFormats/Candidate/interface/ParticleState.h

@@ -10,12 +10,13 @@
  *
  */
 
+#include <Rtypes.h>
+
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/Math/interface/PtEtaPhiMass.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "Rtypes.h"
 
 namespace reco {
 

DataFormats/Math/interface/LorentzVector.h

@@ -1,32 +1,33 @@
-#ifndef Math_LorentzVector_h
-#define Math_LorentzVector_h
-#include "Math/PtEtaPhiE4D.h"
-#include "Math/PtEtaPhiM4D.h"
-#include "Math/LorentzVector.h"
-
-namespace math {
-
-  /// Lorentz vector with cartesian internal representation
-  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double> > PtEtaPhiMLorentzVectorD;
-  /// Lorentz vector with cartesian internal representation
-  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<double> > PtEtaPhiELorentzVectorD;
-  /// Lorentz vector with cylindrical internal representation using pseudorapidity
-  typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> > XYZTLorentzVectorD;
-  /// Lorentz vector with cylindrical internal representation using pseudorapidity
-
-  /// Lorentz vector with cartesian internal representation
-  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<float> > PtEtaPhiMLorentzVectorF;
-  /// Lorentz vector with cartesian internal representation
-  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<float> > PtEtaPhiELorentzVectorF;
-  /// Lorentz vector with cylindrical internal representation using pseudorapidity
-  typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<float> > XYZTLorentzVectorF;
-
-  /// Lorentz vector with cartesian internal representation
-  typedef PtEtaPhiMLorentzVectorD PtEtaPhiMLorentzVector;
-  /// Lorentz vector with cartesian internal representation
-  typedef PtEtaPhiELorentzVectorD PtEtaPhiELorentzVector;
-  /// Lorentz vector with cylindrical internal representation using pseudorapidity
-  typedef XYZTLorentzVectorD XYZTLorentzVector;
-}  // namespace math
-
-#endif
+#ifndef Math_LorentzVector_h
+#define Math_LorentzVector_h
+
+#include <Math/PtEtaPhiE4D.h>
+#include <Math/PtEtaPhiM4D.h>
+#include <Math/LorentzVector.h>
+
+namespace math {
+
+  /// Lorentz vector with cartesian internal representation
+  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double> > PtEtaPhiMLorentzVectorD;
+  /// Lorentz vector with cartesian internal representation
+  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<double> > PtEtaPhiELorentzVectorD;
+  /// Lorentz vector with cylindrical internal representation using pseudorapidity
+  typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> > XYZTLorentzVectorD;
+  /// Lorentz vector with cylindrical internal representation using pseudorapidity
+
+  /// Lorentz vector with cartesian internal representation
+  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<float> > PtEtaPhiMLorentzVectorF;
+  /// Lorentz vector with cartesian internal representation
+  typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<float> > PtEtaPhiELorentzVectorF;
+  /// Lorentz vector with cylindrical internal representation using pseudorapidity
+  typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<float> > XYZTLorentzVectorF;
+
+  /// Lorentz vector with cartesian internal representation
+  typedef PtEtaPhiMLorentzVectorD PtEtaPhiMLorentzVector;
+  /// Lorentz vector with cartesian internal representation
+  typedef PtEtaPhiELorentzVectorD PtEtaPhiELorentzVector;
+  /// Lorentz vector with cylindrical internal representation using pseudorapidity
+  typedef XYZTLorentzVectorD XYZTLorentzVector;
+}  // namespace math
+
+#endif

DataFormats/Math/interface/Point3D.h

@@ -1,21 +1,22 @@
-#ifndef Math_Point3D_h
-#define Math_Point3D_h
-#include "Math/Point3D.h"
-#include "Math/GenVector/CoordinateSystemTags.h"
-
-namespace math {
-  /// point in space with cartesian internal representation
-  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<double> > XYZPointD;
-  /// point in space with cartesian internal representation
-  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float> > XYZPointF;
-  /// point in space with cartesian internal representation
-  typedef XYZPointD XYZPoint;
-
-  /// point in local coordinate system
-  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag> LocalPoint;
-  /// point in global coordinate system
-  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
-      GlobalPoint;
-}  // namespace math
-
-#endif
+#ifndef Math_Point3D_h
+#define Math_Point3D_h
+
+#include <Math/Point3D.h>
+#include <Math/GenVector/CoordinateSystemTags.h>
+
+namespace math {
+  /// point in space with cartesian internal representation
+  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<double> > XYZPointD;
+  /// point in space with cartesian internal representation
+  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float> > XYZPointF;
+  /// point in space with cartesian internal representation
+  typedef XYZPointD XYZPoint;
+
+  /// point in local coordinate system
+  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag> LocalPoint;
+  /// point in global coordinate system
+  typedef ROOT::Math::PositionVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
+      GlobalPoint;
+}  // namespace math
+
+#endif

DataFormats/Math/interface/Vector3D.h

@@ -1,38 +1,39 @@
-#ifndef Math_Vector3D_h
-#define Math_Vector3D_h
-#include "Math/Vector3D.h"
-
-namespace math {
-
-  /// spatial vector with cartesian internal representation
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > XYZVectorD;
-  /// spatial vector with cylindrical internal representation using pseudorapidity
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<double> > RhoEtaPhiVectorD;
-  /// spatial vector with polar internal representation
-  /// WARNING: ROOT dictionary not provided for the type below
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<double> > RThetaPhiVectorD;
-
-  /// spatial vector with cartesian internal representation
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float> > XYZVectorF;
-  /// spatial vector with cylindrical internal representation using pseudorapidity
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<float> > RhoEtaPhiVectorF;
-  /// spatial vector with polar internal representation
-  /// WARNING: ROOT dictionary not provided for the type below
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<float> > RThetaPhiVectorF;
-
-  /// vector in local coordinate system
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag>
-      LocalVector;
-  /// vector in glovbal coordinate system
-  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
-      GlobalVector;
-
-  /// spatial vector with cartesian internal representation
-  typedef XYZVectorD XYZVector;
-  /// spatial vector with cylindrical internal representation using pseudorapidity
-  typedef RhoEtaPhiVectorD RhoEtaPhiVector;
-  /// spatial vector with polar internal representation
-  typedef RThetaPhiVectorD RThetaPhiVector;
-}  // namespace math
-
-#endif
+#ifndef Math_Vector3D_h
+#define Math_Vector3D_h
+
+#include <Math/Vector3D.h>
+
+namespace math {
+
+  /// spatial vector with cartesian internal representation
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > XYZVectorD;
+  /// spatial vector with cylindrical internal representation using pseudorapidity
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<double> > RhoEtaPhiVectorD;
+  /// spatial vector with polar internal representation
+  /// WARNING: ROOT dictionary not provided for the type below
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<double> > RThetaPhiVectorD;
+
+  /// spatial vector with cartesian internal representation
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float> > XYZVectorF;
+  /// spatial vector with cylindrical internal representation using pseudorapidity
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::CylindricalEta3D<float> > RhoEtaPhiVectorF;
+  /// spatial vector with polar internal representation
+  /// WARNING: ROOT dictionary not provided for the type below
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Polar3D<float> > RThetaPhiVectorF;
+
+  /// vector in local coordinate system
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::LocalCoordinateSystemTag>
+      LocalVector;
+  /// vector in glovbal coordinate system
+  typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<float>, ROOT::Math::GlobalCoordinateSystemTag>
+      GlobalVector;
+
+  /// spatial vector with cartesian internal representation
+  typedef XYZVectorD XYZVector;
+  /// spatial vector with cylindrical internal representation using pseudorapidity
+  typedef RhoEtaPhiVectorD RhoEtaPhiVector;
+  /// spatial vector with polar internal representation
+  typedef RThetaPhiVectorD RThetaPhiVector;
+}  // namespace math
+
+#endif

FWCore/Utilities/interface/Exception.h

@@ -41,7 +41,7 @@
 #include <string_view>
 #include <concepts>
 
-#include "fmt/format.h"
+#include <fmt/format.h>
 
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 #include "FWCore/Utilities/interface/Likely.h"