Import Geant4 10.4.0.beta source tree

source/geometry/solids/specific/include/G4UParaboloid.hh

@@ -43,16 +43,18 @@
 #ifndef G4UPARABOLOID_HH
 #define G4UPARABOLOID_HH
 
-#include "G4USolid.hh"
+#include "G4UAdapter.hh"
 
 #if ( defined(G4GEOM_USE_USOLIDS) || defined(G4GEOM_USE_PARTIAL_USOLIDS) )
 
-#include "UParaboloid.hh"
+#include <volumes/UnplacedParaboloid.h>
 
 #include "G4Polyhedron.hh"
 
-class G4UParaboloid : public G4USolid
+class G4UParaboloid : public G4UAdapter<vecgeom::UnplacedParaboloid>
 {
+  using Shape_t = vecgeom::UnplacedParaboloid;
+  using Base_t  = G4UAdapter<vecgeom::UnplacedParaboloid>;
 
   public:  // with description
 
@@ -63,12 +65,14 @@ class G4UParaboloid : public G4USolid
 
     G4VSolid* Clone() const;
 
-    inline UParaboloid* GetShape() const;
-
     G4double GetZHalfLength() const;
     G4double GetRadiusMinusZ() const;
     G4double GetRadiusPlusZ() const;
 
+    void SetZHalfLength(G4double dz);
+    void SetRadiusMinusZ(G4double r1);
+    void SetRadiusPlusZ(G4double r2);
+
     inline G4GeometryType GetEntityType() const;
 
   public:  // without description
@@ -82,7 +86,7 @@ class G4UParaboloid : public G4USolid
     G4UParaboloid &operator=( const G4UParaboloid &source );
       // Copy constructor and assignment operator.
 
-    void Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const;
+    void BoundingLimits(G4ThreeVector& pMin, G4ThreeVector& pMax) const;
     G4bool CalculateExtent(const EAxis pAxis,
                            const G4VoxelLimits& pVoxelLimit,
                            const G4AffineTransform& pTransform,
@@ -94,11 +98,6 @@ class G4UParaboloid : public G4USolid
 // Inline methods
 // --------------------------------------------------------------------
 
-inline UParaboloid* G4UParaboloid::GetShape() const
-{
-  return (UParaboloid*) fShape;
-}
-
 inline G4GeometryType G4UParaboloid::GetEntityType() const
 {
   return "G4Paraboloid";