Import Geant4 2.0.0 source tree

source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AdvancedBrepShapeRepresentationCreator.hh,v 1.2 2000/01/21 13:45:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4AdvancedBrepShapeRepresentationCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4ADVANCEDBREPSHAPEREPRESENTATIONCREATOR_HH
 #define G4ADVANCEDBREPSHAPEREPRESENTATIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4AdvancedBrepShapeRepresentationCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4AdvancedBrepShapeRepresentationCreator();
-~G4AdvancedBrepShapeRepresentationCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4AdvancedBrepShapeRepresentationCreator();
+    ~G4AdvancedBrepShapeRepresentationCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Advanced_Brep_Shape_Representation"; }
+    static G4AdvancedBrepShapeRepresentationCreator GetInstance() { return csc; }
 
-G4String Name(){return "Advanced_Brep_Shape_Representation";};
+  // Members
 
-static G4AdvancedBrepShapeRepresentationCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4AdvancedBrepShapeRepresentationCreator csc;
+    static G4AdvancedBrepShapeRepresentationCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AdvancedFaceCreator.hh,v 1.2 2000/01/21 13:45:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4AdvancedFaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4ADVANCEDFACECREATOR_HH
 #define G4ADVANCEDFACECREATOR_HH
-#include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
-class G4AdvancedFaceCreator;  // Forward declararation -> Simone
+#include "G4GeometryCreator.hh"
 
 class G4AdvancedFaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4AdvancedFaceCreator();
-~G4AdvancedFaceCreator();
+  public:
 
-//Member functions
-void CreateG4Geometry(STEPentity&);
-void CreateSTEPGeometry(void* G4obj);
+  // Constructor & destructor
+  
+    G4AdvancedFaceCreator();
+    ~G4AdvancedFaceCreator();
 
-G4String Name(){return "Advanced_Face";};
+  // Member functions
+  
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Advanced_Face"; }
+    static G4AdvancedFaceCreator GetInstance() { return csc; }
 
-static G4AdvancedFaceCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4AdvancedFaceCreator csc;
+    static G4AdvancedFaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh

@@ -1,44 +1,63 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4AssemblyCreator.hh,v 1.2 2000/01/21 13:45:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4AssemblyCreator
+//
+// Class description:
+//
+//
 
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4ASSEMBLYCREATOR_HH
 #define G4ASSEMBLYCREATOR_HH
 
-#include "G4GeometryTable.hh"
-#include "G4StepFileReader.hh"
-#include "G4NISTStepReader.hh"
-
-#include "G4AdvancedBrepShapeRepresentationCreator.hh"
-#include "G4ManifoldSolidBrepCreator.hh"
-#include "G4ClosedShellCreator.hh"
-#include "G4OpenShellCreator.hh"
-#include "G4PointCreator.hh"
+#include "G4GeometryCreator.hh"
 
+class G4StepFileReader;
 
 class G4AssemblyCreator: public G4GeometryCreator
 {
-public:
-  // Constructor
-  G4AssemblyCreator();
-  G4AssemblyCreator(G4String, G4String ="NIST");
+  public:
+
+  // Constructors
+  
+    G4AssemblyCreator();
+    G4AssemblyCreator(G4String, G4String ="NIST");
 
   // Destructor
-  ~G4AssemblyCreator();    
-
-  //Member functions
-  void ReadStepFile();
-  void CreateG4Geometry(STEPentity&);
-  void CreateSTEPGeometry(void* G4obj);
-  G4String Name(){return "Assembly";}
-  static G4AssemblyCreator GetInstance(){return ci;}
-  
-  //Members
-  int index; // add by L. Broglia, memory for get STEP entity
   
+    ~G4AssemblyCreator();    
 
-private:
-  G4StepFileReader* StepReader;
-  G4String STEPfileName;
-  static G4AssemblyCreator ci;
+  // Member functions
+  
+    void ReadStepFile();
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Assembly"; }
+    static G4AssemblyCreator GetInstance() { return ci; }
+  
+  // Members
+  
+    int index; // add by L. Broglia, memory for get STEP entity
+  
+  private:
+  
+    G4StepFileReader* StepReader;
+    G4String STEPfileName;
+    static G4AssemblyCreator ci;
 };
 
 #endif
-

source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4Axis1PlacementCreator.hh,v 1.2 2000/01/21 13:45:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4Axis1PlacementCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4AXIS1PLACEMENTCREATOR_HH
 #define G4AXIS1PLACEMENTCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4Axis1PlacementCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4Axis1PlacementCreator();
-~G4Axis1PlacementCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4Axis1PlacementCreator();
+    ~G4Axis1PlacementCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Axis1_Placement";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Axis1_Placement"; }
+    static G4Axis1PlacementCreator GetInstance() { return csc; }
 
-static G4Axis1PlacementCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4Axis1PlacementCreator csc;
+    static G4Axis1PlacementCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh

@@ -1,28 +1,51 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4Axis2Placement2dCreator.hh,v 1.2 2000/01/21 13:45:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4Axis2Placement2dCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4AXIS2PLACEMENT2DCREATOR_HH
 #define G4AXIS2PLACEMENT2DCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4Axis2Placement2dCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4Axis2Placement2dCreator();
-~G4Axis2Placement2dCreator();
+  public:
+  
+  // Constructor & destructor
+    G4Axis2Placement2dCreator();
+    ~G4Axis2Placement2dCreator();
 
-//Member functions
+  // Member functions
 
-void CreateG4Geometry(STEPentity&);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Axis2_Placement_2d"; }
+    static G4Axis2Placement2dCreator GetInstance() { return csc; }
 
-void CreateSTEPGeometry(void* G4obj);
+  //Members
 
-G4String Name(){return "Axis2_Placement_2d";};
+  private:
 
-static G4Axis2Placement2dCreator GetInstance(){return csc;};
-
-//Members
-private:
-
-static G4Axis2Placement2dCreator csc;
+    static G4Axis2Placement2dCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4Axis2Placement3dCreator.hh,v 1.2 2000/01/21 13:45:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4Axis2Placement3dCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4AXIS2PLACEMENT3DCREATOR_HH
 #define G4AXIS2PLACEMENT3DCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4Axis2Placement3dCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4Axis2Placement3dCreator();
-~G4Axis2Placement3dCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
+  
+    G4Axis2Placement3dCreator();
+    ~G4Axis2Placement3dCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void*);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Axis2_Placement_3d"; }
+    static G4Axis2Placement3dCreator GetInstance() { return csc; }
 
-G4String Name(){return "Axis2_Placement_3d";};
+  // Members
 
