lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.4.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-03-02 09:34:30 +01:00
parent fc6af9e721
commit fe04dcb406
341 changed files with 18389 additions and 24522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/CSG/History
+8 -1
View File
@@ -1,4 +1,4 @@
$Id: History 107555 2017-11-22 15:26:59Z gcosmo $
$Id: History 108482 2018-02-15 14:34:23Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,13 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
February 5, 2018 G.Cosmo geom-csg-V10-03-39
- Correction in G4UPara::ComputeDimensions() to add explicit cast for the
solid type to parameterise.
December 11, 2017 E.Tcherniaev
- Fixed typo in G4Trd::GetPointOnSurface() for the area settings.
November 22, 2017 G.Cosmo geom-csg-V10-03-38
- Fix in SurfaceNormal() for G4Trap, G4Para, G4Trd to assure explicit
counting of the surfaces where the point is placed on edges.
source/geometry/solids/CSG/src/G4Trd.cc
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Trd.cc 107555 2017-11-22 15:26:59Z gcosmo $
// $Id: G4Trd.cc 108482 2018-02-15 14:34:23Z gcosmo $
//
//
// Implementation for G4Trd class
@@ -748,8 +748,8 @@ G4ThreeVector G4Trd::GetPointOnSurface() const
// Set areas
//
G4double syz = (fDy1 + fDy2)*std::hypot(fDx1 - fDx2, 2*fDz);
G4double sxz = (fDx1 + fDx2)*std::hypot(fDy1 - fDy2, 2*fDz);
G4double sxz = (fDy1 + fDy2)*std::hypot(fDx1 - fDx2, 2*fDz);
G4double syz = (fDx1 + fDx2)*std::hypot(fDy1 - fDy2, 2*fDz);
G4double sface[6] = { 4*fDx1*fDy1, syz, syz, sxz, sxz, 4*fDx2*fDy2 };
for (G4int i=1; i<6; ++i) { sface[i] += sface[i-1]; }
source/geometry/solids/CSG/src/G4UPara.cc
+1 -1
View File
@@ -342,7 +342,7 @@ void G4UPara::ComputeDimensions( G4VPVParameterisation* p,
const G4int n,
const G4VPhysicalVolume* pRep )
{
p->ComputeDimensions(*this,n,pRep);
p->ComputeDimensions(*(G4Para*)this,n,pRep);
}
//////////////////////////////////////////////////////////////////////////
source/geometry/solids/specific/History
+8 -1
View File
@@ -1,4 +1,4 @@
$Id: History 107558 2017-11-22 15:29:33Z gcosmo $
$Id: History 108484 2018-02-15 14:38:03Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,13 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
13-December-2017 E.Tcherniaev (geom-specific-V10-03-26)
- Removed redundant data initialistion in G4ExtrudedSolid constructors.
11-December-2017 E.Tcherniaev
- Added missing initialisation of two data-members in copy-ctor and
assignment operator of G4ExtrudedSolid. Addressing problem report #2016.
22-November-2017 G.Cosmo (geom-specific-V10-03-25)
- Fix in SurfaceNormal() for G4ExtrudedSolid to assure explicit
counting of the surfaces where the point is placed on edg
source/geometry/solids/specific/src/G4ExtrudedSolid.cc
+5 -10
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ExtrudedSolid.cc 107558 2017-11-22 15:29:33Z gcosmo $
// $Id: G4ExtrudedSolid.cc 108484 2018-02-15 14:38:03Z gcosmo $
//
//
// --------------------------------------------------------------------
@@ -77,9 +77,6 @@ G4ExtrudedSolid::G4ExtrudedSolid( const G4String& pName,
: G4TessellatedSolid(pName),
fNv(polygon.size()),
fNz(zsections.size()),
fPolygon(),
fZSections(),
fTriangles(),
fIsConvex(false),
fGeometryType("G4ExtrudedSolid"),
fSolidType(0)
@@ -205,9 +202,6 @@ G4ExtrudedSolid::G4ExtrudedSolid( const G4String& pName,
: G4TessellatedSolid(pName),
fNv(polygon.size()),
fNz(2),
fPolygon(),
fZSections(),
fTriangles(),
fIsConvex(false),
fGeometryType("G4ExtrudedSolid"),
fSolidType(0)
@@ -297,9 +291,8 @@ G4ExtrudedSolid::G4ExtrudedSolid( const G4String& pName,
//_____________________________________________________________________________
G4ExtrudedSolid::G4ExtrudedSolid( __void__& a )
: G4TessellatedSolid(a), fNv(0), fNz(0), fPolygon(), fZSections(),
fTriangles(), fIsConvex(false), fGeometryType("G4ExtrudedSolid"),
fSolidType(0)
: G4TessellatedSolid(a), fNv(0), fNz(0), fIsConvex(false),
fGeometryType("G4ExtrudedSolid"), fSolidType(0)
{
// Fake default constructor - sets only member data and allocates memory
// for usage restricted to object persistency.
@@ -313,6 +306,7 @@ G4ExtrudedSolid::G4ExtrudedSolid(const G4ExtrudedSolid& rhs)
fTriangles(rhs.fTriangles), fIsConvex(rhs.fIsConvex),
fGeometryType(rhs.fGeometryType),
fSolidType(rhs.fSolidType), fPlanes(rhs.fPlanes),
fLines(rhs.fLines), fLengths(rhs.fLengths),
fKScales(rhs.fKScales), fScale0s(rhs.fScale0s),
fKOffsets(rhs.fKOffsets), fOffset0s(rhs.fOffset0s)
{
@@ -337,6 +331,7 @@ G4ExtrudedSolid& G4ExtrudedSolid::operator = (const G4ExtrudedSolid& rhs)
fTriangles = rhs.fTriangles; fIsConvex = rhs.fIsConvex;
fGeometryType = rhs.fGeometryType;
fSolidType = rhs.fSolidType; fPlanes = rhs.fPlanes;
fLines = rhs.fLines; fLengths = rhs.fLengths;
fKScales = rhs.fKScales; fScale0s = rhs.fScale0s;
fKOffsets = rhs.fKOffsets; fOffset0s = rhs.fOffset0s;