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

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/tracking/src/G4TrackingManager.cc (modified) (5 diffs)

trunk/source/tracking/src/G4TrackingManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4TrackingManager.cc,v 1.23 2010/07/19 13:41:21 gcosmo Exp $
+// GEANT4 tag $Name: tracking-V09-03-08 $
 //
 //---------------------------------------------------------------
@@ -49 +49 @@
 G4TrackingManager::G4TrackingManager()
 //////////////////////////////////////
-  : fpUserTrackingAction(NULL), fpTrajectory(NULL),
+  : fpUserTrackingAction(0), fpTrajectory(0),
     StoreTrajectory(0), verboseLevel(0), EventIsAborted(false)
 {
@@ -92 +92 @@
   // Pre tracking user intervention process.
   fpTrajectory = 0;
-  if( fpUserTrackingAction != NULL ) {
+  if( fpUserTrackingAction != 0 ) {
      fpUserTrackingAction->PreUserTrackingAction(fpTrack);
   }
@@ -137 +137 @@
 
   // Post tracking user intervention process.
-  if( fpUserTrackingAction != NULL ) {
+  if( fpUserTrackingAction != 0 ) {
      fpUserTrackingAction->PostUserTrackingAction(fpTrack);
   }
@@ -154 +154 @@
 {
 #ifndef G4_STORE_TRAJECTORY
-  G4Exception("G4TrackingManager::SetTrajectory is invoked without G4_STORE_TRAJECTORY compilor option");
+  G4Exception("G4TrackingManager::SetTrajectory()",
+              "Tracking0015", FatalException,
+              "Invoked without G4_STORE_TRAJECTORY option set!");
 #endif
   fpTrajectory = aTrajectory;