Added contains(x,y,z); Implemented GeoShape::volume() that calculates volume using MC method

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoBox.h

@@ -20,6 +20,9 @@ class GeoBox : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the BOX shape type, as a string
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoCons.h

@@ -19,6 +19,9 @@ class GeoCons : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the CONS shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoEllipticalTube.h

@@ -27,6 +27,9 @@ class GeoEllipticalTube : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the ELLIPTICAL TUBE shape type, as a string
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoGenericTrap.h

@@ -24,6 +24,9 @@ class GeoGenericTrap : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the GENERIC TRAP shape type, as a string.
   virtual const std::string& type() const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoPara.h

@@ -20,6 +20,9 @@ class GeoPara : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the PARA shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoPcon.h

@@ -32,6 +32,9 @@ class GeoPcon : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the PCON shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoPgon.h

@@ -23,6 +23,9 @@ class GeoPgon : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the PGON shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoShape.h

@@ -42,13 +42,16 @@ class GeoShape : public RCBase
   GeoShape ();
 
   //    Returns the volume of the shape, for mass inventory.
-  virtual double volume () const = 0;
+  virtual double volume () const;
 
   //    Returns the bonding box of the shape.
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const = 0;
 
-  //    Boolean OR operation for shapes
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const = 0;
+
+  //    Boolean OR operation for shapes.
   const GeoShapeUnion & add (const GeoShape& shape) const;
 
   //    Subtraction operation for shapes.

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoShapeIntersection.h

@@ -24,6 +24,9 @@ class GeoShapeIntersection : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the AND shape type, as a string.
   virtual const std::string & type () const;
 
@@ -58,6 +61,9 @@ class GeoShapeIntersection : public GeoShape
   //    The second shape operand in the AND operation.
   const GeoShape* m_opB;
 
+  //    Cached volume
+  mutable double fVolume = -1.;
+
   static const std::string s_classType;
   static const ShapeType s_classTypeID;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoShapeShift.h

@@ -27,6 +27,9 @@ class GeoShapeShift : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the OR shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoShapeSubtraction.h

@@ -26,6 +26,9 @@ class GeoShapeSubtraction : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the NOT shape type, as a string.
   virtual const std::string & type () const;
 
@@ -54,12 +57,15 @@ class GeoShapeSubtraction : public GeoShape
   GeoShapeSubtraction(const GeoShapeSubtraction &right);
   GeoShapeSubtraction & operator=(const GeoShapeSubtraction &right);
 
-  //    The shape operand in the Subtraction operation
+  //    The first shape operand in the Subtraction operation
   const GeoShape* m_opA;
 
-  //    The shape operand in the Subtraction operation
+  //    The second shape operand in the Subtraction operation
   const GeoShape* m_opB;
 
+  //    Cached volume
+  mutable double fVolume = -1.;
+
   static const std::string s_classType;
   static const ShapeType s_classTypeID;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoShapeUnion.h

@@ -24,6 +24,9 @@ class GeoShapeUnion : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the OR shape type, as a string.
   virtual const std::string & type () const;
 
@@ -52,12 +55,15 @@ class GeoShapeUnion : public GeoShape
   GeoShapeUnion(const GeoShapeUnion &right);
   GeoShapeUnion & operator=(const GeoShapeUnion &right);
 
-  //    The first shape operand in the OR operation.
+  //    The first shape operand in the OR operation
   const GeoShape* m_opA;
 
-  //    The second shape operand in the OR operation.
+  //    The second shape operand in the OR operation
   const GeoShape* m_opB;
 
+  //    Cached volume
+  mutable double fVolume = -1.;
+
   static const std::string s_classType;
   static const ShapeType s_classTypeID;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoSimplePolygonBrep.h

@@ -34,6 +34,9 @@ class GeoSimplePolygonBrep : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the BREP shape type, as a string
   virtual const std::string& type() const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTessellatedSolid.h

@@ -23,6 +23,9 @@ class GeoTessellatedSolid : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TESSELLATED SOLID shape type, as a string
   virtual const std::string& type() const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTorus.h

@@ -20,6 +20,9 @@ class GeoTorus : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TORUS shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTrap.h

@@ -25,6 +25,9 @@ class GeoTrap : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TRAP shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTrd.h

@@ -19,6 +19,9 @@ class GeoTrd : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TRD shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTube.h

@@ -19,6 +19,9 @@ class GeoTube : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TUBE shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTubs.h

@@ -19,6 +19,9 @@ class GeoTubs : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TUBS shape type, as a string.
   virtual const std::string & type () const;
 

GeoModelCore/GeoModelKernel/GeoModelKernel/GeoTwistedTrap.h

@@ -70,6 +70,9 @@ class GeoTwistedTrap : public GeoShape
   virtual void extent (double& xmin, double& ymin, double& zmin,
                        double& xmax, double& ymax, double& zmax) const;
 
+  //    Returns true if the shape contains the point, false otherwise.
+  virtual bool contains (double x, double y, double z) const;
+
   //    Returns the TWISTED TRAP shape type, as a string.
   virtual const std::string & type () const;