Ignore:
Timestamp:
Sep 10, 2008, 5:40:37 PM (16 years ago)
Author:
garnier
Message:

geant4.8.2 beta

Location:
trunk/source/geometry/solids/BREPS/src
Files:
49 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/solids/BREPS/src/G4Assembly.cc

    r831 r850  
    2626//
    2727// $Id: G4Assembly.cc,v 1.6 2006/06/29 18:41:07 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc

    r831 r850  
    2626//
    2727// $Id: G4Axis2Placement3D.cc,v 1.9 2006/06/29 18:41:09 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolid.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4BREPSolid.cc,v 1.36.4.1 2008/04/23 08:59:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4BREPSolid.cc,v 1.37 2008/03/13 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc

    r831 r850  
    2626//
    2727// $Id: G4BREPSolidBox.cc,v 1.11 2008/01/22 16:03:52 tnikitin Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc

    r831 r850  
    2525//
    2626// $Id: G4BREPSolidCone.cc,v 1.15 2006/06/29 18:41:16 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc

    r831 r850  
    2525//
    2626// $Id: G4BREPSolidCylinder.cc,v 1.11 2006/06/29 18:41:18 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc

    r831 r850  
    2626//
    2727// $Id: G4BREPSolidOpenPCone.cc,v 1.11 2006/06/29 18:41:21 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc

    r831 r850  
    2525//
    2626// $Id: G4BREPSolidPCone.cc,v 1.38 2006/06/29 18:41:24 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc

    r831 r850  
    2525//
    2626// $Id: G4BREPSolidPolyhedra.cc,v 1.35 2008/01/22 16:04:58 tnikitin Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc

    r831 r850  
    2626//
    2727// $Id: G4BREPSolidSphere.cc,v 1.11 2006/06/29 18:41:32 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc

    r831 r850  
    2626//
    2727// $Id: G4BREPSolidTorus.cc,v 1.9 2006/06/29 18:41:34 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BSplineCurve.cc

    r831 r850  
    2626//
    2727// $Id: G4BSplineCurve.cc,v 1.12 2006/06/29 18:41:36 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc

    r831 r850  
    2626//
    2727// $Id: G4BSplineCurveWithKnots.cc,v 1.5 2006/06/29 18:41:38 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BSplineSurface.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4BSplineSurface.cc,v 1.14.4.1 2008/04/23 08:59:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4BSplineSurface.cc,v 1.15 2008/03/13 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc

    r831 r850  
    2626//
    2727// $Id: G4BSplineSurfaceWithKnots.cc,v 1.4 2006/06/29 18:41:46 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BezierSurface.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4BezierSurface.cc,v 1.9.4.1 2008/04/23 08:59:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4BezierSurface.cc,v 1.10 2008/03/13 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc

    r831 r850  
    2626//
    2727// $Id: G4BoundingBox3D.cc,v 1.12 2007/07/16 08:06:55 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4CircularCurve.cc

    r831 r850  
    2626//
    2727// $Id: G4CircularCurve.cc,v 1.10 2006/06/29 18:41:52 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4CompositeCurve.cc

    r831 r850  
    2626//
    2727// $Id: G4CompositeCurve.cc,v 1.13 2006/06/29 18:41:54 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Conic.cc

    r831 r850  
    2626//
    2727// $Id: G4Conic.cc,v 1.8 2006/06/29 18:41:56 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4ConicalSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4ConicalSurface.cc,v 1.11 2006/06/29 18:41:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4ControlPoints.cc

    r831 r850  
    2626//
    2727// $Id: G4ControlPoints.cc,v 1.8 2006/06/29 18:42:00 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Curve.cc

    r831 r850  
    2626//
    2727// $Id: G4Curve.cc,v 1.9 2007/07/16 08:06:55 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4CurvePoint.cc

    r831 r850  
    2626//
    2727// $Id: G4CurvePoint.cc,v 1.5 2006/06/29 18:42:04 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc

    r831 r850  
    2626//
    2727// $Id: G4CurveRayIntersection.cc,v 1.8 2007/07/16 08:06:55 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4CylindricalSurface.cc,v 1.8 2006/06/29 18:42:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Ellipse.cc

    r831 r850  
    2626//
    2727// $Id: G4Ellipse.cc,v 1.12 2007/05/18 07:33:31 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4FConicalSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4FConicalSurface.cc,v 1.19 2006/06/29 18:42:12 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4FCylindricalSurface.cc,v 1.16 2006/06/29 18:42:14 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4FPlane.cc

    r831 r850  
    2626//
    2727// $Id: G4FPlane.cc,v 1.16 2006/06/29 18:42:16 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Hyperbola.cc

    r831 r850  
    2626//
    2727// $Id: G4Hyperbola.cc,v 1.12 2007/05/18 07:33:31 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4KnotVector.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4KnotVector.cc,v 1.10.2.1 2008/04/23 08:59:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4KnotVector.cc,v 1.11 2008/03/13 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Line.cc

    r831 r850  
    2626//
    2727// $Id: G4Line.cc,v 1.10 2006/06/29 18:42:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4OsloMatrix.cc

    r831 r850  
    2626//
    2727// $Id: G4OsloMatrix.cc,v 1.6 2006/06/29 18:42:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Parabola.cc

    r831 r850  
    2626//
    2727// $Id: G4Parabola.cc,v 1.9 2007/05/18 07:33:31 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4PlacedSolid.cc

    r831 r850  
    2626//
    2727// $Id: G4PlacedSolid.cc,v 1.6 2007/05/11 13:49:32 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4PointRat.cc

    r831 r850  
    2626//
    2727// $Id: G4PointRat.cc,v 1.6 2006/06/29 18:42:30 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4ProjectedSurface.cc,v 1.11.4.1 2008/04/23 08:59:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4ProjectedSurface.cc,v 1.12 2008/03/13 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Ray.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4Ray.cc,v 1.11 2006/06/29 18:42:35 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4Ray.cc,v 1.12 2008/07/08 10:00:58 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------
    … …  
    5555{
    5656  if(number_of_plane==1)
    57     return plane2;
     57    { return plane2; }
    5858  else
    59     return plane1;
     59    { return plane1; }
    6060}
    6161
    … …  
    7575 
    7676  if(!NearZero(RayDir.x(), SQRT_SMALL_FASTF))
    77     invdir.setX(1.0 / RayDir.x());
     77    { invdir.setX(1.0 / RayDir.x()); }
    7878   
    7979  if(!NearZero(RayDir.y(), SQRT_SMALL_FASTF))
    80     invdir.setY(1.0 / RayDir.y());
     80    { invdir.setY(1.0 / RayDir.y()); }
    8181   
    8282  if(!NearZero(RayDir.z(), SQRT_SMALL_FASTF))
    83     invdir.setZ(1.0 / RayDir.z());
     83    { invdir.setZ(1.0 / RayDir.z()); }
    8484
    8585  MatVecOrtho(dir1, RayDir);
    … …  
    102102  G4int             i_Which;
    103103
    104   if(NearZero(in.x(), 0.0001) && NearZero(in.y(), 0.0001) &&
    105      NearZero(in.z(), 0.0001) ) 
     104  if( NearZero(in.x(), 0.0001)
     105   && NearZero(in.y(), 0.0001)
     106   && NearZero(in.z(), 0.0001) ) 
    106107  {
    107108    Vsetall( out, 0 );
    … …  
    120121 
    121122  if( std::fabs(in.z()) < f )
     123  {
    122124    i_Which=2;
     125  }
    123126 
    124127  if(!i_Which)
     128  {
    125129    f = std::sqrt((in.y())*(in.y())+(in.z())*(in.z()));    // hypot(in.y(),in.z())
     130  }
    126131  else
     132  {
    127133    if(i_Which==1)
     134    {
    128135      f = std::sqrt((in.z())*(in.z())+(in.x())*(in.x()));  // hypot(in.z(),in.x())
    129     else
    130       f = std::sqrt((in.x())*(in.x())+(in.y())*(in.y()));  // hypot(in.x(),in.y())
    131  
    132     if( NearZero( f, SMALL ) )
    133     {
    134       Vsetall( out, 0 );
    135       return;
    136     }
    137    
    138     f = 1.0/f;
    139    
    140     if(!i_Which)
    141     {
    142       out.setX(0.0);
    143       out.setY(-in.z()*f);
    144       out.setZ( in.y()*f);
    145136    }
    146137    else
    147       if(i_Which==1)
    148       {
    149         out.setY(0.0);
    150         out.setZ(-in.x()*f);
    151         out.setX( in.y()*f);
    152       }
    153       else
    154       {
    155         out.setZ(0.0);
    156         out.setX(-in.z()*f);
    157         out.setY( in.y()*f);
    158       }
     138    {
     139      f = std::sqrt((in.x())*(in.x())+(in.y())*(in.y()));  // hypot(in.x(),in.y())
     140    }
     141  }
     142  if( NearZero( f, SMALL ) )
     143  {
     144    Vsetall( out, 0 );
     145    return;
     146  }
     147   
     148  f = 1.0/f;
     149   
     150  if(!i_Which)
     151  {
     152    out.setX(0.0);
     153    out.setY(-in.z()*f);
     154    out.setZ( in.y()*f);
     155  }
     156  else
     157  {
     158    if(i_Which==1)
     159    {
     160      out.setY(0.0);
     161      out.setZ(-in.x()*f);
     162      out.setX( in.y()*f);
     163    }
     164    else
     165    {
     166      out.setZ(0.0);
     167      out.setX(-in.z()*f);
     168      out.setY( in.y()*f);
     169    }
     170  }
    159171}
    160172
    … …  
    221233  mag = Magnitude(plane1);
    222234  if( mag  <= SQRT_SMALL_FASTF )
     235  {
    223236    return(-1);//        FAIL
     237  }
    224238 
    225239  mag = 1/mag;
    … …  
    240254  if (dir==G4Vector3D(0, 0, 0))
    241255  {
    242     G4cout << "\nZero direction given. Exiting...\n";
    243     exit(1);
     256    G4Exception("G4Ray::RayCheck()", "InvalidInput", FatalException,
     257                "Invalid zero direction given !");
    244258  }
    245259

  • trunk/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4RectangularTrimmedSurface.cc,v 1.7 2006/06/29 18:42:37 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Sort.cc

    r831 r850  
    2626//
    2727// $Id: G4Sort.cc,v 1.5 2006/06/29 18:42:39 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4SphericalSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4SphericalSurface.cc,v 1.10 2006/06/29 18:42:41 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4Surface.cc

    r831 r850  
    2626//
    2727// $Id: G4Surface.cc,v 1.17 2007/07/16 08:06:55 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc

    r831 r850  
    2626//
    2727// $Id: G4SurfaceBoundary.cc,v 1.14 2006/06/29 18:42:46 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4SurfaceList.cc

    r831 r850  
    2525//
    2626//
    27 // $Id: G4SurfaceList.cc,v 1.7.4.1 2008/04/23 08:59:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4SurfaceList.cc,v 1.8 2008/03/13 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc

    r831 r850  
    2626//
    2727// $Id: G4SurfaceOfLinearExtrusion.cc,v 1.4 2006/06/29 18:42:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc

    r831 r850  
    2929//
    3030// $Id: G4SurfaceOfRevolution.cc,v 1.4 2006/06/29 18:42:53 gunter Exp $
    31 // GEANT4 tag $Name: $
     31// GEANT4 tag $Name: HEAD $
    3232//
    3333// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4ThreeMat.cc

    r831 r850  
    2626//
    2727// $Id: G4ThreeMat.cc,v 1.8 2006/06/29 18:42:56 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc

    r831 r850  
    2626//
    2727// $Id: G4ToroidalSurface.cc,v 1.10 2006/06/29 18:42:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.