Import Geant4 2.0.0 source tree
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolid.cc,v 1.10 1999/12/15 14:49:58 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4BREPSolid.cc,v 1.12 2000/04/11 16:15:17 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
|
||||
#include "G4BREPSolid.hh"
|
||||
#include "G4VoxelLimits.hh"
|
||||
@@ -19,13 +19,10 @@
|
||||
#include "G4BSplineSurface.hh"
|
||||
#include "G4ToroidalSurface.hh"
|
||||
#include "G4SphericalSurface.hh"
|
||||
#include "instmgr.h"
|
||||
|
||||
G4Ray G4BREPSolid::Track;
|
||||
G4double G4BREPSolid::ShortestDistance= kInfinity;
|
||||
int G4BREPSolid::NumberOfSolids=0;
|
||||
InstMgr G4BREPSolid::InstanceList;
|
||||
|
||||
|
||||
G4BREPSolid::G4BREPSolid(const G4String name) : G4VSolid(name)
|
||||
{
|
||||
@@ -1019,14 +1016,6 @@ void G4BREPSolid::DescribeYourselfTo (G4VGraphicsScene& scene) const
|
||||
}
|
||||
|
||||
|
||||
G4VisExtent G4BREPSolid::GetExtent() const
|
||||
{
|
||||
G4Point3D Min = bbox->GetBoxMin();
|
||||
G4Point3D Max = bbox->GetBoxMax();
|
||||
return G4VisExtent (Min.x(), Max.x(), Min.y(), Max.y(), Min.z(), Max.z());
|
||||
}
|
||||
|
||||
|
||||
G4Polyhedron* G4BREPSolid::CreatePolyhedron () const
|
||||
{
|
||||
// temporary
|
||||
@@ -1047,27 +1036,6 @@ G4NURBS* G4BREPSolid::CreateNURBS () const
|
||||
}
|
||||
|
||||
|
||||
int G4BREPSolid::CreateSTEPData()
|
||||
{
|
||||
// create the solid entity
|
||||
//STEPentity* ent = new STEPentity();
|
||||
//stateEnum *sEnu = new stateEnum("newSE");
|
||||
//MgrNode *mnode = new MgrNode(ent, sEnu);
|
||||
|
||||
// create the attributelist & attributes for this solid
|
||||
// STEPattributeList *aList = new STEPattributeList();
|
||||
//AttrDescriptor *aDesc = new AttrDescriptor();
|
||||
// STEPattribute *name_attr = new STEPattribute(aDesc, name);
|
||||
|
||||
// create the mgrnode neede by the instance List
|
||||
|
||||
// append node to instance List
|
||||
|
||||
// call entoity creation routines for child entities.
|
||||
return 0; // to shut up compilers
|
||||
}
|
||||
|
||||
|
||||
void G4BREPSolid::CalcBBoxes()
|
||||
{
|
||||
// First initialization
|
||||
@@ -1488,20 +1456,3 @@ G4Point3D G4BREPSolid::Scope()
|
||||
|
||||
return scope;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidBox.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4BREPSolidBox.hh"
|
||||
#include "G4FPlane.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidCone.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4BREPSolidCone.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidCylinder.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4BREPSolidCylinder.hh"
|
||||
|
||||
@@ -51,5 +51,5 @@ G4BREPSolidOpenPCone::G4BREPSolidOpenPCone (G4String name,
|
||||
|
||||
|
||||
void G4BREPSolidOpenPCone::DescribeYourselfTo (G4VGraphicsScene& scene) const {
|
||||
scene.AddThis ( *fPtrSolidA );
|
||||
scene.AddThis ( *this );
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidPCone.cc,v 1.14 1999/12/15 17:17:16 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
//
|
||||
// The polyconical solid G4BREPSolidPCone is a shape defined by a set of
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidPolyhedra.cc,v 1.11 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
// Corrections by S.Giani:
|
||||
// - Xaxis now corresponds to phi=0
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidSphere.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4BREPSolidSphere.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BREPSolidTorus.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4BREPSolidTorus.hh"
|
||||
#include "G4ToroidalSurface.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BSplineCurve.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4BSplineCurve.hh"
|
||||
#include "G4ControlPoints.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BSplineCurveWithKnots.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4BSplineCurveWithKnots.hh"
|
||||
|
||||
|
||||
@@ -5,39 +5,38 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BSplineSurface.cc,v 1.3 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4BSplineSurface.cc,v 1.7 2000/02/25 15:58:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "EntityInst.h"
|
||||
#include "G4BSplineSurface.hh"
|
||||
#include "G4BezierSurface.hh"
|
||||
|
||||
class G4ControlPoints;
|
||||
class G4BoundingBox;
|
||||
#include "G4ControlPoints.hh"
|
||||
#include "G4BoundingBox3D.hh"
|
||||
|
||||
G4BSplineSurface::G4BSplineSurface()
|
||||
{
|
||||
distance = kInfinity;
|
||||
dir=ROW;
|
||||
first_hit = Hit=(G4UVHit*)0;
|
||||
first_hit = Hit = (G4UVHit*)0;
|
||||
ctl_points = (G4ControlPoints*)0;
|
||||
u_knots = v_knots = tmp_knots = (G4KnotVector*)0;
|
||||
}
|
||||
|
||||
|
||||
G4BSplineSurface::G4BSplineSurface(char* nurbfilename, G4Ray& rayref)
|
||||
G4BSplineSurface::G4BSplineSurface(const char* nurbfilename, G4Ray& rayref)
|
||||
{
|
||||
distance = kInfinity;
|
||||
Hit=(G4UVHit*)0;
|
||||
first_hit = Hit;
|
||||
first_hit = Hit = (G4UVHit*)0;
|
||||
ctl_points = (G4ControlPoints*)0;
|
||||
u_knots = v_knots = tmp_knots = (G4KnotVector*)0;
|
||||
}
|
||||
|
||||
|
||||
G4BSplineSurface::G4BSplineSurface(const G4BSplineSurface &tmp)
|
||||
{
|
||||
distance = tmp.distance;
|
||||
Hit=(G4UVHit*)0;
|
||||
first_hit=Hit;
|
||||
first_hit = Hit = (G4UVHit*)0;
|
||||
|
||||
// next=this;
|
||||
order[0] = tmp.order[0];
|
||||
@@ -46,19 +45,23 @@ G4BSplineSurface::G4BSplineSurface(const G4BSplineSurface &tmp)
|
||||
|
||||
u_knots = new G4KnotVector(*tmp.u_knots);
|
||||
v_knots = new G4KnotVector(*tmp.v_knots);
|
||||
tmp_knots = (G4KnotVector*)0;
|
||||
|
||||
ctl_points = new G4ControlPoints(*tmp.ctl_points);
|
||||
}
|
||||
|
||||
|
||||
G4BSplineSurface::G4BSplineSurface(G4int u, G4int v, G4KnotVector& u_kv,
|
||||
G4KnotVector& v_kv,G4ControlPoints& cp)
|
||||
G4KnotVector& v_kv, G4ControlPoints& cp)
|
||||
{
|
||||
first_hit = Hit = (G4UVHit*)0;
|
||||
|
||||
order[0] = u+1;
|
||||
order[1] = v+1;
|
||||
|
||||
u_knots = new G4KnotVector(u_kv);
|
||||
v_knots = new G4KnotVector(v_kv);
|
||||
u_knots = new G4KnotVector(u_kv);
|
||||
v_knots = new G4KnotVector(v_kv);
|
||||
tmp_knots = (G4KnotVector*)0;
|
||||
|
||||
ctl_points = new G4ControlPoints(cp);
|
||||
}
|
||||
@@ -70,13 +73,14 @@ G4BSplineSurface::~G4BSplineSurface()
|
||||
delete v_knots;
|
||||
delete ctl_points;
|
||||
G4UVHit* temphit=Hit;
|
||||
Hit = first_hit;
|
||||
while(Hit!=(G4UVHit*)0)
|
||||
{
|
||||
Hit=Hit->next;
|
||||
delete temphit;
|
||||
temphit=Hit;
|
||||
}
|
||||
delete temphit;// remove last
|
||||
// delete temphit;// remove last
|
||||
|
||||
}
|
||||
|
||||
@@ -166,9 +170,18 @@ G4Point3D G4BSplineSurface::FinalIntersection()
|
||||
// Move to first
|
||||
bezier_list.MoveToFirst();
|
||||
// Find the second last.
|
||||
// What!? Casting a G4Surface* to a G4SurfaceList* !?!?!? - GC
|
||||
//
|
||||
// if(bezier_list.index != bezier_list.last)
|
||||
// while ( ((G4SurfaceList*)bezier_list.index)->next !=
|
||||
// bezier_list.last) bezier_list.Step();
|
||||
//
|
||||
// Try the following instead (if that's the wished behavior)...
|
||||
//
|
||||
if(bezier_list.index != bezier_list.last)
|
||||
while ( ((G4SurfaceList*)bezier_list.index)->next !=
|
||||
bezier_list.last) bezier_list.Step();
|
||||
while (bezier_list.next != bezier_list.last)
|
||||
bezier_list.Step();
|
||||
|
||||
G4BezierSurface* tmp = (G4BezierSurface*) bezier_list.GetSurface();
|
||||
tmp->CalcBBox();
|
||||
|
||||
@@ -335,8 +348,9 @@ void G4BSplineSurface::FindIntersections(const G4Ray& rayref)
|
||||
if(bez_ptr->Distance() < distance) distance = bez_ptr->Distance();
|
||||
|
||||
// Remove the temporary Hit
|
||||
if (first_hit == Hit) first_hit = (G4UVHit*)0;
|
||||
delete Hit;
|
||||
first_hit = Hit = (G4UVHit*)0;
|
||||
Hit = (G4UVHit*)0;
|
||||
|
||||
// Move to next in the List
|
||||
bezier_list.Step();
|
||||
@@ -538,7 +552,8 @@ G4Point3D G4BSplineSurface::BSEvaluate()
|
||||
param = Hit->v;
|
||||
|
||||
// Evaluate the diff_curve...
|
||||
G4PointRat rat_result = (G4PointRat&) InternalEvalCrv(0, diff_curve);
|
||||
// G4PointRat rat_result = (G4PointRat&) InternalEvalCrv(0, diff_curve);
|
||||
G4PointRat rat_result(InternalEvalCrv(0, diff_curve));
|
||||
|
||||
// Calc the 3D values.
|
||||
// L. Broglia
|
||||
@@ -553,7 +568,8 @@ G4Point3D G4BSplineSurface::BSEvaluate()
|
||||
for ( i = 0; i < row_size; i++)
|
||||
{
|
||||
ord = GetOrder(ROW);
|
||||
G4Point3D rtr_pt = (G4Point3D&) InternalEvalCrv(i, curves);
|
||||
// G4Point3D rtr_pt = (G4Point3D&) InternalEvalCrv(i, curves);
|
||||
G4Point3D rtr_pt = (InternalEvalCrv(i, curves)).pt();
|
||||
diff_curve->put(0,i,rtr_pt);
|
||||
}
|
||||
|
||||
@@ -571,7 +587,7 @@ G4Point3D G4BSplineSurface::BSEvaluate()
|
||||
param = Hit->v;
|
||||
|
||||
// Evaluate the diff_curve...
|
||||
result = (G4Point3D&) InternalEvalCrv(0, diff_curve);
|
||||
result = (InternalEvalCrv(0, diff_curve)).pt();
|
||||
}
|
||||
|
||||
delete diff_curve;
|
||||
@@ -592,7 +608,7 @@ G4Point3D G4BSplineSurface::Evaluation(const G4Ray& rayref)
|
||||
temphit=Hit;
|
||||
}
|
||||
|
||||
delete temphit;
|
||||
// delete temphit;
|
||||
|
||||
// Get the real Hit point
|
||||
closest_hit = FinalIntersection();
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
// 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: G4BSplineSurfaceWithKnots.cc,v 1.1 2000/02/25 15:57:43 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4BSplineSurfaceWithKnots.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BezierSurface.cc,v 1.2 1999/12/15 14:50:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
// L. Broglia, 10/10/98
|
||||
// Error in line 331 and replaced addition of coordinates by
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4CircularCurve.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4CircularCurve.hh"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
// G4Conic
|
||||
|
||||
G4Conic::G4Conic (): pShift(0) {}
|
||||
G4Conic::G4Conic (STEPentity& Ent){};
|
||||
G4Conic::~G4Conic() {}
|
||||
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ConicalSurface.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4ConicalSurface.cc,v 1.3 2000/02/25 16:00:13 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
/* /usr/local/gismo/repo/geometry/G4ConicalSurface.cc,v 1.6 1994/08/03 17:15:01 burnett Exp */
|
||||
// File: G4ConicalSurface.cc
|
||||
@@ -61,9 +61,9 @@ G4ConicalSurface::G4ConicalSurface( const G4Point3D& o,
|
||||
*/
|
||||
axis = a*(1/amag);
|
||||
else {
|
||||
G4cerr << "Error in G4ConicalSurface::G4ConicalSurface"
|
||||
<<"--axis has zero length\n"
|
||||
<< "\tDefault axis ( 1.0, 0.0, 0.0 ) is used.\n";
|
||||
G4cerr << "WARNING - G4ConicalSurface::G4ConicalSurface" << G4endl
|
||||
<< "\tAxis has zero length" << G4endl
|
||||
<< "\tDefault axis ( 1.0, 0.0, 0.0 ) is used." << G4endl;
|
||||
|
||||
axis = G4Vector3D( 1.0, 0.0, 0.0 );
|
||||
}
|
||||
@@ -72,10 +72,11 @@ G4ConicalSurface::G4ConicalSurface( const G4Point3D& o,
|
||||
if ( ( e > 0.0 ) && ( e < ( 0.5 * M_PI ) ) )
|
||||
angle = e;
|
||||
else {
|
||||
G4cerr << "Error in G4ConicalSurface::G4ConicalSurface"
|
||||
<< "--asked for angle out of allowed range of 0 to PI/2\n"
|
||||
<< "\tDefault angle of 1.0 is used.\n";
|
||||
|
||||
G4cerr << "WARNING - G4ConicalSurface::G4ConicalSurface" << G4endl
|
||||
<< "\tAsked for angle out of allowed range of 0 to "
|
||||
<< 0.5*M_PI << " (PI/2): " << e << G4endl
|
||||
<< "\tDefault angle of 1.0 is used." << G4endl;
|
||||
|
||||
angle = 1.0;
|
||||
}
|
||||
}
|
||||
@@ -538,15 +539,16 @@ void G4ConicalSurface::SetAngle( G4double e )
|
||||
// Reset the angle of the G4ConicalSurface
|
||||
// Require angle to range from 0 to PI/2
|
||||
// if ( ( e > 0.0 ) && ( e < ( 0.5 * M_PI ) ) )
|
||||
if ( (e > 0.0) && (e <= ( 0.5 * M_PI)) )
|
||||
if ( (e > 0.0) && (e <= ( 0.5 * M_PI )) )
|
||||
angle = e;
|
||||
// use old value (do not change angle) if out of the range,
|
||||
//but Print message
|
||||
else
|
||||
{
|
||||
G4cerr << "Error in G4ConicalSurface::SetAngle"
|
||||
<< "--asked for angle out of allowed range of 0 to PI/2\n"
|
||||
<< "\tDefault angle of " << angle << " is used.\n";
|
||||
G4cerr << "WARNING - G4ConicalSurface::SetAngle" << G4endl
|
||||
<< "\tAsked for angle out of allowed range of 0 to "
|
||||
<< 0.5*M_PI << " (PI/2):" << e << G4endl
|
||||
<< "\tDefault angle of " << angle << " is used." << G4endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ControlPoints.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4ControlPoints.cc,v 1.3 2000/01/21 13:47:51 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
//
|
||||
// Modif 8 oct 98 : A.Floquet
|
||||
@@ -125,17 +125,3 @@ G4double G4ControlPoints::ClosestDistanceToPoint( const G4Point3D& Pt)
|
||||
|
||||
return PointDist;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Curve.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4Curve.hh"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4CylindricalSurface.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
/* /usr/local/gismo/repo/geometry/G4CylindricalSurface.cc,v 1.24 1994/08/03 17:15:09 burnett Exp */
|
||||
// File: G4CylindricalSurface.cc
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Ellipse.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4Ellipse.cc,v 1.3 2000/05/15 14:16:43 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4Ellipse.hh"
|
||||
@@ -34,7 +34,17 @@ G4Curve* G4Ellipse::Project(const G4Transform3D& tr)
|
||||
|
||||
G4Vector3D a = semiAxis1*xPrime;
|
||||
G4Vector3D b = semiAxis2*yPrime;
|
||||
G4double u = atan2( 2*a*b, a.mag2()-b.mag2() ) / 2;
|
||||
|
||||
G4double u;
|
||||
G4double abmag = a.mag2()-b.mag2();
|
||||
G4double prod = 2*a*b;
|
||||
if (abmag < FLT_MAX)
|
||||
if (prod > 0)
|
||||
u = pi/4;
|
||||
else
|
||||
u = -pi/4;
|
||||
else
|
||||
u = atan2(prod,abmag) / 2;
|
||||
|
||||
// get the coordinate axis directions and the semiaxis lengths
|
||||
G4Vector3D sAxis1 = a*cos(u)+b*sin(u);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4FConicalSurface.cc,v 1.9 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
/* /usr/local/gismo/repo/geometry/G4FConicalSurface.cc,v 1.2 1993/02/05 00:38:39 alanb Exp */
|
||||
// File: G4FConicalSurface.cc
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4FCylindricalSurface.cc,v 1.9 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
/* /usr/local/gismo/repo/geometry/FG4Cylinder.cc,v 1.1 1992/10/27 22:02:29 alanb Exp */
|
||||
// File: FG4Cylinder.cc
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4FPlane.cc,v 1.7 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
// Corrections by S.Giani:
|
||||
// - The constructor using iVec now properly stores both the internal and
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Hyperbola.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4Hyperbola.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4KnotVector.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4KnotVector.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Line.cc,v 1.4 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4Line.hh"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4OsloMatrix.cc,v 1.2 1999/12/15 14:50:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
|
||||
#include "G4OsloMatrix.hh"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Parabola.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4Parabola.hh"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4PlacedSolid.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4PlacedSolid.hh"
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4PointRat.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4PointRat.cc,v 1.3 2000/01/21 13:47:51 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
//
|
||||
// Modif 8 oct 98 : A.Floquet
|
||||
@@ -34,11 +34,3 @@ void G4PointRat::operator=(const G4Point3D& a)
|
||||
{ pt3d = a;
|
||||
s=1;
|
||||
}
|
||||
|
||||
void G4PointRat::CopyRationalValue(const RealNode& RNode)
|
||||
{
|
||||
s = RNode.value;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ProjectedSurface.cc,v 1.3 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4ProjectedSurface.hh"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Ray.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4Ray.hh"
|
||||
#include "G4PointRat.hh"
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4RectangularTrimmedSurface.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4RectangularTrimmedSurface.cc,v 1.3 2000/01/21 13:47:52 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "SdaiCONFIG_CONTROL_DESIGN.h"
|
||||
|
||||
#include "G4RectangularTrimmedSurface.hh"
|
||||
#include "G4FPlane.hh"
|
||||
#include "G4BSplineSurface.hh"
|
||||
@@ -45,5 +45,3 @@ int G4RectangularTrimmedSurface::Intersect(const G4Ray& Rayref)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Sort.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
// File: G4Sort.cc
|
||||
// Author: Alan Breakstone
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4SphericalSurface.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
/* $Header: /private/Net/unixhub/u1/ea/liml/gismo/gismo-0.2/geometry/RCS/G4SphericalSurface.cc,v 1.10 1992/08 */
|
||||
// File: G4SphericalSurface.cc
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4SurfaceList.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// $Id: G4SurfaceList.cc,v 1.3 2000/02/14 17:49:32 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4SurfaceList.hh"
|
||||
|
||||
G4SurfaceList::G4SurfaceList()
|
||||
{
|
||||
first = index = last = (G4Surface*)0;
|
||||
first = index = last = next = temp = (G4Surface*)0;
|
||||
number_of_elements=0;
|
||||
}
|
||||
|
||||
@@ -239,11 +239,3 @@ void G4SurfaceList::QuickG4Sort(G4Surface** Dist, int left, int right)
|
||||
if( i < right )
|
||||
QuickG4Sort(Dist, i, right);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ThreeMat.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
/* G4ThreeMat.cc,v 1.5 1993/08/02 22:21:27 atwood Exp */
|
||||
// File: G4ThreeMat.cc
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ToroidalSurface.cc,v 1.2 1999/12/15 14:50:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
// GEANT4 tag $Name: geant4-02-00 $
|
||||
//
|
||||
#include "G4ToroidalSurface.hh"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user