Changeset 1347 for trunk/source/geometry/solids
- Timestamp:
- Dec 22, 2010, 3:52:27 PM (14 years ago)
- Location:
- trunk/source/geometry/solids
- Files:
-
- 125 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/geometry/solids/BREPS/GNUmakefile
r831 r1347 1 # $Id: GNUmakefile,v 1. 5 2004/06/11 14:17:16gcosmo Exp $1 # $Id: GNUmakefile,v 1.7 2010/10/27 07:34:32 gcosmo Exp $ 2 2 # ------------------------------------------------------------ 3 3 # GNUmakefile for BREPS library. Gabriele Cosmo, 15/11/96. -
trunk/source/geometry/solids/BREPS/History
r850 r1347 1 $Id: History,v 1.7 0 2008/07/08 10:01:13gcosmo Exp $1 $Id: History,v 1.79 2010/11/23 15:15:11 gcosmo Exp $ 2 2 ---------------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 23/11/2010 : G.Cosmo breps-V09-03-07 and V09-03-06 21 - Fixed remaining cases of pointer handling in experimental G4BezierSurface 22 code. 23 24 01/11/2010 : G.Cosmo breps-V09-03-05 25 - Fixed cases of null pointer forward in G4BREPSolid, G4BREPSolidPolyhedra 26 and G4BezierSurface classes. 27 28 20/10/2010 : G.Cosmo breps-V09-03-04 29 - Implemented Clone() virtual method for all solids, returning a pointer 30 to a dynamically allocated copy of the solid. To be used by Geant4-MT. 31 32 22/09/2010 : G. Cosmo breps-V09-03-03 33 - Implemented copy-constructor and assignment operator for solids classes 34 to facilitate conversion to Geant4-MT. 35 36 06/09/2010 : G. Cosmo breps-V09-03-02 37 - Fixed possible leak in G4BREPSolid::IsConvex() method. 38 - Corrected possible dereferencing of null pointer in method 39 G4BREPSolidSphere::DistanceToOut(). 40 - Corrected deletion of internal data in G4BSplineCurve::Project() method. 41 - Fixed possible leak in G4BezierSurface::ClipSurface() method, and fixed 42 case of dereferenciation of null pointer. 43 - Fixed leak in destructor of G4ToroidalSurface. 44 - Added dummy initialisation of static data in G4BoundingBox3D, 45 G4ProjectedSurface and G4Surface. 46 47 13/07/2010 : G. Cosmo breps-V09-03-01 48 - Fixed compilation warning on Linux for G4Surface... 49 50 05/07/2010 : G. Cosmo breps-V09-03-00 51 - G4Hyperbola: corrected signature to internal Init() function to avoid 52 parameter passed by value. 53 - G4Assembly: corrected case of invalid iterator in destructor. 54 - G4BREPSolid: corrected logic in IsConvex(), avoiding explicit memory leak. 55 - G4BSplineCurve: corrected initialization of null pointer in Project(); 56 removed useless typedef. 57 - G4CompositeCurve, G4SurfaceBoundary: corrected cases of invalid iterator. 58 - G4OsloMatrix: fixed leak in construction of G4PointMatrix. 59 - Added fake initializations to constructors in G4BREPSolid, G4Assembly, 60 G4BREPSolidPCone, G4BREPSolidPolyhedra, G4BSplineSurface, G4BezierSurface, 61 G4BoundingBox3D, G4CircularCurve, G4Curve, G4CurvePoint, G4Ellipse, 62 G4FCylindricalSurface, G4FPlane, G4Hyperbola, G4KnotVector, G4OsloMatrix, 63 G4Parabola, G4ProjectedSurface, G4Ray, G4RectangularTrimmedSurface, 64 G4Surface, G4ToroidalSurface. 65 - Code cleanup in G4ConicalSurface, GCylindricalSurface and G4SpericalSurface. 19 66 20 67 08/07/2008 : G. Cosmo breps-V09-01-02 -
trunk/source/geometry/solids/BREPS/test/CurveTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: CurveTest.cc,v 1.6 2006/06/29 18:43:01 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/CurveTestFunction.hh
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: CurveTestFunction.hh,v 1.9 2007/05/18 10:31:11 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPIOtest.cc
r1316 r1347 25 25 // 26 26 // $Id: G4BREPIOtest.cc,v 1.6 2006/06/29 18:43:05 gunter Exp $ 27 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$27 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 28 28 // 29 29 // ---------------------------------------------------------------------- -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidBoxTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidBoxTest.cc,v 1.9 2006/06/29 18:43:07 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidConeTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidConeTest.cc,v 1.11 2006/06/29 18:43:09 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidCylinderTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidCylinderTest.cc,v 1.11 2006/06/29 18:43:11 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidPConeTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidPConeTest.cc,v 1.16 2006/06/29 18:43:14 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidPolyhedraTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidPolyhedraTest.cc,v 1.12 2006/06/29 18:43:17 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidSphereTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidSphereTest.cc,v 1.10 2006/06/29 18:43:19 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4BREPSolidTorusTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4BREPSolidTorusTest.cc,v 1.10 2006/06/29 18:43:21 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/G4FPlaneTest.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: G4FPlaneTest.cc,v 1.8 2007/05/18 10:31:11 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/BREPS/test/testG4BREPSolidOpenPCone.cc
r1316 r1347 26 26 ////////////////////////////////////////////////////////////////////////// 27 27 // $Id: testG4BREPSolidOpenPCone.cc,v 1.7 2006/06/29 18:43:25 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 ////////////////////////////////////////////////////////////////////////// 30 30 // -
trunk/source/geometry/solids/Boolean/GNUmakefile
r831 r1347 1 # $Id: GNUmakefile,v 1. 6 2005/05/09 13:44:58gcosmo Exp $1 # $Id: GNUmakefile,v 1.8 2010/10/27 07:34:32 gcosmo Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # GNUmakefile for geometry/CSG library. Gabriele Cosmo, 16/11/96. -
trunk/source/geometry/solids/Boolean/History
r1315 r1347 1 1 2 $Id: History,v 1.6 4 2010/05/11 15:04:01gcosmo Exp $2 $Id: History,v 1.67 2010/10/20 07:31:58 gcosmo Exp $ 3 3 ------------------------------------------------------------------- 4 4 … … 20 20 * Reverse chronological order (last date on top), please * 21 21 ---------------------------------------------------------- 22 23 October 19, 2010 G.Cosmo geom-bool-V09-03-03 24 - Implemented Clone() virtual method for all solids, returning a pointer 25 to a dynamically allocated copy of the solid. To be used by Geant4-MT. 26 27 September 22, 2010 G.Cosmo geom-bool-V09-03-02 28 - Implemented copy-constructor and assignment operator for concrete 29 solids classes to facilitate conversion to Geant4-MT. 30 31 July 7, 2010 G.Cosmo geom-bool-V09-03-01 32 - Simplified logic in G4UnionSolid::Inside() to exclude obvious 33 conditional cases. 22 34 23 35 May 11, 2010 J.Allison geom-bool-V09-03-00 -
trunk/source/geometry/solids/Boolean/test/ApproxEqual.hh
r1316 r1347 26 26 // 27 27 // $Id: ApproxEqual.hh,v 1.6 2006/06/29 18:43:50 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/GNUmakefile
r831 r1347 1 # $Id: GNUmakefile,v 1. 7 2005/05/09 13:47:24gcosmo Exp $1 # $Id: GNUmakefile,v 1.9 2010/10/27 07:34:32 gcosmo Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # GNUmakefile for geometry/CSG library. Gabriele Cosmo, 16/11/96. -
trunk/source/geometry/solids/CSG/History
r1315 r1347 1 $Id: History,v 1.1 21 2010/05/25 09:19:02gcosmo Exp $1 $Id: History,v 1.135 2010/11/23 14:46:11 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 Nov 23, 2010 G.Cosmo geom-csg-V09-03-14 & V09-03-12 21 - Fixed one left cases of cout precision restoring in G4Sphere. 22 23 Oct 19, 2010 G.Cosmo geom-csg-V09-03-11 24 - Implemented Clone() virtual method for all solids, returning a pointer to a 25 dynamically allocated copy of the solid. To be used by Geant4-MT. 26 27 Sep 23, 2010 G.Cosmo geom-csg-V09-03-10 28 - Initialize fpPolyhedron to zero in G4CSGSolid copy-ctor and operator=(). 29 30 Sep 22, 2010 G.Cosmo geom-csg-V09-03-09 31 - Relaxed checking condition on SetOuterRadius() method to avoid 32 restrictions in order of calls for modifiers. 33 34 Sep 17, 2010 G.Cosmo geom-csg-V09-03-08 35 - Implemented copy-constructor and assignment operator for all solids 36 to facilitate conversion to Geant4-MT. 37 38 Sep 17, 2010 G.Cosmo geom-csg-V09-03-07 39 - Added missing validity checks on radii to modifiers in G4Tubs. 40 41 Sep 07, 2010 G.Cosmo geom-csg-V09-03-06 42 - Fix within G4CSGDEBUG code for restoring cout precision. 43 44 Aug 23, 2010 G.Cosmo geom-csg-V09-03-05 45 - G4Cons: fixed trivial compilation warning on Linux. 46 47 Aug 19, 2010 T.Nikitina geom-csg-V09-03-04 48 - G4Torus: fix in DistanceToOut(p,v,...) to address problem report #1081. 49 50 Jul 12, 2010 G.Cosmo geom-csg-V09-03-03 51 - Fixed condition in G4Tubs::Inside(p) for point on surface (T.Nikitina). 52 - Corrected use of std::fabs() in place of std::abs() in G4Tubs, G4Cons, 53 G4Sphere and G4Torus. Use pre-computed half-tolerance constants in G4Torus. 54 55 Jul 08, 2010 G.Cosmo geom-csg-V09-03-02 56 - Improved initialisation logic in constructor for: G4Box, G4Cons, G4Orb, 57 G4Para, G4Sphere, G4Torus, G4Trap, G4Trd, G4Tubs. 58 - Corrected cases of not-restored cout precision in: G4Box, G4Cons, G4Orb, 59 G4Para, G4Torus, G4Trap, G4Tubs. 60 - G4Torus: fixed call to internal method for finding roots, to avoid copy 61 of sdt::vector() by parameters. Some cleanup to avoid unnecessary protected 62 section and virtual table. 63 - Updated unit test for G4Sphere (V.Grichine). 19 64 20 65 May 25, 2010 G.Cosmo geom-csg-V09-03-01 -
trunk/source/geometry/solids/CSG/test/ApproxEqual.hh
r1316 r1347 26 26 // 27 27 // $Id: ApproxEqual.hh,v 1.5 2006/06/29 18:45:47 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Box.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Box.cc,v 1.9 2006/06/29 18:45:53 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Cons1.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Cons1.cc,v 1.8 2007/04/23 13:58:39 grichine Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Cons2.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Cons2.cc,v 1.21 2009/11/12 10:40:45 tnikitin Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // Simple test of G4Cons -
trunk/source/geometry/solids/CSG/test/testG4Orb.cc
r1316 r1347 26 26 27 27 // $Id: testG4Orb.cc,v 1.7 2009/01/29 16:54:51 grichine Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // G4Orb Test File -
trunk/source/geometry/solids/CSG/test/testG4Para1.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Para1.cc,v 1.8 2006/06/29 18:46:01 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Para2.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Para2.cc,v 1.6 2006/06/29 18:46:03 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // Test of G4Para -
trunk/source/geometry/solids/CSG/test/testG4Sphere.cc
r1316 r1347 25 25 // 26 26 27 // $Id: testG4Sphere.cc,v 1. 29 2009/05/14 13:22:44 tnikitinExp $28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$27 // $Id: testG4Sphere.cc,v 1.30 2010/03/24 09:50:03 grichine Exp $ 28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // G4Sphere Test File … … 96 96 { 97 97 G4double kAngTolerance = G4GeometryTolerance::GetInstance()->GetAngularTolerance(); 98 98 EInside inside; 99 99 G4int i, iMax; 100 100 G4double Dist, vol, volCheck; … … 292 292 G4ThreeVector vb830(0.1644697995,0.18507236,0.9688642354); 293 293 294 295 G4Sphere s18_03_10("s18_03_10", 47*mm, 48*mm, 0*deg, 200*deg, 80*deg, 100*deg); 296 G4ThreeVector p18_03_10(43.37539710867407*mm, 16.12036885157033*mm, -8.224548565698871*mm); 297 G4ThreeVector v18_03_10(-0.4161958548132512, 0.6603942936714858, -0.6250283092167956); 298 299 inside = s18_03_10.Inside(p18_03_10) ; 300 G4cout<<"s18_03_10.Inside(p18_03_10 ... = "<<OutputInside(inside)<<G4endl ; 301 302 303 294 304 #ifdef NDEBUG 295 305 G4Exception("FAIL: *** Assertions must be compiled in! ***"); … … 347 357 // Check G4Sphere::Inside 348 358 349 EInsideinside = s7.Inside(G4ThreeVector(1399.984667238032,359 inside = s7.Inside(G4ThreeVector(1399.984667238032, 350 360 5.9396696802500299, 351 361 -2.7661927818688308) ) ; … … 501 511 Dist=sn22.DistanceToOut(G4ThreeVector(-45.,0.,0.),vx,calcNorm,pgoodNorm,pNorm); 502 512 assert(ApproxEqual(Dist,45.)); 503 504 513 G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl; 514 G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl; 505 515 506 516 // … … 1049 1059 G4double d, G4ThreeVector dir, EInside exp); 1050 1060 1051 1061 G4Sphere SpAroundX("SpAroundX", 10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree ); 1052 1062 1053 1063 G4double sinOneDeg = std::sin( 1.0 * degree ); … … 1091 1101 1092 1102 // Try the edges 1093 1103 G4ThreeVector NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0); 1094 1104 G4ThreeVector PosEdgePt( radOne * std::cos(10.0*degree), radOne * std::sin(10.0*degree), 0.0); 1095 1105 -
trunk/source/geometry/solids/CSG/test/testG4Sphere2.cc
r1316 r1347 26 26 27 27 // $Id: testG4Sphere2.cc,v 1.6 2007/05/18 10:24:32 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // G4Sphere Test File -
trunk/source/geometry/solids/CSG/test/testG4Torus.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Torus.cc,v 1.16 2007/05/18 10:24:32 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Trap.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Trap.cc,v 1.13 2006/06/29 18:46:25 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Trd.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Trd.cc,v 1.10 2006/06/29 18:46:29 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/CSG/test/testG4Tubs.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Tubs.cc,v 1.22 2008/11/05 13:56:30 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/specific/GNUmakefile
r831 r1347 1 # $Id: GNUmakefile,v 1. 6 2007/05/23 09:31:15gcosmo Exp $1 # $Id: GNUmakefile,v 1.8 2010/10/27 07:34:32 gcosmo Exp $ 2 2 # ---------------------------------------------------------------------------- 3 3 # GNUmakefile for geometry/solids/specific library. Gabriele Cosmo, 05/04/00. -
trunk/source/geometry/solids/specific/History
r1337 r1347 1 $Id: History,v 1.1 71 2010/06/16 08:46:50gcosmo Exp $1 $Id: History,v 1.186 2010/11/26 13:36:35 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 26-Nov-2010 T.Nikitina (geom-specific-V09-03-20) 21 - Fixes in G4GenericTrap reported by SBT unit test in SurfaceNormal(), 22 DistanceToPlane() and VisExtent(). 23 24 16-Nov-2010 T.Nikitina (geom-specific-V09-03-19) 25 - G4EllipticalCone: fixes in DistanceToIn(p,v) and DistanceToOut(p,v) for 26 correct handling of point on the surface. 27 Corrected formula for SurfaceNormal(p). 28 29 10-Nov-2010 T.Nikitina (geom-specific-V09-03-18) 30 - Added checks on crossing of vertices and too big twisted angle in 31 G4GenericTrap. 32 - Fixed case of division by zero in G4TwistedTubs. 33 - Added unit test for G4Polyhedra. 34 35 02-Nov-2010 G.Cosmo (geom-specific-V09-03-17) 36 - More fixes on Coverity reports for G4TessellatedSolid and G4ReduciblePolygon. 37 38 20-Oct-2010 G.Cosmo (geom-specific-V09-03-16) 39 - Implemented Clone() virtual method for all solids, returning a pointer 40 to a dynamically allocated copy of the solid. To be used by Geant4-MT. 41 42 23-Sep-2010 G.Cosmo (geom-specific-V09-03-15) 43 - Initialize fpPolyhedron to zero in copy-ctor and operator=(). 44 - Completed implementation of copy-ctor and operator=() for facets. 45 46 20-Sep-2010 G.Cosmo (geom-specific-V09-03-14) 47 - Implemented copy-constructor and assignment operator for all solids 48 to facilitate conversion to Geant4-MT. 49 50 08-Sep-2010 G.Cosmo (geom-specific-V09-03-13) 51 - Correction to previous fix in G4ReduciblePolygon to avoid deleting current 52 'vertexHead' pointer. 53 54 07-Sep-2010 G.Cosmo (geom-specific-V09-03-12) 55 - Fix within G4CSGDEBUG code for restoring cout precision. 56 - Fix in G4ReduciblePolygon::RemoveRedundantVertices() to avoid potential 57 case of dereferencing freed pointer. 58 59 19-Aug-2010 T.Nikitina (geom-specific-V09-03-11) 60 - G4EllipticalTube: extended implementation of SurfaceNormal(p) in agreement 61 with canonical form. Added unit test testG4EllipticalTube.cc. 62 63 16-Jul-2010 G.Cosmo (geom-specific-V09-03-10) 64 - Fixed cases of division by zero in G4VTwistSurface and G4TwistBoxSide. 65 - Use INT_MAX as initialisation for max limits in G4SolidExtentList. 66 67 12-Jul-2010 G.Cosmo (geom-specific-V09-03-09) 68 - Added dummy initialization to members in struct 69 G4PolyPhiFace::G4PolyPhiFaceEdge, struct G4ReduciblePolygon::ABVertex. 70 G4Ellipsoid, G4EllipticalTube, G4EnclosingCylinder, G4ExtrudedSolid, G4Hype, 71 G4IntersectingCone, G4Paraboloid, G4PolyPhiFace, G4Polycone, G4PolyconeSide, 72 G4Polyhedra, G4PolyhedraSide, G4QuadrangularFacet, G4ReduciblePolygon, 73 G4TessellatedSolid, G4TriangularFacet, G4TwistBoxSide, G4TwistTrapAlphaSide, 74 G4TwistTrapFlatSide, G4TwistTrapParallelSide, G4TwistTubsFlatSide, 75 G4TwistTubsHypeSide, G4TwistTubsSide, G4TwistedTubs, G4VCSGfaceted, G4VFacet, 76 G4VTwistSurface, G4VTwistedFaceted. 77 - Fixed case of dereferencing null pointer in methods 78 G4EllipticalTube::DistanceToOut(p,v), G4VCSGfaceted::DistanceToIn(p,v) 79 and G4VCSGfaceted::DistanceToOut(p,v). 80 - Fixed unecessary object copy as argument in method 81 G4PolyhedraSide::IntersectSidePlane(). 82 - Avoid possible case of derefencing null pointer in G4ReduciblePolygon 83 RemoveDuplicateVertices() and RemoveRedundantVertices() methods. 84 - Replaced calls to std::abs() with std::fabs() where suitable. 19 85 20 86 16-Jun-2010 G.Cosmo (geom-specific-V09-03-08) -
trunk/source/geometry/solids/specific/test/ApproxEqual.hh
r1316 r1347 26 26 // 27 27 // $Id: ApproxEqual.hh,v 1.4 2006/06/29 18:49:38 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/specific/test/testG4Ellipsoid.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Ellipsoid.cc,v 1.5 2007/02/09 12:05:51 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // testG4Ellipsoid -
trunk/source/geometry/solids/specific/test/testG4ExtrudedSolid.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4ExtrudedSolid.cc,v 1.4 2008/02/27 12:33:20 ivana Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // testG4ExtrudedSolid -
trunk/source/geometry/solids/specific/test/testG4Hype.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Hype.cc,v 1.8 2006/06/29 18:49:45 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/TExCad.cc
r1316 r1347 26 26 // 27 27 // $Id: TExCad.cc,v 1.2 2006/06/29 18:49:57 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01DetectorConstruction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:49:59 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01PhysicsList.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:50:01 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01PrimaryGeneratorAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:50:03 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01RunAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:50:05 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01VisManager.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01VisManager.hh,v 1.2 2006/06/29 18:50:08 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01DetectorConstruction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.cc,v 1.3 2007/05/18 10:36:48 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01PhysicsList.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:50:13 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01PrimaryGeneratorAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:50:15 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01RunAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:50:17 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01VisManager.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01VisManager.cc,v 1.3 2007/05/18 10:36:48 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/TExMixed.cc
r1316 r1347 26 26 // 27 27 // $Id: TExMixed.cc,v 1.2 2006/06/29 18:50:21 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01DetectorConstruction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:51:01 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01PhysicsList.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:51:22 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01PrimaryGeneratorAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:51:24 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01RunAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:51:26 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01DetectorConstruction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.cc,v 1.2 2006/06/29 18:51:28 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01PhysicsList.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:51:30 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01PrimaryGeneratorAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:51:32 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01RunAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:51:35 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/TExQuadr.cc
r1316 r1347 26 26 // 27 27 // $Id: TExQuadr.cc,v 1.2 2006/06/29 18:51:37 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01DetectorConstruction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:51:39 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01PhysicsList.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:51:41 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01PrimaryGeneratorAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:51:44 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01RunAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:51:47 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01VisManager.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01VisManager.hh,v 1.2 2006/06/29 18:51:49 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01DetectorConstruction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.cc,v 1.3 2007/05/18 10:39:04 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01PhysicsList.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:51:53 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01PrimaryGeneratorAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:51:55 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01RunAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:52:05 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01VisManager.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01VisManager.cc,v 1.3 2007/05/18 10:39:04 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/TExTria.cc
r1316 r1347 26 26 // 27 27 // $Id: TExTria.cc,v 1.2 2006/06/29 18:52:11 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01DetectorConstruction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:52:13 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01PhysicsList.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:52:15 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01PrimaryGeneratorAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:52:17 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01RunAction.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:52:19 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01VisManager.hh
r1316 r1347 26 26 // 27 27 // $Id: TEx01VisManager.hh,v 1.2 2006/06/29 18:52:21 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01DetectorConstruction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01DetectorConstruction.cc,v 1.5 2007/05/18 10:40:29 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01PhysicsList.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:52:25 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01PrimaryGeneratorAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:52:27 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01RunAction.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:52:29 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01VisManager.cc
r1316 r1347 26 26 // 27 27 // $Id: TEx01VisManager.cc,v 1.3 2007/05/18 10:40:29 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/specific/test/testG4Tet.cc
r1316 r1347 26 26 // 27 27 // $Id: testG4Tet.cc,v 1.3 2006/06/29 18:49:49 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 -
trunk/source/geometry/solids/specific/test/testPointOnSurfacePoly.cc
r1316 r1347 26 26 // 27 27 // $Id: testPointOnSurfacePoly.cc,v 1.3 2008/04/25 08:50:00 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/OpticalEscape/AXPETDemonstrator.cc
r1316 r1347 26 26 // 27 27 // $Id: AXPETDemonstrator.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/OpticalEscape/src/AXPETDetectorConstruction.cc
r1316 r1347 24 24 // ******************************************************************** 25 25 // 26 // $Id: AXPETDetectorConstruction.cc,v 1. 1 2008/09/03 13:34:03 gcosmoExp $26 // $Id: AXPETDetectorConstruction.cc,v 1.2 2010/11/16 13:35:53 tnikitin Exp $ 27 27 // ------------------------------------------------------------ 28 28 // Geant4 class implementation file … … 52 52 #include "G4Trd.hh" 53 53 #include "G4Tet.hh" 54 #include "G4GenericTrap.hh" 55 #include "G4TessellatedSolid.hh" 56 #include "G4ExtrudedSolid.hh" 54 57 55 58 #include "G4Polycone.hh" … … 60 63 #include "G4TwistedTrd.hh" 61 64 #include "G4TwistedTrap.hh" 65 66 #include "G4TwoVector.hh" 67 #include "G4TriangularFacet.hh" 68 #include "G4QuadrangularFacet.hh" 62 69 63 70 #include "G4BooleanSolid.hh" … … 488 495 else if ( val == "Tet" ) 489 496 { 490 491 G4ThreeVector pzero(0,0,0); 492 G4ThreeVector pnt1(1.,0.,0.),pnt2(0,1.,0.), pnt3(0,0.,1.); 493 G4Tet t1( "aTet", pzero, pnt1, pnt2, pnt3); 497 G4ThreeVector anchor = G4ThreeVector( 0, 0, 0); 498 G4ThreeVector p2 = G4ThreeVector(1.0, 0.5, 0); 499 G4ThreeVector p3 = G4ThreeVector(0.5, 1.0, 0); 500 G4ThreeVector p4 = G4ThreeVector(0.5, 0.5, 1.0); 501 502 aVolume = new G4Tet("aTet",anchor,p2,p3,p4); 494 503 } 495 504 else if ( val == "Trap") … … 539 548 540 549 } 550 551 else if (val == "TwistedBox") 552 { 553 aVolume = new G4TwistedBox("aTwistedBox",40*deg,0.5,1.0,1.5); 554 } 555 else if (val == "TwistedTrd") 556 { 557 aVolume = new G4TwistedTrd("aTwistedTrd",0.5,1.0,0.8,1.5,1.8,20*deg); 558 } 559 else if (val == "TwistedTrap") 560 { 561 aVolume = new G4TwistedTrap("aTwistedTrap",40*deg,0.5,1.0,0.8,1.5); 562 } 563 else if ( val == "TwistedTrap2") 564 { 565 aVolume = new G4TwistedTrap("aTwistedTrap2", 566 20*deg, // twist angle 567 0.80, // half z length 568 10*deg, // direction between end planes 569 40*deg, // defined by polar and azimutal angles. 570 0.8, // half y length at -pDz 571 1.1, // half x length at -pDz,-pDy 572 1.6, // half x length at -pDz,+pDy 573 0.8, // half y length at +pDz 574 1.1, // half x length at +pDz,-pDy 575 1.6, // half x length at +pDz,+pDy 576 -50*deg // tilt angle at +pDz 577 ) ; 578 } 579 else if ( val == "TwistedTubs") 580 { 581 aVolume = new G4TwistedTubs("aTwistedTubs",10.*deg,1.0,2.,4.,171.*deg); 582 583 } 584 else if (val == "GenericTrap" ){ 585 std::vector<G4TwoVector> vertices; 586 vertices.push_back(G4TwoVector( -4.5, -4.5)); 587 vertices.push_back(G4TwoVector( -4.5, 4.5)); 588 vertices.push_back(G4TwoVector( 4.5, 4.5)); 589 vertices.push_back(G4TwoVector( 4.5, -4.5)); 590 vertices.push_back(G4TwoVector( -3.5, -3.5)); 591 vertices.push_back(G4TwoVector( -3.5, 3.5)); 592 vertices.push_back(G4TwoVector( 3.5, 3.5)); 593 vertices.push_back(G4TwoVector( 3.5, -2.5)); 594 aVolume = new G4GenericTrap("aGenTrd",4.,vertices); 595 } 596 else if(val == "TessellatedSolid") 597 { 598 G4double targetSize = 2.; 599 G4TessellatedSolid* aVolume1 = new G4TessellatedSolid("aTessellatedSolid"); 600 G4TriangularFacet *facet1 = new 601 G4TriangularFacet (G4ThreeVector(-targetSize,-targetSize, 0.0), 602 G4ThreeVector(+targetSize,-targetSize, 0.0), 603 G4ThreeVector( 0.0, 0.0,+targetSize), 604 ABSOLUTE); 605 G4TriangularFacet *facet2 = new 606 G4TriangularFacet (G4ThreeVector(+targetSize,-targetSize, 0.0), 607 G4ThreeVector(+targetSize,+targetSize, 0.0), 608 G4ThreeVector( 0.0, 0.0,+targetSize), 609 ABSOLUTE); 610 G4TriangularFacet *facet3 = new 611 G4TriangularFacet (G4ThreeVector(+targetSize,+targetSize, 0.0), 612 G4ThreeVector(-targetSize,+targetSize, 0.0), 613 G4ThreeVector( 0.0, 0.0,+targetSize), 614 ABSOLUTE); 615 G4TriangularFacet *facet4 = new 616 G4TriangularFacet (G4ThreeVector(-targetSize,+targetSize, 0.0), 617 G4ThreeVector(-targetSize,-targetSize, 0.0), 618 G4ThreeVector( 0.0, 0.0,+targetSize), 619 ABSOLUTE); 620 G4QuadrangularFacet *facet5 = new 621 G4QuadrangularFacet (G4ThreeVector(-targetSize,-targetSize, 0.0), 622 G4ThreeVector(-targetSize,+targetSize, 0.0), 623 G4ThreeVector(+targetSize,+targetSize, 0.0), 624 G4ThreeVector(+targetSize,-targetSize, 0.0), 625 ABSOLUTE); 626 627 aVolume1->AddFacet((G4VFacet*) facet1); 628 aVolume1->AddFacet((G4VFacet*) facet2); 629 aVolume1->AddFacet((G4VFacet*) facet3); 630 aVolume1->AddFacet((G4VFacet*) facet4); 631 aVolume1->AddFacet((G4VFacet*) facet5); 632 633 aVolume1->SetSolidClosed(true); 634 635 aVolume = aVolume1; 636 637 } 638 else if (val == "ExtrudedSolid") 639 { 640 std::vector<G4TwoVector> polygon; 641 polygon.push_back(G4TwoVector(-3., -3.0)); 642 polygon.push_back(G4TwoVector(-3., 3.0)); 643 polygon.push_back(G4TwoVector( 3., 3.0)); 644 polygon.push_back(G4TwoVector( 3., -3.0)); 645 polygon.push_back(G4TwoVector( 1.5, -3.0)); 646 polygon.push_back(G4TwoVector( 1.5, 1.5)); 647 polygon.push_back(G4TwoVector(-1.5, 1.5)); 648 polygon.push_back(G4TwoVector(-1.5, -3.0)); 649 650 std::vector<G4ExtrudedSolid::ZSection> zsections; 651 zsections.push_back(G4ExtrudedSolid::ZSection(-4.0, G4TwoVector(-2.0, 1.0), 1.5)); 652 zsections.push_back(G4ExtrudedSolid::ZSection( 1.0, G4TwoVector( 0, 0), 0.5)); 653 zsections.push_back(G4ExtrudedSolid::ZSection( 1.5, G4TwoVector( 0, 0), 0.7)); 654 zsections.push_back(G4ExtrudedSolid::ZSection( 4.0, G4TwoVector( 2.0, 2.0), 0.9)); 655 656 aVolume = new G4ExtrudedSolid("aExtrudedSolid", polygon, zsections); 657 } 658 659 541 660 else 542 661 { G4cout <<"DetectorConstruction tried to select "<<val<<G4endl; -
trunk/source/geometry/solids/test/OpticalEscape/src/AXPETDetectorMessenger.cc
r1316 r1347 24 24 // ******************************************************************** 25 25 // 26 // $Id: AXPETDetectorMessenger.cc,v 1. 1 2008/09/03 13:34:03 gcosmoExp $26 // $Id: AXPETDetectorMessenger.cc,v 1.2 2010/11/16 13:36:00 tnikitin Exp $ 27 27 // ------------------------------------------------------------ 28 28 // Geant4 class implementation file … … 56 56 selDetCmd->SetDefaultValue("Tubs"); 57 57 58 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube ");58 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube Tet GenericTrap TwistedBox TwistedTrd TwistedTrap TwistedTubs TessellatedSolid ExtrudedSolid"); 59 59 selDetCmd->AvailableForStates(G4State_PreInit,G4State_Idle); 60 60 -
trunk/source/geometry/solids/test/OpticalEscape/src/AXPETPhysicsList.cc
r1316 r1347 24 24 // ******************************************************************** 25 25 // 26 // $Id: AXPETPhysicsList.cc,v 1. 1 2008/09/03 13:34:03 gcosmoExp $26 // $Id: AXPETPhysicsList.cc,v 1.2 2010/11/16 13:38:09 tnikitin Exp $ 27 27 // ------------------------------------------------------------ 28 28 // Geant4 class implementation file … … 129 129 #include "G4PhotoElectricEffect.hh" 130 130 131 #include "G4MultipleScattering.hh" 131 #include "G4eMultipleScattering.hh" 132 #include "G4MuMultipleScattering.hh" 133 #include "G4hMultipleScattering.hh" 132 134 133 135 #include "G4eIonisation.hh" … … 159 161 //electron 160 162 // Construct processes for electron 161 pmanager->AddProcess(new G4 MultipleScattering(),-1, 1, 1);163 pmanager->AddProcess(new G4eMultipleScattering(),-1, 1, 1); 162 164 pmanager->AddProcess(new G4eIonisation(), -1, 2, 2); 163 165 pmanager->AddProcess(new G4eBremsstrahlung(), -1, 3, 3); … … 166 168 //positron 167 169 // Construct processes for positron 168 pmanager->AddProcess(new G4 MultipleScattering(),-1, 1, 1);170 pmanager->AddProcess(new G4eMultipleScattering(),-1, 1, 1); 169 171 pmanager->AddProcess(new G4eIonisation(), -1, 2, 2); 170 172 pmanager->AddProcess(new G4eBremsstrahlung(), -1, 3, 3); … … 175 177 //muon 176 178 // Construct processes for muon 177 pmanager->AddProcess(new G4Mu ltipleScattering(),-1, 1, 1);179 pmanager->AddProcess(new G4MuMultipleScattering(),-1, 1, 1); 178 180 pmanager->AddProcess(new G4MuIonisation(), -1, 2, 2); 179 181 pmanager->AddProcess(new G4MuBremsstrahlung(), -1, 3, 3); … … 184 186 (particle->GetParticleName() != "chargedgeantino")) { 185 187 // all others charged particles except geantino 186 pmanager->AddProcess(new G4 MultipleScattering(),-1,1,1);188 pmanager->AddProcess(new G4hMultipleScattering(),-1,1,1); 187 189 pmanager->AddProcess(new G4hIonisation(), -1,2,2); 188 190 } … … 222 224 G4String particleName = particle->GetParticleName(); 223 225 if (theCerenkovProcess->IsApplicable(*particle)) { 224 // pmanager->AddContinuousProcess(theCerenkovProcess);225 226 pmanager->AddProcess(theCerenkovProcess); 226 227 pmanager->SetProcessOrdering(theCerenkovProcess,idxPostStep); -
trunk/source/geometry/solids/test/SolidsChecker/SolidsChecker.cc
r1316 r1347 26 26 // 27 27 // $Id: SolidsChecker.cc,v 1.4 2006/10/20 14:51:40 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SolidsChecker/include/Sc01EventActionMessenger.hh
r1316 r1347 26 26 // 27 27 // $Id: Sc01EventActionMessenger.hh,v 1.2 2006/06/29 18:53:42 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SolidsChecker/include/Sc01VisManager.hh
r1316 r1347 26 26 // 27 27 // $Id: Sc01VisManager.hh,v 1.2 2006/06/29 18:53:51 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SolidsChecker/include/SteppingAction.hh
r1316 r1347 26 26 // 27 27 // $Id: SteppingAction.hh,v 1.2 2006/06/29 18:53:53 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SolidsChecker/src/Sc01EventActionMessenger.cc
r1316 r1347 26 26 // 27 27 // $Id: Sc01EventActionMessenger.cc,v 1.2 2006/06/29 18:54:02 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SolidsChecker/src/Sc01VisManager.cc
r1316 r1347 26 26 // 27 27 // $Id: Sc01VisManager.cc,v 1.3 2007/05/18 11:03:28 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SolidsChecker/src/SteppingAction.cc
r1316 r1347 26 26 // 27 27 // $Id: SteppingAction.cc,v 1.3 2006/06/29 18:54:14 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SurfaceChecker/SurfaceChecker.cc
r1316 r1347 26 26 // 27 27 // $Id: SurfaceChecker.cc,v 1.3 2006/10/20 14:43:18 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCDetectorConstruction.hh
r1316 r1347 26 26 // 27 27 // $Id: SCDetectorConstruction.hh,v 1.6 2006/12/13 15:43:46 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCEventAction.hh
r1316 r1347 26 26 // 27 27 // $Id: SCEventAction.hh,v 1.2 2006/06/29 18:54:24 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCMagneticField.hh
r1316 r1347 26 26 // 27 27 // $Id: SCMagneticField.hh,v 1.2 2006/06/29 18:54:27 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCPhysicsList.hh
r1316 r1347 26 26 // 27 27 // $Id: SCPhysicsList.hh,v 1.2 2006/06/29 18:54:29 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCPrimaryGeneratorAction.hh
r1316 r1347 26 26 // 27 27 // $Id: SCPrimaryGeneratorAction.hh,v 1.3 2006/06/29 18:54:31 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCRunAction.hh
r1316 r1347 26 26 // 27 27 // $Id: SCRunAction.hh,v 1.2 2006/06/29 18:54:33 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCSteppingAction.hh
r1316 r1347 26 26 // 27 27 // $Id: SCSteppingAction.hh,v 1.2 2006/06/29 18:54:35 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCSteppingVerbose.hh
r1316 r1347 26 26 // 27 27 // $Id: SCSteppingVerbose.hh,v 1.2 2006/06/29 18:54:37 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // This class manages the verbose outputs in G4SteppingManager. -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCTrackerHit.hh
r1316 r1347 26 26 // 27 27 // $Id: SCTrackerHit.hh,v 1.2 2006/06/29 18:54:39 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCTrackerSD.hh
r1316 r1347 26 26 // 27 27 // $Id: SCTrackerSD.hh,v 1.2 2006/06/29 18:54:41 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/include/SCVisManager.hh
r1316 r1347 26 26 // 27 27 // $Id: SCVisManager.hh,v 1.2 2006/06/29 18:54:44 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCDetectorConstruction.cc
r1316 r1347 26 26 // 27 27 // $Id: SCDetectorConstruction.cc,v 1.9 2007/07/18 14:38:48 tnikitin Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCEventAction.cc
r1316 r1347 26 26 // 27 27 // $Id: SCEventAction.cc,v 1.2 2006/06/29 18:54:51 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCMagneticField.cc
r1316 r1347 26 26 // 27 27 // $Id: SCMagneticField.cc,v 1.2 2006/06/29 18:54:53 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // User Field class implementation. -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCPhysicsList.cc
r1316 r1347 26 26 // 27 27 // $Id: SCPhysicsList.cc,v 1.2 2006/06/29 18:54:55 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCPrimaryGeneratorAction.cc
r1316 r1347 26 26 // 27 27 // $Id: SCPrimaryGeneratorAction.cc,v 1.8 2006/12/13 15:43:52 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCRunAction.cc
r1316 r1347 26 26 // 27 27 // $Id: SCRunAction.cc,v 1.2 2006/06/29 18:54:59 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCSteppingAction.cc
r1316 r1347 26 26 // 27 27 // $Id: SCSteppingAction.cc,v 1.2 2006/06/29 18:55:01 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCSteppingVerbose.cc
r1316 r1347 26 26 // 27 27 // $Id: SCSteppingVerbose.cc,v 1.2 2006/06/29 18:55:03 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCSurfacePoint.hh
r1316 r1347 26 26 // 27 27 // $Id: SCSurfacePoint.hh,v 1.2 2006/06/29 18:55:06 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCTrackerHit.cc
r1316 r1347 26 26 // 27 27 // $Id: SCTrackerHit.cc,v 1.2 2006/06/29 18:55:09 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCTrackerSD.cc
r1316 r1347 26 26 // 27 27 // $Id: SCTrackerSD.cc,v 1.2 2006/06/29 18:55:12 gunter Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/geometry/solids/test/SurfaceChecker/src/SCVisManager.cc
r1316 r1347 26 26 // 27 27 // $Id: SCVisManager.cc,v 1.3 2007/05/18 11:04:23 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/SurfaceVisTest/SurfaceVisTest.cc
r1316 r1347 41 41 42 42 //a pre-built physics list 43 #include "QGSP_ EMV.hh"43 #include "QGSP_BERT_EMV.hh" 44 44 45 45 //My includes … … 69 69 70 70 //Set mandatory initialization and user action classes 71 runManager->SetUserInitialization(new QGSP_ EMV);71 runManager->SetUserInitialization(new QGSP_BERT_EMV); 72 72 73 73 runManager->SetUserInitialization(new DetectorConstruction); -
trunk/source/geometry/solids/test/SurfaceVisTest/src/DetectorConstruction.cc
r1316 r1347 51 51 #include "G4Trd.hh" 52 52 #include "G4Tet.hh" 53 #include "G4GenericTrap.hh" 54 #include "G4TessellatedSolid.hh" 55 #include "G4ExtrudedSolid.hh" 53 56 54 57 #include "G4Polycone.hh" … … 68 71 69 72 #include "G4BREPSolidBox.hh" 73 #include "G4TwoVector.hh" 74 #include "G4TriangularFacet.hh" 75 #include "G4QuadrangularFacet.hh" 70 76 71 77 #include "G4LogicalVolume.hh" … … 497 503 else if ( val == "Tet" ) 498 504 { 499 505 // G4ThreeVector anchor = G4ThreeVector(0, 0, 0); 506 //G4ThreeVector p2 = G4ThreeVector(10*cm, 5*cm , 0); 507 //G4ThreeVector p3 = G4ThreeVector(5*cm,10*cm,0); 508 //G4ThreeVector p4 = G4ThreeVector(5*cm,5*cm ,10*cm); 509 510 //aVolume = new G4Tet("aTet",anchor,p2,p3,p4); 500 511 G4ThreeVector pzero(0,0,0); 501 512 G4ThreeVector pnt1(10.*cm,0.*cm,0.*cm),pnt2(5.0*cm,10.*cm,0.*cm), pnt3(5.*cm,5.*cm,10.*cm); 502 513 G4bool goodTet; 503 G4Tet t1( "aTet", pzero, pnt1, pnt2, pnt3, &goodTet);514 aVolume= new G4Tet( "aTet", pzero, pnt1, pnt2, pnt3, &goodTet); 504 515 } 505 516 else if ( val == "Trap") … … 549 560 550 561 } 562 else if (val == "GenericTrap" ){ 563 std::vector<G4TwoVector> vertices; 564 vertices.push_back(G4TwoVector( -4.5*cm, -4.5*cm)); 565 vertices.push_back(G4TwoVector( -4.5*cm, 4.5*cm)); 566 vertices.push_back(G4TwoVector( 4.5*cm, 4.5*cm)); 567 vertices.push_back(G4TwoVector( 4.5*cm, -4.5*cm)); 568 vertices.push_back(G4TwoVector( -3.5*cm, -3.5*cm)); 569 vertices.push_back(G4TwoVector( -3.5*cm, 3.5*cm)); 570 vertices.push_back(G4TwoVector( 3.5*cm, 3.5*cm)); 571 vertices.push_back(G4TwoVector( 3.5*cm, -2.5*cm)); 572 aVolume = new G4GenericTrap("aGenTrd",14.*cm,vertices); 573 } 574 575 else if(val == "TessellatedSolid") 576 { 577 G4double targetSize = 10.*cm; 578 G4TessellatedSolid* aVolume1 = new G4TessellatedSolid("aTessellatedSolid"); 579 G4TriangularFacet *facet1 = new 580 G4TriangularFacet (G4ThreeVector(-targetSize,-targetSize, 0.0), 581 G4ThreeVector(+targetSize,-targetSize, 0.0), 582 G4ThreeVector( 0.0, 0.0,+targetSize), 583 ABSOLUTE); 584 G4TriangularFacet *facet2 = new 585 G4TriangularFacet (G4ThreeVector(+targetSize,-targetSize, 0.0), 586 G4ThreeVector(+targetSize,+targetSize, 0.0), 587 G4ThreeVector( 0.0, 0.0,+targetSize), 588 ABSOLUTE); 589 G4TriangularFacet *facet3 = new 590 G4TriangularFacet (G4ThreeVector(+targetSize,+targetSize, 0.0), 591 G4ThreeVector(-targetSize,+targetSize, 0.0), 592 G4ThreeVector( 0.0, 0.0,+targetSize), 593 ABSOLUTE); 594 G4TriangularFacet *facet4 = new 595 G4TriangularFacet (G4ThreeVector(-targetSize,+targetSize, 0.0), 596 G4ThreeVector(-targetSize,-targetSize, 0.0), 597 G4ThreeVector( 0.0, 0.0,+targetSize), 598 ABSOLUTE); 599 G4QuadrangularFacet *facet5 = new 600 G4QuadrangularFacet (G4ThreeVector(-targetSize,-targetSize, 0.0), 601 G4ThreeVector(-targetSize,+targetSize, 0.0), 602 G4ThreeVector(+targetSize,+targetSize, 0.0), 603 G4ThreeVector(+targetSize,-targetSize, 0.0), 604 ABSOLUTE); 605 606 aVolume1->AddFacet((G4VFacet*) facet1); 607 aVolume1->AddFacet((G4VFacet*) facet2); 608 aVolume1->AddFacet((G4VFacet*) facet3); 609 aVolume1->AddFacet((G4VFacet*) facet4); 610 aVolume1->AddFacet((G4VFacet*) facet5); 611 612 aVolume1->SetSolidClosed(true); 613 614 aVolume = aVolume1; 615 616 } 617 else if (val == "ExtrudedSolid") 618 { 619 std::vector<G4TwoVector> polygon; 620 polygon.push_back(G4TwoVector(-3.*cm, -3.0*cm)); 621 polygon.push_back(G4TwoVector(-3.*cm, 3.0*cm)); 622 polygon.push_back(G4TwoVector( 3.*cm, 3.0*cm)); 623 polygon.push_back(G4TwoVector( 3.*cm, -3.0*cm)); 624 polygon.push_back(G4TwoVector( 1.5*cm, -3.0*cm)); 625 polygon.push_back(G4TwoVector( 1.5*cm, 1.5*cm)); 626 polygon.push_back(G4TwoVector(-1.5*cm, 1.5*cm)); 627 polygon.push_back(G4TwoVector(-1.5*cm, -3.0*cm)); 628 629 std::vector<G4ExtrudedSolid::ZSection> zsections; 630 zsections.push_back(G4ExtrudedSolid::ZSection(-4.0*cm, G4TwoVector(-2.0*cm, 1.0*cm), 1.5)); 631 zsections.push_back(G4ExtrudedSolid::ZSection( 1.0*cm, G4TwoVector( 0*cm, 0*cm), 0.5)); 632 zsections.push_back(G4ExtrudedSolid::ZSection( 1.5*cm, G4TwoVector( 0*cm, 0*cm), 0.7)); 633 zsections.push_back(G4ExtrudedSolid::ZSection( 4.0*cm, G4TwoVector( 2.0*cm, 2.0*cm), 0.9)); 634 635 aVolume = new G4ExtrudedSolid("aExtrudedSolid", polygon, zsections); 636 } 637 else if (val == "TwistedBox") 638 { 639 aVolume = new G4TwistedBox("aTwistedBox",40*deg,5*cm,10*cm,15*cm); 640 } 641 else if (val == "TwistedTrd") 642 { 643 aVolume = new G4TwistedTrd("aTwistedTrd",5*cm,10*cm,8*cm,15*cm,18*cm,20*deg); 644 } 645 else if (val == "TwistedTrap") 646 { 647 aVolume = new G4TwistedTrap("aTwistedTrap",40*deg,5*cm,10*cm,8*cm,15*cm); 648 } 649 else if ( val == "TwistedTrap2") 650 { 651 aVolume = new G4TwistedTrap("aTwistedTrap2", 652 20*deg, // twist angle 653 80*cm, // half z length 654 10*deg, // direction between end planes 655 40*deg, // defined by polar and azimutal angles. 656 8*cm, // half y length at -pDz 657 11*cm, // half x length at -pDz,-pDy 658 16*cm, // half x length at -pDz,+pDy 659 8*cm, // half y length at +pDz 660 11*cm, // half x length at +pDz,-pDy 661 16*cm, // half x length at +pDz,+pDy 662 -50*deg // tilt angle at +pDz 663 ) ; 664 } 665 else if ( val == "TwistedTubs") 666 { 667 aVolume = new G4TwistedTubs("aTwistedTubs",10.*deg,1*cm,2*cm,4*cm,171.*deg); 668 669 } 551 670 else 552 671 { G4cout <<"DetectorConstruction tried to select "<<val<<G4endl; -
trunk/source/geometry/solids/test/SurfaceVisTest/src/DetectorMessenger.cc
r1316 r1347 48 48 selDetCmd->SetDefaultValue("Polyhedra"); 49 49 50 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube ");50 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube GenericTrap TwistedBox TwistedTrd TwistedTrap TwistedTubs TessellatedSolid ExtrudedSolid Tet "); 51 51 selDetCmd->AvailableForStates(G4State_PreInit,G4State_Idle); 52 52 -
trunk/source/geometry/solids/test/SurfaceVisTest/src/RunMessenger.cc
r1316 r1347 26 26 // 27 27 // $Id: RunMessenger.cc,v 1.1 2008/05/15 14:01:08 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/testPointOnSurface.cc
r1316 r1347 26 26 // 27 27 // $Id: testPointOnSurface.cc,v 1.5 2007/02/12 11:29:23 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/testSolidComparisons.cc
r1316 r1347 26 26 // 27 27 // $Id: testSolidComparisons.cc,v 1.6 2007/05/18 11:06:34 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -
trunk/source/geometry/solids/test/testSurfaceArea.cc
r1316 r1347 26 26 // 27 27 // $Id: testSurfaceArea.cc,v 1.2 2007/02/12 11:29:23 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // -------------------------------------------------------------------- -
trunk/source/geometry/solids/test/testSurfaceAreaCube.cc
r1316 r1347 26 26 // 27 27 // $Id: testSurfaceAreaCube.cc,v 1.1 2006/10/20 14:38:52 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04- beta-cand-01$28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // --------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.