Import Geant4 10.7.0.beta source tree

source/global/HEPGeometry/CMakeLists.txt

@@ -1,17 +0,0 @@
-#------------------------------------------------------------------------------
-# CMakeLists.txt
-# Module : G4hepgeometry
-# Package: Geant4.src.G4global.G4hepgeometry
-#
-# CMakeLists.txt for building a header-only module.
-#
-# Generated on : 24/9/2010
-#
-#
-#------------------------------------------------------------------------------
-
-if(GEANT4_BUILD_GRANULAR_LIBS)
-    include(Geant4MacroLibraryTargets)
-    GEANT4_HEADER_MODULE_TARGET(COMPONENT sources.cmake)
-endif()
-

source/global/HEPGeometry/include/G4LorentzRotation.hh

@@ -33,5 +33,4 @@
 
 typedef CLHEP::HepLorentzRotation G4LorentzRotation;
 
-#endif // G4LorentzRotation_hh
-
+#endif  // G4LorentzRotation_hh

source/global/HEPGeometry/include/G4LorentzVector.hh

@@ -33,4 +33,4 @@
 
 typedef CLHEP::HepLorentzVector G4LorentzVector;
 
-#endif // G4LorentzVector_hh
+#endif  // G4LorentzVector_hh

source/global/HEPGeometry/include/G4Plane3D.hh

@@ -28,9 +28,9 @@
 #ifndef G4PLANE3D_HH
 #define G4PLANE3D_HH
 
-#include "globals.hh"
-#include "G4Point3D.hh"
 #include "G4Normal3D.hh"
+#include "G4Point3D.hh"
+#include "globals.hh"
 #include <CLHEP/Geometry/Plane3D.h>
 
 typedef HepGeom::Plane3D<G4double> G4Plane3D;

source/global/HEPGeometry/include/geomdefs.hh

@@ -25,7 +25,7 @@
 //
 //
 //
-// 
+//
 // ----------------------------------------------------------------------
 // Constants, typedefs, enums for Geometry Section
 //
@@ -50,11 +50,25 @@ static const double kMinExitingNormalCosine = 1E-3;
 // Radial3D = Radial axis in spherical polar
 // Phi = Phi axis in cylindrical polar
 // kUndefined = Not defined axis
-enum EAxis {kXAxis,kYAxis,kZAxis,kRho,kRadial3D,kPhi,kUndefined};
+enum EAxis
+{
+  kXAxis,
+  kYAxis,
+  kZAxis,
+  kRho,
+  kRadial3D,
+  kPhi,
+  kUndefined
+};
 
 // G4VSolid::Inside return codes
 // kSurface => within tolerance of exact surface
-enum EInside {kOutside,kSurface,kInside};
+enum EInside
+{
+  kOutside,
+  kSurface,
+  kInside
+};
 // enum EInside {kInside=1, kSurface=2, kOutside=3};
 
 // kNormal = (G4PVPlacement) Conventional positioning
@@ -65,11 +79,17 @@ enum EInside {kOutside,kSurface,kInside};
 // kParameterised = (G4PVParameterised) General parameterised volume
 //                           => Distance & location computed to volumes
 //                              after setup/modification via user object
-enum EVolume {kNormal,kReplica,kParameterised,kExternal};
+enum EVolume
+{
+  kNormal,
+  kReplica,
+  kParameterised,
+  kExternal
+};
 
 // Default max size of Navigation history
 //
-static const G4int kHistoryMax    = 15;
+static const G4int kHistoryMax = 15;
 
 // History increase stride of Navigation history
 //

source/global/HEPGeometry/sources.cmake

@@ -1,45 +1,23 @@
 #------------------------------------------------------------------------------
-# sources.cmake
 # Module : G4hepgeometry
 # Package: Geant4.src.G4global.G4hepgeometry
-#
-# Sources description for a library.
-# Lists the sources and headers of the code explicitely.
-# Lists include paths needed.
-# Lists the internal granular and global dependencies of the library.
-# Source specific properties should be added at the end.
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
-# List external includes needed.
-include_directories(${CLHEP_INCLUDE_DIRS})
-
-# List internal includes needed.
-include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
-
 #
 # Define the Geant4 Module.
 #
-include(Geant4MacroDefineModule)
-GEANT4_DEFINE_MODULE(NAME G4hepgeometry
-    HEADERS
-        G4LorentzRotation.hh
-        G4LorentzVector.hh
-        G4Normal3D.hh
-        G4Plane3D.hh
-        G4Point3D.hh
-        G4Transform3D.hh
-        G4Vector3D.hh
-        geomdefs.hh
-    SOURCES
-    GRANULAR_DEPENDENCIES
-        G4globman
-    GLOBAL_DEPENDENCIES
-    LINK_LIBRARIES
+geant4_define_module(NAME G4hepgeometry
+  HEADERS
+    G4LorentzRotation.hh
+    G4LorentzVector.hh
+    G4Normal3D.hh
+    G4Plane3D.hh
+    G4Point3D.hh
+    G4Transform3D.hh
+    G4Vector3D.hh
+    geomdefs.hh
+  GRANULAR_DEPENDENCIES
+    G4globman
 )
 
 # List any source specific properties here
-