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

Import Geant4 10.5.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/navigation/include/G4Navigator.icc
+12 -17
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Navigator.icc 73164 2013-08-21 08:55:28Z gcosmo $
// $Id: G4Navigator.icc 110048 2018-05-15 06:28:03Z gcosmo $
//
//
// class G4Navigator Inline implementation
@@ -52,8 +52,7 @@ G4ThreeVector G4Navigator::GetCurrentLocalCoordinate() const
inline
G4ThreeVector G4Navigator::ComputeLocalAxis(const G4ThreeVector& pVec) const
{
return (fHistory.GetTopTransform().IsRotated())
? fHistory.GetTopTransform().TransformAxis(pVec) : pVec ;
return fHistory.GetTopTransform().TransformAxis(pVec);
}
// ********************************************************************
@@ -66,7 +65,7 @@ inline
G4ThreeVector
G4Navigator::ComputeLocalPoint(const G4ThreeVector& pGlobalPoint) const
{
return ( fHistory.GetTopTransform().TransformPoint(pGlobalPoint) ) ;
return fHistory.GetTopTransform().TransformPoint(pGlobalPoint);
}
// ********************************************************************
@@ -193,9 +192,7 @@ const G4AffineTransform& G4Navigator::GetGlobalToLocalTransform() const
inline
const G4AffineTransform G4Navigator::GetLocalToGlobalTransform() const
{
G4AffineTransform tempTransform;
tempTransform = fHistory.GetTopTransform().Inverse();
return tempTransform;
return fHistory.GetTopTransform().Inverse();
}
// ********************************************************************
@@ -207,8 +204,7 @@ const G4AffineTransform G4Navigator::GetLocalToGlobalTransform() const
inline
G4ThreeVector G4Navigator::NetTranslation() const
{
G4AffineTransform tf(fHistory.GetTopTransform().Inverse());
return tf.NetTranslation();
return fHistory.GetTopTransform().InverseNetTranslation();
}
// ********************************************************************
@@ -220,8 +216,7 @@ G4ThreeVector G4Navigator::NetTranslation() const
inline
G4RotationMatrix G4Navigator::NetRotation() const
{
G4AffineTransform tf(fHistory.GetTopTransform().Inverse());
return tf.NetRotation();
return fHistory.GetTopTransform().InverseNetRotation();
}
// ********************************************************************
@@ -233,10 +228,10 @@ G4RotationMatrix G4Navigator::NetRotation() const
inline
G4GRSVolume* G4Navigator::CreateGRSVolume() const
{
G4AffineTransform tf(fHistory.GetTopTransform().Inverse());
const G4AffineTransform& tf = fHistory.GetTopTransform();
return new G4GRSVolume(fHistory.GetTopVolume(),
tf.NetRotation(),
tf.NetTranslation());
tf.InverseNetRotation(),
tf.InverseNetTranslation());
}
// ********************************************************************
@@ -248,10 +243,10 @@ G4GRSVolume* G4Navigator::CreateGRSVolume() const
inline
G4GRSSolid* G4Navigator::CreateGRSSolid() const
{
G4AffineTransform tf(fHistory.GetTopTransform().Inverse());
const G4AffineTransform& tf = fHistory.GetTopTransform();
return new G4GRSSolid(fHistory.GetTopVolume()->GetLogicalVolume()->GetSolid(),
tf.NetRotation(),
tf.NetTranslation());
tf.InverseNetRotation(),
tf.InverseNetTranslation());
}
// ********************************************************************
source/geometry/navigation/include/G4PathFinder.hh
+1 -1
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PathFinder.hh 110067 2018-05-15 09:20:12Z gcosmo $
// $Id: G4PathFinder.hh 109355 2018-04-12 08:08:58Z gcosmo $
//
// class G4PathFinder
//
source/geometry/navigation/include/G4PropagatorInField.hh
+8 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PropagatorInField.hh 90009 2015-05-08 07:42:39Z gcosmo $
// $Id: G4PropagatorInField.hh 110728 2018-06-11 06:12:39Z gcosmo $
//
//
// Class G4PropagatorInField
@@ -199,9 +199,13 @@ class G4PropagatorInField
G4double stepTrial,
const G4FieldTrack& aFieldTrack);
void ReportLoopingParticle( G4int count, double StepTaken, G4VPhysicalVolume* pPhysVol);
void ReportStuckParticle( G4int noZeroSteps, G4double proposedStep, G4double lastTriedStep,
G4VPhysicalVolume* physVol );
void ReportLoopingParticle( G4int count, G4double StepTaken,
G4double stepRequest, const char* methodName,
G4ThreeVector momentumVec,
G4VPhysicalVolume* physVol);
void ReportStuckParticle( G4int noZeroSteps, G4double proposedStep,
G4double lastTriedStep, G4VPhysicalVolume* physVol);
private:
// ----------------------------------------------------------------------
// DATA Members
source/geometry/navigation/include/G4ReplicaNavigation.icc
+9 -6
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ReplicaNavigation.icc 66356 2012-12-18 09:02:32Z gcosmo $
// $Id: G4ReplicaNavigation.icc 110766 2018-06-13 07:34:39Z gcosmo $
//
//
// class G4ReplicaNavigation Inline implementation
@@ -93,11 +93,14 @@ G4ReplicaNavigation::VoxelLocate( const G4SmartVoxelHeader* pHead,
{
#ifdef G4DEBUG_NAVIGATION
G4cerr << " WARNING: assert in G4ReplicaNavigation::VoxelLocate "
<< " has failed : " << G4endl
<< " (targetNodeNo>=0&&targetNodeNo<targetHeaderNoSlices) "
<< " targetNodeNo= " << targetNodeNo
<< " Number of Slices = " << targetHeaderNoSlices << G4endl;
std::ostringstream message;
message << "Voxel location failed:" << G4endl
<< " (targetNodeNo>=0&&targetNodeNo<targetHeaderNoSlices) "
<< G4endl
<< " - targetNodeNo= " << targetNodeNo << G4endl
<< " - Number of Slices = " << targetHeaderNoSlices;
G4Exception("G4ReplicaNavigation::VoxelLocate()",
"GeomNav1002", JustWarning, message);
#endif
// In the case of rotational symmetry and an extent over the
// whole 360 degrees, the above is not true and you can go from