Ignore:
Timestamp:
Jan 8, 2010, 11:56:51 AM (14 years ago)
Author:
garnier
Message:

update geant4.9.3 tag

Location:
trunk/source/geometry/navigation/include
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh

    r921 r1228  
    2626//
    2727// $Id: G4AuxiliaryNavServices.hh,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc

    r921 r1228  
    2626//
    2727// $Id: G4AuxiliaryNavServices.icc,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4BrentLocator.hh

    r985 r1228  
    2626//
    2727// $Id: G4BrentLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// Class G4BrentLocator

  • trunk/source/geometry/navigation/include/G4DrawVoxels.hh

    r1058 r1228  
    2626//
    2727// $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh

    r921 r1228  
    2626//
    2727// $Id: G4ErrorPropagationNavigator.hh,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestLogger.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestPoint.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestSegment.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestSegment.hh,v 1.4 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestVolume.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeometryMessenger.hh

    r921 r1228  
    2626//
    2727// $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh

    r985 r1228  
    2626//
    2727// $Id: G4MultiLevelLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4MultiNavigator.hh

    r921 r1228  
    2626//
    2727// $Id: G4MultiNavigator.hh,v 1.5 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4Navigator.hh

    r1058 r1228  
    2525//
    2626//
    27 // $Id: G4Navigator.hh,v 1.28 2009/01/27 09:32:14 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    237237    // Verify if the step has exited the mother volume.
    238238
    239   inline void  CheckMode(G4bool mode);
     239  inline void   CheckMode(G4bool mode);
    240240    // Run navigation in "check-mode", therefore using additional
    241241    // verifications and more strict correctness conditions.
    242242    // Is effective only with G4VERBOSE set.
     243  inline G4bool IsCheckModeActive() { return fCheck; }
    243244
    244245  void PrintState() const;

  • trunk/source/geometry/navigation/include/G4Navigator.icc

    r921 r1228  
    2626//
    2727// $Id: G4Navigator.icc,v 1.15 2007/10/18 14:18:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4NormalNavigation.hh

    r921 r1228  
    2626//
    2727// $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4NormalNavigation.icc

    r921 r1228  
    2626//
    2727// $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh

    r921 r1228  
    2626//
    2727// $Id: G4ParameterisedNavigation.hh,v 1.6 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc

    r921 r1228  
    2626//
    2727// $Id: G4ParameterisedNavigation.icc,v 1.7 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4PathFinder.hh

    r921 r1228  
    2525//
    2626// $Id: G4PathFinder.hh,v 1.34 2007/11/02 12:28:31 japost Exp $
    27 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929// class G4PathFinder

  • trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh

    r1058 r1228  
    2626//
    2727// $Id: G4PhantomParameterisation.hh,v 1.5 2009/05/19 18:27:03 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc

    r921 r1228  
    2626//
    2727// $Id: G4PhantomParameterisation.icc,v 1.1 2007/10/17 19:13:58 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//--------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4PropagatorInField.hh

    r921 r1228  
    2525//
    2626//
    27 // $Id: G4PropagatorInField.hh,v 1.17 2008/11/13 14:28:56 tnikitin Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     27// $Id: G4PropagatorInField.hh,v 1.19 2009/11/13 17:34:26 japost Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    163163   inline G4VIntersectionLocator* GetIntersectionLocator();
    164164   inline void SetIntersectionLocator(G4VIntersectionLocator *pLocator );
     165     // Change or get the object which calculates the exact
     166     //  intersection point with the next boundary
    165167 
    166168 public:  // without description
    … …  
    168170   inline G4double  GetDeltaIntersection() const;
    169171   inline G4double  GetDeltaOneStep() const;
    170    inline void    SetAccuraciesWithDeltaOneStep( G4double deltaOneStep ); 
    171    inline void    SetDeltaIntersection( G4double deltaIntersection );
    172    inline void    SetDeltaOneStep( G4double deltaOneStep ); 
    173      // The above 5 methods are obsolete and will not work, as they have been
    174      // replaced by the same methods in G4FieldManager since Geant4 4.0 ...
    175172
    176173   inline G4FieldManager*  GetCurrentFieldManager();
    … …  
    182179                                       G4int noAbandon );
    183180   inline G4int GetThresholdNoZeroSteps( G4int i );
     181
     182   inline G4double  GetZeroStepThreshold();
     183   inline void      SetZeroStepThreshold( G4double newLength );
     184
     185   void RefreshIntersectionLocator();
     186     // Update the Locator with parameters from this class
     187     //    and from current field manager
    184188
    185189 protected:  // with description
    … …  
    243247   G4double  kCarTolerance;
    244248     // Geometrical tolerance defining surface thickness
     249   G4double  fZeroStepThreshold;
     250     // Threshold for counting of tiny or 'zero' steps
    245251
    246252   G4VIntersectionLocator *fIntersectionLocator;

  • trunk/source/geometry/navigation/include/G4PropagatorInField.icc

    r921 r1228  
    2525//
    2626//
    27 // $Id: G4PropagatorInField.icc,v 1.13 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     27// $Id: G4PropagatorInField.icc,v 1.16 2009/11/13 17:34:26 japost Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    110110}
    111111
     112// #if 0
    112113inline
    113114G4double G4PropagatorInField::GetDeltaIntersection() const
    … …  
    121122  return fCurrentFieldMgr->GetDeltaOneStep();
    122123}
    123 
    124 inline
    125 void
    126 G4PropagatorInField::SetAccuraciesWithDeltaOneStep( G4double valDeltaOneStep )
    127 {
    128   fDetectorFieldMgr->SetAccuraciesWithDeltaOneStep(valDeltaOneStep);
    129 }
    130 
    131 inline
    132 void G4PropagatorInField::SetDeltaOneStep( G4double valDeltaOneStep )
    133 {
    134   fDetectorFieldMgr->SetDeltaOneStep(valDeltaOneStep);
    135 }
    136 
    137 inline
    138 void G4PropagatorInField::SetDeltaIntersection( G4double valDeltaIntersection )
    139 {
    140   fDetectorFieldMgr->SetDeltaIntersection(valDeltaIntersection);
    141 }
     124// #endif
    142125
    143126inline
    … …  
    236219}
    237220
     221inline G4double  G4PropagatorInField::GetZeroStepThreshold(){ return fZeroStepThreshold; }
     222inline void      G4PropagatorInField::SetZeroStepThreshold( G4double newLength )
     223{
     224  fZeroStepThreshold= newLength;
     225}
     226
    238227inline
    239228void G4PropagatorInField::SetDetectorFieldManager(G4FieldManager* newDetectorFieldManager)
    … …  
    259248SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator )
    260249{
    261   if(SimpleOrMultiNavigator)  { fNavigator= SimpleOrMultiNavigator; }
     250  if(SimpleOrMultiNavigator)  {
     251     fNavigator= SimpleOrMultiNavigator;
     252     if( fIntersectionLocator ) {
     253         fIntersectionLocator->SetNavigatorFor( SimpleOrMultiNavigator );
     254     }
     255  }
    262256}
    263257
    … …  
    295289                          LinearStepLength,IntersectionPoint);
    296290}
     291

  • trunk/source/geometry/navigation/include/G4RegularNavigation.hh

    r921 r1228  
    2626//
    2727// $Id: G4RegularNavigation.hh,v 1.2 2007/10/18 14:18:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh

    r985 r1228  
    2626//
    2727// $Id: G4RegularNavigationHelper.hh,v 1.1 2009/01/27 09:31:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh

    r921 r1228  
    2626//
    2727// $Id: G4ReplicaNavigation.hh,v 1.6 2007/05/18 07:31:09 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc

    r921 r1228  
    2626//
    2727// $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4SafetyHelper.hh

    r921 r1228  
    2626//
    2727// $Id: G4SafetyHelper.hh,v 1.7 2007/05/02 15:32:13 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4SimpleLocator.hh

    r985 r1228  
    2626//
    2727// $Id: G4SimpleLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4TransportationManager.hh

    r921 r1228  
    2626//
    2727// $Id: G4TransportationManager.hh,v 1.12 2007/04/20 15:28:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// class G4TransportationManager

  • trunk/source/geometry/navigation/include/G4TransportationManager.icc

    r921 r1228  
    2626//
    2727// $Id: G4TransportationManager.icc,v 1.10 2007/04/20 15:28:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929// ------------------------------------------------------------
    3030//  GEANT 4  inlined function members implementation

  • trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh

    r985 r1228  
    2525//
    2626//
    27 // $Id: G4VIntersectionLocator.hh,v 1.4 2008/11/14 18:26:35 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     27// $Id: G4VIntersectionLocator.hh,v 1.6 2009/11/30 11:39:15 japost Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
    … …  
    9595       // whether an intersection occurred. NOTE: changes the Safety!
    9696
     97     inline void    SetEpsilonStepFor( G4double EpsilonStep );
     98     inline void    SetDeltaIntersectionFor( G4double deltaIntersection );
     99     inline void    SetNavigatorFor( G4Navigator *fNavigator );
     100     inline void    SetChordFinderFor(G4ChordFinder *fCFinder );
     101       // These parameters must be set at each step, in case they were changed
     102
     103       // Note: This simple approach ensures that all scenarios are considered.
     104       //   [ Future refinement may identify which are invariant during a
     105       //      track, run or event ]
     106
     107    inline void     SetVerboseFor(G4int fVerbose);
     108    inline G4int    GetVerboseFor();
     109       // Controling verbosity enables checking of the locating of intersections
     110
    97111  public:  // without description
     112    // Additional inline Set/Get methods for parameters, dependent objects
    98113
    99     // inline Set/Get methods used for IntersctionLocator
     114    inline G4double       GetDeltaIntersectionFor();
     115    inline G4double       GetEpsilonStepFor();
     116    inline G4Navigator*   GetNavigatorFor();
     117    inline G4ChordFinder* GetChordFinderFor();
    100118
    101     inline G4double  GetDeltaIntersectionFor();
    102     inline G4double  GetEpsilonStepFor();
    103     inline G4Navigator*  GetNavigatorFor();
    104     inline G4ChordFinder*  GetChordFinderFor();
    105     inline G4int  GetVerboseFor();
     119    inline void   SetSafetyParametersFor(G4bool UseSafety );
    106120
    107     inline void SetEpsilonStepFor( G4double EpsilonStep );
    108     inline void SetDeltaIntersectionFor( G4double deltaIntersection );
    109     inline void SetNavigatorFor( G4Navigator *fNavigator );
    110     inline void SetChordFinderFor(G4ChordFinder *fCFinder );
    111     inline void SetSafetyParametersFor(G4bool UseSafety );
    112     inline void SetVerboseFor(G4int fVerbose);
    113 
    114     inline void AddAdjustementOfFoundIntersection(G4bool UseCorrection);
     121    inline void   AddAdjustementOfFoundIntersection(G4bool UseCorrection);
    115122    inline G4bool GetAdjustementOfFoundIntersection();
     123      // Methods to be made Obsolete - replaced by methods below
     124    inline void   AdjustIntersections(G4bool UseCorrection);
     125    inline G4bool AreIntersectionsAdjusted(){ return fUseNormalCorrection; } 
     126      // Change adjustment flag  ( New Interface )
    116127
    117128  protected:  // with description
    … …  
    144155  protected:
    145156
    146     G4double kCarTolerance;
    147     G4int    fVerboseLevel;
    148       // For verbose purposes
    149     G4bool   fUseNormalCorrection;
     157    G4double kCarTolerance;         // Constant
    150158
     159    G4int    fVerboseLevel;          // For debugging
     160    G4bool   fUseNormalCorrection;   // Configuration parameter
     161
     162    G4Navigator   *fiNavigator;
     163      // Parameters set by G4PropagatorInField  ( when ? )
     164
     165    G4ChordFinder *fiChordFinder;
    151166    G4double       fiEpsilonStep;
    152167    G4double       fiDeltaIntersection;
    153     G4Navigator   *fiNavigator;
    154     G4ChordFinder *fiChordFinder;
    155168    G4bool         fiUseSafety;
    156       // For passing the parameters from G4PropagatorInField
     169      // Parameters set at each physical step by calling method - G4PropagatorInField
    157170
    158171    G4Navigator *fHelpingNavigator;

  • trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc

    r985 r1228  
    2626//
    2727// $Id: G4VIntersectionLocator.icc,v 1.3 2008/11/14 18:26:35 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4VoxelNavigation.hh

    r921 r1228  
    2626//
    2727// $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4VoxelNavigation.icc

    r921 r1228  
    2626//
    2727// $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.