Changeset 921 for trunk/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc

Timestamp:

Feb 16, 2009, 10:14:30 AM (16 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Mag_SpinEqRhs.cc,v 1.12 2006/06/29 18:24:39 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4Mag_SpinEqRhs.cc,v 1.13 2008/11/21 21:18:26 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // This is the standard right-hand side for equation of motion.
@@ -45 +45 @@
   : G4Mag_EqRhs( MagField ) 
 {
-   anomaly = 1.165923e-3;
+   anomaly = 0.0011659208;
 }
 
@@ -53 +53 @@
 G4Mag_SpinEqRhs::SetChargeMomentumMass(G4double particleCharge, // in e+ units
                                        G4double MomentumXc,
-                                       G4double mass)
+                                       G4double particleMass)
 {
    //  To set fCof_val 
-   G4Mag_EqRhs::SetChargeMomentumMass(particleCharge, MomentumXc, mass);
+   G4Mag_EqRhs::SetChargeMomentumMass(particleCharge, MomentumXc, particleMass);
 
-   omegac = 0.105658387*GeV/mass * 2.837374841e-3*(rad/cm/kilogauss);
+   omegac = 0.105658387*GeV/particleMass * 2.837374841e-3*(rad/cm/kilogauss);
 
    ParticleCharge = particleCharge;
 
-   E = std::sqrt(sqr(MomentumXc)+sqr(mass));
+   E = std::sqrt(sqr(MomentumXc)+sqr(particleMass));
    beta  = MomentumXc/E;
-   gamma = E/mass;
+   gamma = E/particleMass;
 
 }
@@ -96 +96 @@
 
    G4ThreeVector Spin(y[9],y[10],y[11]);
+
+   if (Spin.mag() > 0.) Spin = Spin.unit();
+
    G4ThreeVector dSpin;