Changeset 1347 for trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (14 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc (modified) (5 diffs)

trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VIntersectionLocator.cc,v 1.7 2009/11/27 15:21:59 japost Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VIntersectionLocator.cc,v 1.8 2010/07/13 15:59:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Class G4VIntersectionLocator implementation
@@ -83 +83 @@
 
   G4double step_len = CurrentFT.GetCurveLength() - StartFT.GetCurveLength();
-      
+  G4int oldprc;  // cout/cerr precision settings
+
   if( ((stepNo == 0) && (verboseLevel <3)) || (verboseLevel >= 3) )
   {
-    static G4int noPrecision= 4;
-    G4cout.precision(noPrecision);
-    // G4cout.setf(ios_base::fixed,ios_base::floatfield);
+    oldprc = G4cout.precision(4);
     G4cout << std::setw( 6)  << " " 
            << std::setw( 25) << " Current Position  and  Direction" << " "
@@ -100 +99 @@
            << std::setw( 7) << " N_y " << " "
            << std::setw( 7) << " N_z " << " " ;
-    //            << G4endl; 
-    G4cout     // << " >>> "
-           << std::setw( 7) << " Delta|N|" << " "
-      //   << std::setw( 7) << " Delta(N_z) " << " "
+    G4cout << std::setw( 7) << " Delta|N|" << " "
            << std::setw( 9) << "StepLen" << " "  
            << std::setw(12) << "StartSafety" << " "  
            << std::setw( 9) << "PhsStep" << " ";  
-  
     G4cout << G4endl;
+    G4cout.precision(oldprc);
   }
   if((stepNo == 0) && (verboseLevel <=3))
@@ -126 +122 @@
        G4cout << std::setw( 5) << "Start" ;
     }
-    G4cout.precision(8);
+    oldprc = G4cout.precision(8);
     G4cout << std::setw(10) << CurrentFT.GetCurveLength() << " "; 
-    G4cout.precision(8);
     G4cout << std::setw(10) << CurrentPosition.x() << " "
            << std::setw(10) << CurrentPosition.y() << " "
@@ -136 +131 @@
            << std::setw( 7) << CurrentUnitVelocity.y() << " "
            << std::setw( 7) << CurrentUnitVelocity.z() << " ";
-     //  G4cout << G4endl; 
-     //     G4cout << " >>> " ; 
-     G4cout.precision(3); 
-     G4cout << std::setw( 7)
-            << CurrentFT.GetMomentum().mag()- StartFT.GetMomentum().mag()
-            << " "; 
-     //   << std::setw( 7)
-     //   << CurrentUnitVelocity.z() - InitialUnitVelocity.z() << " ";
-     G4cout << std::setw( 9) << step_len << " "; 
-     G4cout << std::setw(12) << safety << " ";
-     if( requestStep != -1.0 )
-     {
-       G4cout << std::setw( 9) << requestStep << " ";
-     }
-     else
-     {
-       G4cout << std::setw( 9) << "Init/NotKnown" << " "; 
-     }
-     G4cout << G4endl;
-   }
-   else // if( verboseLevel > 3 )
-   {
-     //  Multi-line output
+    G4cout.precision(3); 
+    G4cout << std::setw( 7)
+           << CurrentFT.GetMomentum().mag()- StartFT.GetMomentum().mag()
+           << " "; 
+    G4cout << std::setw( 9) << step_len << " "; 
+    G4cout << std::setw(12) << safety << " ";
+    if( requestStep != -1.0 )
+    {
+      G4cout << std::setw( 9) << requestStep << " ";
+    }
+    else
+    {
+      G4cout << std::setw( 9) << "Init/NotKnown" << " "; 
+    }
+    G4cout << G4endl;
+    G4cout.precision(oldprc);
+  }
+  else // if( verboseLevel > 3 )
+  {
+    //  Multi-line output
        
-     G4cout << "Step taken was " << step_len  
-            << " out of PhysicalStep= " <<  requestStep << G4endl;
-     G4cout << "Final safety is: " << safety << G4endl;
-
-     G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
-            << G4endl;
-     G4cout << G4endl; 
-   }
+    G4cout << "Step taken was " << step_len  
+           << " out of PhysicalStep= " <<  requestStep << G4endl;
+    G4cout << "Final safety is: " << safety << G4endl;
+    G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
+           << G4endl;
+    G4cout << G4endl; 
+  }
 }