-static G4Axis2Placement3dCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4Axis2Placement3dCreator csc;
+    static G4Axis2Placement3dCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4Axis2PlacementCreator.hh,v 1.2 2000/01/21 13:45:09 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4Axis2PlacementCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4AXIS2PLACEMENTCREATOR_HH
 #define G4AXIS2PLACEMENTCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4Axis2PlacementCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4Axis2PlacementCreator();
-~G4Axis2PlacementCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4Axis2PlacementCreator();
+    ~G4Axis2PlacementCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Axis2_Placement";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Axis2_Placement"; }
+    static G4Axis2PlacementCreator GetInstance() { return csc; }
 
-static G4Axis2PlacementCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4Axis2PlacementCreator csc;
+    static G4Axis2PlacementCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4Axis2PlacementsCreator.hh,v 1.2 2000/01/21 13:45:09 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4Axis2PlacementsCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4AXIS2PLACEMENTSCREATOR_HH
 #define G4AXIS2PLACEMENTSCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4Axis2PlacementsCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4Axis2PlacementsCreator();
-~G4Axis2PlacementsCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4Axis2PlacementsCreator();
+    ~G4Axis2PlacementsCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Axis2_Placements"; }
+    static G4Axis2PlacementsCreator GetInstance() { return csc; }
 
-G4String Name(){return "Axis2_Placements";};
+  // Members
+  
+  private:
 
-static G4Axis2PlacementsCreator GetInstance(){return csc;};
-
-//Members
-private:
-
-static G4Axis2PlacementsCreator csc;
+    static G4Axis2PlacementsCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4BSplineCurveWithKnotsCreator.hh,v 1.2 2000/01/21 13:45:10 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4BSplineCurveWithKnotsCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4BSPLINECURVEWITHKNOTSCREATOR_HH
 #define G4BSPLINECURVEWITHKNOTSCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4BSplineCurveWithKnotsCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4BSplineCurveWithKnotsCreator();
-~G4BSplineCurveWithKnotsCreator();
+  public:
+  
+    // Constructor & destructor
 
-//Member functions
+      G4BSplineCurveWithKnotsCreator();
+      ~G4BSplineCurveWithKnotsCreator();
 
-void CreateG4Geometry(STEPentity&);
+    // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+      void CreateG4Geometry(STEPentity&);
+      void CreateSTEPGeometry(void* G4obj);
+      G4String Name() { return "B_Spline_Curve_With_Knots"; }
+      static G4BSplineCurveWithKnotsCreator GetInstance() { return csc; }
 
-G4String Name(){return "B_Spline_Curve_With_Knots";};
+    // Members
 
-static G4BSplineCurveWithKnotsCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4BSplineCurveWithKnotsCreator csc;
+    static G4BSplineCurveWithKnotsCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4BSplineSurfaceCreator.hh,v 1.2 2000/01/21 13:45:11 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4BSplineSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4BSPLINESURFACECREATOR_HH
 #define G4BSPLINESURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4BSplineSurfaceCreator: public G4GeometryCreator 
 {
-public:
-//Constructor
-G4BSplineSurfaceCreator();
-~G4BSplineSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4BSplineSurfaceCreator();
+    ~G4BSplineSurfaceCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "B_Spline_Surface";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "B_Spline_Surface"; }
+    static G4BSplineSurfaceCreator GetInstance() { return csc; }
 
-static G4BSplineSurfaceCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4BSplineSurfaceCreator csc;
+    static G4BSplineSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh

@@ -1,30 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4BSplineSurfaceWithKnotsCreator.hh,v 1.2 2000/01/21 13:45:11 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4BSplineSurfaceWithKnotsCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4BSPLINESURFACEWITHKNOTSCREATOR_HH
 #define G4BSPLINESURFACEWITHKNOTSCREATOR_HH
-#include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
+
 #include "G4BSplineSurfaceCreator.hh"
-#include "G4ControlPoints.hh"
 
 class G4BSplineSurfaceWithKnotsCreator: public G4BSplineSurfaceCreator
 {
-public:
-//Constructor
-G4BSplineSurfaceWithKnotsCreator();
-~G4BSplineSurfaceWithKnotsCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4BSplineSurfaceWithKnotsCreator();
+    ~G4BSplineSurfaceWithKnotsCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "B_Spline_Surface_With_Knots";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "B_Spline_Surface_With_Knots"; }
+    static G4BSplineSurfaceWithKnotsCreator GetInstance() { return csc; }
 
-static G4BSplineSurfaceWithKnotsCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4BSplineSurfaceWithKnotsCreator csc;
+    static G4BSplineSurfaceWithKnotsCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh

@@ -1,30 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4BoundedSurfaceCreator.hh,v 1.2 2000/01/21 13:45:12 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4BoundedSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4BOUNDEDSURFACECREATOR_HH
 #define G4BOUNDEDSURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4ControlPoints.hh"
-#include "G4BSplineSurface.hh"
 
 class G4BoundedSurfaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4BoundedSurfaceCreator();
-~G4BoundedSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4BoundedSurfaceCreator();
+    ~G4BoundedSurfaceCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Bounded_Surface";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Bounded_Surface"; }
+    static G4BoundedSurfaceCreator GetInstance() { return csc; }
 
-static G4BoundedSurfaceCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4BoundedSurfaceCreator csc;
+    static G4BoundedSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4CartesianPointCreator.hh,v 1.2 2000/01/21 13:45:13 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4CartesianPointCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CARTESIANPOINTCREATOR_HH
 #define G4CARTESIANPOINTCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4CartesianPointCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4CartesianPointCreator();
-~G4CartesianPointCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4CartesianPointCreator();
+    ~G4CartesianPointCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Cartesian_Point";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Cartesian_Point"; }
+    static G4CartesianPointCreator GetInstance() { return csc; }
 
-static G4CartesianPointCreator GetInstance(){return csc;};
+  // Members
+  
+  private:
 
-//Members
-private:
-
-static G4CartesianPointCreator csc;
+    static G4CartesianPointCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4CircleCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4CircleCreator.hh,v 1.2 2000/01/21 13:45:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4CircleCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CIRCLECREATOR_HH
 #define G4CIRCLECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4CircleCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4CircleCreator();
-~G4CircleCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4CircleCreator();
+    ~G4CircleCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Circle"; }
+    static G4CircleCreator GetInstance() { return csc; }
 
-G4String Name(){return "Circle";};
+  // Members
 
-static G4CircleCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4CircleCreator csc;
+    static G4CircleCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh

