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

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/navigation/include/G4PropagatorInField.icc
+7 -26
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PropagatorInField.icc 90009 2015-05-08 07:42:39Z gcosmo $
// $Id: G4PropagatorInField.icc 107114 2017-11-02 14:54:05Z gcosmo $
//
//
// ------------------------------------------------------------------------
@@ -305,31 +305,12 @@ G4bool G4PropagatorInField::IntersectChord( const G4ThreeVector& StartPointA,
return retVal;
}
inline G4EquationOfMotion* G4PropagatorInField::GetCurrentEquationOfMotion()
inline G4EquationOfMotion* G4PropagatorInField::GetCurrentEquationOfMotion()
{
G4EquationOfMotion* equationOfMotion = 0;
// equationOfMotion =
// (fFieldPropagator->GetChordFinder()->GetIntegrationDriver()->GetStepper())
// ->GetEquationOfMotion();
// Consolidate into auxiliary method G4EquationOfMotion* GetEquationOfMotion()
G4MagIntegratorStepper* pStepper= 0;
G4ChordFinder* pChordFinder= this->GetChordFinder();
if( pChordFinder )
{
G4MagInt_Driver* pIntDriver= 0;
pIntDriver= pChordFinder->GetIntegrationDriver();
if( pIntDriver )
{
pStepper= pIntDriver->GetStepper();
}
if( pStepper )
{
equationOfMotion= pStepper->GetEquationOfMotion();
}
if(auto pChordFinder = GetChordFinder()) {
if(auto pIntDriver = pChordFinder->GetIntegrationDriver()) {
return pIntDriver->GetEquationOfMotion();
}
}
return equationOfMotion;
return nullptr;
}