Changeset 1337 for trunk/source/geometry/solids/specific/src
- Timestamp:
- Sep 30, 2010, 2:47:17 PM (14 years ago)
- Location:
- trunk/source/geometry/solids/specific/src
- Files:
-
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/geometry/solids/specific/src/G4ClippablePolygon.cc
r1228 r1337 26 26 // 27 27 // $Id: G4ClippablePolygon.cc,v 1.12 2007/05/11 13:54:28 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4Ellipsoid.cc
r1228 r1337 25 25 // 26 26 // $Id: G4Ellipsoid.cc,v 1.24 2009/09/24 15:51:02 gcosmo Exp $ 27 // GEANT4 tag $Name: geant4-09-0 3$27 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 28 28 // 29 29 // class G4Ellipsoid -
trunk/source/geometry/solids/specific/src/G4EllipticalCone.cc
r1228 r1337 25 25 // 26 26 // $Id: G4EllipticalCone.cc,v 1.16 2008/04/25 08:45:26 gcosmo Exp $ 27 // GEANT4 tag $Name: geant4-09-0 3$27 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 28 28 // 29 29 // Implementation of G4EllipticalCone class -
trunk/source/geometry/solids/specific/src/G4EllipticalTube.cc
r1228 r1337 26 26 // 27 27 // $Id: G4EllipticalTube.cc,v 1.27 2006/10/20 13:45:21 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
r1228 r1337 26 26 // 27 27 // $Id: G4EnclosingCylinder.cc,v 1.10 2007/05/11 13:54:29 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4ExtrudedSolid.cc
r1315 r1337 26 26 // 27 27 // $Id: G4ExtrudedSolid.cc,v 1.19 2010/04/15 10:23:34 ivana Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4GenericTrap.cc
r1316 r1337 25 25 // 26 26 // 27 // $Id: G4GenericTrap.cc,v 1.1 2 2010/06/11 09:42:28 gcosmoExp $28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $27 // $Id: G4GenericTrap.cc,v 1.13 2010/06/25 09:41:07 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // … … 206 206 if(count==4) 207 207 { 208 if ( ( fabs(p.x()-poly[0].x())+fabs(p.y()-poly[0].y())) > halfCarTolerance )208 if ( (std::fabs(p.x()-poly[0].x())+std::fabs(p.y()-poly[0].y())) > halfCarTolerance ) 209 209 { 210 210 in=kOutside; … … 316 316 if ( (p2-p0).mag2() < kCarTolerance ) 317 317 { 318 if ( fabs(p.z()+fDz) > kCarTolerance )318 if ( std::fabs(p.z()+fDz) > kCarTolerance ) 319 319 { 320 320 p2=G4ThreeVector(fVertices[(s+1)%4].x(),fVertices[(s+1)%4].y(),-fDz); … … 430 430 if ( (p2-p0).mag2() < kCarTolerance ) 431 431 { 432 if ( fabs(p.z()+fDz) > halfCarTolerance )432 if ( std::fabs(p.z()+fDz) > halfCarTolerance ) 433 433 { 434 434 p2=G4ThreeVector(fVertices[j].x(),fVertices[j].y(),-fDz); … … 756 756 G4double zac=0; 757 757 758 if ( ( fabs(xa-xc)+fabs(ya-yc)) < halfCarTolerance )758 if ( (std::fabs(xa-xc)+std::fabs(ya-yc)) < halfCarTolerance ) 759 759 { 760 760 xc=fVertices[j+4].x(); … … 765 765 //Line case 766 766 // 767 if ( ( fabs(xb-xc)+fabs(yb-yc)) < halfCarTolerance )767 if ( (std::fabs(xb-xc)+std::fabs(yb-yc)) < halfCarTolerance ) 768 768 { 769 769 return kInfinity; … … 850 850 yd=fVertices[4+j].y(); 851 851 852 if ( (( fabs(xb-xd)+fabs(yb-yd))<halfCarTolerance)853 || (( fabs(xa-xc)+fabs(ya-yc))<halfCarTolerance) )852 if ( ((std::fabs(xb-xd)+std::fabs(yb-yd))<halfCarTolerance) 853 || ((std::fabs(xa-xc)+std::fabs(ya-yc))<halfCarTolerance) ) 854 854 { 855 855 G4double s=DistToTriangle(p,v,ipl) ; -
trunk/source/geometry/solids/specific/src/G4Hype.cc
r1228 r1337 27 27 // $Id: G4Hype.cc,v 1.27 2008/04/14 08:49:28 gcosmo Exp $ 28 28 // $Original: G4Hype.cc,v 1.0 1998/06/09 16:57:50 safai Exp $ 29 // GEANT4 tag $Name: geant4-09-0 3$29 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 30 30 // 31 31 // -
trunk/source/geometry/solids/specific/src/G4IntersectingCone.cc
r1228 r1337 26 26 // 27 27 // $Id: G4IntersectingCone.cc,v 1.12 2008/04/28 08:59:47 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4Paraboloid.cc
r1228 r1337 25 25 // 26 26 // $Id: G4Paraboloid.cc,v 1.9 2009/02/27 15:10:46 tnikitin Exp $ 27 // GEANT4 tag $Name: geant4-09-0 3$27 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 28 28 // 29 29 // class G4Paraboloid -
trunk/source/geometry/solids/specific/src/G4PolyPhiFace.cc
r1228 r1337 26 26 // 27 27 // $Id: G4PolyPhiFace.cc,v 1.15 2008/05/15 11:41:59 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4Polycone.cc
r1228 r1337 25 25 // 26 26 // 27 // $Id: G4Polycone.cc,v 1.4 3 2008/05/15 13:45:15gcosmo Exp $28 // GEANT4 tag $Name: geant4-09-0 3$27 // $Id: G4Polycone.cc,v 1.44 2010/06/16 08:24:14 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // … … 1151 1151 G4Polyhedron* polyhedron = new G4Polyhedron; 1152 1152 G4int problem = polyhedron->createPolyhedron(nNodes, nFaces, xyz, faces_vec); 1153 delete faces_vec;1154 delete xyz;1153 delete [] faces_vec; 1154 delete [] xyz; 1155 1155 if (problem) 1156 1156 { -
trunk/source/geometry/solids/specific/src/G4PolyconeSide.cc
r1315 r1337 26 26 // 27 27 // $Id: G4PolyconeSide.cc,v 1.24 2010/02/24 11:31:49 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4Polyhedra.cc
r1228 r1337 25 25 // 26 26 // 27 // $Id: G4Polyhedra.cc,v 1.4 2 2008/05/15 13:45:15gcosmo Exp $28 // GEANT4 tag $Name: geant4-09-0 3$27 // $Id: G4Polyhedra.cc,v 1.43 2010/06/16 08:24:14 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // … … 1126 1126 G4Polyhedron* polyhedron = new G4Polyhedron; 1127 1127 G4int problem = polyhedron->createPolyhedron(nNodes, nFaces, xyz, faces_vec); 1128 delete faces_vec;1129 delete xyz;1128 delete [] faces_vec; 1129 delete [] xyz; 1130 1130 if (problem) 1131 1131 { -
trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc
r1315 r1337 26 26 // 27 27 // $Id: G4PolyhedraSide.cc,v 1.17 2010/02/24 11:31:49 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4QuadrangularFacet.cc
r1228 r1337 27 27 // 28 28 // $Id: G4QuadrangularFacet.cc,v 1.7 2008/12/18 12:57:34 gunter Exp $ 29 // GEANT4 tag $Name: geant4-09-0 3$29 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 30 30 // 31 31 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -
trunk/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
r1228 r1337 26 26 // 27 27 // $Id: G4ReduciblePolygon.cc,v 1.11 2006/06/29 18:48:53 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4SolidExtentList.cc
r1315 r1337 26 26 // 27 27 // $Id: G4SolidExtentList.cc,v 1.6 2010/02/10 16:38:37 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TessellatedGeometryAlgorithms.cc
r1228 r1337 27 27 // 28 28 // $Id: G4TessellatedGeometryAlgorithms.cc,v 1.6 2008/12/18 12:57:36 gunter Exp $ 29 // GEANT4 tag $Name: geant4-09-0 3$29 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 30 30 // 31 31 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -
trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc
r1315 r1337 26 26 // 27 27 // $Id: G4TessellatedSolid.cc,v 1.20 2010/04/28 16:21:21 flei Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -
trunk/source/geometry/solids/specific/src/G4Tet.cc
r1228 r1337 29 29 // 30 30 // $Id: G4Tet.cc,v 1.11 2006/11/13 08:58:03 gcosmo Exp $ 31 // GEANT4 tag $Name: geant4-09-0 3$31 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 32 32 // 33 33 // class G4Tet -
trunk/source/geometry/solids/specific/src/G4TriangularFacet.cc
r1315 r1337 26 26 // 27 27 // $Id: G4TriangularFacet.cc,v 1.13 2010/04/28 16:21:21 flei Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta- cand-01 $28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -
trunk/source/geometry/solids/specific/src/G4TwistBoxSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistBoxSide.cc,v 1.6 2007/05/23 09:31:02 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistTrapAlphaSide.cc,v 1.8 2007/05/23 13:26:06 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistTrapFlatSide.cc,v 1.6 2007/05/23 09:31:02 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistTrapParallelSide.cc,v 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistTubsFlatSide.cc,v 1.7 2007/05/23 09:31:02 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistTubsHypeSide.cc,v 1.6 2007/05/18 07:39:56 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistTubsSide.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistTubsSide.cc,v 1.6 2009/11/11 12:23:37 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistedBox.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistedBox.cc,v 1.12 2006/06/29 18:49:20 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistedTrap.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistedTrap.cc,v 1.14 2006/06/29 18:49:23 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistedTrd.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistedTrd.cc,v 1.7 2006/06/29 18:49:25 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4TwistedTubs.cc
r1228 r1337 26 26 // 27 27 // $Id: G4TwistedTubs.cc,v 1.24 2007/05/18 07:39:56 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4VCSGfaceted.cc
r1228 r1337 31 31 // 32 32 // $Id: G4VCSGfaceted.cc,v 1.26 2009/05/08 14:29:56 gcosmo Exp $ 33 // GEANT4 tag $Name: geant4-09-0 3$33 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 34 34 // 35 35 // -
trunk/source/geometry/solids/specific/src/G4VFacet.cc
r1228 r1337 27 27 // 28 28 // $Id: G4VFacet.cc,v 1.8 2008/12/18 12:57:38 gunter Exp $ 29 // GEANT4 tag $Name: geant4-09-0 3$29 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 30 30 // 31 31 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -
trunk/source/geometry/solids/specific/src/G4VTwistSurface.cc
r1228 r1337 26 26 // 27 27 // $Id: G4VTwistSurface.cc,v 1.9 2007/05/31 13:52:48 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-0 3$28 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/src/G4VTwistedFaceted.cc
r1228 r1337 25 25 // 26 26 // $Id: G4VTwistedFaceted.cc,v 1.18 2007/05/25 09:42:34 gcosmo Exp $ 27 // GEANT4 tag $Name: geant4-09-0 3$27 // GEANT4 tag $Name: geant4-09-04-beta-01 $ 28 28 // 29 29 //
Note: See TracChangeset
for help on using the changeset viewer.