@@ -1,29 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ClosedShellCreator.hh,v 1.2 2000/01/21 13:45:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ClosedShellCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CLOSEDSHELLCREATOR_HH
 #define G4CLOSEDSHELLCREATOR_HH
+
 #include "G4ConnectedFaceSetCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4BREPSolid.hh"
 
 class G4ClosedShellCreator: public G4ConnectedFaceSetCreator 
 {
-public:
-//Constructor
-G4ClosedShellCreator();
-~G4ClosedShellCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
+  
+    G4ClosedShellCreator();
+    ~G4ClosedShellCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Closed_Shell"; }
+    static G4ClosedShellCreator GetInstance() { return csc; }
 
-G4String Name(){return "Closed_Shell";};
+  //Members
 
-static G4ClosedShellCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4ClosedShellCreator csc;
+    static G4ClosedShellCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ConicCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ConicCreator.hh,v 1.2 2000/01/21 13:45:14 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ConicCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CONICCREATOR_HH
 #define G4CONICCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ConicCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ConicCreator();
-~G4ConicCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ConicCreator();
+    ~G4ConicCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Conic";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Conic"; }
+    static G4ConicCreator GetInstance() { return csc; }
 
-static G4ConicCreator GetInstance(){return csc;};
+  // Members
+  
+  private:
 
-//Members
-private:
-
-static G4ConicCreator csc;
+    static G4ConicCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ConicalSurfaceCreator.hh,v 1.2 2000/01/21 13:45:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ConicalSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CONICALSURFACECREATOR_HH
 #define G4CONICALSURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ConicalSurfaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ConicalSurfaceCreator();
-~G4ConicalSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ConicalSurfaceCreator();
+    ~G4ConicalSurfaceCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Conical_Surface";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Conical_Surface"; }
+    static G4ConicalSurfaceCreator GetInstance() { return csc; }
+    
+  // Members
 
-static G4ConicalSurfaceCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4ConicalSurfaceCreator csc;
+    static G4ConicalSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ConnectedFaceSetCreator.hh,v 1.2 2000/01/21 13:45:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ConnectedFaceSetCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CONNECTEDFACESETCREATOR_HH
 #define G4CONNECTEDFACESETCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ConnectedFaceSetCreator: public G4GeometryCreator 
 {
-public:
-//Constructor
-G4ConnectedFaceSetCreator();
-~G4ConnectedFaceSetCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ConnectedFaceSetCreator();
+    ~G4ConnectedFaceSetCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Connected_Face_Set";};
+  void CreateG4Geometry(STEPentity&);
+  void CreateSTEPGeometry(void* G4obj);
+  G4String Name() { return "Connected_Face_Set"; }
+  static G4ConnectedFaceSetCreator GetInstance() { return csc; }
 
-static G4ConnectedFaceSetCreator GetInstance(){return csc;};
-
-//Members
+  // Members
+  
 private:
 
-static G4ConnectedFaceSetCreator csc;
+  static G4ConnectedFaceSetCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh

@@ -1,27 +1,53 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ContextDependentShapeRepresentationCreator.hh,v 1.2 2000/01/21 13:45:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ContextDependentShapeRepresentationCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CONTEXTDEPENDENTSHAPEREPRESENTATIONCREATOR_HH
 #define G4CONTEXTDEPENDENTSHAPEREPRESENTATIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ContextDependentShapeRepresentationCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ContextDependentShapeRepresentationCreator();
-~G4ContextDependentShapeRepresentationCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ContextDependentShapeRepresentationCreator();
+    ~G4ContextDependentShapeRepresentationCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Context_Dependent_Shape_Representation";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Context_Dependent_Shape_Representation"; }
+    static G4ContextDependentShapeRepresentationCreator GetInstance()
+     { return csc; }
+     
+  // Members
+  
+  private:
 
-static G4ContextDependentShapeRepresentationCreator GetInstance(){return csc;};
-
-//Members
-private:
-static G4ContextDependentShapeRepresentationCreator csc;
+    static G4ContextDependentShapeRepresentationCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4CurveCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4CurveCreator.hh,v 1.2 2000/01/21 13:45:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4CurveCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CURVECREATOR_HH
 #define G4CURVECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4CurveCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4CurveCreator();
-~G4CurveCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4CurveCreator();
+    ~G4CurveCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Curve";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Curve"; }
+    static G4CurveCreator GetInstance() { return csc; }
 
-static G4CurveCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4CurveCreator csc;
+    static G4CurveCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4CylindricalSurfaceCreator.hh,v 1.2 2000/01/21 13:45:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4CylindricalSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4CYLINDRICALSURFACECREATOR_HH
 #define G4CYLINDRICALSURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4CylindricalSurfaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4CylindricalSurfaceCreator();
-~G4CylindricalSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4CylindricalSurfaceCreator();
+    ~G4CylindricalSurfaceCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Cylindrical_Surface";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Cylindrical_Surface"; }
+    static G4CylindricalSurfaceCreator GetInstance() { return csc; }
 
-static G4CylindricalSurfaceCreator GetInstance(){return csc;};
+  // Members
+  
+  private:
 
-//Members
-private:
-
-static G4CylindricalSurfaceCreator csc;
+    static G4CylindricalSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4DirectionCreator.hh,v 1.2 2000/01/21 13:45:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4DirectionCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4DIRECTIONCREATOR_HH
 #define G4DIRECTIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4DirectionCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4DirectionCreator();
-~G4DirectionCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4DirectionCreator();
+    ~G4DirectionCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Direction";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Direction"; }
+    static G4DirectionCreator GetInstance() { return csc; }
 
-static G4DirectionCreator GetInstance(){return csc;};
+  //Members
+  
+  private:
 
-//Members
-private:
-
-static G4DirectionCreator csc;
+    static G4DirectionCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4EdgeCurveCreator.hh,v 1.2 2000/01/21 13:45:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4EdgeCurveCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4EDGECURVECREATOR_HH
 #define G4EDGECURVECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4EdgeCurveCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4EdgeCurveCreator();
-~G4EdgeCurveCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4EdgeCurveCreator();
+    ~G4EdgeCurveCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Edge_Curve";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Edge_Curve"; }
+    static G4EdgeCurveCreator GetInstance() { return csc; }
 
-static G4EdgeCurveCreator GetInstance(){return csc;};
+  // Members
+  
+  private:
 
-//Members
-private:
-
-static G4EdgeCurveCreator csc;
+    static G4EdgeCurveCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4EdgeLoopCreator.hh,v 1.2 2000/01/21 13:45:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4EdgeLoopCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4EDGELOOPCREATOR_HH
 #define G4EDGELOOPCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4EdgeLoopCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4EdgeLoopCreator();
