Ignore:
Timestamp:
Jan 8, 2010, 11:56:51 AM (14 years ago)
Author:
garnier
Message:

update geant4.9.3 tag

Location:
trunk/source/geometry/solids/specific/src
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/solids/specific/src/G4ClippablePolygon.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ClippablePolygon.cc,v 1.12 2007/05/11 13:54:28 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4Ellipsoid.cc

    r1058 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4Ellipsoid.cc,v 1.14 2007/05/18 07:39:56 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4Ellipsoid.cc,v 1.24 2009/09/24 15:51:02 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929// class G4Ellipsoid
    … …  
    385385  EInside in;
    386386
     387  static const G4double halfRadTolerance=kRadTolerance*0.5;
     388
    387389  // check this side of z cut first, because that's fast
    388390  //
    389   if (p.z() < zBottomCut-kRadTolerance/2.0)
    390     { return in=kOutside; }
    391   if (p.z() > zTopCut+kRadTolerance/2.0)
    392     { return in=kOutside; }
    393 
    394   rad2oo= sqr(p.x()/(xSemiAxis+kRadTolerance/2.))
    395         + sqr(p.y()/(ySemiAxis+kRadTolerance/2.))
    396         + sqr(p.z()/(zSemiAxis+kRadTolerance/2.));
    397 
    398   if (rad2oo > 1.0)
    399     { return in=kOutside; }
     391  if (p.z() < zBottomCut-halfRadTolerance) { return in=kOutside; }
     392  if (p.z() > zTopCut+halfRadTolerance)    { return in=kOutside; }
     393
     394  rad2oo= sqr(p.x()/(xSemiAxis+halfRadTolerance))
     395        + sqr(p.y()/(ySemiAxis+halfRadTolerance))
     396        + sqr(p.z()/(zSemiAxis+halfRadTolerance));
     397
     398  if (rad2oo > 1.0)  { return in=kOutside; }
    400399   
    401   rad2oi= sqr(p.x()*(1.0+kRadTolerance/2./xSemiAxis)/xSemiAxis)
    402       + sqr(p.y()*(1.0+kRadTolerance/2./ySemiAxis)/ySemiAxis)
    403       + sqr(p.z()*(1.0+kRadTolerance/2./zSemiAxis)/zSemiAxis);
     400  rad2oi= sqr(p.x()*(1.0+halfRadTolerance/xSemiAxis)/xSemiAxis)
     401      + sqr(p.y()*(1.0+halfRadTolerance/ySemiAxis)/ySemiAxis)
     402      + sqr(p.z()*(1.0+halfRadTolerance/zSemiAxis)/zSemiAxis);
    404403
    405404  // Check radial surfaces
    … …  
    408407  if (rad2oi < 1.0)
    409408  {
    410     in = ( (p.z() < zBottomCut+kRadTolerance/2.0)
    411         || (p.z() > zTopCut-kRadTolerance/2.0) ) ? kSurface : kInside;
     409    in = ( (p.z() < zBottomCut+halfRadTolerance)
     410        || (p.z() > zTopCut-halfRadTolerance) ) ? kSurface : kInside;
     411    if ( rad2oi > 1.0-halfRadTolerance )  { in=kSurface; }
    412412  }
    413413  else
    … …  
    415415    in = kSurface;
    416416  }
    417 
    418417  return in;
     418
    419419}
    420420
    … …  
    460460                                    const G4ThreeVector& v  ) const
    461461{
    462   G4double distMin;
    463  
     462  static const G4double halfCarTolerance=kCarTolerance*0.5;
     463  static const G4double halfRadTolerance=kRadTolerance*0.5;
     464
     465  G4double distMin = std::min(xSemiAxis,ySemiAxis);
     466  const G4double dRmax = 100.*std::min(distMin,zSemiAxis);
    464467  distMin= kInfinity;
    465468
    466469  // check to see if Z plane is relevant
    467   if (p.z() < zBottomCut) {
    468     if (v.z() <= 0.0)
    469       return distMin;
     470  if (p.z() <= zBottomCut+halfCarTolerance)
     471  {
     472    if (v.z() <= 0.0) { return distMin; }
    470473    G4double distZ = (zBottomCut - p.z()) / v.z();
    471     if (distZ > kRadTolerance/2.0 && Inside(p+distZ*v) != kOutside )
    472       {
    473         // early exit since can't intercept curved surface if we reach here
    474         return distMin= distZ;
    475       }
    476   }
    477   if (p.z() > zTopCut) {
    478     if (v.z() >= 0.0)
    479       return distMin;
     474
     475    if ( (distZ > -halfRadTolerance) && (Inside(p+distZ*v) != kOutside) )
     476    {
     477      // early exit since can't intercept curved surface if we reach here
     478      if ( std::abs(distZ) < halfRadTolerance ) { distZ=0.; }
     479      return distMin= distZ;
     480    }
     481  }
     482  if (p.z() >= zTopCut-halfCarTolerance)
     483  {
     484    if (v.z() >= 0.0) { return distMin;}
    480485    G4double distZ = (zTopCut - p.z()) / v.z();
    481     if (distZ > kRadTolerance/2.0 && Inside(p+distZ*v) != kOutside )
    482       {
    483         // early exit since can't intercept curved surface if we reach here
    484         return distMin= distZ;
    485       }
     486    if ( (distZ > -halfRadTolerance) && (Inside(p+distZ*v) != kOutside) )
     487    {
     488      // early exit since can't intercept curved surface if we reach here
     489      if ( std::abs(distZ) < halfRadTolerance ) { distZ=0.; }
     490      return distMin= distZ;
     491    }
    486492  }
    487493  // if fZCut1 <= p.z() <= fZCut2, then must hit curved surface
    … …  
    492498  A= sqr(v.x()/xSemiAxis) + sqr(v.y()/ySemiAxis) + sqr(v.z()/zSemiAxis);
    493499  C= sqr(p.x()/xSemiAxis) + sqr(p.y()/ySemiAxis) + sqr(p.z()/zSemiAxis) - 1.0;
    494   B= 2.0 * ( p.x()*v.x()/(xSemiAxis*xSemiAxis) + p.y()*v.y()/(ySemiAxis*ySemiAxis)
    495              + p.z()*v.z()/(zSemiAxis*zSemiAxis) );
     500  B= 2.0 * ( p.x()*v.x()/(xSemiAxis*xSemiAxis)
     501           + p.y()*v.y()/(ySemiAxis*ySemiAxis)
     502           + p.z()*v.z()/(zSemiAxis*zSemiAxis) );
    496503
    497504  C= B*B - 4.0*A*C;
    498505  if (C > 0.0)
    499     {
    500       G4double distR= (-B - std::sqrt(C) ) / (2.0*A);
    501       G4double intZ= p.z()+distR*v.z();
    502       if (distR > kRadTolerance/2.0
    503           && intZ >= zBottomCut-kRadTolerance/2.0
    504           && intZ <= zTopCut+kRadTolerance/2.0)
    505         {
    506           distMin = distR;
    507         }
    508       else
    509         {
    510           distR= (-B + std::sqrt(C) ) / (2.0*A);
    511           intZ= p.z()+distR*v.z();
    512           if (distR > kRadTolerance/2.0
    513               && intZ >= zBottomCut-kRadTolerance/2.0
    514               && intZ <= zTopCut+kRadTolerance/2.0)
    515             {
    516               distMin = distR;
    517             }
    518         }
    519     }
    520 
     506  {   
     507    G4double distR= (-B - std::sqrt(C)) / (2.0*A);
     508    G4double intZ = p.z()+distR*v.z();
     509    if ( (distR > halfRadTolerance)
     510      && (intZ >= zBottomCut-halfRadTolerance)
     511      && (intZ <= zTopCut+halfRadTolerance) )
     512    {
     513      distMin = distR;
     514    }
     515    else if( (distR >- halfRadTolerance)
     516            && (intZ >= zBottomCut-halfRadTolerance)
     517            && (intZ <= zTopCut+halfRadTolerance) )
     518    {
     519      // p is on the curved surface, DistanceToIn returns 0 or kInfinity:
     520      // DistanceToIn returns 0, if second root is positive (means going inside)
     521      // If second root is negative, DistanceToIn returns kInfinity (outside)
     522      //
     523      distR = (-B + std::sqrt(C) ) / (2.0*A);
     524      if(distR>0.) { distMin=0.; }
     525    }
     526    else
     527    {
     528      distR= (-B + std::sqrt(C)) / (2.0*A);
     529      intZ = p.z()+distR*v.z();
     530      if ( (distR > halfRadTolerance)
     531        && (intZ >= zBottomCut-halfRadTolerance)
     532        && (intZ <= zTopCut+halfRadTolerance) )
     533      {
     534        G4ThreeVector norm=SurfaceNormal(p);
     535        if (norm.dot(v)<0.) { distMin = distR; }
     536      }
     537    }
     538    if ( (distMin!=kInfinity) && (distMin>dRmax) )
     539    {                    // Avoid rounding errors due to precision issues on
     540                         // 64 bits systems. Split long distances and recompute
     541      G4double fTerm = distMin-std::fmod(distMin,dRmax);
     542      distMin = fTerm + DistanceToIn(p+fTerm*v,v);
     543    }
     544  }
     545 
     546  if (std::abs(distMin)<halfRadTolerance) { distMin=0.; }
    521547  return distMin;
    522548}
    … …  
    651677      {
    652678        case kPlaneSurf:
    653           *n= G4ThreeVector(0.,0.,(v.z() > 1.0 ? 1. : -1.));
     679          *n= G4ThreeVector(0.,0.,(v.z() > 0.0 ? 1. : -1.));
    654680          break;
    655681        case kCurvedSurf:
    … …  
    683709    }
    684710  }
     711   
    685712  return distMin;
    686713}
    … …  
    905932  max1  = xSemiAxis > ySemiAxis ? xSemiAxis : ySemiAxis;
    906933  max1  = max1 > zSemiAxis ? max1 : zSemiAxis;
    907   if(max1 == xSemiAxis){max2 = ySemiAxis; max3 = zSemiAxis;}
    908   else if(max1 == ySemiAxis){max2 = xSemiAxis; max3 = zSemiAxis;}
    909   else {max2 = xSemiAxis; max3 = ySemiAxis; }
    910 
    911   phi   = RandFlat::shoot(0.,2.*pi);
     934  if (max1 == xSemiAxis)      { max2 = ySemiAxis; max3 = zSemiAxis; }
     935  else if (max1 == ySemiAxis) { max2 = xSemiAxis; max3 = zSemiAxis; }
     936  else                        { max2 = xSemiAxis; max3 = ySemiAxis; }
     937
     938  phi   = RandFlat::shoot(0.,twopi);
    912939  theta = RandFlat::shoot(0.,pi);
    913940 

  • trunk/source/geometry/solids/specific/src/G4EllipticalCone.cc

    r1058 r1228  
    2525//
    2626// $Id: G4EllipticalCone.cc,v 1.16 2008/04/25 08:45:26 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929// Implementation of G4EllipticalCone class

  • trunk/source/geometry/solids/specific/src/G4EllipticalTube.cc

    r1058 r1228  
    2626//
    2727// $Id: G4EllipticalTube.cc,v 1.27 2006/10/20 13:45:21 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4EnclosingCylinder.cc

    r1058 r1228  
    2626//
    2727// $Id: G4EnclosingCylinder.cc,v 1.10 2007/05/11 13:54:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4ExtrudedSolid.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ExtrudedSolid.cc,v 1.18 2008/10/30 11:47:45 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4Hype.cc

    r1058 r1228  
    2727// $Id: G4Hype.cc,v 1.27 2008/04/14 08:49:28 gcosmo Exp $
    2828// $Original: G4Hype.cc,v 1.0 1998/06/09 16:57:50 safai Exp $
    29 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     29// GEANT4 tag $Name: geant4-09-03 $
    3030//
    3131//

  • trunk/source/geometry/solids/specific/src/G4IntersectingCone.cc

    r1058 r1228  
    2626//
    2727// $Id: G4IntersectingCone.cc,v 1.12 2008/04/28 08:59:47 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4Paraboloid.cc

    r1058 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4Paraboloid.cc,v 1.8 2008/07/17 07:33:00 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4Paraboloid.cc,v 1.9 2009/02/27 15:10:46 tnikitin Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929// class G4Paraboloid
    … …  
    866866      *n = G4ThreeVector(p.x() + intersection * v.x(), p.y()
    867867         + intersection * v.y(), - k1 / 2);
     868      *n = n->unit();
    868869    }
    869870    return intersection;

  • trunk/source/geometry/solids/specific/src/G4PolyPhiFace.cc

    r1058 r1228  
    2626//
    2727// $Id: G4PolyPhiFace.cc,v 1.15 2008/05/15 11:41:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4Polycone.cc

    r1058 r1228  
    2626//
    2727// $Id: G4Polycone.cc,v 1.43 2008/05/15 13:45:15 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4PolyconeSide.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4PolyconeSide.cc,v 1.19 2008/05/15 11:41:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4PolyconeSide.cc,v 1.22 2009/11/11 12:23:37 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    462462  if (p == G4ThreeVector(0.,0.,0.))  { return p; }
    463463
    464   G4ThreeVector dFrom;
    465   G4double dOut2;
     464  G4double dFrom, dOut2;
    466465 
    467466  dFrom = DistanceAway( p, false, dOut2 );
    … …  
    470469 
    471470  G4double rad = p.perp();
    472   return G4ThreeVector( rNorm*p.x()/rad, rNorm*p.y()/rad, zNorm );
     471  if (rad!=0.) { return G4ThreeVector(rNorm*p.x()/rad,rNorm*p.y()/rad,zNorm); }
     472  return G4ThreeVector( 0.,0., zNorm ).unit();
    473473}
    474474

  • trunk/source/geometry/solids/specific/src/G4Polyhedra.cc

    r1058 r1228  
    2626//
    2727// $Id: G4Polyhedra.cc,v 1.42 2008/05/15 13:45:15 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4PolyhedraSide.cc,v 1.15 2008/05/15 11:41:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4QuadrangularFacet.cc

    r1058 r1228  
    2727//
    2828// $Id: G4QuadrangularFacet.cc,v 1.7 2008/12/18 12:57:34 gunter Exp $
    29 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     29// GEANT4 tag $Name: geant4-09-03 $
    3030//
    3131// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/source/geometry/solids/specific/src/G4ReduciblePolygon.cc

    r1058 r1228  
    2626//
    2727// $Id: G4ReduciblePolygon.cc,v 1.11 2006/06/29 18:48:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4SolidExtentList.cc

    r1058 r1228  
    2626//
    2727// $Id: G4SolidExtentList.cc,v 1.5 2007/05/11 13:54:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TessellatedGeometryAlgorithms.cc

    r1058 r1228  
    2727//
    2828// $Id: G4TessellatedGeometryAlgorithms.cc,v 1.6 2008/12/18 12:57:36 gunter Exp $
    29 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     29// GEANT4 tag $Name: geant4-09-03 $
    3030//
    3131// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc

    r1058 r1228  
    2525// ********************************************************************
    2626//
    27 // $Id: G4TessellatedSolid.cc,v 1.18 2008/03/13 11:58:28 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4TessellatedSolid.cc,v 1.19 2009/04/27 08:06:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    … …  
    520520    } while (nearParallel && m!=maxTries);
    521521
     522#ifdef G4VERBOSE
    522523    if (m == maxTries)
    523524    {
    … …  
    528529// something wrong with geometry.
    529530//
     531      G4cout.precision(16) ;
     532      G4cout << G4endl ;
     533      G4cout << "Solid name       = " << GetName()  << G4endl;
     534      G4cout << "Geometry Type    = " << geometryType  << G4endl;
     535      G4cout << "Number of facets = " << facets.size() << G4endl;
     536      G4cout << "Position:"  << G4endl << G4endl ;
     537      G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
     538      G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
     539      G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
    530540      G4Exception("G4TessellatedSolid::Inside()",
    531                 "UnknownInsideOutside", FatalException,
     541                "UnknownInsideOutside-MaxTries", JustWarning,
    532542                "Cannot determine whether point is inside or outside volume!");
    533543    }
     544#endif
    534545//
    535546//
    … …  
    550561      locationprime = kInside;
    551562
    552     if (i == 0) location = locationprime;
     563    if (i == 0)  { location = locationprime; }
     564#ifdef G4VERBOSE
    553565    else if (locationprime != location)
    554566    {
    … …  
    558570// geometry is not constructed correctly.
    559571//
     572      G4cout.precision(16) ;
     573      G4cout << G4endl ;
     574      G4cout << "Solid name       = " << GetName()  << G4endl;
     575      G4cout << "Geometry Type    = " << geometryType  << G4endl;
     576      G4cout << "Number of facets = " << facets.size() << G4endl;
     577      G4cout << "Position:"  << G4endl << G4endl ;
     578      G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
     579      G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
     580      G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
    560581      G4Exception("G4TessellatedSolid::Inside()",
    561                 "UnknownInsideOutside", FatalException,
     582                "UnknownInsideOutside", JustWarning,
    562583                "Cannot determine whether point is inside or outside volume!");
    563584    }
     585#endif
    564586  }
    565587

  • trunk/source/geometry/solids/specific/src/G4Tet.cc

    r1058 r1228  
    2929//
    3030// $Id: G4Tet.cc,v 1.11 2006/11/13 08:58:03 gcosmo Exp $
    31 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     31// GEANT4 tag $Name: geant4-09-03 $
    3232//
    3333// class G4Tet

  • trunk/source/geometry/solids/specific/src/G4TriangularFacet.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TriangularFacet.cc,v 1.12 2008/11/13 08:25:07 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/source/geometry/solids/specific/src/G4TwistBoxSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistBoxSide.cc,v 1.6 2007/05/23 09:31:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistTrapAlphaSide.cc,v 1.8 2007/05/23 13:26:06 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistTrapFlatSide.cc,v 1.6 2007/05/23 09:31:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistTrapParallelSide.cc,v
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistTubsFlatSide.cc,v 1.7 2007/05/23 09:31:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistTubsHypeSide.cc,v 1.6 2007/05/18 07:39:56 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistTubsSide.cc

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4TwistTubsSide.cc,v 1.5 2006/06/29 18:49:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// $Id: G4TwistTubsSide.cc,v 1.6 2009/11/11 12:23:37 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    411411           G4int l;
    412412           G4double      lastdeltaY = deltaY;
    413            G4ThreeVector last = deltaY;
    414413           for (l=0; l<maxcount; l++) {
    415414             G4ThreeVector surfacenormal = GetNormal(xxonsurface);

  • trunk/source/geometry/solids/specific/src/G4TwistedBox.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistedBox.cc,v 1.12 2006/06/29 18:49:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistedTrap.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistedTrap.cc,v 1.14 2006/06/29 18:49:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistedTrd.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistedTrd.cc,v 1.7 2006/06/29 18:49:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4TwistedTubs.cc

    r1058 r1228  
    2626//
    2727// $Id: G4TwistedTubs.cc,v 1.24 2007/05/18 07:39:56 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4VCSGfaceted.cc

    r1058 r1228  
    3030// and all its terms.
    3131//
    32 // $Id: G4VCSGfaceted.cc,v 1.25 2008/05/22 10:22:52 gcosmo Exp $
    33 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     32// $Id: G4VCSGfaceted.cc,v 1.26 2009/05/08 14:29:56 gcosmo Exp $
     33// GEANT4 tag $Name: geant4-09-03 $
    3434//
    3535//
    … …  
    550550{
    551551  if(fSurfaceArea != 0.) {;}
    552   else   { fSurfaceArea = EstimateCubicVolume(fStatistics,fAreaAccuracy); }
     552  else   { fSurfaceArea = EstimateSurfaceArea(fStatistics,fAreaAccuracy); }
    553553  return fSurfaceArea;
    554554}

  • trunk/source/geometry/solids/specific/src/G4VFacet.cc

    r1058 r1228  
    2727//
    2828// $Id: G4VFacet.cc,v 1.8 2008/12/18 12:57:38 gunter Exp $
    29 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     29// GEANT4 tag $Name: geant4-09-03 $
    3030//
    3131// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/source/geometry/solids/specific/src/G4VTwistSurface.cc

    r1058 r1228  
    2626//
    2727// $Id: G4VTwistSurface.cc,v 1.9 2007/05/31 13:52:48 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/src/G4VTwistedFaceted.cc

    r1058 r1228  
    2525//
    2626// $Id: G4VTwistedFaceted.cc,v 1.18 2007/05/25 09:42:34 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929//
Note: See TracChangeset for help on using the changeset viewer.