Import Geant4 11.3.0 source tree
This commit is contained in:
@@ -75,8 +75,8 @@ class G4DormandPrince745 : public G4MagIntegratorStepper
|
||||
|
||||
G4int IntegratorOrder() const override { return 4; }
|
||||
|
||||
const G4String& StepperType() const { return gStepperType; }
|
||||
const G4String& StepperDescription() const { return gStepperDescription; }
|
||||
const G4String& StepperType() const;
|
||||
const G4String& StepperDescription() const;
|
||||
|
||||
const field_utils::State& GetYOut() const { return fyOut; }
|
||||
|
||||
@@ -89,11 +89,6 @@ class G4DormandPrince745 : public G4MagIntegratorStepper
|
||||
|
||||
private:
|
||||
|
||||
static const G4String gStepperType;
|
||||
static const G4String gStepperDescription;
|
||||
// Name and description of this steppers
|
||||
// plus details of its implementation
|
||||
|
||||
field_utils::State ak2, ak3, ak4, ak5, ak6, ak7, ak8, ak9;
|
||||
field_utils::State fyIn, fyOut, fdydxIn;
|
||||
|
||||
|
||||
@@ -57,20 +57,19 @@ enum G4FieldType
|
||||
/// in Geant4
|
||||
enum G4EquationType
|
||||
{
|
||||
kMagUsualEqRhs, ///< G4Mag_UsualEqRhs: the standard right-hand side for
|
||||
///< equation
|
||||
/// of motion.
|
||||
kMagSpinEqRhs, ///< G4Mag_SpinEqRhs: the equation of motion for a particle
|
||||
kEqMagnetic, ///< G4Mag_UsualEqRhs: the standard right-hand side for
|
||||
///< equation of motion.
|
||||
kEqMagneticWithSpin,///< G4Mag_SpinEqRhs: the equation of motion for a particle
|
||||
///< with spin
|
||||
/// in a pure magnetic field
|
||||
kEqMagElectric, ///< G4EqMagElectricField: Equation of motion in a combined
|
||||
/// electric and magnetic field
|
||||
kEqEMFieldWithSpin, ///< G4EqEMFieldWithSpin: Equation of motion for a
|
||||
///< in a pure magnetic field
|
||||
kEqElectroMagnetic, ///< G4EqMagElectricField: Equation of motion in a combined
|
||||
///< electric and magnetic field
|
||||
kEqEMfieldWithSpin, ///< G4EqEMFieldWithSpin: Equation of motion for a
|
||||
///< particle with spin
|
||||
/// in a combined electric and magnetic field
|
||||
kEqEMFieldWithEDM, ///< G4EqEMFieldWithEDM: Equation of motion in a combined
|
||||
/// electric and magnetic field, with spin tracking for
|
||||
/// both MDM and EDM terms
|
||||
///< in a combined electric and magnetic field
|
||||
kEqEMfieldWithEDM, ///< G4EqEMFieldWithEDM: Equation of motion in a combined
|
||||
///< electric and magnetic field, with spin tracking for
|
||||
///< both MDM and EDM terms
|
||||
kUserEquation ///< User defined equation of motion
|
||||
};
|
||||
|
||||
@@ -259,7 +258,7 @@ class G4FieldParameters
|
||||
G4FieldType fField = kMagnetic;
|
||||
|
||||
/// Type of equation of motion of a particle in a field
|
||||
G4EquationType fEquation = kMagUsualEqRhs;
|
||||
G4EquationType fEquation = kEqMagnetic;
|
||||
|
||||
/// Type of integrator of particle's equation of motion
|
||||
G4StepperType fStepper = kDormandPrince745;
|
||||
|
||||
@@ -55,8 +55,8 @@ class G4UIcmdWithABool;
|
||||
/// - /field/fieldType fieldType \n
|
||||
/// fieldType = Magnetic | ElectroMagnetic | Gravity
|
||||
/// - /field/equationType eqType \n
|
||||
/// eqType = MagUsualEqRhs | MagSpinEqRhs | EqMagElectric |
|
||||
/// EMFieldWithSpin | EqEMFieldWithEDM
|
||||
/// eqType = EqMagnetic | EqMagneticWithSpin | EqElectroMagnetic |
|
||||
/// EqEMfieldWithSpin | EqEMfieldWithEDM
|
||||
/// - /field/stepperType stepperType \n
|
||||
/// stepperType = CashKarpRKF45 | ClassicalRK4 | ExplicitEuler | ImplicitEuler |
|
||||
/// SimpleHeum | SimpleRunge | ConstRK4 | ExactHelixStepper
|
||||
|
||||
Reference in New Issue
Block a user