-~G4EdgeLoopCreator();
+  public:
 
-//Member functions
+  // Constructor
 
-void CreateG4Geometry(STEPentity&);
+    G4EdgeLoopCreator();
+    ~G4EdgeLoopCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Edge_Loop";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Edge_Loop"; }
+    static G4EdgeLoopCreator GetInstance() { return csc; }
 
-static G4EdgeLoopCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4EdgeLoopCreator csc;
+    static G4EdgeLoopCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4EllipseCreator.hh,v 1.2 2000/01/21 13:45:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4EllipseCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4ELLIPSECREATOR_HH
 #define G4ELLIPSECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4EllipseCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4EllipseCreator();
-~G4EllipseCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4EllipseCreator();
+    ~G4EllipseCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Ellipse"; }
+    static G4EllipseCreator GetInstance() { return csc; }
 
-G4String Name(){return "Ellipse";};
+  //Members
 
-static G4EllipseCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4EllipseCreator csc;
+    static G4EllipseCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4FaceBoundCreator.hh,v 1.2 2000/01/21 13:45:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4FaceBoundCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4FACEBOUNDCREATOR_HH
 #define G4FACEBOUNDCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4FaceBoundCreator: public G4GeometryCreator 
 {
-public:
-//Constructor
-G4FaceBoundCreator();
-~G4FaceBoundCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4FaceBoundCreator();
+    ~G4FaceBoundCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Face_Bound";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Face_Bound"; }
+    static G4FaceBoundCreator GetInstance() { return csc; }
 
-static G4FaceBoundCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4FaceBoundCreator csc;
+    static G4FaceBoundCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh

@@ -1,29 +1,51 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4FaceOuterBoundCreator.hh,v 1.2 2000/01/21 13:45:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4FaceOuterBoundCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4FACEOUTERBOUNDCREATOR_HH
 #define G4FACEOUTERBOUNDCREATOR_HH
-#include "G4GeometryCreator.hh"
-//#include "G4GeometryTable.hh"
+
 #include "G4FaceBoundCreator.hh"
 
 class G4FaceOuterBoundCreator: public G4FaceBoundCreator
 {
-public:
-//Constructor
-G4FaceOuterBoundCreator();
-~G4FaceOuterBoundCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateSTEPGeometry(void* G4obj);
+    G4FaceOuterBoundCreator();
+    ~G4FaceOuterBoundCreator();
 
-G4String Name(){return "Face_Outer_Bound";};
+  // Member functions
 
-static G4FaceOuterBoundCreator GetInstance(){return csc;};
+  void CreateSTEPGeometry(void* G4obj);
+  G4String Name() { return "Face_Outer_Bound"; }
+  static G4FaceOuterBoundCreator GetInstance() { return csc; }
 
-//Members
-private:
+  // Members
 
-static G4FaceOuterBoundCreator csc;
+  private:
+
+    static G4FaceOuterBoundCreator csc;
 };
+
 #endif
-
-

source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4FaceSurfaceCreator.hh,v 1.2 2000/01/21 13:45:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4FaceSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4FACESURFACECREATOR_HH
 #define G4FACESURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4FaceSurfaceCreator: public G4GeometryCreator 
 {
-public:
-//Constructor
-G4FaceSurfaceCreator();
-~G4FaceSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
+  
+    G4FaceSurfaceCreator();
+    ~G4FaceSurfaceCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Face_Surface"; }
+    static G4FaceSurfaceCreator GetInstance() { return csc; }
+    
+  // Members
 
-G4String Name(){return "Face_Surface";};
-
-static G4FaceSurfaceCreator GetInstance(){return csc;};
-
-//Members
 private:
 
-static G4FaceSurfaceCreator csc;
+    static G4FaceSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4GeometricRepresentationContextCreator.hh,v 1.2 2000/01/21 13:45:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4GeometricRepresentationContextCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4GEOMETRICREPRESENTATIONCONTEXTCREATOR_HH
 #define G4GEOMETRICREPRESENTATIONCONTEXTCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4GeometricRepresentationContextCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4GeometricRepresentationContextCreator();
-~G4GeometricRepresentationContextCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4GeometricRepresentationContextCreator();
+    ~G4GeometricRepresentationContextCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Geometric_Representation_Context";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Geometric_Representation_Context"; }
+    static G4GeometricRepresentationContextCreator GetInstance() { return csc; }
 
-static G4GeometricRepresentationContextCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4GeometricRepresentationContextCreator csc;
+    static G4GeometricRepresentationContextCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh

@@ -1,63 +1,68 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4GeometryCreator.hh,v 1.3 2000/01/21 13:45:26 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4GeometryCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4GEOMETRYCREATOR_HH
 #define G4GEOMETRYCREATOR_HH
-//#include "G4OrderedTable.hh"
-#include "G4STEPEntity.hh"
-#include "G4NISTStepReader.hh"
-#include "G4Curve.hh"
-#include "G4PlacedSolid.hh"
-//#include "G4Placement.hh"
-#include "G4Axis2Placement3D.hh"
 
-//typedef G4RWTPtrOrderedVector<G4Curve> G4CurveVector;
-//typedef G4RWTPtrOrderedVector<G4CurveVector> G4BoundaryVector;
+#include <schema.h>
+#include "globals.hh"
+#include "G4PlacedSolid.hh"
+#include "G4Surface.hh"
+#include "G4BREPSolid.hh"
+
 typedef G4RWTPtrOrderedVector<G4PlacedSolid> G4PlacedSolidVector;
-//typedef G4RWTPtrOrderedVector<G4GeometryCreator> G4CreatorVector;
 typedef G4RWTPtrOrderedVector<G4Surface> G4SurfaceVector;
 typedef G4RWTPtrOrderedVector<G4BREPSolid> G4SolidVector;
