Changeset 1315 for trunk/source/geometry/magneticfield/src

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4MagIntegratorDriver.cc,v 1.56 2009/11/12 18:41:03 japost Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4MagIntegratorDriver.cc,v 1.53 2009/11/05 22:31:43 japost Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -208 +208 @@
 
 #ifdef G4DEBUG_FIELD
-    G4double xSubStepStart= x; 
     for (i=0;i<nvar;i++)  { ySubStepStart[i] = y[i]; }
     yFldTrkStart.LoadFromArray(y, fNoIntegrationVariables);
@@ -228 +227 @@
       lastStepSucceeded= (hdid == h);   
 #ifdef G4DEBUG_FIELD
-      if (dbg>2) {
-        PrintStatus( ySubStepStart, xSubStepStart, y, x, h,  nstp); // Only
+      if (dbg>2)
+      {
+        PrintStatus( ySubStepStart, xSubStart, y, x, h,  nstp); // Only
       }
 #endif
@@ -291 +291 @@
     {
       if( nstp==nStpPr )  { G4cout << "***** Many steps ****" << G4endl; }
-      G4cout << "MagIntDrv: " ; 
       G4cout << "hdid="  << std::setw(12) << hdid  << " "
-             << "hnext=" << std::setw(12) << hnext << " " 
-             << "hstep=" << std::setw(12) << hstep << " (requested) " 
-             << G4endl;
+             << "hnext=" << std::setw(12) << hnext << " " << G4endl;
       PrintStatus( ystart, x1, y, x, h, (nstp==nStpPr) ? -nstp: nstp); 
     }
@@ -372 +369 @@
         lastStep = true;
 #ifdef G4DEBUG_FIELD
-        if (dbg>2)
+        if (dbg)
         {
-          int prec= G4cout.precision(12); 
           G4cout << "Warning: G4MagIntegratorDriver::AccurateAdvance"
                  << G4endl
                  << "  Integration step 'h' became "
-                 << h << " due to roundoff. " << G4endl
-                 << " Calculated as difference of x2= "<< x2 << " and x=" << x
+                 << h << " due to roundoff " << G4endl
                  << "  Forcing termination of advance." << G4endl;
-          G4cout.precision(prec);
         }          
 #endif
@@ -587 +581 @@
                  /  ( sqr(y[9]) + sqr(y[10]) + sqr(y[11]) );
       errspin_sq *= inv_eps_vel_sq;
-      errmax_sq = std::max( errmax_sq, errspin_sq ); 
-   }
+    }
 
     if ( errmax_sq <= 1.0 )  { break; } // Step succeeded.