Changeset 1340 for trunk/source/tracking/src/G4SteppingManager.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/tracking/src/G4SteppingManager.cc (modified) (6 diffs)

trunk/source/tracking/src/G4SteppingManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SteppingManager.cc,v 1.50 2009/02/27 08:09:50 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4SteppingManager.cc,v 1.51 2010/07/19 13:41:21 gcosmo Exp $
+// GEANT4 tag $Name: tracking-V09-03-08 $
 //
 //---------------------------------------------------------------
@@ -57 +57 @@
 G4SteppingManager::G4SteppingManager()
 //////////////////////////////////////
-  : fUserSteppingAction(NULL), verboseLevel(0)
+  : fUserSteppingAction(0), verboseLevel(0)
 {
 
@@ -241 +241 @@
 
 // User intervention process.
-   if( fUserSteppingAction != NULL ) {
+   if( fUserSteppingAction != 0 ) {
       fUserSteppingAction->UserSteppingAction(fStep);
    }
@@ -262 +262 @@
    PreStepPointIsGeom = false;
    FirstStep = true;
-   fParticleChange = NULL;
+   fParticleChange = 0;
    fPreviousStepSize = 0.;
    fStepStatus = fUndefined;
@@ -335 +335 @@
        if(fTrack->GetParentID()==0)
        {
-        G4cerr << "Primary particle starting at "
-               << fTrack->GetPosition()
-               << " is outside of the world volume." << G4endl;
-        G4Exception("G4SteppingManager::Primary vertex outside of the world");
+         G4cerr << "ERROR - G4SteppingManager::SetInitialStep()" << G4endl
+                << "        Primary particle starting at - "
+                << fTrack->GetPosition()
+                << " - is outside of the world volume." << G4endl;
+         G4Exception("G4SteppingManager::SetInitialStep()", "Tracking0010",
+                     FatalException, "Primary vertex outside of the world!");
        }
 
        fTrack->SetTrackStatus( fStopAndKill );
-       G4cerr << "G4SteppingManager::SetInitialStep(): warning: "
-              << "initial track position is outside world! "
+       G4cout << "WARNING - G4SteppingManager::SetInitialStep()" << G4endl
+              << "          Initial track position is outside world! - "
               << fTrack->GetPosition() << G4endl;
    }
@@ -352 +354 @@
 #ifdef G4VERBOSE
                          // !!!!! Verbose
-           if(verboseLevel>0) fVerbose->TrackingStarted();
+   if(verboseLevel>0) fVerbose->TrackingStarted();
 #endif
 }