Optimize geom includes

root-project · linev · May 28, 2020 · May 4, 2020 · May 4, 2020 · May 4, 2020
commit 07c72071e42b7bb203fea8c2076c8dad1441baaa
@@ -16,6 +16,7 @@
 #include "TXMLEngine.h"
 #include "TGeoMatrix.h"
 #include "TGeoVolume.h"
+#include "TGeoElement.h"
 
 #include <map>
 #include <iostream>

@@ -13,6 +13,7 @@
 #define ROOT_TGDMLWRITE
 
 #include "TGeoMatrix.h"
+#include "TGeoElement.h"
 #include "TXMLEngine.h"
 #include "TGeoVolume.h"
 #include "TGeoParaboloid.h"

@@ -12,7 +12,7 @@
 #ifndef ROOT_TGeoAtt
 #define ROOT_TGeoAtt
 
-#include "TObject.h"
+#include "Rtypes.h"
 
 class TGeoAtt
 {

@@ -12,10 +12,11 @@
 #ifndef ROOT_TGeoBoolNode
 #define ROOT_TGeoBoolNode
 
-#include <mutex>
-
 #include "TObject.h"
 
+#include <mutex>
+#include <vector>
+
 // forward declarations
 class TGeoShape;
 class TGeoMatrix;

@@ -15,7 +15,11 @@
 
 #include "TGeoNode.h"
 
+#ifdef R__LESS_INCLUDES
+struct TGeoStateInfo;
+#else
 #include "TGeoStateInfo.h"
+#endif
 
 // forward declarations
 class TGeoManager;

@@ -14,7 +14,9 @@
 
 #include <mutex>
 #include <thread>
+#include <map>
 
+#include "TNamed.h"
 #include "TObjArray.h"
 #include "TGeoNavigator.h"
 

@@ -16,7 +16,12 @@
 #include <TAttFill.h>
 #include <TList.h>
 
+#ifdef R__LESS_INCLUDES
+class TGeoElement;
+class TGeoElementTable;
+#else
 #include "TGeoElement.h"
+#endif
 
 // forward declarations
 class TGeoExtension;

@@ -11,8 +11,7 @@
 #ifndef ROOT_TGeoParallelWorld
 #define ROOT_TGeoParallelWorld
 
-
-#include "TGeoVolume.h"
+#include "TNamed.h"
 
 // forward declarations
 class TGeoManager;

@@ -12,12 +12,12 @@
 #ifndef ROOT_TGeoPatternFinder
 #define ROOT_TGeoPatternFinder
 
-#include <mutex>
-
 #include "TObject.h"
 
-#include "TGeoVolume.h"
+#include <mutex>
+#include <vector>
 
+#include "TGeoVolume.h"
 
 class TGeoMatrix;
 

@@ -12,10 +12,11 @@
 #ifndef ROOT_TGeoPgon
 #define ROOT_TGeoPgon
 
-#include <mutex>
-
 #include "TGeoPcon.h"
 
+#include <mutex>
+#include <vector>
+
 class TGeoPgon : public TGeoPcon
 {
 public:

@@ -14,8 +14,6 @@
 
 #include "TNamed.h"
 
-#include "TObjArray.h"
-
 #include "TAttLine.h"
 
 // forward declarations
@@ -25,6 +23,7 @@ class TGeoVolume;
 class TGeoNode;
 class TGeoShape;
 class TGeoNavigator;
+class TObjArray;
 
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //

@@ -9,6 +9,9 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
+#ifndef ROOT_TGeoRCPtr
+#define ROOT_TGeoRCPtr
+
 /** \class TGeoRCPtr
 \ingroup Geometry_classes
 
@@ -114,3 +117,5 @@ class TGeoRCPtr
 private:
    T *fPtr;   //Actual pointer
 };
+
+#endif
@@ -9,6 +9,9 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
+#ifndef ROOT_TGeoTypedefs
+#define ROOT_TGeoTypedefs
+
 /// Typedefs used by the geometry group
 #include <vector>
 
@@ -18,3 +21,5 @@ namespace Tessellated {
   using VertexVec_t = std::vector<Vertex_t>;
 
 } // namespace Tessellated
+
+#endif
@@ -9,8 +9,8 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#ifndef ROOT_Vertex_t
-#define ROOT_Vertex_t
+#ifndef ROOT_TGeoVector3
+#define ROOT_TGeoVector3
 
 #include <Riostream.h>
 #include <TMath.h>

@@ -13,15 +13,17 @@
 #ifndef ROOT_TGeoVolume
 #define ROOT_TGeoVolume
 
-#include <mutex>
 
+#include "TNamed.h"
 #include "TGeoAtt.h"
 #include "TAttLine.h"
 #include "TAttFill.h"
 #include "TAtt3D.h"
 #include "TObjArray.h"
 #include "TGeoMedium.h"
 #include "TGeoShape.h"
+#include <mutex>
+#include <vector>
 
 // forward declarations
 class TH2F;

@@ -12,10 +12,11 @@
 #ifndef ROOT_TGeoXtru
 #define ROOT_TGeoXtru
 
-#include <mutex>
-
 #include "TGeoBBox.h"
 
+#include <mutex>
+#include <vector>
+
 class TGeoPolygon;
 
 class TGeoXtru : public TGeoBBox

@@ -11,8 +11,8 @@
 
 #include "TGeoCache.h"
 
-#include "Rtypes.h"
 #include "TGeoManager.h"
+#include "TGeoStateInfo.h"
 #include "TGeoMatrix.h"
 #include "TGeoVolume.h"
 #include "TObject.h"

@@ -8,9 +8,11 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#include "TROOT.h"
 #include "TGeoGlobalMagField.h"
 
+#include "TROOT.h"
+#include "TList.h"
+
 /** \class TGeoGlobalMagField
 \ingroup Geometry_classes
 

@@ -20,8 +20,7 @@ Base class describing materials.
 #include "Riostream.h"
 #include "TMath.h"
 #include "TObjArray.h"
-#include "TStyle.h"
-#include "TList.h"
+#include "TGeoElement.h"
 #include "TGeoManager.h"
 #include "TGeoExtension.h"
 #include "TGeoMaterial.h"

@@ -20,6 +20,7 @@ Editors for materials.
 #include "TGeoMaterialEditor.h"
 #include "TGeoTabManager.h"
 #include "TGeoMaterial.h"
+#include "TGeoElement.h"
 #include "TGeoManager.h"
 #include "TVirtualGeoPainter.h"
 #include "TView.h"

@@ -14,10 +14,6 @@
 
 #include "TVirtualGeoTrack.h"
 
-#include "TPolyLine3D.h"
-
-class TPolyMarker3D;
-
 /////////////////////////////////////////////////////////////////////////////
 // TGeoTrack - Tracks attached to a geometry.                              //
 //             Tracks are 3D objects made of points and they store a       //

@@ -25,6 +25,7 @@ using TBuffer3D mechanism.
 #include "TAttFill.h"
 #include "TVirtualPad.h"
 #include "TCanvas.h"
+#include "TCanvasImp.h"
 #include "TH2F.h"
 #include "TF1.h"
 #include "TGraph.h"
@@ -37,6 +38,7 @@ using TBuffer3D mechanism.
 #include "TGeoAtt.h"
 #include "TGeoVolume.h"
 #include "TGeoNode.h"
+#include "TGeoElement.h"
 #include "TGeoManager.h"
 #include "TGeoTrack.h"
 #include "TGeoOverlap.h"