-//typedef G4RWTPtrOrderedVector<G4Placement> G4PlacementVector;
-
-//#include "G4STEPEntity.hh"
-//erator ==(class G4RWTPtrOrderedVector<G4Curve> a, class G4RWTPtrOrderedVector<G4Curve> b){}
-#include "globals.hh"
-#include "instmgr.h"
-#include "STEPentity.h"
-#include "STEPaggregate.h"
-
-#include "G4Curve.hh"
-//#include "G4Surface.hh"
-#include "G4FPlane.hh"
-#include "G4FConicalSurface.hh"
-#include "G4FCylindricalSurface.hh"
-#include "G4CylindricalSurface.hh"
-#include "G4ToroidalSurface.hh"
-#include "G4SphericalSurface.hh"
-#include "G4PlacedSolid.hh"
 
 class G4GeometryCreator
 {
   
-public:
-  G4GeometryCreator(){}
-  virtual ~G4GeometryCreator(){};
+  public:
 
-  virtual void CreateG4Geometry(STEPentity&)=0;
-  virtual void CreateSTEPGeometry(void* =0)=0;
+  // Constructor & destructor
+  
+    G4GeometryCreator() {;}
+    virtual ~G4GeometryCreator() {;}
 
-  virtual void* GetCreatedObject(){return createdObject;}
+  // Member functions
   
-  virtual G4String Name()=0;
-  virtual G4bool operator==(const G4GeometryCreator&){return 0;}
-  virtual STEPattribute* GetNamedAttribute(G4String&,STEPentity&);
-  virtual STEPentity* GetNamedEntity(G4String&,STEPentity&);  
-  G4int GetNextId(){objectId +=10 ; return objectId; }
+    virtual void CreateG4Geometry(STEPentity&)=0;
+    virtual void CreateSTEPGeometry(void* =0)=0;
+
+    virtual void* GetCreatedObject() { return createdObject; }
   
-  static G4int objectId;
-  static InstMgr instanceManager;
-  void* createdObject;
+    virtual G4String Name()=0;
+    virtual G4bool operator==(const G4GeometryCreator&) { return 0; }
+    virtual STEPattribute* GetNamedAttribute(G4String&,STEPentity&);
+    virtual STEPentity* GetNamedEntity(G4String&,STEPentity&);  
+    G4int GetNextId() { objectId+=10; return objectId; }
+
+  // Members
+    
+    static G4int objectId;
+    static InstMgr instanceManager;
+    void* createdObject;
 
 };
 
 #endif
-
-
-

source/geometry/solids/STEPinterface/include/G4GeometryTable.hh

@@ -1,48 +1,64 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4GeometryTable.hh,v 1.3 2000/01/21 13:45:26 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4GeometryTable
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4GEOMETRYTABLE_HH
 #define G4GEOMETRYTABLE_HH
 
+#include "globals.hh"
 #include "G4GeometryCreator.hh"
-//#include "G4OrderedTable.hh"
-//#include "G4NISTStepReader.hh"
 
-//typedef G4RWTPtrOrderedVector<G4Curve> G4CurveVector;
-//typedef G4RWTPtrOrderedVector<G4CurveVector> G4BoundaryVector;
-//typedef G4RWTPtrOrderedVector<G4PlacedSolid> G4PlacedSolidVector;
-//typedef G4RWTPtrOrderedVector<G4GeometryCreator*> G4CreatorVector;
 typedef G4RWTPtrOrderedVector<G4GeometryCreator> G4CreatorVector;
-//typedef G4RWTPtrOrderedVector<G4Surface> G4SurfaceVector;
-//typedef G4RWTPtrOrderedVector<G4BREPSolid> G4SolidVector;
-
-
-
-//operator ==(class G4RWTPtrOrderedVector<G4Curve> a, class G4RWTPtrOrderedVector<G4Curve> b){}
-
 
 class G4GeometryTable
 {
-public:
+  public:
+
   // Destructor
-  ~G4GeometryTable();    
-  //Member functions
-  static void RegisterObject(G4GeometryCreator*);
-  static G4bool ExistsInTable(G4String&);
-  static G4GeometryCreator* GetObject(G4String);
-  static void* CreateObject(STEPentity&);
-  static void* CreateSTEPObject(void*, G4String&);  
-  static void PrintObjectNames();
-  static G4GeometryTable& GetInstance(){return gt;}
+  
+    ~G4GeometryTable();    
+
+  // Member functions
+
+    static void RegisterObject(G4GeometryCreator*);
+    static G4bool ExistsInTable(G4String&);
+    static G4GeometryCreator* GetObject(G4String);
+    static void* CreateObject(STEPentity&);
+    static void* CreateSTEPObject(void*, G4String&);  
+    static void PrintObjectNames();
+    static G4GeometryTable& GetInstance() { return gt; }
+
+  public:
 
-public:
   // Constructor, singleton
-  G4GeometryTable();
 
-  //Members
-private:
-  static G4CreatorVector RegisteredObjects;
-  static G4GeometryTable gt;
+    G4GeometryTable();
+
+  // Members
+
+  private:
+
+    static G4CreatorVector RegisteredObjects;
+    static G4GeometryTable gt;
 };
 
 #endif
-
-
-

source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4HyperbolaCreator.hh,v 1.2 2000/01/21 13:45:26 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4HyperbolaCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4HYPERBOLACREATOR_HH
 #define G4HYPERBOLACREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4HyperbolaCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4HyperbolaCreator();
-~G4HyperbolaCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4HyperbolaCreator();
+    ~G4HyperbolaCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Hyperbola";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Hyperbola"; }
+    static G4HyperbolaCreator GetInstance() { return csc; }
 
-static G4HyperbolaCreator GetInstance(){return csc;};
+  // Members
+  
+  private:
 
-//Members
-private:
-
-static G4HyperbolaCreator csc;
+    static G4HyperbolaCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh

@@ -1,29 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ItemDefinedTransformationCreator.hh,v 1.2 2000/01/21 13:45:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ItemDefinedTransformationCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4ITEMDEFINEDTRANSFORMATIONCREATOR_HH
 #define G4ITEMDEFINEDTRANSFORMATIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4PlacementVector.hh"
 
 class G4ItemDefinedTransformationCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ItemDefinedTransformationCreator();
-~G4ItemDefinedTransformationCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ItemDefinedTransformationCreator();
+    ~G4ItemDefinedTransformationCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Item_Defined_Transformation";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Item_Defined_Transformation"; }
+    static G4ItemDefinedTransformationCreator GetInstance() { return csc; }
 
-static G4ItemDefinedTransformationCreator GetInstance(){return csc;};
+  // Members
+  
+  private:
 
-//Members
-private:
-
-static G4ItemDefinedTransformationCreator csc;
+    static G4ItemDefinedTransformationCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4LineCreator.hh

@@ -1,29 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4LineCreator.hh,v 1.2 2000/01/21 13:45:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4LineCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4LINECREATOR_HH
 #define G4LINECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4Line.hh"
 
 class G4LineCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4LineCreator();
-~G4LineCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4LineCreator();
+    ~G4LineCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Line";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Line"; }
+    static G4LineCreator GetInstance() { return csc; }
 
