Changeset 1340 for trunk/source/geometry/magneticfield/src/G4NystromRK4.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/geometry/magneticfield/src/G4NystromRK4.cc (modified) (3 diffs)

trunk/source/geometry/magneticfield/src/G4NystromRK4.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4NystromRK4.cc,v 1.6 2009/12/16 17:49:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4NystromRK4.cc,v 1.9 2010/09/10 15:42:09 japost Exp $
+// GEANT4 tag $Name: field-V09-03-03 $
 //
 // History:
@@ -49 +49 @@
     m_cachedMom( false )
 {
-  m_fldPosition[0]  = m_iPoint[1] = m_fPoint[2] = 9.9999999e+99 ;
-  m_fldPosition[1]  = m_iPoint[1] = m_fPoint[2] = 9.9999999e+99 ;
-  m_fldPosition[2]  = m_iPoint[1] = m_fPoint[2] = 9.9999999e+99 ;
+  m_fldPosition[0]  = m_iPoint[0] = m_fPoint[0] = m_mPoint[0] = 9.9999999e+99 ;
+  m_fldPosition[1]  = m_iPoint[1] = m_fPoint[1] = m_mPoint[1] = 9.9999999e+99 ;
+  m_fldPosition[2]  = m_iPoint[2] = m_fPoint[2] = m_mPoint[2] = 9.9999999e+99 ;
   m_fldPosition[3]  = -9.9999999e+99;
+  m_lastField[0] = m_lastField[1] = m_lastField[2] = 0.0;
 
   m_magdistance2 = distanceConstField*distanceConstField;
@@ -196 +197 @@
 G4NystromRK4::ComputeRightHandSide(const G4double P[],G4double dPdS[])
 {
-  getField(P);
+  G4double P4vec[4]= { P[0], P[1], P[2], P[7] }; // Time is P[7]
+  getField(P4vec);
   m_mom   = std::sqrt(P[3]*P[3]+P[4]*P[4]+P[5]*P[5])     ; 
   m_imom  = 1./m_mom                                ;