Import Geant4 3.0.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-08 15:55:53 +02:00
parent e7d7193284
commit cfcb558cfe
3050 changed files with 91703 additions and 48310 deletions
+22 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.5 2000/02/25 16:36:16 gcosmo Exp $
$Id: History,v 1.8 2000/11/20 18:17:25 gcosmo Exp $
----------------------------------------------------------------------------
=========================================================
@@ -17,6 +17,27 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
20th November 2000 Gabriele Cosmo (stepinterface-V02-00-02)
- Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
o commented out variables declared and not used.
o fixed declaration of variables used before being initialised.
o fixed order of initialisation of member data in constructors.
o fixed usage of unsigned-int (size_t) for array indeces.
10th November 2000 Gabriele Cosmo (stepinterface-V02-00-01)
- Added GetInstanceManager() method to G4GeometryCreator.
09th November 2000 Gabriele Cosmo (stepinterface-V02-00-00)
- QA code revision and cleanup (+fixes from CodeWizard filtering):
o Changed return value to "const char*" to method Name() and made
post-const in all creator classes.
o Made virtual methods not inlined in G4GeometryCreator.
o Moved public data members to protected/private in G4GeometryCreator
and G4AssemblyCreator.
o G4AssemblyCreator: defined private copy-constructor and operator=.
o Fix in G4Axis2Placement3dCreator::CreateSTEPGeometry(void*) where
G4Point3D was casted to G4Vector3D by mistake (!).
25th February 2000 Gabriele Cosmo (stepinterface-V01-00-01)
- Improved overall diagnostics.
- Fixed internal memory-leaks.
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4AdvancedBrepShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4AdvancedBrepShapeRepresentationCreator
@@ -39,7 +39,7 @@ class G4AdvancedBrepShapeRepresentationCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Advanced_Brep_Shape_Representation"; }
const char* Name() const { return "Advanced_Brep_Shape_Representation"; }
static G4AdvancedBrepShapeRepresentationCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4AdvancedFaceCreator.hh,v 1.3 2000/11/09 16:35:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4AdvancedFaceCreator
@@ -39,7 +39,7 @@ class G4AdvancedFaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Advanced_Face"; }
const char* Name() const { return "Advanced_Face"; }
static G4AdvancedFaceCreator GetInstance() { return csc; }
// Members
@@ -5,15 +5,17 @@
// 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 $
// $Id: G4AssemblyCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4AssemblyCreator
//
// Class description:
//
//
// Main class for detector geometry assembly read from a STEP file.
// Currently the default STEP reader is assumed to be the NIST reader
// from the SCL NIST public domain library.
// Authors: J.Sulkimo, P.Urban.
// Revisions by: L.Broglia, G.Cosmo.
@@ -30,12 +32,12 @@ class G4StepFileReader;
class G4AssemblyCreator: public G4GeometryCreator
{
public:
public: // with description
// Constructors
G4AssemblyCreator();
G4AssemblyCreator(G4String, G4String ="NIST");
G4AssemblyCreator(const G4String&, const G4String& reader="NIST");
// Destructor
@@ -46,15 +48,18 @@ class G4AssemblyCreator: public G4GeometryCreator
void ReadStepFile();
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Assembly"; }
const char* Name() const { return "Assembly"; }
static G4AssemblyCreator GetInstance() { return ci; }
// Members
int index; // add by L. Broglia, memory for get STEP entity
private:
G4AssemblyCreator(const G4AssemblyCreator&);
G4AssemblyCreator& operator=(const G4AssemblyCreator&);
// Private copy constructor and assignment operator.
private:
G4int index; // memory for get STEP entity - L.Broglia
G4StepFileReader* StepReader;
G4String STEPfileName;
static G4AssemblyCreator ci;
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4Axis1PlacementCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis1PlacementCreator
@@ -39,7 +39,7 @@ class G4Axis1PlacementCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Axis1_Placement"; }
const char* Name() const { return "Axis1_Placement"; }
static G4Axis1PlacementCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4Axis2Placement2dCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement2dCreator
@@ -38,7 +38,7 @@ class G4Axis2Placement2dCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Axis2_Placement_2d"; }
const char* Name() const { return "Axis2_Placement_2d"; }
static G4Axis2Placement2dCreator GetInstance() { return csc; }
//Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4Axis2Placement3dCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement3dCreator
@@ -39,7 +39,7 @@ class G4Axis2Placement3dCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Axis2_Placement_3d"; }
const char* Name() const { return "Axis2_Placement_3d"; }
static G4Axis2Placement3dCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4Axis2PlacementCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2PlacementCreator
@@ -39,7 +39,7 @@ class G4Axis2PlacementCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Axis2_Placement"; }
const char* Name() const { return "Axis2_Placement"; }
static G4Axis2PlacementCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4Axis2PlacementsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2PlacementsCreator
@@ -39,7 +39,7 @@ class G4Axis2PlacementsCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Axis2_Placements"; }
const char* Name() const { return "Axis2_Placements"; }
static G4Axis2PlacementsCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4BSplineCurveWithKnotsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurveWithKnotsCreator
@@ -39,7 +39,7 @@ class G4BSplineCurveWithKnotsCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "B_Spline_Curve_With_Knots"; }
const char* Name() const { return "B_Spline_Curve_With_Knots"; }
static G4BSplineCurveWithKnotsCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4BSplineSurfaceCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceCreator
@@ -39,7 +39,7 @@ class G4BSplineSurfaceCreator: public G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "B_Spline_Surface"; }
const char* Name() const { return "B_Spline_Surface"; }
static G4BSplineSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4BSplineSurfaceWithKnotsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceWithKnotsCreator
@@ -39,7 +39,7 @@ class G4BSplineSurfaceWithKnotsCreator: public G4BSplineSurfaceCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "B_Spline_Surface_With_Knots"; }
const char* Name() const { return "B_Spline_Surface_With_Knots"; }
static G4BSplineSurfaceWithKnotsCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4BoundedSurfaceCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BoundedSurfaceCreator
@@ -39,7 +39,7 @@ class G4BoundedSurfaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Bounded_Surface"; }
const char* Name() const { return "Bounded_Surface"; }
static G4BoundedSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4CartesianPointCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CartesianPointCreator
@@ -39,7 +39,7 @@ class G4CartesianPointCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Cartesian_Point"; }
const char* Name() const { return "Cartesian_Point"; }
static G4CartesianPointCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4CircleCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CircleCreator
@@ -39,7 +39,7 @@ class G4CircleCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Circle"; }
const char* Name() const { return "Circle"; }
static G4CircleCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ClosedShellCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ClosedShellCreator
@@ -39,7 +39,7 @@ class G4ClosedShellCreator: public G4ConnectedFaceSetCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Closed_Shell"; }
const char* Name() const { return "Closed_Shell"; }
static G4ClosedShellCreator GetInstance() { return csc; }
//Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ConicCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ConicCreator
@@ -39,7 +39,7 @@ class G4ConicCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Conic"; }
const char* Name() const { return "Conic"; }
static G4ConicCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ConicalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ConicalSurfaceCreator
@@ -39,7 +39,7 @@ class G4ConicalSurfaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Conical_Surface"; }
const char* Name() const { return "Conical_Surface"; }
static G4ConicalSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ConnectedFaceSetCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ConnectedFaceSetCreator
@@ -39,7 +39,7 @@ class G4ConnectedFaceSetCreator: public G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Connected_Face_Set"; }
const char* Name() const { return "Connected_Face_Set"; }
static G4ConnectedFaceSetCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ContextDependentShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ContextDependentShapeRepresentationCreator
@@ -39,7 +39,7 @@ class G4ContextDependentShapeRepresentationCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Context_Dependent_Shape_Representation"; }
const char* Name() const { return "Context_Dependent_Shape_Representation"; }
static G4ContextDependentShapeRepresentationCreator GetInstance()
{ return csc; }
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4CurveCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CurveCreator
@@ -39,7 +39,7 @@ class G4CurveCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Curve"; }
const char* Name() const { return "Curve"; }
static G4CurveCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4CylindricalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CylindricalSurfaceCreator
@@ -39,7 +39,7 @@ class G4CylindricalSurfaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Cylindrical_Surface"; }
const char* Name() const { return "Cylindrical_Surface"; }
static G4CylindricalSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4DirectionCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4DirectionCreator
@@ -39,7 +39,7 @@ class G4DirectionCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Direction"; }
const char* Name() const { return "Direction"; }
static G4DirectionCreator GetInstance() { return csc; }
//Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4EdgeCurveCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4EdgeCurveCreator
@@ -39,7 +39,7 @@ class G4EdgeCurveCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Edge_Curve"; }
const char* Name() const { return "Edge_Curve"; }
static G4EdgeCurveCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4EdgeLoopCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4EdgeLoopCreator
@@ -39,7 +39,7 @@ class G4EdgeLoopCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Edge_Loop"; }
const char* Name() const { return "Edge_Loop"; }
static G4EdgeLoopCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4EllipseCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4EllipseCreator
@@ -39,7 +39,7 @@ class G4EllipseCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Ellipse"; }
const char* Name() const { return "Ellipse"; }
static G4EllipseCreator GetInstance() { return csc; }
//Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4FaceBoundCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4FaceBoundCreator
@@ -39,7 +39,7 @@ class G4FaceBoundCreator: public G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Face_Bound"; }
const char* Name() const { return "Face_Bound"; }
static G4FaceBoundCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4FaceOuterBoundCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4FaceOuterBoundCreator
@@ -38,7 +38,7 @@ class G4FaceOuterBoundCreator: public G4FaceBoundCreator
// Member functions
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Face_Outer_Bound"; }
const char* Name() const { return "Face_Outer_Bound"; }
static G4FaceOuterBoundCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4FaceSurfaceCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4FaceSurfaceCreator
@@ -39,7 +39,7 @@ class G4FaceSurfaceCreator: public G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Face_Surface"; }
const char* Name() const { return "Face_Surface"; }
static G4FaceSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4GeometricRepresentationContextCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4GeometricRepresentationContextCreator
@@ -39,7 +39,7 @@ class G4GeometricRepresentationContextCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Geometric_Representation_Context"; }
const char* Name() const { return "Geometric_Representation_Context"; }
static G4GeometricRepresentationContextCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4GeometryCreator.hh,v 1.5 2000/11/10 17:44:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4GeometryCreator
@@ -41,23 +41,25 @@ class G4GeometryCreator
// Constructor & destructor
G4GeometryCreator() {;}
virtual ~G4GeometryCreator() {;}
G4GeometryCreator();
virtual ~G4GeometryCreator();
// Member functions
virtual G4bool operator==(const G4GeometryCreator&);
virtual void CreateG4Geometry(STEPentity&)=0;
virtual void CreateSTEPGeometry(void* =0)=0;
virtual void* GetCreatedObject() { return createdObject; }
virtual void* GetCreatedObject();
virtual G4String Name()=0;
virtual G4bool operator==(const G4GeometryCreator&) { return 0; }
virtual STEPattribute* GetNamedAttribute(G4String&,STEPentity&);
virtual STEPentity* GetNamedEntity(G4String&,STEPentity&);
virtual const char* Name() const=0;
virtual STEPattribute* GetNamedAttribute(const G4String&, STEPentity&);
virtual STEPentity* GetNamedEntity(const G4String&, STEPentity&);
InstMgr* GetInstanceManager() const;
G4int GetNextId() { objectId+=10; return objectId; }
// Members
protected:
static G4int objectId;
static InstMgr instanceManager;
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4GeometryTable.hh,v 1.4 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4GeometryTable
@@ -45,7 +45,7 @@ class G4GeometryTable
static void* CreateObject(STEPentity&);
static void* CreateSTEPObject(void*, G4String&);
static void PrintObjectNames();
static G4GeometryTable& GetInstance() { return gt; }
static const G4GeometryTable& GetInstance() { return gt; }
public:
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4HyperbolaCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4HyperbolaCreator
@@ -39,7 +39,7 @@ class G4HyperbolaCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Hyperbola"; }
const char* Name() const { return "Hyperbola"; }
static G4HyperbolaCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ItemDefinedTransformationCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ItemDefinedTransformationCreator
@@ -39,7 +39,7 @@ class G4ItemDefinedTransformationCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Item_Defined_Transformation"; }
const char* Name() const { return "Item_Defined_Transformation"; }
static G4ItemDefinedTransformationCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4LineCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4LineCreator
@@ -39,7 +39,7 @@ class G4LineCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Line"; }
const char* Name() const { return "Line"; }
static G4LineCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ManifoldSolidBrepCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ManifoldSolidBrepCreator
@@ -39,7 +39,7 @@ class G4ManifoldSolidBrepCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Manifold_Solid_Brep"; }
const char* Name() const { return "Manifold_Solid_Brep"; }
static G4ManifoldSolidBrepCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4NISTStepReader.hh,v 1.3 2000/01/21 13:45:28 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4NISTStepReader.hh,v 1.4 2000/11/09 16:35:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4NISTStepReader
@@ -68,14 +68,14 @@ extern STEPentity *GetEntity (STEPnode *node, InstMgr *im);
// This needs to be defined for the STEPfile reader
extern void SchemaInit (Registry &);
class G4NISTStepReader: public G4StepFileReader
class G4NISTStepReader : public G4StepFileReader
{
public:
void ReadSTEPFile(G4String);
void ReadSTEPFile(const char*);
void SaveSTEPFile();
void UpdateSTEPFile();
InstMgr GetInstanceManager() { return InstanceList; }
InstMgr GetInstanceManager() const { return InstanceList; }
private:
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4OpenShellCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4OpenShellCreator
@@ -39,7 +39,7 @@ class G4OpenShellCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Open_Shell"; }
const char* Name() const { return "Open_Shell"; }
static G4OpenShellCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4OrientedEdgeCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4OrientedEdgeCreator
@@ -39,7 +39,7 @@ class G4OrientedEdgeCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Oriented_Edge"; }
const char* Name() const { return "Oriented_Edge"; }
static G4OrientedEdgeCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ParabolaCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ParabolaCreator
@@ -39,7 +39,7 @@ class G4ParabolaCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Parabola"; }
const char* Name() const { return "Parabola"; }
static G4ParabolaCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4PlaneCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4PlaneCreator
@@ -39,7 +39,7 @@ class G4PlaneCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Plane"; }
const char* Name() const { return "Plane"; }
static G4PlaneCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4PointCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4PointCreator
@@ -39,7 +39,7 @@ class G4PointCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Point"; }
const char* Name() const { return "Point"; }
static G4PointCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4PointOnCurveCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4PointOnCurveCreator
@@ -39,7 +39,7 @@ class G4PointOnCurveCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Point_On_Curve"; }
const char* Name() const { return "Point_On_Curve"; }
static G4PointOnCurveCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4PointOnSurfaceCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4PointOnSurfaceCreator
@@ -39,7 +39,7 @@ class G4PointOnSurfaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Point_On_Surface"; }
const char* Name() const { return "Point_On_Surface"; }
static G4PointOnSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4PointReplicaCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4PointReplicaCreator
@@ -39,7 +39,7 @@ class G4PointReplicaCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Point_Replica"; }
const char* Name() const { return "Point_Replica"; }
static G4PointReplicaCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ProductDefinitionShapeCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ProductDefinitionShapeCreator
@@ -40,7 +40,7 @@ class G4ProductDefinitionShapeCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Product_Definition_Shape"; }
const char* Name() const { return "Product_Definition_Shape"; }
static G4ProductDefinitionShapeCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4RationalBSplineSurfaceCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4RationalBSplineSurfaceCreator
@@ -40,7 +40,7 @@ class G4RationalBSplineSurfaceCreator: public G4BSplineSurfaceCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Rational_B_Spline_Surface"; }
const char* Name() const { return "Rational_B_Spline_Surface"; }
static G4RationalBSplineSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4RepresentationRelationshipCreator.hh,v 1.4 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4RepresentationRelationshipCreator
@@ -39,7 +39,7 @@ class G4RepresentationRelationshipCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Representation_Relationship"; }
const char* Name() const { return "Representation_Relationship"; }
static G4RepresentationRelationshipCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4RepresentationRelationshipWithTransformationCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4RepresentationRelationshipWithTransformationCreator
@@ -40,7 +40,7 @@ class G4RepresentationRelationshipWithTransformationCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name()
const char* Name() const
{ return "Representation_Relationship_With_Transformation"; }
static G4RepresentationRelationshipWithTransformationCreator GetInstance()
{ return csc; }
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ShapeDefinitionRepresentationCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ShapeDefinitionRepresentationCreator
@@ -39,7 +39,7 @@ class G4ShapeDefinitionRepresentationCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Shape_Definition_Representation"; }
const char* Name() const { return "Shape_Definition_Representation"; }
static G4ShapeDefinitionRepresentationCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ShapeRepresentationCreator
@@ -39,7 +39,7 @@ class G4ShapeRepresentationCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Shape_Representation"; }
const char* Name() const { return "Shape_Representation"; }
static G4ShapeRepresentationCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ShapeRepresentationRelationshipCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ShapeRepresentationRelationshipCreator
@@ -39,7 +39,7 @@ class G4ShapeRepresentationRelationshipCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Shape_Representation_Relationship"; }
const char* Name() const { return "Shape_Representation_Relationship"; }
static G4ShapeRepresentationRelationshipCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4SphericalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4SphericalSurfaceCreator
@@ -39,7 +39,7 @@ class G4SphericalSurfaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void*);
G4String Name() { return "Spherical_Surface"; }
const char* Name() const { return "Spherical_Surface"; }
static G4SphericalSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4StepFileReader.hh,v 1.3 2000/01/21 13:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4StepFileReader.hh,v 1.4 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4StepFileReader
@@ -30,10 +30,13 @@
class G4StepFileReader
{
public:
virtual void ReadSTEPFile(G4String)=0;
G4StepFileReader(){;}
virtual ~G4StepFileReader(){;}
virtual void ReadSTEPFile(const char*)=0;
virtual void SaveSTEPFile()=0;
virtual void UpdateSTEPFile()=0;
virtual InstMgr GetInstanceManager()=0;
virtual InstMgr GetInstanceManager() const=0;
};
#endif
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4ToroidalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ToroidalSurfaceCreator
@@ -39,7 +39,7 @@ class G4ToroidalSurfaceCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Toroidal_Surface"; }
const char* Name() const { return "Toroidal_Surface"; }
static G4ToroidalSurfaceCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4VectorCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4VectorCreator
@@ -39,7 +39,7 @@ class G4VectorCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Vector"; }
const char* Name() const { return "Vector"; }
static G4VectorCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// 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 $
// $Id: G4VertexPointCreator.hh,v 1.3 2000/11/09 16:35:50 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4VertexPointCreator
@@ -39,7 +39,7 @@ class G4VertexPointCreator: private G4GeometryCreator
void CreateG4Geometry(STEPentity&);
void CreateSTEPGeometry(void* G4obj);
G4String Name() { return "Vertex_Point"; }
const char* Name() const { return "Vertex_Point"; }
static G4VertexPointCreator GetInstance() { return csc; }
// Members
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4AdvancedBrepShapeRepresentationCreator.cc,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4AdvancedBrepShapeRepresentationCreator.cc,v 1.4 2000/11/20 18:17:26 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4AdvancedBrepShapeRepresentationCreator
@@ -56,7 +56,7 @@ void G4AdvancedBrepShapeRepresentationCreator::CreateG4Geometry(STEPentity& sEnt
G4PlacedSolid* placedSld;
G4BREPSolid* sld;
STEPentity* ent;
G4Axis2Placement3D* place;
G4Axis2Placement3D* place = 0;
// default place
G4Axis2Placement3D* place0 = new (G4Axis2Placement3D)( G4Vector3D(1, 0, 0),
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4AdvancedFaceCreator.cc,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4AdvancedFaceCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4AssemblyCreator.cc,v 1.5 2000/02/25 16:36:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4AssemblyCreator.cc,v 1.7 2000/11/20 18:17:27 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4AssemblyCreator
@@ -35,16 +35,34 @@ G4AssemblyCreator::G4AssemblyCreator()
G4GeometryTable::RegisterObject(this);
}
G4AssemblyCreator::G4AssemblyCreator(G4String fileName, G4String readerName)
G4AssemblyCreator::G4AssemblyCreator(const G4AssemblyCreator& c)
{
// Name of STEP file to read in, existance of file should be checked
//here also...
index = c.index;
StepReader = c.StepReader;
STEPfileName = c.STEPfileName;
}
G4AssemblyCreator& G4AssemblyCreator::operator=(const G4AssemblyCreator& c)
{
if (&c == this) return *this;
index = c.index;
StepReader = c.StepReader;
STEPfileName = c.STEPfileName;
return *this;
}
G4AssemblyCreator::G4AssemblyCreator(const G4String& fileName,
const G4String& readerName)
{
// Name of STEP file to read in, existance of file should be checked...
//
STEPfileName = fileName;
// define type of STEP file reader to use
if(readerName == "NIST")
StepReader = new G4NISTStepReader();
//else...
// define type of STEP file reader to use (use else...)
//
if (readerName == "NIST") StepReader = new G4NISTStepReader();
}
@@ -68,8 +86,8 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& sEntity)
// Advanced_Brep_Shape_Representation are created into
// Context_Dependent_Shape_Representation and
// Shape_Definition_Representation
G4int AdvancedBrepShapes = instanceManager.EntityKeywordCount
("Advanced_Brep_Shape_Representation");
// G4int AdvancedBrepShapes = instanceManager.EntityKeywordCount
// ("Advanced_Brep_Shape_Representation");
G4int ConDepShapes = instanceManager.EntityKeywordCount
@@ -78,7 +96,7 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& sEntity)
G4int ShapeDefReps = instanceManager.EntityKeywordCount
("Shape_Definition_Representation");
G4int instanceCount = instanceManager.InstanceCount();
// G4int instanceCount = instanceManager.InstanceCount();
STEPentity* ent=0;
index = 0;
@@ -144,7 +162,7 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& sEntity)
}
}
else
else if (ShapeDefReps>0)
{
const char* key = "Shape_Definition_Representation";
@@ -207,13 +225,13 @@ void G4AssemblyCreator::CreateSTEPGeometry(void* G4obj)
Registry reg(&::HeaderSchemaInit);
SdaiCONFIG_CONTROL_DESIGNInit (reg);
//G4Placement* plc = (G4Placement*)G4obj;
//G4String name("Axis2Placement3d");
// G4Placement* plc = (G4Placement*)G4obj;
// G4String name("Axis2Placement3d");
// G4FCylindricalSurface *fCyl = (G4FCylindricalSurface *)G4obj;
// G4String name("Cylindrical_Surface");
G4ToroidalSurface *tor = (G4ToroidalSurface *)G4obj;
// G4ToroidalSurface *tor = (G4ToroidalSurface *)G4obj;
G4String name("Toroidal_Surface");
{
void *tmp =G4GeometryTable::CreateSTEPObject(G4obj, name);
}
G4GeometryTable::CreateSTEPObject(G4obj, name);
}
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4Axis1PlacementCreator.cc,v 1.2 2000/01/21 13:45:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis1PlacementCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4Axis2Placement2dCreator.cc,v 1.2 2000/01/21 13:45:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement2dCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4Axis2Placement3dCreator.cc,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4Axis2Placement3dCreator.cc,v 1.4 2000/11/09 16:35:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement3dCreator
@@ -85,7 +85,7 @@ void G4Axis2Placement3dCreator::CreateSTEPGeometry(void* G4obj)
G4Vector3D axis = plc->GetAxis();
G4Vector3D dir = plc->GetRefDirection();
G4Vector3D pt = plc->GetLocation();
G4Point3D pt = plc->GetLocation();
G4String pointName("Cartesian_Point");
G4String directionName("Direction");
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4Axis2PlacementCreator.cc,v 1.2 2000/01/21 13:45:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2PlacementCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4Axis2PlacementsCreator.cc,v 1.3 2000/01/21 13:45:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2PlacementsCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4BSplineCurveWithKnotsCreator.cc,v 1.4 2000/02/25 16:36:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4BSplineCurveWithKnotsCreator.cc,v 1.5 2000/11/20 18:17:27 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurveWithKnotsCreator
@@ -114,7 +114,7 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
G4Point3D* pt = (G4Point3D*) tmp;
G4Point3D Pt(pt->x(), pt->y(), pt->z());
if(controlPointsList.length() <= nbpoint+1)
if(G4int(controlPointsList.length()) <= nbpoint+1)
controlPointsList.reshape(nbpoint+1);
controlPointsList[nbpoint] = Pt;
@@ -159,7 +159,7 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
if (weight <= 0)
weight = 1;
if(weightsData.length() <= nbpoint+1)
if(G4int(weightsData.length()) <= nbpoint+1)
weightsData.reshape(nbpoint+1);
weightsData[nbpoint] = weight;
@@ -204,7 +204,7 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
if (knot <= 0)
knot = 1;
if(knots.length() <= nbpoint+1)
if(G4int(knots.length()) <= nbpoint+1)
knots.reshape(nbpoint+1);
knots[nbpoint] = knot;
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4BSplineSurfaceCreator.cc,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4BSplineSurfaceCreator.cc,v 1.4 2000/11/20 18:17:28 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceCreator
@@ -33,7 +33,6 @@ void G4BSplineSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
{
SdaiB_spline_surface* bSpline = new SdaiB_spline_surface(&Ent);
G4int u,v;
STEPentity* ent=0;
G4String attrName("u_degree");
STEPattribute *Attr = GetNamedAttribute(attrName, Ent);
u = *Attr->ptr.i;
@@ -55,8 +54,6 @@ void G4BSplineSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
cols = v+1;
rows = u+1;
STEPentity* entity;
G4int Index;
STEPentity *Entity;
char tmp[16];
SCLstring s;
@@ -65,7 +62,6 @@ void G4BSplineSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
G4int stringlength = strlen(Str);
G4ControlPoints controlPoints(4,rows, cols);
RealAggregate rationalAggr;
RealNode* rNode =0;
for(G4int a=0;a<rows;a++)
for(G4int b=0;b<cols;b++)
{
@@ -94,7 +90,7 @@ void G4BSplineSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
}
c = Str[Count];
int Index=0;
G4int Index=0;
while(c != ',' && c != ')')
{
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4BSplineSurfaceWithKnotsCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4BSplineSurfaceWithKnotsCreator.cc,v 1.4 2000/11/20 18:17:28 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceWithKnotsCreator
@@ -101,7 +101,7 @@ void G4BSplineSurfaceWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
Attr = GetNamedAttribute(attrName, Ent);
knotAggr = Attr->ptr.a;
bSpline.v_knots_((RealAggregate*)knotAggr);
G4int vKnotCount = knotAggr->EntryCount();
// G4int vKnotCount = knotAggr->EntryCount();
G4int totalVKnotCount = 0;
multiNode = (IntNode*)multAggr->GetHead();
@@ -135,8 +135,7 @@ void G4BSplineSurfaceWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
// b_spline base parts
G4int u,v;
STEPentity* ent=0;
G4int u=0,v=0;
attrName = "u_degree";
Attr = GetNamedAttribute(attrName, Ent);
if(Attr)
@@ -172,8 +171,6 @@ void G4BSplineSurfaceWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
cols = v+1;
rows = u+1;
STEPentity* entity;
G4int Index;
STEPentity *Entity;
char tmp[16];
SCLstring s;
@@ -182,7 +179,6 @@ void G4BSplineSurfaceWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
G4int stringlength = strlen(Str);
controlPoints = new G4ControlPoints(4,rows, cols);
RealAggregate rationalAggr;
RealNode* rNode =0;
for(G4int a=0;a<rows;a++)
for(G4int b=0;b<cols;b++)
{
@@ -192,7 +188,7 @@ void G4BSplineSurfaceWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
// The string Str contains the STEP file id:s of the underlying point
// entities so well have to parse the string to get them out...arghhh!
char c = ' ';
int Count=0;
G4int Count=0;
// Loop to find the entities
@@ -211,7 +207,7 @@ void G4BSplineSurfaceWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
}
c = Str[Count];
int Index=0;
G4int Index=0;
while(c != ',' && c != ')')
{
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4BoundedSurfaceCreator.cc,v 1.4 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4BoundedSurfaceCreator.cc,v 1.5 2000/11/20 18:17:29 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4BoundedSurfaceCreator
@@ -38,7 +38,6 @@ G4BoundedSurfaceCreator::~G4BoundedSurfaceCreator() {}
void G4BoundedSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
{
STEPcomplex* complexEnt = (STEPcomplex*)&Ent;
void* tmp=0;
STEPentity* subEnt=0;
SdaiB_spline_surface *bSpline=0;
SdaiB_spline_surface_with_knots *bSplineWithKnots=0;
@@ -89,8 +88,6 @@ void G4BoundedSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
cols = v+1;
rows = u+1;
char tmpstr[16];
STEPentity* entity;
G4int Index;
STEPentity *Entity;
SCLstring s;
STEPaggregate *Aggr=bSpline->control_points_list_();
@@ -99,7 +96,6 @@ void G4BoundedSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
G4int stringlength = strlen(Str);
G4ControlPoints controlPoints(4,rows, cols);
RealAggregate rationalAggr;
RealNode* rNode =0;
G4int a;
for(a=0;a<rows;a++)
for(G4int b=0;b<cols;b++)
@@ -110,7 +106,7 @@ void G4BoundedSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
// The string Str contains the STEP file id:s of the underlying point
// entities so well have to parse the string to get them out...arghhh!
char c = ' ';
int Count=0;
G4int Count=0;
// Loop to find the entities
@@ -129,7 +125,7 @@ void G4BoundedSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
}
c = Str[Count];
int Index=0;
G4int Index=0;
while(c != ',' && c != ')')
{
@@ -198,7 +194,7 @@ void G4BoundedSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
G4int vMultCount = multAggr->EntryCount();
knotAggr = bSplineWithKnots->v_knots_();
G4int vKnotCount = knotAggr->EntryCount();
// G4int vKnotCount = knotAggr->EntryCount();
G4int totalVKnotCount = 0;
multiNode = (IntNode*)multAggr->GetHead();
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4CartesianPointCreator.cc,v 1.2 2000/01/21 13:45:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CartesianPointCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4CircleCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CircleCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ClosedShellCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4ClosedShellCreator.cc,v 1.5 2000/11/20 18:17:29 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ClosedShellCreator
@@ -43,7 +43,7 @@ void G4ClosedShellCreator::CreateG4Geometry(STEPentity& Ent)
G4SurfaceVector SurfaceVec;
for(size_t a=0; a<FaceCount;a++)
for(G4int a=0; a<FaceCount;a++)
{
TmpEnt = ((EntityNode*)Node)->node;
void *tmp = G4GeometryTable::CreateObject(*TmpEnt);
@@ -59,7 +59,7 @@ void G4ClosedShellCreator::CreateG4Geometry(STEPentity& Ent)
<< "\tTotal of " << SurfNum << " G4Surface components created, out of "
<< FaceCount << " expected !" << G4endl
<< "\tBREP Solid not correctly instantiated." << G4endl;
for(size_t b=0;b<SurfNum;b++)
for(G4int b=0;b<SurfNum;b++)
srfVec[b] = (SurfaceVec[b]);
G4BREPSolid* sld = new G4BREPSolid(" ", srfVec, SurfNum);
@@ -72,7 +72,7 @@ void G4ClosedShellCreator::CreateSTEPGeometry(void* G4obj)
G4BREPSolid* bSld = (G4BREPSolid*)G4obj;
SdaiClosed_shell* sld = new SdaiClosed_shell();
G4int surfaceCount = bSld->NumberOfFaces();
G4int surfaceCount = bSld->GetNumberOfFaces();
EntityAggregate eAggr;
EntityNode* eNode=0;
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ConicCreator.cc,v 1.2 2000/01/21 13:45:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4ConicCreator.cc,v 1.3 2000/11/20 18:17:29 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ConicCreator
@@ -38,7 +38,7 @@ void G4ConicCreator::CreateG4Geometry(STEPentity& Ent)
// Get the placement
STEPentity* TmpEnt= *Attr->ptr.c;
void *tmp =G4GeometryTable::CreateObject(*TmpEnt);
G4GeometryTable::CreateObject(*TmpEnt);
// place = (G4Placement*)place;
}
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ConicalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ConicalSurfaceCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ConnectedFaceSetCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ConnectedFaceSetCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ContextDependentShapeRepresentationCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4ContextDependentShapeRepresentationCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4CurveCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CurveCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4CylindricalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4CylindricalSurfaceCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4DirectionCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4DirectionCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4EdgeCurveCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4EdgeCurveCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4EdgeCurveCreator
@@ -34,7 +34,6 @@ void G4EdgeCurveCreator::CreateG4Geometry(STEPentity& Ent)
{
G4Point3D *pt1,*pt2;
G4Curve* crv=0;
G4bool sameSense;
// Get start point
G4String attrName("edge_start");
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EdgeLoopCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4EdgeLoopCreator
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EllipseCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4EllipseCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4FaceBoundCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4FaceBoundCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4FaceBoundCreator
@@ -32,7 +32,6 @@ G4FaceBoundCreator::~G4FaceBoundCreator() {}
void G4FaceBoundCreator::CreateG4Geometry(STEPentity& Ent)
{
G4int orientation;
G4String attrName("bound");
STEPattribute *Attr = GetNamedAttribute(attrName, Ent);
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4FaceOuterBoundCreator.cc,v 1.2 2000/01/21 13:46:01 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4FaceOuterBoundCreator
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4FaceSurfaceCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4FaceSurfaceCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4FaceSurfaceCreator
@@ -33,7 +33,6 @@ G4FaceSurfaceCreator::~G4FaceSurfaceCreator() {}
void G4FaceSurfaceCreator::CreateG4Geometry(STEPentity& Ent)
{
G4Surface* srf=0;
G4bool sense;
G4String attrName("face_geometry");
STEPattribute *Attr = GetNamedAttribute(attrName, Ent);
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4GeometricRepresentationContextCreator.cc,v 1.3 2000/01/21 13:46:02 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4GeometricRepresentationContextCreator.cc,v 1.4 2000/11/20 18:17:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// ----------------------------------------------------------------------
// Class G4GeometricRepresentationContextCreator
@@ -41,8 +41,8 @@ void G4GeometricRepresentationContextCreator::CreateG4Geometry(STEPentity& Ent)
G4String attrName("coordinate_space_dimension");
Attr = GetNamedAttribute(attrName, Ent);
// Get coordinate space dimension
SdaiReal Tmpdim = *Attr->ptr.r; // ptr.r --> REAL_TYPE
// Get coordinate space dimension (ptr.r --> REAL_TYPE)
// SdaiReal Tmpdim = *Attr->ptr.r;
// void *tmp = G4GeometryTable::CreateObject(*TmpEnt);
// place = (G4Axis2Placement3D*)tmp...;
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4GeometryCreator.cc,v 1.3 2000/01/21 13:46:02 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4GeometryCreator.cc,v 1.5 2000/11/10 17:44:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -28,8 +28,26 @@
InstMgr G4GeometryCreator::instanceManager;
G4int G4GeometryCreator::objectId = 0;
G4GeometryCreator::G4GeometryCreator() {}
G4GeometryCreator::~G4GeometryCreator() {}
G4bool G4GeometryCreator::operator==(const G4GeometryCreator&)
{
return 0;
}
void* G4GeometryCreator::GetCreatedObject()
{
return createdObject;
}
InstMgr* G4GeometryCreator::GetInstanceManager() const
{
return &instanceManager;
}
STEPattribute*
G4GeometryCreator::GetNamedAttribute(G4String& attrName, STEPentity& Ent)
G4GeometryCreator::GetNamedAttribute(const G4String& attrName, STEPentity& Ent)
{
STEPattribute* attr;
@@ -43,13 +61,14 @@ G4GeometryCreator::GetNamedAttribute(G4String& attrName, STEPentity& Ent)
return attr;
}
G4String err = "\nCannot find attribute " + attrName + " in entity " + Ent.EntityName();
G4String err = "\nCannot find attribute " + G4String(attrName)
+ " in entity " + Ent.EntityName();
G4Exception(err);
return 0; // NULL
}
STEPentity*
G4GeometryCreator::GetNamedEntity(G4String& entName, STEPentity& Ent)
G4GeometryCreator::GetNamedEntity(const G4String& entName, STEPentity& Ent)
{
// Ent is a complex entity
@@ -68,7 +87,8 @@ G4GeometryCreator::GetNamedEntity(G4String& entName, STEPentity& Ent)
return subEnt;
}
}
G4String err = "\nCannot find entity " + entName + " in complex entity " + Ent.EntityName();
G4String err = "\nCannot find entity " + G4String(entName)
+ " in complex entity " + Ent.EntityName();
G4Exception(err);
return 0;
@@ -82,6 +102,6 @@ G4int[][] G4GeometryCreator::GetIds(GenericAggregate& aggr)
GenericAggrNode* gNode = (GenericAggrNode*)aggr->GetHead();
SCLstring str;
G4String aggrStr = gNode->asStr(str);
const char* aggrStr = gNode->asStr(str);
}
*/
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4GeometryTable.cc,v 1.6 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4GeometryTable.cc,v 1.7 2000/11/20 18:17:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -38,7 +38,7 @@ G4bool G4GeometryTable::ExistsInTable(G4String& objectName)
{
G4bool existsInTable = false;
for(G4int a=0;a<RegisteredObjects.length();a++)
for(size_t a=0;a<RegisteredObjects.length();a++)
{
G4GeometryCreator* gcTmp = RegisteredObjects(a);
G4String rName = gcTmp->Name();
@@ -58,7 +58,7 @@ void G4GeometryTable::RegisterObject(G4GeometryCreator* gc)
G4GeometryCreator* G4GeometryTable::GetObject(G4String objectName)
{
for(G4int a=0; a<RegisteredObjects.length(); a++)
for(size_t a=0; a<RegisteredObjects.length(); a++)
{
G4GeometryCreator* gcTmp = RegisteredObjects(a);
G4String rName = gcTmp->Name();
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4HyperbolaCreator.cc,v 1.2 2000/01/21 13:46:02 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ItemDefinedTransformationCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LineCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ManifoldSolidBrepCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4NISTStepReader.cc,v 1.3 2000/01/21 13:46:03 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4NISTStepReader.cc,v 1.4 2000/11/09 16:35:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -30,7 +30,7 @@
#include <OpenOODB.h>
#endif
void G4NISTStepReader::ReadSTEPFile(G4String STEPfilename)
void G4NISTStepReader::ReadSTEPFile(const char* STEPfilename)
{
// Reads the Step file into the nist toolkit class library
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4OpenShellCreator.cc,v 1.2 2000/01/21 13:46:03 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4OrientedEdgeCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ParabolaCreator.cc,v 1.2 2000/01/21 13:46:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PlaneCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PointCreator.cc,v 1.2 2000/01/21 13:46:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PointOnCurveCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PointOnSurfaceCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// ----------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More