Import Geant4 10.4.1 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 107408 2017-11-10 13:35:09Z gcosmo $
|
||||
$Id: History 108480 2018-02-15 14:28:27Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,7 +17,11 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
November 10, P.Arce (geommng-V10-03-22)
|
||||
December 19, 2017 G.Cosmo (geommng-V10-03-23)
|
||||
- Fixed self-consistency in G4VVolumeMaterialScanner header (missing #include).
|
||||
Thanks to Raphael Isemann for reporting this.
|
||||
|
||||
November 10, 2017 P.Arce (geommng-V10-03-22)
|
||||
- Bug report 2011: precision correction in G4ErrorPlaneSurfaceTarget.cc
|
||||
|
||||
October 16, 2017 G.Cosmo geommng-V10-03-21
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VVolumeMaterialScanner.hh 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
// $Id: G4VVolumeMaterialScanner.hh 108480 2018-02-15 14:28:27Z gcosmo $
|
||||
//
|
||||
// class G4VVolumeMaterialScanner
|
||||
//
|
||||
@@ -39,6 +39,8 @@
|
||||
#ifndef G4VVOLUMEMATERIALSCANNER_HH
|
||||
#define G4VVOLUMEMATERIALSCANNER_HH
|
||||
|
||||
#include "G4Types.hh"
|
||||
|
||||
class G4Material;
|
||||
|
||||
class G4VVolumeMaterialScanner
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
$Id: History 107606 2017-11-27 09:39:04Z gcosmo $
|
||||
$Id: History 108664 2018-02-27 07:20:25Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,13 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
February 26, 2018 - J.Apostolakis (geomnav-V10-03-10)
|
||||
---------------------------------
|
||||
- Fix for momentum value in G4PathFinder::SetChargeMomentumMass
|
||||
Was passing magnitude square, instead of magnitude.
|
||||
Corrects bug report 2037.
|
||||
Thanks to Renee Fatemi (Univ. of Kentucky, mu-to-e experim.)
|
||||
|
||||
November 23, 2017 - J.Apostolakis (geomnav-V10-03-09)
|
||||
---------------------------------
|
||||
- Fix in G4PathFinder to cope with zero proposed step.
|
||||
@@ -50,7 +57,7 @@ August 25, 2017 - J.Apostolakis (geomnav-V10-03-05)
|
||||
|
||||
March 22, 2017 - G.Cosmo (geomnav-V10-03-04)
|
||||
------------------------
|
||||
- Avoid eletion of field-manager pointer in destructor of
|
||||
- Avoid deletion of field-manager pointer in destructor of
|
||||
G4TransportationManager, as it is being deleted by G4FieldManagerStore.
|
||||
|
||||
March 21, 2017 - G.Cosmo (geomnav-V10-03-03, 02, 01)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PathFinder.cc 107606 2017-11-27 09:39:04Z gcosmo $
|
||||
// $Id: G4PathFinder.cc 108664 2018-02-27 07:20:25Z gcosmo $
|
||||
// GEANT4 tag $ Name: $
|
||||
//
|
||||
// class G4PathFinder Implementation
|
||||
@@ -1177,7 +1177,7 @@ G4PathFinder::DoNextCurvedStep( const G4FieldTrack &initialState,
|
||||
fpFieldPropagator->GetCurrentEquationOfMotion();
|
||||
|
||||
equationOfMotion->SetChargeMomentumMass( *(initialState.GetChargeState()),
|
||||
initialState.GetMomentum().mag2(),
|
||||
initialState.GetMomentum().mag(),
|
||||
initialState.GetRestMass() );
|
||||
|
||||
#ifdef G4DEBUG_PATHFINDER
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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]; }
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user