-static G4LineCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4LineCreator csc;
+    static G4LineCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh

@@ -1,29 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ManifoldSolidBrepCreator.hh,v 1.2 2000/01/21 13:45:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ManifoldSolidBrepCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4MANIFOLDSOLIDBREPCREATOR_HH
 #define G4MANIFOLDSOLIDBREPCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4BREPSolid.hh"
 
 class G4ManifoldSolidBrepCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ManifoldSolidBrepCreator();
-~G4ManifoldSolidBrepCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ManifoldSolidBrepCreator();
+    ~G4ManifoldSolidBrepCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Manifold_Solid_Brep";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Manifold_Solid_Brep"; }
+    static G4ManifoldSolidBrepCreator GetInstance() { return csc; }
 
-static G4ManifoldSolidBrepCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ManifoldSolidBrepCreator csc;
+    static G4ManifoldSolidBrepCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh

@@ -5,31 +5,28 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NISTStepReader.hh,v 1.2 1999/12/15 14:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-01 $
+// $Id: G4NISTStepReader.hh,v 1.3 2000/01/21 13:45:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
 //
+// ----------------------------------------------------------------------
+// Class G4NISTStepReader
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4NISTSTEPFILEREADER_HH
 #define G4NISTSTEPFILEREADER_HH
+
+#include <instmgr.h>
 #include "G4StepFileReader.hh"
 
-#include "STEPfile.h"   /*  STEPfile class and others used by SCL */
-#include "sdai.h"       /*  definitions of for EXRPESS built-in types  */
-#include "schema.h"
-#include "instmgr.h"
-//#include "G4StepFile.h"   /*  or suitable substitute   */
-
-
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
-#include "instmgr.h"
-#include "Registry.h"
-//#include "STEPfile.h"
-#include "STEPentity.h"
-#include "STEPaggregate.h"
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // Function defined as a stub (necessary to use the scl)
 // The purpose of this function is to allow the DisplayNode object to delete 
@@ -57,13 +54,12 @@ void AssignFileId (STEPentity *se, InstMgr& instance_list)
 // define this to be the name of the display window object for 
 // STEP entity instance editing or define your own.
 // This is only needed as there's a link to these from the toolkit
-class STEPentity;
-class InstMgr;
+
 class StepEntityEditor
 {
   public:
-    StepEntityEditor() {};
-    ~StepEntityEditor() {};
+    StepEntityEditor() {;}
+    ~StepEntityEditor() {;}
 };
 
 extern void AssignFileId (STEPentity *se, InstMgr& instance_list);
@@ -74,15 +70,16 @@ extern void SchemaInit (Registry &);
 
 class G4NISTStepReader: public G4StepFileReader
 {
- public:
-  void ReadSTEPFile(G4String);
-  void SaveSTEPFile();
-  void UpdateSTEPFile();
-  InstMgr GetInstanceManager(){return InstanceList;}
+  public:
 
- private:
-  InstMgr InstanceList;
-   
+    void ReadSTEPFile(G4String);
+    void SaveSTEPFile();
+    void UpdateSTEPFile();
+    InstMgr GetInstanceManager() { return InstanceList; }
+
+  private:
+
+    InstMgr InstanceList;
 };
 
 #endif

source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4OpenShellCreator.hh,v 1.2 2000/01/21 13:45:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4OpenShellCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4OPENSHELLCREATOR_HH
 #define G4OPENSHELLCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4OpenShellCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4OpenShellCreator();
-~G4OpenShellCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4OpenShellCreator();
+    ~G4OpenShellCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Open_Shell";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Open_Shell"; }
+    static G4OpenShellCreator GetInstance() { return csc; }
 
-static G4OpenShellCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4OpenShellCreator csc;
+    static G4OpenShellCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4OrientedEdgeCreator.hh,v 1.2 2000/01/21 13:45:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4OrientedEdgeCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4ORIENTEDEDGECREATOR_HH
 #define G4ORIENTEDEDGECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4OrientedEdgeCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4OrientedEdgeCreator();
-~G4OrientedEdgeCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4OrientedEdgeCreator();
+    ~G4OrientedEdgeCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Oriented_Edge";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Oriented_Edge"; }
+    static G4OrientedEdgeCreator GetInstance() { return csc; }
 
-static G4OrientedEdgeCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4OrientedEdgeCreator csc;
+    static G4OrientedEdgeCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ParabolaCreator.hh,v 1.2 2000/01/21 13:45:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ParabolaCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4PARABOLACREATOR_HH
 #define G4PARABOLACREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ParabolaCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ParabolaCreator();
-~G4ParabolaCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ParabolaCreator();
+    ~G4ParabolaCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Parabola";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Parabola"; }
+    static G4ParabolaCreator GetInstance() { return csc; }
 
-static G4ParabolaCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ParabolaCreator csc;
+    static G4ParabolaCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PlaneCreator.hh,v 1.2 2000/01/21 13:45:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4PlaneCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4PLANECREATOR_HH
 #define G4PLANECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4PlaneCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4PlaneCreator();
-~G4PlaneCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4PlaneCreator();
+    ~G4PlaneCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Plane";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Plane"; }
+    static G4PlaneCreator GetInstance() { return csc; }
 
-static G4PlaneCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4PlaneCreator csc;
+    static G4PlaneCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4PointCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PointCreator.hh,v 1.2 2000/01/21 13:45:28 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4PointCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4POINTCREATOR_HH
 #define G4POINTCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4PointCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4PointCreator();
-~G4PointCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4PointCreator();
+    ~G4PointCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Point";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Point"; }
+    static G4PointCreator GetInstance() { return csc; }
 
-static G4PointCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4PointCreator csc;
+    static G4PointCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PointOnCurveCreator.hh,v 1.2 2000/01/21 13:45:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4PointOnCurveCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4POINTONCURVECREATOR_HH
 #define G4POINTONCURVECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4PointOnCurveCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4PointOnCurveCreator();
-~G4PointOnCurveCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4PointOnCurveCreator();
+    ~G4PointOnCurveCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Point_On_Curve";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Point_On_Curve"; }
+    static G4PointOnCurveCreator GetInstance() { return csc; }
 
-static G4PointOnCurveCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4PointOnCurveCreator csc;
+    static G4PointOnCurveCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PointOnSurfaceCreator.hh,v 1.2 2000/01/21 13:45:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4PointOnSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4POINTONSURFACECREATOR_HH
 #define G4POINTONSURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4PointOnSurfaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4PointOnSurfaceCreator();
-~G4PointOnSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
+  
+    G4PointOnSurfaceCreator();
+    ~G4PointOnSurfaceCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Point_On_Surface"; }
+    static G4PointOnSurfaceCreator GetInstance() { return csc; }
 
-G4String Name(){return "Point_On_Surface";};
+  // Members
 
-static G4PointOnSurfaceCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4PointOnSurfaceCreator csc;
+    static G4PointOnSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4PointReplicaCreator.hh,v 1.2 2000/01/21 13:45:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4PointReplicaCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4POINTREPLICACREATOR_HH
 #define G4POINTREPLICACREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4PointReplicaCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4PointReplicaCreator();
-~G4PointReplicaCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4PointReplicaCreator();
+    ~G4PointReplicaCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void* G4obj);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Point_Replica"; }
+    static G4PointReplicaCreator GetInstance() { return csc; }
 
-G4String Name(){return "Point_Replica";};
+  // Members
 
-static G4PointReplicaCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4PointReplicaCreator csc;
+    static G4PointReplicaCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh

@@ -1,28 +1,53 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ProductDefinitionShapeCreator.hh,v 1.2 2000/01/21 13:45:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ProductDefinitionShapeCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4PRODUCTDEFINITIONSHAPECREATOR_HH
 #define G4PRODUCTDEFINITIONSHAPECREATOR_HH
+
 #include "G4GeometryCreator.hh"
 #include "G4GeometryTable.hh"
 
 class G4ProductDefinitionShapeCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ProductDefinitionShapeCreator();
-~G4ProductDefinitionShapeCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ProductDefinitionShapeCreator();
+    ~G4ProductDefinitionShapeCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Product_Definition_Shape";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Product_Definition_Shape"; }
+    static G4ProductDefinitionShapeCreator GetInstance() { return csc; }
 
-static G4ProductDefinitionShapeCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ProductDefinitionShapeCreator csc;
+    static G4ProductDefinitionShapeCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh

@@ -1,29 +1,53 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4RationalBSplineSurfaceCreator.hh,v 1.2 2000/01/21 13:45:29 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4RationalBSplineSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4RATIONALBSPLINESURFACECREATOR_HH
 #define G4RATIONALBSPLINESURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 #include "G4BSplineSurfaceCreator.hh"
 
 class G4RationalBSplineSurfaceCreator: public G4BSplineSurfaceCreator 
 {
-public:
-//Constructor
-G4RationalBSplineSurfaceCreator();
-~G4RationalBSplineSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4RationalBSplineSurfaceCreator();
+    ~G4RationalBSplineSurfaceCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Rational_B_Spline_Surface";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Rational_B_Spline_Surface"; }
+    static G4RationalBSplineSurfaceCreator GetInstance() { return csc; }
+    
+  // Members
 
-static G4RationalBSplineSurfaceCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4RationalBSplineSurfaceCreator csc;
+    static G4RationalBSplineSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4RepresentationRelationshipCreator.hh,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4RepresentationRelationshipCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4REPRESENTATIONRELATIONSHIPCREATOR_HH
 #define G4REPRESENTATIONRELATIONSHIPCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4RepresentationRelationshipCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4RepresentationRelationshipCreator();
-~G4RepresentationRelationshipCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4RepresentationRelationshipCreator();
+    ~G4RepresentationRelationshipCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Representation_Relationship";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Representation_Relationship"; }
+    static G4RepresentationRelationshipCreator GetInstance() { return csc; }
 
-static G4RepresentationRelationshipCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
-static G4int placeCount;
-static G4RepresentationRelationshipCreator csc;
+  private:
+
+    static G4RepresentationRelationshipCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh

@@ -1,28 +1,55 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4RepresentationRelationshipWithTransformationCreator.hh,v 1.2 2000/01/21 13:45:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4RepresentationRelationshipWithTransformationCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4REPRESENTATIONRELATIONSHIPWITHTRANSFORMATIONCREATOR_HH
 #define G4REPRESENTATIONRELATIONSHIPWITHTRANSFORMATIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
-class G4RepresentationRelationshipWithTransformationCreator: private G4GeometryCreator 
+class G4RepresentationRelationshipWithTransformationCreator
+      : private G4GeometryCreator 
 {
-public:
-//Constructor
-G4RepresentationRelationshipWithTransformationCreator();
-~G4RepresentationRelationshipWithTransformationCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4RepresentationRelationshipWithTransformationCreator();
+    ~G4RepresentationRelationshipWithTransformationCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void*);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name()
+      { return "Representation_Relationship_With_Transformation"; }
+    static G4RepresentationRelationshipWithTransformationCreator GetInstance()
+      { return csc; }
 
-G4String Name(){return "Representation_Relationship_With_Transformation";};
+  // Members
 
-static G4RepresentationRelationshipWithTransformationCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4RepresentationRelationshipWithTransformationCreator csc;
+    static G4RepresentationRelationshipWithTransformationCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ShapeDefinitionRepresentationCreator.hh,v 1.2 2000/01/21 13:45:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ShapeDefinitionRepresentationCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4SHAPEDEFINITIONREPRESENTATIONCREATOR_HH
 #define G4SHAPEDEFINITIONREPRESENTATIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ShapeDefinitionRepresentationCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ShapeDefinitionRepresentationCreator();
-~G4ShapeDefinitionRepresentationCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ShapeDefinitionRepresentationCreator();
+    ~G4ShapeDefinitionRepresentationCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Shape_Definition_Representation";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Shape_Definition_Representation"; }
+    static G4ShapeDefinitionRepresentationCreator GetInstance() { return csc; }
 
-static G4ShapeDefinitionRepresentationCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ShapeDefinitionRepresentationCreator csc;
+    static G4ShapeDefinitionRepresentationCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ShapeRepresentationCreator.hh,v 1.2 2000/01/21 13:45:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ShapeRepresentationCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4SHAPEREPRESENTATIONCREATOR_HH
 #define G4SHAPEREPRESENTATIONCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4PlacementVector.hh"
+
 class G4ShapeRepresentationCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ShapeRepresentationCreator();
-~G4ShapeRepresentationCreator();
+  public:
 
-//Member functions
+  // Constructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ShapeRepresentationCreator();
+    ~G4ShapeRepresentationCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Shape_Representation";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Shape_Representation"; }
+    static G4ShapeRepresentationCreator GetInstance() { return csc; }
 
-static G4ShapeRepresentationCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ShapeRepresentationCreator csc;
+    static G4ShapeRepresentationCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh

