Import Geant4 9.6.0 source tree

source/geometry/solids/Boolean/include/G4BooleanSolid.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4BooleanSolid.hh,v 1.18 2010-09-22 14:57:59 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //
 // class G4BooleanSolid
@@ -111,13 +110,20 @@ class G4BooleanSolid : public G4VSolid
 
   protected:
   
-    G4VSolid* fPtrSolidA;
-    G4VSolid* fPtrSolidB;
-
     G4Polyhedron* StackPolyhedron(HepPolyhedronProcessor&,
                                   const G4VSolid*) const;
       // Stack polyhedra for processing. Return top polyhedron.
 
+    inline G4double GetAreaRatio() const;
+      // Ratio of surface areas of SolidA to total A+B
+
+  protected:
+  
+    G4VSolid* fPtrSolidA;
+    G4VSolid* fPtrSolidB;
+
+    mutable G4double fAreaRatio; // Calculation deferred to GetPointOnSurface()
+
   private:
 
     G4int    fStatistics;

source/geometry/solids/Boolean/include/G4BooleanSolid.icc

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4BooleanSolid.icc,v 1.4 2006-10-20 14:20:54 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
@@ -102,3 +101,14 @@ G4double G4BooleanSolid::GetSurfaceArea()
   else   { fSurfaceArea = EstimateSurfaceArea(fStatistics,fAreaAccuracy); }
   return fSurfaceArea;
 }
+
+inline 
+G4double G4BooleanSolid::GetAreaRatio() const
+{
+  if (fAreaRatio <= 0.)
+  {
+    fAreaRatio = fPtrSolidA->GetSurfaceArea() /
+      (fPtrSolidA->GetSurfaceArea()+fPtrSolidB->GetSurfaceArea());
+  }
+  return fAreaRatio;
+}

source/geometry/solids/Boolean/include/G4DisplacedSolid.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4DisplacedSolid.hh,v 1.21 2010-10-20 07:31:39 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //
 // class G4DisplacedSolid

source/geometry/solids/Boolean/include/G4IntersectionSolid.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4IntersectionSolid.hh,v 1.11 2010-10-20 07:31:39 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //
 // class G4IntersectionSolid

source/geometry/solids/Boolean/include/G4SubtractionSolid.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4SubtractionSolid.hh,v 1.11 2010-10-20 07:31:39 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //
 // class G4SubtractionSolid

source/geometry/solids/Boolean/include/G4UnionSolid.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UnionSolid.hh,v 1.12 2010-10-20 07:31:39 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //
 // class G4UnionSolid