Changeset 1340 for trunk/source/geometry/magneticfield/include
- Timestamp:
- Nov 5, 2010, 3:45:55 PM (14 years ago)
- Location:
- trunk/source/geometry/magneticfield/include
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4CashKarpRKF45.hh,v 1.1 1 2008/01/11 15:23:54 japostExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4CashKarpRKF45.hh,v 1.12 2010/07/14 10:00:36 gcosmo Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 88 88 private: 89 89 90 // G4int fNumberOfVariables ; // Already kept in G4MagIntegratorStepper91 G4double *ak2, *ak3, *ak4, *ak5, *ak6, *ak7, *yTemp, *yIn;// scratch space90 G4double *ak2, *ak3, *ak4, *ak5, *ak6, *ak7, *yTemp, *yIn; 91 // scratch space 92 92 93 // for DistChord calculations 93 G4double fLastStepLength; 94 G4double *fLastInitialVector, *fLastFinalVector, 95 *fLastDyDx, *fMidVector, *fMidError; 96 // for DistChord calculations 94 97 95 G4double fLastStepLength; 96 G4double *fLastInitialVector, *fLastFinalVector, 97 *fLastDyDx, *fMidVector, *fMidError; 98 G4CashKarpRKF45* fAuxStepper; 98 G4CashKarpRKF45* fAuxStepper; 99 99 100 }; 100 101 -
trunk/source/geometry/magneticfield/include/G4ConstRK4.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4ConstRK4.hh,v 1. 2 2008/10/29 14:17:42 gcosmoExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4ConstRK4.hh,v 1.3 2010/09/10 15:50:17 japost Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 54 54 public: // with description 55 55 56 G4ConstRK4(G4Mag_EqRhs *EquationMotion, G4int numberOfVariables =8);56 G4ConstRK4(G4Mag_EqRhs *EquationMotion, G4int numberOfStateVariables=8); 57 57 ~G4ConstRK4(); 58 58 -
trunk/source/geometry/magneticfield/include/G4EqEMFieldWithEDM.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4EqEMFieldWithEDM.hh,v 1. 1 2009/11/04 23:51:42 gumExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4EqEMFieldWithEDM.hh,v 1.2 2010/07/14 10:00:36 gcosmo Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 78 78 G4double fElectroMagCof ; 79 79 G4double fMassCof; 80 81 80 G4double omegac; 82 81 G4double anomaly; 83 82 G4double eta; 84 G4double ParticleCharge;83 G4double pcharge; 85 84 G4double E; 86 85 G4double gamma; -
trunk/source/geometry/magneticfield/include/G4EqEMFieldWithSpin.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4EqEMFieldWithSpin.hh,v 1. 3 2008/11/14 13:37:09gcosmo Exp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4EqEMFieldWithSpin.hh,v 1.4 2010/07/14 10:00:36 gcosmo Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 73 73 G4double fElectroMagCof ; 74 74 G4double fMassCof; 75 76 75 G4double omegac; 77 76 G4double anomaly; 78 G4double ParticleCharge;77 G4double pcharge; 79 78 G4double E; 80 79 G4double gamma; -
trunk/source/geometry/magneticfield/include/G4ExactHelixStepper.hh
r1337 r1340 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4ExactHelixStepper.hh,v 1. 5 2007/05/18 12:50:31tnikitin Exp $27 // GEANT4 tag $Name: geant4-09-04-beta-01$26 // $Id: G4ExactHelixStepper.hh,v 1.7 2010/07/21 13:45:37 tnikitin Exp $ 27 // GEANT4 tag $Name: field-V09-03-03 $ 28 28 // 29 29 // … … 82 82 83 83 private: 84 G4ThreeVector fBfieldValue; // Initial value of field at last step85 G4ThreeVector yInitialEHS, yFinalEHS;86 G4ThreeVector pInitial;87 G4double fLastStepSize; // Length of last step88 G4double fYInSav[7]; // Starting state of x, p, ...89 // Values saved for calculating mid-point for chord90 84 91 G4Mag_EqRhs* fPtrMagEqOfMot; 85 G4ThreeVector fBfieldValue; 86 // Initial value of field at last step 87 G4Mag_EqRhs* fPtrMagEqOfMot; 92 88 }; 93 89 -
trunk/source/geometry/magneticfield/include/G4MagErrorStepper.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4MagErrorStepper.hh,v 1.1 1 2006/06/29 18:22:50 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4MagErrorStepper.hh,v 1.12 2010/09/10 15:52:53 japost Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 52 52 public: // with description 53 53 54 // G4MagErrorStepper(G4Mag_EqRhs *EqRhs, G4int numberOfVariables); 55 G4MagErrorStepper(G4EquationOfMotion *EqRhs, G4int numberOfVariables); 54 G4MagErrorStepper(G4EquationOfMotion *EqRhs, G4int numberOfVariables, G4int numStateVariables=12); 56 55 virtual ~G4MagErrorStepper(); 57 56 -
trunk/source/geometry/magneticfield/include/G4MagErrorStepper.icc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4MagErrorStepper.icc,v 1.1 3 2006/06/29 18:22:52 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4MagErrorStepper.icc,v 1.14 2010/09/10 15:52:53 japost Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // -------------------------------------------------------------------- … … 32 32 inline 33 33 G4MagErrorStepper::G4MagErrorStepper(G4EquationOfMotion *EquationRhs, 34 G4int numberOfVariables) 35 : G4MagIntegratorStepper(EquationRhs,numberOfVariables) 34 G4int numberOfVariables, 35 G4int numStateVariables) 36 : G4MagIntegratorStepper(EquationRhs,numberOfVariables,numStateVariables) 36 37 { 37 38 G4int nvar = std::max(this->GetNumberOfVariables(), 8); -
trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4MagIntegratorDriver.hh,v 1.2 0 2007/05/10 10:10:05 japostExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4MagIntegratorDriver.hh,v 1.21 2010/07/14 10:00:36 gcosmo Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 241 241 G4int fNoTotalSteps, fNoBadSteps, fNoSmallSteps, fNoInitialSmallSteps; 242 242 G4double fDyerr_max, fDyerr_mx2; 243 G4double fDyerrPos_smTot, fDyerr Vel_smTot, fDyerrPos_lgTot, fDyerrVel_lgTot;244 G4double fSumH_sm, 243 G4double fDyerrPos_smTot, fDyerrPos_lgTot, fDyerrVel_lgTot; 244 G4double fSumH_sm, fSumH_lg; 245 245 // Step Statistics 246 246 -
trunk/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4Mag_SpinEqRhs.hh,v 1.1 1 2006/06/29 18:23:09 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: G4Mag_SpinEqRhs.hh,v 1.12 2010/07/14 10:00:36 gcosmo Exp $ 28 // GEANT4 tag $Name: field-V09-03-03 $ 29 29 // 30 30 // … … 75 75 G4double omegac; 76 76 G4double anomaly; 77 G4double ParticleCharge; 78 77 G4double pcharge; 79 78 G4double E; 80 79 G4double gamma; -
trunk/source/geometry/magneticfield/include/G4NystromRK4.hh
r1337 r1340 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4NystromRK4.hh,v 1. 3 2009/11/12 15:01:36 japostExp $27 // GEANT4 tag $Name: geant4-09-04-beta-01$26 // $Id: G4NystromRK4.hh,v 1.4 2010/07/14 10:00:36 gcosmo Exp $ 27 // GEANT4 tag $Name: field-V09-03-03 $ 28 28 // 29 29 // class G4NystromRK4 … … 123 123 G4double dz = P[2]-m_fldPosition[2]; 124 124 125 if((dx*dx+dy*dy+dz*dz) > m_magdistance2) {126 125 if((dx*dx+dy*dy+dz*dz) > m_magdistance2) 126 { 127 127 m_fldPosition[0] = P[0]; 128 128 m_fldPosition[1] = P[1]; -
trunk/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
r1337 r1340 26 26 // 27 27 // 28 // $Id: G4RKG3_Stepper.hh,v 1.1 3 2007/05/18 12:44:02tnikitin Exp $29 // GEANT4 tag $Name: geant4-09-04-beta-01$28 // $Id: G4RKG3_Stepper.hh,v 1.14 2010/07/23 14:13:09 tnikitin Exp $ 29 // GEANT4 tag $Name: field-V09-03-03 $ 30 30 // 31 31 // … … 69 69 G4double DistChord() const ; 70 70 71 void StepNoErr( const G4double tIn[ 7],72 const G4double dydx[ 7],71 void StepNoErr( const G4double tIn[8], 72 const G4double dydx[6], 73 73 G4double Step, 74 G4double tOut[ 7],74 G4double tOut[8], 75 75 G4double B[3] ); 76 76 // Integrator RK Stepper from G3 with only two field evaluation per … … 79 79 // B[3] is magnetic field which is passed from substep to substep. 80 80 81 void StepWithEst( const G4double tIn[ 7],82 const G4double dydx[ 7],81 void StepWithEst( const G4double tIn[8], 82 const G4double dydx[6], 83 83 G4double Step, 84 G4double tOut[ 7],84 G4double tOut[8], 85 85 G4double& alpha2, 86 86 G4double& beta2,
Note: See TracChangeset
for help on using the changeset viewer.