Changeset 1340 for trunk/source/tracking


Ignore:
Timestamp:
Nov 5, 2010, 3:45:55 PM (14 years ago)
Author:
garnier
Message:

update ti head

Location:
trunk/source/tracking
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/tracking/CVS/Entries

    r1337 r1340  
    11D/include////
    22D/src////
    3 /GNUmakefile/1.5/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    4 /History/1.142/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
     3/CMakeLists.txt/1.1/Wed Sep 29 19:11:07 2010//Ttracking-V09-03-08
     4/GNUmakefile/1.7/Fri Nov  5 10:48:43 2010//Ttracking-V09-03-08
     5/sources.cmake/1.1/Wed Sep 29 19:11:16 2010//Ttracking-V09-03-08
     6/History/1.146/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08

  • trunk/source/tracking/CVS/Tag

    r1331 r1340  
    1 Ngeant4-09-04-beta-01
     1Ntracking-V09-03-08

  • trunk/source/tracking/GNUmakefile

    r827 r1340  
    1 # $Id: GNUmakefile,v 1.5 2004/06/11 14:30:16 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.7 2010/10/27 07:57:21 gcosmo Exp $
    22# ----------------------------------------------------------
    33# GNUmakefile for tracking library.  Katsuya Amako, 5/9/95.

  • trunk/source/tracking/History

    r1337 r1340  
    1 $Id: History,v 1.142 2010/06/16 20:03:00 allison Exp $
    2 $Name: geant4-09-04-beta-01 $
     1$Id: History,v 1.146 2010/10/27 07:57:21 gcosmo Exp $
     2$Name: tracking-V09-03-08 $
    33-------------------------------------------------------------------
    44
    … …  
    1818     * Reverse chronological order (last date on top), please *
    1919     ----------------------------------------------------------
     20
     2127 October 2010 Gabriele Cosmo (tracking-V09-03-08)
     22- Restored DLL setup as originally. Withdrawn changes in last tag.
     23
     2419 October 2010 Gabriele Cosmo (tracking-V09-03-07)
     25- Replaced G4TRACKING_ALLOC_EXPORT flag with G4ALLOC_EXPORT for DLL exported
     26  symbols.
     27
     286 October 2010 Hisaya Kurashige (tracking-V09-03-06)
     29- Modified G4SteppingManager::GetSecondary() to give const G4TrackVector*
     30  (co-work with track-V09-03-05)
     31
     3219 July 2010 Gabriele Cosmo (tracking-V09-03-05)
     33- Added dummy initialisation to members in constructors in classes:
     34  G4AdjointSteppingAction, G4UserSteppingAction, G4UserTrackingAction
     35  and G4VSteppingVerbose.
     36- G4SteppingManager:  and use canonical form for G4Exception.
     37  Added protection for possible negative index in method ApplyProductionCut()
     38  and some printout formatting.
     39- Added redundant return statement after exception in G4SteppingManager2.
     40- Fixed restoring of output settings in G4SteppingVerbose.
     41- Use 0 instead of NULL where applicable.
    2042
    214316 June 2010 John Allison (tracking-V09-03-04)

  • trunk/source/tracking/include/CVS/Entries

    r1337 r1340  
    1 /G4AdjointCrossSurfChecker.hh/1.2/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    2 /G4AdjointSteppingAction.hh/1.3/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    3 /G4RichTrajectory.hh/1.6/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    4 /G4RichTrajectoryPoint.hh/1.7/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    5 /G4SmoothTrajectory.hh/1.14/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    6 /G4SmoothTrajectoryPoint.hh/1.13/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    7 /G4SteppingManager.hh/1.31/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    8 /G4SteppingVerbose.hh/1.12/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    9 /G4TrackingManager.hh/1.21/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    10 /G4TrackingMessenger.hh/1.10/Thu Sep 30 06:16:11 2010//Tgeant4-09-04-beta-01
    11 /G4Trajectory.hh/1.27/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    12 /G4TrajectoryPoint.hh/1.17/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    13 /G4UserSteppingAction.hh/1.12/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    14 /G4UserTrackingAction.hh/1.11/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    15 /G4VSteppingVerbose.hh/1.24/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    16 /G4VTrajectory.hh/1.19/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    17 /G4VTrajectoryPoint.hh/1.15/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
     1/G4AdjointCrossSurfChecker.hh/1.2/Thu Sep 30 06:16:11 2010//Ttracking-V09-03-08
     2/G4AdjointSteppingAction.hh/1.3/Thu Sep 30 06:16:11 2010//Ttracking-V09-03-08
     3/G4SteppingVerbose.hh/1.12/Thu Sep 30 06:16:11 2010//Ttracking-V09-03-08
     4/G4TrackingMessenger.hh/1.10/Thu Sep 30 06:16:11 2010//Ttracking-V09-03-08
     5/G4UserSteppingAction.hh/1.12/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     6/G4UserTrackingAction.hh/1.11/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     7/G4VSteppingVerbose.hh/1.24/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     8/G4VTrajectory.hh/1.19/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     9/G4VTrajectoryPoint.hh/1.15/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     10/G4RichTrajectory.hh/1.8/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     11/G4RichTrajectoryPoint.hh/1.9/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     12/G4SmoothTrajectory.hh/1.16/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     13/G4SmoothTrajectoryPoint.hh/1.15/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     14/G4SteppingManager.hh/1.32/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     15/G4TrackingManager.hh/1.23/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     16/G4Trajectory.hh/1.29/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     17/G4TrajectoryPoint.hh/1.19/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
    1818D

  • trunk/source/tracking/include/CVS/Tag

    r1331 r1340  
    1 Ngeant4-09-04-beta-01
     1Ntracking-V09-03-08

  • trunk/source/tracking/include/G4RichTrajectory.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4RichTrajectory.hh,v 1.6 2009/11/24 10:04:14 perl Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4RichTrajectory.hh,v 1.8 2010/10/27 07:57:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------

  • trunk/source/tracking/include/G4RichTrajectoryPoint.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4RichTrajectoryPoint.hh,v 1.7 2009/11/24 10:04:14 perl Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4RichTrajectoryPoint.hh,v 1.9 2010/10/27 07:57:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------

  • trunk/source/tracking/include/G4SmoothTrajectory.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SmoothTrajectory.hh,v 1.14 2010/06/16 20:03:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SmoothTrajectory.hh,v 1.16 2010/10/27 07:57:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------

  • trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SmoothTrajectoryPoint.hh,v 1.13 2006/06/29 21:15:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SmoothTrajectoryPoint.hh,v 1.15 2010/10/27 07:57:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------

  • trunk/source/tracking/include/G4SteppingManager.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SteppingManager.hh,v 1.31 2007/10/09 03:51:06 tsasaki Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SteppingManager.hh,v 1.32 2010/10/06 13:17:15 kurasige Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    113113// Get/Set functions
    114114
    115    G4TrackVector* GetSecondary() const;
     115   const G4TrackVector* GetSecondary() const;
    116116   void SetUserAction(G4UserSteppingAction* apAction);
    117117   G4Track* GetTrack() const;
    … …  
    459459  }
    460460
    461   inline G4TrackVector* G4SteppingManager::GetSecondary() const {
     461  inline const G4TrackVector* G4SteppingManager::GetSecondary() const {
    462462    return fStep->GetSecondary();
    463463  }

  • trunk/source/tracking/include/G4TrackingManager.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4TrackingManager.hh,v 1.21 2006/11/14 10:58:47 tsasaki Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4TrackingManager.hh,v 1.23 2010/10/06 13:17:15 kurasige Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    181181   
    182182   inline G4TrackVector* G4TrackingManager::GimmeSecondaries() const {
    183      return fpSteppingManager->GetSecondary();
     183     return fpSteppingManager->GetfSecondary();
    184184   }
    185185
    186186   inline void G4TrackingManager::SetUserAction(G4UserTrackingAction* apAction){
    187187     fpUserTrackingAction = apAction;
    188      if(apAction != NULL){
     188     if(apAction != 0){
    189189       apAction->SetTrackingManagerPointer(this);
    190190     } 
    … …  
    193193   inline void G4TrackingManager::SetUserAction(G4UserSteppingAction* apAction){
    194194     fpSteppingManager->SetUserAction(apAction);
    195      if(apAction != NULL){
     195     if(apAction != 0){
    196196       apAction->SetSteppingManagerPointer(fpSteppingManager); 
    197197     } 

  • trunk/source/tracking/include/G4Trajectory.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4Trajectory.hh,v 1.27 2010/06/16 20:03:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4Trajectory.hh,v 1.29 2010/10/27 07:57:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------

  • trunk/source/tracking/include/G4TrajectoryPoint.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4TrajectoryPoint.hh,v 1.17 2006/06/29 21:15:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4TrajectoryPoint.hh,v 1.19 2010/10/27 07:57:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------

  • trunk/source/tracking/src/CVS/Entries

    r1337 r1340  
    1 /G4AdjointCrossSurfChecker.cc/1.2/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    2 /G4AdjointSteppingAction.cc/1.3/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    3 /G4RichTrajectory.cc/1.9/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    4 /G4RichTrajectoryPoint.cc/1.6/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    5 /G4SmoothTrajectory.cc/1.21/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    6 /G4SmoothTrajectoryPoint.cc/1.15/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    7 /G4SteppingManager.cc/1.50/Thu Sep 30 06:16:12 2010//Tgeant4-09-04-beta-01
    8 /G4SteppingManager2.cc/1.37/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    9 /G4SteppingVerbose.cc/1.23/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    10 /G4TrackingManager.cc/1.22/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    11 /G4TrackingMessenger.cc/1.15/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    12 /G4Trajectory.cc/1.35/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    13 /G4TrajectoryPoint.cc/1.19/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    14 /G4UserSteppingAction.cc/1.10/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    15 /G4UserTrackingAction.cc/1.10/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    16 /G4VSteppingVerbose.cc/1.18/Thu Sep 30 06:16:13 2010//Tgeant4-09-04-beta-01
    17 /G4VTrajectory.cc/1.16/Thu Sep 30 06:16:14 2010//Tgeant4-09-04-beta-01
    18 /G4VTrajectoryPoint.cc/1.4/Thu Sep 30 06:16:14 2010//Tgeant4-09-04-beta-01
     1/G4AdjointCrossSurfChecker.cc/1.2/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     2/G4RichTrajectory.cc/1.9/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     3/G4RichTrajectoryPoint.cc/1.6/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     4/G4SmoothTrajectoryPoint.cc/1.15/Thu Sep 30 06:16:12 2010//Ttracking-V09-03-08
     5/G4TrackingMessenger.cc/1.15/Thu Sep 30 06:16:13 2010//Ttracking-V09-03-08
     6/G4Trajectory.cc/1.35/Thu Sep 30 06:16:13 2010//Ttracking-V09-03-08
     7/G4TrajectoryPoint.cc/1.19/Thu Sep 30 06:16:13 2010//Ttracking-V09-03-08
     8/G4VTrajectoryPoint.cc/1.4/Thu Sep 30 06:16:14 2010//Ttracking-V09-03-08
     9/G4AdjointSteppingAction.cc/1.4/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     10/G4SmoothTrajectory.cc/1.22/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     11/G4SteppingManager.cc/1.51/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     12/G4SteppingManager2.cc/1.38/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     13/G4SteppingVerbose.cc/1.24/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     14/G4TrackingManager.cc/1.23/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     15/G4UserSteppingAction.cc/1.11/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     16/G4UserTrackingAction.cc/1.11/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     17/G4VSteppingVerbose.cc/1.19/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
     18/G4VTrajectory.cc/1.17/Fri Nov  5 10:48:47 2010//Ttracking-V09-03-08
    1919D

  • trunk/source/tracking/src/CVS/Tag

    r1331 r1340  
    1 Ngeant4-09-04-beta-01
     1Ntracking-V09-03-08

  • trunk/source/tracking/src/G4AdjointSteppingAction.cc

    r1337 r1340  
    2424// ********************************************************************
    2525//
    26 // $Id: G4AdjointSteppingAction.cc,v 1.3 2009/11/20 14:24:34 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4AdjointSteppingAction.cc,v 1.4 2010/07/19 13:41:21 gcosmo Exp $
     27// GEANT4 tag $Name: tracking-V09-03-08 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////
    … …  
    4343//
    4444G4AdjointSteppingAction::G4AdjointSteppingAction()
     45  : ext_sourceEMax(0.), start_event(false),
     46    did_adj_part_reach_ext_source(false), last_ekin(0.), last_weight(0.),
     47    prim_weight(0.), last_part_def(0), theUserAdjointSteppingAction(0)
    4548{
    4649  theG4AdjointCrossSurfChecker = G4AdjointCrossSurfChecker::GetInstance();
    47   did_adj_part_reach_ext_source =false;
    48   theUserAdjointSteppingAction =0;
    4950}
    5051////////////////////////////////////////////////////////////////////////////////////////////////

  • trunk/source/tracking/src/G4SmoothTrajectory.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SmoothTrajectory.cc,v 1.21 2010/06/16 20:03:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SmoothTrajectory.cc,v 1.22 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//
    … …  
    7979   // The first point has no auxiliary points, so set the auxiliary
    8080   // points vector to NULL (jacek 31/10/2002)
    81    positionRecord->push_back(new G4SmoothTrajectoryPoint(aTrack->GetPosition(), NULL));
     81   positionRecord->push_back(new G4SmoothTrajectoryPoint(aTrack->GetPosition(), 0));
    8282}
    8383

  • trunk/source/tracking/src/G4SteppingManager.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SteppingManager.cc,v 1.50 2009/02/27 08:09:50 tsasaki Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SteppingManager.cc,v 1.51 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    5757G4SteppingManager::G4SteppingManager()
    5858//////////////////////////////////////
    59   : fUserSteppingAction(NULL), verboseLevel(0)
     59  : fUserSteppingAction(0), verboseLevel(0)
    6060{
    6161
    … …  
    241241
    242242// User intervention process.
    243    if( fUserSteppingAction != NULL ) {
     243   if( fUserSteppingAction != 0 ) {
    244244      fUserSteppingAction->UserSteppingAction(fStep);
    245245   }
    … …  
    262262   PreStepPointIsGeom = false;
    263263   FirstStep = true;
    264    fParticleChange = NULL;
     264   fParticleChange = 0;
    265265   fPreviousStepSize = 0.;
    266266   fStepStatus = fUndefined;
    … …  
    335335       if(fTrack->GetParentID()==0)
    336336       {
    337         G4cerr << "Primary particle starting at "
    338                << fTrack->GetPosition()
    339                << " is outside of the world volume." << G4endl;
    340         G4Exception("G4SteppingManager::Primary vertex outside of the world");
     337         G4cerr << "ERROR - G4SteppingManager::SetInitialStep()" << G4endl
     338                << "        Primary particle starting at - "
     339                << fTrack->GetPosition()
     340                << " - is outside of the world volume." << G4endl;
     341         G4Exception("G4SteppingManager::SetInitialStep()", "Tracking0010",
     342                     FatalException, "Primary vertex outside of the world!");
    341343       }
    342344
    343345       fTrack->SetTrackStatus( fStopAndKill );
    344        G4cerr << "G4SteppingManager::SetInitialStep(): warning: "
    345               << "initial track position is outside world! "
     346       G4cout << "WARNING - G4SteppingManager::SetInitialStep()" << G4endl
     347              << "          Initial track position is outside world! - "
    346348              << fTrack->GetPosition() << G4endl;
    347349   }
    … …  
    352354#ifdef G4VERBOSE
    353355                         // !!!!! Verbose
    354            if(verboseLevel>0) fVerbose->TrackingStarted();
     356   if(verboseLevel>0) fVerbose->TrackingStarted();
    355357#endif
    356358}

  • trunk/source/tracking/src/G4SteppingManager2.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SteppingManager2.cc,v 1.37 2009/09/25 00:23:41 gum Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SteppingManager2.cc,v 1.38 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    5050#include "G4SteppingControl.hh"
    5151#include "G4TransportationManager.hh"
    52 //#include "G4UserLimits.hh"
    5352#include "G4SteppingManager.hh"
    5453#include "G4LossTableManager.hh"
    … …  
    5958{
    6059#ifdef debug
    61   G4cout<<"G4SteppingManager::GetProcessNumber: is called track="<<fTrack<<G4endl;
     60  G4cout<<"G4SteppingManager::GetProcessNumber: is called track="
     61        <<fTrack<<G4endl;
    6262#endif
    6363
    6464  G4ProcessManager* pm= fTrack->GetDefinition()->GetProcessManager();
    65                 if(!pm)
     65  if(!pm)
    6666  {
    67     G4cout<<"G4SteppingManager::GetProcessNumber: ProcessManager=0 for particle="
    68           <<fTrack->GetDefinition()->GetParticleName()<<", PDG_code="
    69           <<fTrack->GetDefinition()->GetPDGEncoding()<<G4endl;
    70                                 G4Exception("G4SteppingManager::GetProcessNumber: Process Manager is not found.");
     67    G4cerr << "ERROR - G4SteppingManager::GetProcessNumber()" << G4endl
     68           << "        ProcessManager is NULL for particle = "
     69           << fTrack->GetDefinition()->GetParticleName() << ", PDG_code = "
     70           << fTrack->GetDefinition()->GetPDGEncoding() << G4endl;
     71    G4Exception("G4SteppingManager::GetProcessNumber()", "Tracking0011",
     72                FatalException, "Process Manager is not found.");
     73    return;
    7174  }
    7275
    … …  
    7679   fAtRestGetPhysIntVector = pm->GetAtRestProcessVector(typeGPIL);
    7780#ifdef debug
    78   G4cout<<"G4SteppingManager::GetProcessNumber: #ofAtRest="<<MAXofAtRestLoops<<G4endl;
     81   G4cout << "G4SteppingManager::GetProcessNumber: #ofAtRest="
     82          << MAXofAtRestLoops << G4endl;
    7983#endif
    8084
    … …  
    8488   fAlongStepGetPhysIntVector = pm->GetAlongStepProcessVector(typeGPIL);
    8589#ifdef debug
    86                         G4cout<<"G4SteppingManager::GetProcessNumber:#ofAlongStp="<<MAXofAlongStepLoops<<G4endl;
     90   G4cout << "G4SteppingManager::GetProcessNumber:#ofAlongStp="
     91          << MAXofAlongStepLoops << G4endl;
    8792#endif
    8893
    … …  
    9297   fPostStepGetPhysIntVector = pm->GetPostStepProcessVector(typeGPIL);
    9398#ifdef debug
    94                         G4cout<<"G4SteppingManager::GetProcessNumber: #ofPostStep="<<MAXofPostStepLoops<<G4endl;
     99   G4cout << "G4SteppingManager::GetProcessNumber: #ofPostStep="
     100          << MAXofPostStepLoops << G4endl;
    95101#endif
    96102
    … …  
    98104       SizeOfSelectedDoItVector<MAXofAlongStepLoops ||
    99105       SizeOfSelectedDoItVector<MAXofPostStepLoops  )
    100                         {
    101                           G4cout<<"G4SteppingManager::GetProcessNumber: SizeOfSelectedDoItVector="
    102            <<SizeOfSelectedDoItVector<<" is smaller then one of MAXofAtRestLoops="
    103            <<MAXofAtRestLoops<<" or MAXofAlongStepLoops="<<MAXofAlongStepLoops
    104            <<" or MAXofPostStepLoops="<<MAXofPostStepLoops<<G4endl;
    105                                         G4Exception("G4SteppingManager::GetProcessNumber: The array size is smaller than the actutal number of processes. Chnage G4SteppingManager.hh and recompile is needed.");
     106   {
     107     G4cerr << "ERROR - G4SteppingManager::GetProcessNumber()" << G4endl
     108            << "        SizeOfSelectedDoItVector= " << SizeOfSelectedDoItVector
     109            << " ; is smaller then one of MAXofAtRestLoops= "
     110            << MAXofAtRestLoops << G4endl
     111            << "        or MAXofAlongStepLoops= " << MAXofAlongStepLoops
     112            << " or MAXofPostStepLoops= " << MAXofPostStepLoops << G4endl;
     113     G4Exception("G4SteppingManager::GetProcessNumber()",
     114                 "Tracking0012", FatalException,
     115                 "The array size is smaller than the actual No of processes.");
    106116   }
    107117}
    … …  
    144154//      fStepStatus = fUserDefinedLimit;
    145155//      fStep->GetPostStepPoint()
    146 //           ->SetProcessDefinedStep(NULL);
     156//           ->SetProcessDefinedStep(0);
    147157//      // Take note that the process pointer is 'NULL' if the Step
    148158//      // is defined by the user defined limit.
    … …  
    155165   for(size_t np=0; np < MAXofPostStepLoops; np++){
    156166     fCurrentProcess = (*fPostStepGetPhysIntVector)(np);
    157      if (fCurrentProcess== NULL) {
     167     if (fCurrentProcess== 0) {
    158168       (*fSelectedPostStepDoItVector)[np] = InActivated;
    159169       continue;
    … …  
    225235   for(size_t kp=0; kp < MAXofAlongStepLoops; kp++){
    226236     fCurrentProcess = (*fAlongStepGetPhysIntVector)[kp];
    227      if (fCurrentProcess== NULL) continue;
     237     if (fCurrentProcess== 0) continue;
    228238         // NULL means the process is inactivated by a user on fly.
    229239
    230240     physIntLength = fCurrentProcess->
    231                      AlongStepGPIL( *fTrack,
    232                                                   fPreviousStepSize,
    233                                                        PhysicalStep,
    234                                        safetyProposedToAndByProcess,
    235                                                     &fGPILSelection );
     241                     AlongStepGPIL( *fTrack, fPreviousStepSize,
     242                                     PhysicalStep,
     243                                     safetyProposedToAndByProcess,
     244                                    &fGPILSelection );
    236245#ifdef G4VERBOSE
    237246                         // !!!!! Verbose
    … …  
    287296   for( size_t ri=0 ; ri < MAXofAtRestLoops ; ri++ ){
    288297     fCurrentProcess = (*fAtRestGetPhysIntVector)[ri];
    289      if (fCurrentProcess== NULL) {
     298     if (fCurrentProcess== 0) {
    290299       (*fSelectedAtRestDoItVector)[ri] = InActivated;
    291300       NofInactiveProc++;
    … …  
    294303
    295304     lifeTime =
    296        fCurrentProcess->AtRestGPIL(
    297                                                      *fTrack,
    298                                                 &fCondition );
     305       fCurrentProcess->AtRestGPIL( *fTrack, &fCondition );
    299306
    300307     if(fCondition==Forced && fCurrentProcess){
    … …  
    305312       if(lifeTime < shortestLifeTime ){
    306313          shortestLifeTime = lifeTime;
    307           fAtRestDoItProcTriggered =  G4int(int(ri));
     314          fAtRestDoItProcTriggered =  G4int(ri);
    308315          (*fSelectedAtRestDoItVector)[fAtRestDoItProcTriggered] = NotForced;
    309316       }
    … …  
    311318   }
    312319
    313 // at least one process is necessary to destory the particle 
     320// at least one process is necessary to destroy the particle 
    314321// exit with warning
    315322   if(NofInactiveProc==MAXofAtRestLoops){
    316      //     G4Exception("G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " );
    317      G4cerr << "G4SteppingManager::InvokeAtRestDoItProcs: No AtRestDoIt process is active. " << G4endl;
     323     G4cerr << "ERROR - G4SteppingManager::InvokeAtRestDoItProcs()" << G4endl
     324            << "        No AtRestDoIt process is active!" << G4endl;
     325     // G4Exception("G4SteppingManager::InvokeAtRestDoItProcs", "Tracking0013",
     326     //             FatalException, "No AtRestDoIt process is active." );
    318327   }
    319328
    … …  
    401410   for( size_t ci=0 ; ci<MAXofAlongStepLoops ; ci++ ){
    402411     fCurrentProcess = (*fAlongStepDoItVector)[ci];
    403      if (fCurrentProcess== NULL) continue;
     412     if (fCurrentProcess== 0) continue;
    404413         // NULL means the process is inactivated by a user on fly.
    405414
    … …  
    577586  G4int tPtclIdx
    578587    = G4ProductionCuts::GetIndex(aSecondary->GetDefinition());
     588  if (tPtclIdx<0)  { return; }
    579589  G4ProductionCutsTable* tCutsTbl
    580590    = G4ProductionCutsTable::GetProductionCutsTable();

  • trunk/source/tracking/src/G4SteppingVerbose.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SteppingVerbose.cc,v 1.24 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    149149          ptProcManager = (*fAlongStepDoItVector)(ci);
    150150          G4cout << "      " << ci+1 << ") ";
    151           if(ptProcManager != NULL){
     151          if(ptProcManager != 0){
    152152             G4cout << ptProcManager->GetProcessName() << G4endl;
    153153          }
    … …  
    292292      G4cout << std::setw(11) << "OutOfWorld" << " ";
    293293    }
    294     if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
     294    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != 0){
    295295      G4cout << fStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
    296296    } else {
    … …  
    710710  G4cout << "        Creator Process     : "
    711711       << std::setw(20);
    712   if( fTrack->GetCreatorProcess() == NULL){
     712  if( fTrack->GetCreatorProcess() == 0){
    713713    G4cout << " Event Generator" << G4endl;
    714714  } else {
    … …  
    739739  if(Silent==1){ return; }
    740740   G4String volName;
     741   G4int oldprc;
    741742
    742743// Show header
    743744   G4cout << G4endl;
    744745   G4cout << "    ++G4Step Information " << G4endl;
    745    G4cout.precision(16);
     746   oldprc = G4cout.precision(16);
    746747
    747748// Show G4Step specific information
    … …  
    857858        G4cout << G4endl;
    858859        G4cout << "         Process defined Step: " ;
    859         if( fStep->GetPreStepPoint()->GetProcessDefinedStep() == NULL ){
     860        if( fStep->GetPreStepPoint()->GetProcessDefinedStep() == 0 ){
    860861           G4cout << std::setw(20) << "Undefined";
    861862        } else {
    862863           G4cout << std::setw(20) << fStep->GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName();
    863864        }
    864         if( fStep->GetPostStepPoint()->GetProcessDefinedStep() == NULL){
     865        if( fStep->GetPostStepPoint()->GetProcessDefinedStep() == 0){
    865866           G4cout << std::setw(20) << "Undefined";
    866867        } else {
    867868           G4cout << std::setw(20) << fStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
    868869        }
     870   G4cout.precision(oldprc);
    869871
    870872   G4cout << G4endl;

  • trunk/source/tracking/src/G4TrackingManager.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4TrackingManager.cc,v 1.23 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    4949G4TrackingManager::G4TrackingManager()
    5050//////////////////////////////////////
    51   : fpUserTrackingAction(NULL), fpTrajectory(NULL),
     51  : fpUserTrackingAction(0), fpTrajectory(0),
    5252    StoreTrajectory(0), verboseLevel(0), EventIsAborted(false)
    5353{
    … …  
    9292  // Pre tracking user intervention process.
    9393  fpTrajectory = 0;
    94   if( fpUserTrackingAction != NULL ) {
     94  if( fpUserTrackingAction != 0 ) {
    9595     fpUserTrackingAction->PreUserTrackingAction(fpTrack);
    9696  }
    … …  
    137137
    138138  // Post tracking user intervention process.
    139   if( fpUserTrackingAction != NULL ) {
     139  if( fpUserTrackingAction != 0 ) {
    140140     fpUserTrackingAction->PostUserTrackingAction(fpTrack);
    141141  }
    … …  
    154154{
    155155#ifndef G4_STORE_TRAJECTORY
    156   G4Exception("G4TrackingManager::SetTrajectory is invoked without G4_STORE_TRAJECTORY compilor option");
     156  G4Exception("G4TrackingManager::SetTrajectory()",
     157              "Tracking0015", FatalException,
     158              "Invoked without G4_STORE_TRAJECTORY option set!");
    157159#endif
    158160  fpTrajectory = aTrajectory;

  • trunk/source/tracking/src/G4UserSteppingAction.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4UserSteppingAction.cc,v 1.11 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030// ---------------------------------------------------------------
    … …  
    5050G4UserSteppingAction::G4UserSteppingAction()
    5151/////////////////////////////////////////////////////////
     52   : fpSteppingManager(0)
    5253{
    5354 if(!(G4ParticleTable::GetParticleTable()->GetReadiness()))
    … …  
    5657   msg =  " You are instantiating G4UserSteppingAction BEFORE your\n";
    5758   msg += "G4VUserPhysicsList is instantiated and assigned to G4RunManager.\n";
    58    msg += " Such an instantiation is prohibited by Geant4 version 8.0. To fix this problem,\n";
     59   msg += " Such an instantiation is prohibited since Geant4 version 8.0. To fix this problem,\n";
    5960   msg += "please make sure that your main() instantiates G4VUserPhysicsList AND\n";
    6061   msg += "set it to G4RunManager before instantiating other user action classes\n";
    6162   msg += "such as G4UserSteppingAction.";
    6263   G4Exception("G4UserSteppingAction::G4UserSteppingAction()",
    63               "Tracking0002",FatalException,msg);
     64               "Tracking0002", FatalException, msg);
    6465 }
    6566}
    … …  
    7778  fpSteppingManager = pValue;
    7879} 
    79 
    80 
    81 
    82 

  • trunk/source/tracking/src/G4UserTrackingAction.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4UserTrackingAction.cc,v 1.11 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030// ---------------------------------------------------------------
    … …  
    4646G4UserTrackingAction::G4UserTrackingAction()
    4747/////////////////////////////////////////////////////////
     48  : fpTrackingManager(0)
    4849{
    4950  if(!(G4ParticleTable::GetParticleTable()->GetReadiness()))
    … …  
    5253   msg =  " You are instantiating G4UserTrackingAction BEFORE your\n";
    5354   msg += "G4VUserPhysicsList is instantiated and assigned to G4RunManager.\n";
    54    msg += " Such an instantiation is prohibited by Geant4 version 8.0. To fix this problem,\n";
     55   msg += " Such an instantiation is prohibited since Geant4 version 8.0. To fix this problem,\n";
    5556   msg += "please make sure that your main() instantiates G4VUserPhysicsList AND\n";
    5657   msg += "set it to G4RunManager before instantiating other user action classes\n";
    5758   msg += "such as G4UserTrackingAction.";
    5859   G4Exception("G4UserTrackingAction::G4UserTrackingAction()",
    59               "Tracking0001",FatalException,msg);
     60               "Tracking0001", FatalException, msg);
    6061  }
    6162}
    … …  
    7374  fpTrackingManager = pValue;
    7475}
    75 
    76 
    77 
    78 
    79 
    80 
    81 
    82 
    83 

  • trunk/source/tracking/src/G4VSteppingVerbose.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VSteppingVerbose.cc,v 1.19 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    5151G4int G4VSteppingVerbose::Silent = 0;
    5252G4int G4VSteppingVerbose::SilentStepInfo = 0;
    53 G4VSteppingVerbose::G4VSteppingVerbose() :verboseLevel(0){
    54   if(fInstance!= NULL) G4Exception("G4SteppingVerbose is the singleton. Only one SteppingVerbose class can be instantiated.");
     53
     54G4VSteppingVerbose::G4VSteppingVerbose()
     55  : fManager(0), fUserSteppingAction(0),
     56    PhysicalStep(0.), GeometricalStep(0.), CorrectedStep(0.),
     57    PreStepPointIsGeom(false), FirstStep(false),
     58    TempInitVelocity(0.), TempVelocity(0.), Mass(0.), sumEnergyChange(0.),
     59    fParticleChange(0), fTrack(0), fSecondary(0), fStep(0),
     60    fPreStepPoint(0), fPostStepPoint(0), fCurrentVolume(0),
     61    fSensitive(0), fCurrentProcess(0), fAtRestDoItVector(0),
     62    fAlongStepDoItVector(0), fPostStepDoItVector(0), fAtRestGetPhysIntVector(0),
     63    fAlongStepGetPhysIntVector(0), fPostStepGetPhysIntVector(0),
     64    MAXofAtRestLoops(0), MAXofAlongStepLoops(0), MAXofPostStepLoops(0),
     65    currentMinimumStep(0.), numberOfInteractionLengthLeft(0.),
     66    fAtRestDoItProcTriggered(0), fAlongStepDoItProcTriggered(0),
     67    fPostStepDoItProcTriggered(0), fN2ndariesAtRestDoIt(0),
     68    fN2ndariesAlongStepDoIt(0), fN2ndariesPostStepDoIt(0),
     69    fNavigator(0), verboseLevel(0), fSelectedAtRestDoItVector(0),
     70    fSelectedAlongStepDoItVector(0), fSelectedPostStepDoItVector(0),
     71    fPreviousStepSize(0.), physIntLength(0.)
     72{
     73  if(fInstance!= 0)
     74  {
     75    G4Exception("G4VSteppingVerbose::G4VSteppingVerbose()",
     76                "Tracking0014", FatalException,
     77                "Only one SteppingVerbose class can be instantiated.");
     78  }
    5579}
    5680G4VSteppingVerbose::~G4VSteppingVerbose(){;}
    … …  
    6286  fManager=fMan;
    6387}
    64 
    65 
    6688
    6789//////////////////////////////////////////////////

  • trunk/source/tracking/src/G4VTrajectory.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VTrajectory.cc,v 1.16 2010/06/16 20:03:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VTrajectory.cc,v 1.17 2010/07/19 13:41:21 gcosmo Exp $
     28// GEANT4 tag $Name: tracking-V09-03-08 $
    2929//
    3030// ---------------------------------------------------------------
    … …  
    134134  if (!warnedAboutIMode && i_mode != 0) {
    135135    G4Exception
    136         ("G4VTrajectory::DrawTrajectory",
    137          "",
    138          JustWarning,
    139 "WARNING: DEPRECATED: The use of i_mode argument in DrawTrajectory"
    140 "\n  is deprecated and will be removed at the next major release.");
     136        ("G4VTrajectory::DrawTrajectory()",
     137         "Tracking0100", JustWarning,
     138         "DEPRECATED! The use of i_mode argument in DrawTrajectory()"
     139         "\n  is deprecated and will be removed at the next major release.");
    141140    warnedAboutIMode = true;
    142141  }
Note: See TracChangeset for help on using the changeset viewer.