Changeset 921 for trunk/source/geometry/solids/specific

Timestamp:

Feb 16, 2009, 10:14:30 AM (16 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

Location:

trunk/source/geometry/solids/specific

Files:

• History (modified) (2 diffs)
• include/G4EllipticalCone.hh (modified) (2 diffs)
• include/G4EllipticalCone.icc (modified) (2 diffs)
• src/G4ExtrudedSolid.cc (modified) (2 diffs)
• src/G4TriangularFacet.cc (modified) (3 diffs)
• src/G4VFacet.cc (modified) (3 diffs)

trunk/source/geometry/solids/specific/History

@@ -1 @@
-$Id: History,v 1.145 2008/08/12 08:57:31 gcosmo Exp $
+$Id: History,v 1.150 2008/11/21 09:26:53 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+21-Nov-2008, G.Cosmo (geom-specific-V09-01-19)
+- Added missing accessors to G4EllipticalCone, required for detector
+  persistency.
+
+13-Nov-2008, G.Cosmo (geom-specific-V09-01-18)
+- Corrected initialisation of algorithm in G4TriangularFacet constructor.
+
+30-Oct-2008, I.Hrivnacova (geom-specific-V09-01-17)
+- G4ExtrudedSolid: fixed bug in the decomposition of polygonal sides for
+  quadrangular facets in MakeFacets(). Addresses problem report #1029.
+
+23-Sep-2008, T.Nikitina (geom-specific-V09-01-16)
+- Corrected algorithm in G4TriangularFacet::GetPointOnFace() according to
+  suggestion advanced in problem report #1025. Fixes a problem of false
+  overlaps detection related to G4ExtrudedSolid and G4TessellatedSolid.
+
+12-Sep-2008, G.Cosmo (geom-specific-V09-01-15)
+- G4VFacet: corrected increment of indeces in operator==(), following
+  problem report #1024.
 
 25-Jul-2008, I.Hrivnacova (geom-specific-V09-01-14)

trunk/source/geometry/solids/specific/include/G4EllipticalCone.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4EllipticalCone.hh,v 1.11 2007/08/20 15:21:40 tnikitin Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4EllipticalCone.hh,v 1.12 2008/11/21 09:26:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
@@ -96 +96 @@
     //
     inline G4double GetSemiAxisMax () const;
+    inline G4double GetSemiAxisX () const;
+    inline G4double GetSemiAxisY () const;
+    inline G4double GetZMax() const;
     inline G4double GetZTopCut() const;
     inline void SetSemiAxis (G4double x, G4double y, G4double z);

trunk/source/geometry/solids/specific/include/G4EllipticalCone.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4EllipticalCone.icc,v 1.6 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4EllipticalCone.icc,v 1.7 2008/11/21 09:26:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
@@ -43 +43 @@
 {
   return ySemiAxis > xSemiAxis ? ySemiAxis : xSemiAxis;
+}
+
+inline
+G4double G4EllipticalCone::GetSemiAxisX () const
+{
+  return xSemiAxis;
+}
+
+inline
+G4double G4EllipticalCone::GetSemiAxisY () const
+{
+  return ySemiAxis;
+}
+
+inline
+G4double G4EllipticalCone::GetZMax() const
+{
+  return zheight;
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ExtrudedSolid.cc,v 1.17 2008/08/12 08:54:57 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ExtrudedSolid.cc,v 1.18 2008/10/30 11:47:45 ivana Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //
@@ -562 +562 @@
 
     good = AddFacet( new G4QuadrangularFacet( GetVertex(fNz-1, 3), GetVertex(fNz-1, 2), 
-                                              GetVertex(fNz-1, 1), GetVertex(1, 0),
+                                              GetVertex(fNz-1, 1), GetVertex(fNz-1, 0),
                                               ABSOLUTE) );
     if ( ! good ) { return false; }

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

@@ -25 +25 @@
 // ********************************************************************
 //
-// $Id: G4TriangularFacet.cc,v 1.10 2007/12/10 16:30:35 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4TriangularFacet.cc,v 1.12 2008/11/13 08:25:07 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -75 +75 @@
   : G4VFacet()
 {
-  if (!tGeomAlg) { tGeomAlg = G4TessellatedGeometryAlgorithms::GetInstance(); }
+  tGeomAlg  = G4TessellatedGeometryAlgorithms::GetInstance();
   P0        = Pt0;
   nVertices = 3;
@@ -710 +710 @@
 G4ThreeVector G4TriangularFacet::GetPointOnFace() const
 {
-  G4double lambda0 = CLHEP::RandFlat::shoot(0.,1.);
-  G4double lambda1 = CLHEP::RandFlat::shoot(0.,lambda0);
-
+  G4double alpha = CLHEP::RandFlat::shoot(0.,1.);
+  G4double beta = CLHEP::RandFlat::shoot(0.,1);
+  G4double lambda1=alpha*beta;
+  G4double lambda0=alpha-lambda1;
+  
   return (P0 + lambda0*E[0] + lambda1*E[1]);
 }

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

@@ -25 +25 @@
 // ********************************************************************
 //
-// $Id: G4VFacet.cc,v 1.6 2007/08/23 14:45:03 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VFacet.cc,v 1.7 2008/09/12 07:16:22 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -96 +96 @@
     {
       coincident = (GetVertex(i)-right.GetVertex(j)).mag2() < tolerance;
-    } while (!coincident && j++ < nVertices);
-  } while (coincident && i++ < nVertices);
+    } while (!coincident && ++j < nVertices);
+  } while (coincident && ++i < nVertices);
   
   return coincident;
@@ -117 +117 @@
 std::ostream &G4VFacet::StreamInfo(std::ostream &os) const
 {
-  os <<G4endl;
-  os <<"***********************************************************************"
-     <<G4endl;
-  os <<"FACET TYPE       = " <<geometryType <<G4endl;
-  os <<"ABSOLUTE VECTORS = " <<G4endl;
-  os <<"P0               = " <<P0 <<G4endl;
+  os << G4endl;
+  os << "*********************************************************************"
+     << G4endl;
+  os << "FACET TYPE       = " << geometryType << G4endl;
+  os << "ABSOLUTE VECTORS = " << G4endl;
+  os << "P0               = " << P0 << G4endl;
   for (G4ThreeVectorList::const_iterator it=P.begin(); it!=P.end(); it++)
-    os <<"P[" <<it-P.begin()+1 <<"]      = " <<*it <<G4endl;
-    
-  os <<"RELATIVE VECTORS = " <<G4endl;
+    { os << "P[" << it-P.begin()+1 << "]      = " << *it << G4endl; }
+
+  os << "RELATIVE VECTORS = " << G4endl;
   for (G4ThreeVectorList::const_iterator it=E.begin(); it!=E.end(); it++)
-    os <<"E[" <<it-E.begin()+1 <<"]      = " <<*it <<G4endl;
-  
-  os <<"***********************************************************************"
-     <<G4endl;
+    { os << "E[" << it-E.begin()+1 << "]      = " << *it << G4endl; }
+
+  os << "*********************************************************************"
+     << G4endl;
   
   return os;