Import Geant4 10.0.0 source tree

source/persistency/gdml/include/G4GDMLReadSolids.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4GDMLReadSolids.hh 77528 2013-11-25 13:06:36Z gcosmo $
 //
 //
 // class G4GDMLReadSolids
@@ -52,8 +52,9 @@ class G4SurfaceProperty;
 class G4GDMLReadSolids : public G4GDMLReadMaterials
 {
    enum BooleanOp {UNION,SUBTRACTION,INTERSECTION};
-   typedef struct { G4double rmin,rmax,z; } zplaneType;
-
+  // typedef struct { G4double rmin,rmax,z; } zplaneType;
+   typedef struct { G4double r,z; } rzPointType;
+  
  public:
 
    G4VSolid* GetSolid(const G4String&) const;
@@ -62,7 +63,7 @@ class G4GDMLReadSolids : public G4GDMLReadMaterials
    virtual void SolidsRead(const xercesc::DOMElement* const);
 
  protected:
-
+   typedef struct { G4double rmin,rmax,z; } zplaneType;
    G4GDMLReadSolids();
    virtual ~G4GDMLReadSolids();
 
@@ -74,11 +75,14 @@ class G4GDMLReadSolids : public G4GDMLReadMaterials
    void EltubeRead(const xercesc::DOMElement* const);
    void XtruRead(const xercesc::DOMElement* const);
    void HypeRead(const xercesc::DOMElement* const);
+   void MultiUnionRead(const xercesc::DOMElement* const);
    void OrbRead(const xercesc::DOMElement* const);
    void ParaRead(const xercesc::DOMElement* const);
    void ParaboloidRead(const xercesc::DOMElement* const);
    void PolyconeRead(const xercesc::DOMElement* const);
+   void GenericPolyconeRead(const xercesc::DOMElement* const);
    void PolyhedraRead(const xercesc::DOMElement* const);
+   void GenericPolyhedraRead(const xercesc::DOMElement* const);
    G4QuadrangularFacet* QuadrangularRead(const xercesc::DOMElement* const);
    void ReflectedSolidRead(const xercesc::DOMElement* const);
    G4ExtrudedSolid::ZSection SectionRead(const xercesc::DOMElement* const,G4double);
@@ -98,7 +102,9 @@ class G4GDMLReadSolids : public G4GDMLReadMaterials
    G4TriangularFacet* TriangularRead(const xercesc::DOMElement* const);
    G4TwoVector TwoDimVertexRead(const xercesc::DOMElement* const,G4double);
    zplaneType ZplaneRead(const xercesc::DOMElement* const);
+   rzPointType RZPointRead(const xercesc::DOMElement* const);
    void OpticalSurfaceRead(const xercesc::DOMElement* const);
+  
 };
 
 #endif