Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (14 years ago)
Author:
garnier
Message:

geant4 tag 9.4

Location:
trunk/source/geometry/solids/CSG
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/solids/CSG/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.7 2005/05/09 13:47:24 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.9 2010/10/27 07:34:32 gcosmo Exp $
    22# ----------------------------------------------------------------
    33# GNUmakefile for geometry/CSG library.  Gabriele Cosmo, 16/11/96.

  • trunk/source/geometry/solids/CSG/History

    r1315 r1347  
    1 $Id: History,v 1.121 2010/05/25 09:19:02 gcosmo Exp $
     1$Id: History,v 1.135 2010/11/23 14:46:11 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20Nov 23, 2010  G.Cosmo                    geom-csg-V09-03-14 & V09-03-12
     21- Fixed one left cases of cout precision restoring in G4Sphere.
     22
     23Oct 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
     27Sep 23, 2010  G.Cosmo                    geom-csg-V09-03-10
     28- Initialize fpPolyhedron to zero in G4CSGSolid copy-ctor and operator=().
     29
     30Sep 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
     34Sep 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
     38Sep 17, 2010  G.Cosmo                    geom-csg-V09-03-07
     39- Added missing validity checks on radii to modifiers in G4Tubs.
     40
     41Sep 07, 2010  G.Cosmo                    geom-csg-V09-03-06
     42- Fix within G4CSGDEBUG code for restoring cout precision.
     43
     44Aug 23, 2010  G.Cosmo                    geom-csg-V09-03-05
     45- G4Cons: fixed trivial compilation warning on Linux.
     46
     47Aug 19, 2010  T.Nikitina                 geom-csg-V09-03-04
     48- G4Torus: fix in DistanceToOut(p,v,...) to address problem report #1081.
     49
     50Jul 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
     55Jul 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).
    1964
    2065May 25, 2010  G.Cosmo                    geom-csg-V09-03-01

  • trunk/source/geometry/solids/CSG/test/ApproxEqual.hh

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Box.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Cons1.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Cons2.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030// Simple test of G4Cons

  • trunk/source/geometry/solids/CSG/test/testG4Orb.cc

    r1316 r1347  
    2626
    2727// $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 $
    2929//
    3030// G4Orb Test File

  • trunk/source/geometry/solids/CSG/test/testG4Para1.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030 

  • trunk/source/geometry/solids/CSG/test/testG4Para2.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030// Test of G4Para

  • trunk/source/geometry/solids/CSG/test/testG4Sphere.cc

    r1316 r1347  
    2525//
    2626
    27 // $Id: testG4Sphere.cc,v 1.29 2009/05/14 13:22:44 tnikitin Exp $
    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 $
    2929//
    3030// G4Sphere Test File
    … …  
    9696{
    9797    G4double kAngTolerance = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
    98 
     98    EInside inside;
    9999    G4int i, iMax;
    100100    G4double Dist, vol, volCheck;
    … …  
    292292   G4ThreeVector vb830(0.1644697995,0.18507236,0.9688642354);
    293293
     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
    294304#ifdef NDEBUG
    295305    G4Exception("FAIL: *** Assertions must be compiled in! ***");
    … …  
    347357// Check G4Sphere::Inside
    348358
    349     EInside inside = s7.Inside(G4ThreeVector(1399.984667238032,
     359    inside = s7.Inside(G4ThreeVector(1399.984667238032,
    350360                                             5.9396696802500299,
    351361                                            -2.7661927818688308)  ) ;
    … …  
    501511     Dist=sn22.DistanceToOut(G4ThreeVector(-45.,0.,0.),vx,calcNorm,pgoodNorm,pNorm);
    502512     assert(ApproxEqual(Dist,45.));
    503      G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl;
    504      G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl;
     513G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl;
     514G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl;
    505515
    506516     //
    … …  
    10491059                           G4double  d,    G4ThreeVector dir,    EInside  exp);
    10501060
    1051         G4Sphere SpAroundX("SpAroundX",  10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree );
     1061  G4Sphere SpAroundX("SpAroundX",  10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree );
    10521062
    10531063        G4double  sinOneDeg = std::sin( 1.0 * degree );
    … …  
    10911101
    10921102        // Try the edges 
    1093         G4ThreeVector  NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0);
     1103  G4ThreeVector  NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0);
    10941104        G4ThreeVector  PosEdgePt( radOne * std::cos(10.0*degree), radOne * std::sin(10.0*degree), 0.0);
    10951105

  • trunk/source/geometry/solids/CSG/test/testG4Sphere2.cc

    r1316 r1347  
    2626
    2727// $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 $
    2929//
    3030// G4Sphere Test File

  • trunk/source/geometry/solids/CSG/test/testG4Torus.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Trap.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Trd.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030 

  • trunk/source/geometry/solids/CSG/test/testG4Tubs.cc

    r1316 r1347  
    2626//
    2727// $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 $
    2929//
    3030
Note: See TracChangeset for help on using the changeset viewer.