@@ -1,29 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ShapeRepresentationRelationshipCreator.hh,v 1.2 2000/01/21 13:45:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ShapeRepresentationRelationshipCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4SHAPEREPRESENTATIONRELATIONSHIPCREATOR_HH
 #define G4SHAPEREPRESENTATIONRELATIONSHIPCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
-#include "G4PlacementVector.hh"
 
 class G4ShapeRepresentationRelationshipCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ShapeRepresentationRelationshipCreator();
-~G4ShapeRepresentationRelationshipCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ShapeRepresentationRelationshipCreator();
+    ~G4ShapeRepresentationRelationshipCreator();
 
-void CreateSTEPGeometry(void*);
+  // Member functions
 
-G4String Name(){return "Shape_Representation_Relationship";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Shape_Representation_Relationship"; }
+    static G4ShapeRepresentationRelationshipCreator GetInstance() { return csc; }
 
-static G4ShapeRepresentationRelationshipCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ShapeRepresentationRelationshipCreator csc;
+    static G4ShapeRepresentationRelationshipCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4SphericalSurfaceCreator.hh,v 1.2 2000/01/21 13:45:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4SphericalSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4SPHERICALSURFACECREATOR_HH
 #define G4SPHERICALSURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4SphericalSurfaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4SphericalSurfaceCreator();
-~G4SphericalSurfaceCreator();
+  public:
+  
+  // Constructor & destructor
 
-//Member functions
+    G4SphericalSurfaceCreator();
+    ~G4SphericalSurfaceCreator();
 
-void CreateG4Geometry(STEPentity&);
+  // Member functions
 
-void CreateSTEPGeometry(void*);
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void*);
+    G4String Name() { return "Spherical_Surface"; }
+    static G4SphericalSurfaceCreator GetInstance() { return csc; }
 
-G4String Name(){return "Spherical_Surface";};
+  // Members
 
-static G4SphericalSurfaceCreator GetInstance(){return csc;};
+  private:
 
-//Members
-private:
-
-static G4SphericalSurfaceCreator csc;
+    static G4SphericalSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4StepFileReader.hh

@@ -5,22 +5,35 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4StepFileReader.hh,v 1.2 1999/12/15 14:50:20 gunter Exp $
-// GEANT4 tag $Name: geant4-01-01 $
+// $Id: G4StepFileReader.hh,v 1.3 2000/01/21 13:45:31 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
 //
+// ----------------------------------------------------------------------
+// Class G4StepFileReader
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4STEPFILEREADER_HH
 #define G4STEPFILEREADER_HH
 
+#include <schema.h>
 #include "globals.hh"
-#include "instmgr.h"
 
 class G4StepFileReader
 {
-public:
-  virtual void ReadSTEPFile(G4String)=0;
-  virtual void SaveSTEPFile()=0;
-  virtual void UpdateSTEPFile()=0;
-  virtual InstMgr GetInstanceManager()=0;
+  public:
+    virtual void ReadSTEPFile(G4String)=0;
+    virtual void SaveSTEPFile()=0;
+    virtual void UpdateSTEPFile()=0;
+    virtual InstMgr GetInstanceManager()=0;
 };
 
 #endif

source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4ToroidalSurfaceCreator.hh,v 1.2 2000/01/21 13:45:31 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4ToroidalSurfaceCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4TOROIDALSURFACECREATOR_HH
 #define G4TOROIDALSURFACECREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4ToroidalSurfaceCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4ToroidalSurfaceCreator();
-~G4ToroidalSurfaceCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4ToroidalSurfaceCreator();
+    ~G4ToroidalSurfaceCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Toroidal_Surface";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Toroidal_Surface"; }
+    static G4ToroidalSurfaceCreator GetInstance() { return csc; }
 
-static G4ToroidalSurfaceCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4ToroidalSurfaceCreator csc;
+    static G4ToroidalSurfaceCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4VectorCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4VectorCreator.hh,v 1.2 2000/01/21 13:45:31 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4VectorCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4VECTORCREATOR_HH
 #define G4VECTORCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4VectorCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4VectorCreator();
-~G4VectorCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4VectorCreator();
+    ~G4VectorCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Vector";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Vector"; }
+    static G4VectorCreator GetInstance() { return csc; }
 
-static G4VectorCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4VectorCreator csc;
+    static G4VectorCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh

@@ -1,28 +1,52 @@
+// This code implementation is the intellectual property of
+// the GEANT4 collaboration.
+//
+// By copying, distributing or modifying the Program (or any work
+// based on the Program) you indicate your acceptance of this statement,
+// and all its terms.
+//
+// $Id: G4VertexPointCreator.hh,v 1.2 2000/01/21 13:45:39 gcosmo Exp $
+// GEANT4 tag $Name: geant4-02-00 $
+//
+// ----------------------------------------------------------------------
+// Class G4VertexPointCreator
+//
+// Class description:
+//
+//
+
+// Authors: J.Sulkimo, P.Urban.
+// Revisions by: L.Broglia, G.Cosmo.
+//
+// History:
+//   18-Nov-1999: First step of re-engineering - G.Cosmo
+// ----------------------------------------------------------------------
 #ifndef G4VERTEXPOINTCREATOR_HH
 #define G4VERTEXPOINTCREATOR_HH
+
 #include "G4GeometryCreator.hh"
-#include "G4GeometryTable.hh"
 
 class G4VertexPointCreator: private G4GeometryCreator 
 {
-public:
-//Constructor
-G4VertexPointCreator();
-~G4VertexPointCreator();
+  public:
 
-//Member functions
+  // Constructor & destructor
 
-void CreateG4Geometry(STEPentity&);
+    G4VertexPointCreator();
+    ~G4VertexPointCreator();
 
-void CreateSTEPGeometry(void* G4obj);
+  // Member functions
 
-G4String Name(){return "Vertex_Point";};
+    void CreateG4Geometry(STEPentity&);
+    void CreateSTEPGeometry(void* G4obj);
+    G4String Name() { return "Vertex_Point"; }
+    static G4VertexPointCreator GetInstance() { return csc; }
 
-static G4VertexPointCreator GetInstance(){return csc;};
+  // Members
 
-//Members
-private:
+  private:
 
-static G4VertexPointCreator csc;
+    static G4VertexPointCreator csc;
 };
+
 #endif

source/geometry/solids/STEPinterface/include/includes

@@ -1,3 +1,4 @@
+#include <schema.h>
 #include "G4PointCreator.hh"
 #include "G4PointOnSurfaceCreator.hh"
 #include "G4PointOnCurveCreator.hh"