Changeset 1347 for trunk/source/geometry/solids/CSG/test

Timestamp:

Dec 22, 2010, 3:52:27 PM (15 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/geometry/solids/CSG/test

Files:

• ApproxEqual.hh (modified) (1 diff)
• testG4Box.cc (modified) (1 diff)
• testG4Cons1.cc (modified) (1 diff)
• testG4Cons2.cc (modified) (1 diff)
• testG4Orb.cc (modified) (1 diff)
• testG4Para1.cc (modified) (1 diff)
• testG4Para2.cc (modified) (1 diff)
• testG4Sphere.cc (modified) (7 diffs)
• testG4Sphere2.cc (modified) (1 diff)
• testG4Torus.cc (modified) (1 diff)
• testG4Trap.cc (modified) (1 diff)
• testG4Trd.cc (modified) (1 diff)
• testG4Tubs.cc (modified) (1 diff)

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

@@ -26 +26 @@
 //
 // $Id: ApproxEqual.hh,v 1.5 2006/06/29 18:45:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 

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

@@ -26 +26 @@
 //
 // $Id: testG4Box.cc,v 1.9 2006/06/29 18:45:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 

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

@@ -26 +26 @@
 //
 // $Id: testG4Cons1.cc,v 1.8 2007/04/23 13:58:39 grichine Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 

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

@@ -26 +26 @@
 //
 // $Id: testG4Cons2.cc,v 1.21 2009/11/12 10:40:45 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Simple test of G4Cons

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

@@ -26 +26 @@
 
 // $Id: testG4Orb.cc,v 1.7 2009/01/29 16:54:51 grichine Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // G4Orb Test File

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

@@ -26 +26 @@
 //
 // $Id: testG4Para1.cc,v 1.8 2006/06/29 18:46:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
  

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

@@ -26 +26 @@
 //
 // $Id: testG4Para2.cc,v 1.6 2006/06/29 18:46:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Test of G4Para

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

@@ -25 +25 @@
 //
 
-// $Id: testG4Sphere.cc,v 1.29 2009/05/14 13:22:44 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// $Id: testG4Sphere.cc,v 1.30 2010/03/24 09:50:03 grichine Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // G4Sphere Test File
@@ -96 +96 @@
 {
     G4double kAngTolerance = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
-
+    EInside inside;
     G4int i, iMax;
     G4double Dist, vol, volCheck;
@@ -292 +292 @@
    G4ThreeVector vb830(0.1644697995,0.18507236,0.9688642354);
 
+
+   G4Sphere      s18_03_10("s18_03_10", 47*mm, 48*mm, 0*deg, 200*deg, 80*deg, 100*deg);
+   G4ThreeVector p18_03_10(43.37539710867407*mm, 16.12036885157033*mm, -8.224548565698871*mm);
+   G4ThreeVector v18_03_10(-0.4161958548132512, 0.6603942936714858, -0.6250283092167956);
+
+   inside = s18_03_10.Inside(p18_03_10) ;
+   G4cout<<"s18_03_10.Inside(p18_03_10 ... = "<<OutputInside(inside)<<G4endl ;
+
+
+
 #ifdef NDEBUG
     G4Exception("FAIL: *** Assertions must be compiled in! ***");
@@ -347 +357 @@
 // Check G4Sphere::Inside
 
-    EInside inside = s7.Inside(G4ThreeVector(1399.984667238032,
+    inside = s7.Inside(G4ThreeVector(1399.984667238032,
                                              5.9396696802500299,
                                             -2.7661927818688308)  ) ;
@@ -501 +511 @@
      Dist=sn22.DistanceToOut(G4ThreeVector(-45.,0.,0.),vx,calcNorm,pgoodNorm,pNorm);
      assert(ApproxEqual(Dist,45.));
-     G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl;
-     G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl;
+G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl;
+G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl;
 
      //
@@ -1049 +1059 @@
                            G4double  d,    G4ThreeVector dir,    EInside  exp); 
 
-        G4Sphere SpAroundX("SpAroundX",  10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree );
+  G4Sphere SpAroundX("SpAroundX",  10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree );
 
         G4double  sinOneDeg = std::sin( 1.0 * degree );
@@ -1091 +1101 @@
 
         // Try the edges  
-        G4ThreeVector  NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0); 
+  G4ThreeVector  NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0); 
         G4ThreeVector  PosEdgePt( radOne * std::cos(10.0*degree), radOne * std::sin(10.0*degree), 0.0); 
 

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

@@ -26 +26 @@
 
 // $Id: testG4Sphere2.cc,v 1.6 2007/05/18 10:24:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // G4Sphere Test File

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

@@ -26 +26 @@
 //
 // $Id: testG4Torus.cc,v 1.16 2007/05/18 10:24:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 

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

@@ -26 +26 @@
 //
 // $Id: testG4Trap.cc,v 1.13 2006/06/29 18:46:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 

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

@@ -26 +26 @@
 //
 // $Id: testG4Trd.cc,v 1.10 2006/06/29 18:46:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
  

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

@@ -26 +26 @@
 //
 // $Id: testG4Tubs.cc,v 1.22 2008/11/05 13:56:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //