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

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/geometry/magneticfield/src/G4UniformMagField.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UniformMagField.cc,v 1.11 2006/06/29 18:24:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4UniformMagField.cc,v 1.12 2010/07/14 10:00:36 gcosmo Exp $
+// GEANT4 tag $Name: field-V09-03-03 $
 //
 //
@@ -56 +56 @@
                                      G4double vPhi    )
 {
-   if(vField >= 0 && 
-      vTheta >= 0 && vTheta <= pi && 
-      vPhi >= 0 && vPhi <= twopi)
-   {
-      fFieldComponents[0] = vField*std::sin(vTheta)*std::cos(vPhi) ;
-      fFieldComponents[1] = vField*std::sin(vTheta)*std::sin(vPhi) ;
-      fFieldComponents[2] = vField*std::cos(vTheta) ;
-   }
-   else
+   if ( (vField<0) || (vTheta<0) || (vTheta>pi) || (vPhi<0) || (vPhi>twopi) )
    {
       G4Exception("G4UniformMagField::G4UniformMagField()",
                   "WrongArgumentValue", FatalException, "Invalid parameters.") ;
    }
+   fFieldComponents[0] = vField*std::sin(vTheta)*std::cos(vPhi) ;
+   fFieldComponents[1] = vField*std::sin(vTheta)*std::sin(vPhi) ;
+   fFieldComponents[2] = vField*std::cos(vTheta) ;
 }