Import Geant4 10.7.0 source tree

source/geometry/volumes/include/G4AssemblyVolume.hh

@@ -28,7 +28,7 @@
 // Class description:
 //
 // G4AssemblyVolume is a helper class to make the build process of geometry
-// easier. It allows to combine several volumes together in an arbitrary way
+// easier. It allows one to combine several volumes together in an arbitrary way
 // in 3D space and then work with the result as with a single logical volume
 // for placement.
 // The resulting objects are independent copies of each of the assembled

source/geometry/volumes/include/G4LogicalBorderSurface.hh

@@ -31,12 +31,11 @@
 // of two physical volumes.
 
 // Author: John Apostolakis (John.Apostolakis@cern.ch), 17-06-1997
-//
 // --------------------------------------------------------------------
-#ifndef G4LogicalBorderSurface_h
-#define G4LogicalBorderSurface_h 1
+#ifndef G4LogicalBorderSurface_hh
+#define G4LogicalBorderSurface_hh 1
 
-#include <vector>
+#include <map>
 
 #include "G4LogicalSurface.hh"
 #include "G4VPhysicalVolume.hh"
@@ -44,7 +43,9 @@
 class G4VPhysicalVolume;
 class G4LogicalBorderSurface;
 
-using G4LogicalBorderSurfaceTable = std::vector<G4LogicalBorderSurface*>;
+using G4LogicalBorderSurfaceTable
+      = std::map<std::pair<const G4VPhysicalVolume*,
+                           const G4VPhysicalVolume*>, G4LogicalBorderSurface*>;
 
 class G4LogicalBorderSurface : public G4LogicalSurface
 {
@@ -99,5 +100,5 @@ class G4LogicalBorderSurface : public G4LogicalSurface
 
 #include "G4LogicalBorderSurface.icc"
 
-#endif /* G4LogicalBorderSurface_h */
+#endif
 

source/geometry/volumes/include/G4LogicalSkinSurface.hh

@@ -31,10 +31,9 @@
 // volume.
 
 // Author: John Apostolakis (John.Apostolakis@cern.ch), 16-06-1997
-//
-// ----------------------------------------------------------------------
-#ifndef G4LogicalSkinSurface_h
-#define G4LogicalSkinSurface_h 1
+// --------------------------------------------------------------------
+#ifndef G4LogicalSkinSurface_hh
+#define G4LogicalSkinSurface_hh 1
 
 #include <vector>
 
@@ -48,7 +47,7 @@ using G4LogicalSkinSurfaceTable = std::vector<G4LogicalSkinSurface*>;
 class G4LogicalSkinSurface : public G4LogicalSurface 
 {
 
-  public:  // with description
+  public:
 
     G4LogicalSkinSurface( const G4String& name,
                                 G4LogicalVolume* vol,
@@ -71,7 +70,7 @@ class G4LogicalSkinSurface : public G4LogicalSurface
 
     static void CleanSurfaceTable();
     static const G4LogicalSkinSurfaceTable* GetSurfaceTable();
-    static size_t GetNumberOfSkinSurfaces();
+    static std::size_t GetNumberOfSkinSurfaces();
     static void DumpInfo(); // const 
       // To handle with the table of surfaces.
 
@@ -91,5 +90,5 @@ class G4LogicalSkinSurface : public G4LogicalSurface
 
 #include "G4LogicalSkinSurface.icc"
 
-#endif /* G4LogicalSkinSurface_h */
+#endif