Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (14 years ago)
Author:
garnier
Message:

geant4 tag 9.4

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

Legend:

Unmodified
Added
Removed

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

    r1337 r1347  
    2626//
    2727// $Id: G4AuxiliaryNavServices.hh,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4AuxiliaryNavServices.icc,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4BrentLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Class G4BrentLocator

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

    r1337 r1347  
    2626//
    2727// $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4ErrorPropagationNavigator.hh,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestSegment.hh,v 1.4 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4GeometryMessenger.hh,v 1.5 2010/11/10 14:06:40 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------
    … …  
    7878    void SetVerbosity(G4String newValue);
    7979    void SetCheckMode(G4String newValue);
     80    void SetPushFlag(G4String newValue);
    8081    void LineTest();
    8182    void RecursiveLineTest();
    … …  
    8889    G4UIcmdWith3VectorAndUnit *posCmd, *dirCmd;
    8990    G4UIcmdWith3Vector        *grzCmd, *cyzCmd;
    90     G4UIcmdWithABool          *chkCmd, *linCmd, *grdCmd, *cylCmd, *runCmd;
     91    G4UIcmdWithABool          *chkCmd, *pchkCmd, *linCmd,
     92                              *grdCmd, *cylCmd, *runCmd;
    9193    G4UIcmdWithoutParameter   *recCmd, *resCmd;
    9294    G4UIcmdWithADoubleAndUnit *tolCmd;

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4MultiLevelLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4MultiLevelLocator.hh,v 1.3 2010/07/13 15:59:42 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    7878     G4FieldTrack* ptrInterMedFT[max_depth+1];
    7979       // Used to store intermediate tracks values in case of too slow progress
    80 
    81      G4int maxNumberOfStepsForIntersection;
    82      G4int maxNumberOfCallsToReIntegration;
    83      G4int maxNumberOfCallsToReIntegration_depth;
    84        //  Counters for Statistics about Location and ReIntegrations
    8580};
    8681

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

    r1337 r1347  
    2626//
    2727// $Id: G4MultiNavigator.hh,v 1.5 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4Navigator.hh,v 1.34 2010/12/15 13:46:39 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    200200  inline G4GRSSolid* CreateGRSSolid() const;
    201201  inline G4TouchableHistory* CreateTouchableHistory() const;
     202  inline G4TouchableHistory* CreateTouchableHistory(const G4NavigationHistory*) const;
    202203    // `Touchable' creation methods: caller has deletion responsibility.
    203204
    … …  
    241242    // verifications and more strict correctness conditions.
    242243    // Is effective only with G4VERBOSE set.
    243   inline G4bool IsCheckModeActive() { return fCheck; }
     244  inline G4bool IsCheckModeActive() const;
     245  inline void   SetPushVerbosity(G4bool mode);
     246    // Set/unset verbosity for pushed tracks (default is true).
    244247
    245248  void PrintState() const;
    … …  
    263266    //         9 (ready to abandon), 10 (abandoned)
    264267
    265   // inline
    266268  void SetSavedState();
    267   // ( fValidExitNormal, fExitNormal, fExiting, fEntering,
    268   //   fBlockedPhysicalVolume, fBlockedReplicaNo, fLastStepWasZero);
    269   // inline
     269    // ( fValidExitNormal, fExitNormal, fExiting, fEntering,
     270    //   fBlockedPhysicalVolume, fBlockedReplicaNo, fLastStepWasZero);
    270271  void RestoreSavedState();
    271272    // Copy aspects of the state, to enable a non-state changing
    272273    //  call to ComputeStep
    273 
    274  public:  // with description
    275274
    276275  inline G4ThreeVector GetCurrentLocalCoordinate() const;
    … …  
    283282    // Compute+return the local->global translation/rotation of current volume.
    284283
     284  inline void EnableBestSafety( G4bool value= false );
     285    // Enable best-possible evaluation of isotropic safety
     286
    285287 protected:  // with description
     288
    286289  inline G4ThreeVector ComputeLocalPoint(const G4ThreeVector& rGlobPoint) const;
    287290    // Return position vector in local coordinate system, given a position
    … …  
    310313    // o Recompute transforms and/or solids of replicated/parameterised
    311314    //   volumes.
     315
     316 private:
     317
     318  void ComputeStepLog(const G4ThreeVector& pGlobalpoint,
     319                            G4double moveLenSq) const;
     320    // Log and checks for steps larger than the tolerance
    312321
    313322 protected:  // without description
    … …  
    434443  G4bool fCheck;
    435444    // Check-mode flag  [if true, more strict checks are performed].
    436   G4bool fPushed;
    437     // Push flag  [if true, means a stuck particle has been pushed].
     445  G4bool fPushed, fWarnPush;
     446    // Push flags  [if true, means a stuck particle has been pushed].
    438447
    439448  // Helpers/Utility classes

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4Navigator.icc,v 1.15 2007/10/18 14:18:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4Navigator.icc,v 1.18 2010/12/15 13:46:39 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    308308
    309309// ********************************************************************
     310// CreateTouchableHistory(history)
     311//
     312// `Touchable' creation method: caller has deletion responsibility
     313// ********************************************************************
     314//
     315inline
     316G4TouchableHistory*
     317G4Navigator::CreateTouchableHistory(const G4NavigationHistory* history) const
     318{
     319  return new G4TouchableHistory(*history);
     320}
     321
     322// ********************************************************************
    310323// LocateGlobalPointAndUpdateTouchableHandle
    311324// ********************************************************************
    … …  
    450463
    451464// ********************************************************************
     465// IsCheckModeActive
     466// ********************************************************************
     467//
     468inline
     469G4bool G4Navigator::IsCheckModeActive() const
     470{
     471  return fCheck;
     472}
     473
     474// ********************************************************************
     475// SetPushVerbosity
     476// ********************************************************************
     477//
     478inline
     479void G4Navigator::SetPushVerbosity(G4bool mode)
     480{
     481  fWarnPush = mode;
     482}
     483
     484// ********************************************************************
    452485// SeverityOfZeroStepping
    453486//
    … …  
    485518  return severity;
    486519}
     520
     521// ********************************************************************
     522// EnableBestSafety
     523// ********************************************************************
     524//
     525inline void G4Navigator::EnableBestSafety( G4bool value )
     526{
     527  fvoxelNav.EnableBestSafety( value );
     528}

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4NormalNavigation.hh,v 1.6 2010/11/04 08:57:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242#define G4NORMALNAVIGATION_HH
    4343
     44#include <iomanip>
     45
    4446#include "G4NavigationHistory.hh"
     47#include "G4NavigationLogger.hh"
    4548#include "G4VPhysicalVolume.hh"
    4649#include "G4LogicalVolume.hh"
    … …  
    8992                            const G4double pMaxLength=DBL_MAX );
    9093
    91     inline G4int GetVerboseLevel();
     94    inline G4int GetVerboseLevel() const;
    9295    inline void  SetVerboseLevel(G4int level);
    9396      // Get/Set Verbose(ness) level.
    … …  
    102105
    103106    G4bool fCheck;
    104     G4int  fVerbose;
     107    G4NavigationLogger* fLogger;
    105108};
    106109

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4NormalNavigation.icc,v 1.5 2010/11/04 08:57:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    9494}
    9595
     96// ********************************************************************
     97// GetVerboseLevel
     98// ********************************************************************
     99//
    96100inline
    97 G4int G4NormalNavigation::GetVerboseLevel()
     101G4int G4NormalNavigation::GetVerboseLevel() const
    98102{
    99   return fVerbose;
     103  return fLogger->GetVerboseLevel();
    100104}
    101105
     106// ********************************************************************
     107// SetVerboseLevel
     108// ********************************************************************
     109//
    102110inline
    103111void G4NormalNavigation::SetVerboseLevel(G4int level)
    104112{
    105   fVerbose = level;
     113  fLogger->SetVerboseLevel(level);
    106114}
    107115
     116// ********************************************************************
     117// CheckMode
     118// ********************************************************************
     119//
    108120inline
    109121void G4NormalNavigation::CheckMode(G4bool mode)

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

    r1337 r1347  
    2626//
    2727// $Id: G4ParameterisedNavigation.hh,v 1.6 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4ParameterisedNavigation.icc,v 1.7 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PathFinder.hh,v 1.34 2007/11/02 12:28:31 japost Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PathFinder.hh,v 1.35 2010/07/13 15:59:42 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// class G4PathFinder
    … …  
    259259   // State for Step numbers
    260260   G4int         fLastStepNo, fCurrentStepNo;
    261    G4bool        fParticleIsLooping;
    262261
    263262   G4int         fVerboseLevel;            // For debuging purposes
    264 
    265    G4int         fMax_loop_count;
    266      // Limit for the number of sub-steps taken in one call to ComputeStep
    267263
    268264   G4TransportationManager* fpTransportManager; // Cache for frequent use

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4PhantomParameterisation.hh,v 1.5 2009/05/19 18:27:03 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PhantomParameterisation.hh,v 1.6 2010/11/09 15:43:15 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    117117      // voxels fill it completely.
    118118
    119     G4int GetReplicaNo( const G4ThreeVector& localPoint,
     119    virtual G4int GetReplicaNo( const G4ThreeVector& localPoint,
    120120                        const G4ThreeVector& localDir );
    121121      // Get the voxel number corresponding to the point in the container
    … …  
    167167      // Check that the copy number is within limits.
    168168
    169   private:
     169  protected:
    170170
    171171    G4double fVoxelHalfX,fVoxelHalfY,fVoxelHalfZ;

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

    r1337 r1347  
    2626//
    2727// $Id: G4PhantomParameterisation.icc,v 1.1 2007/10/17 19:13:58 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//--------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4PropagatorInField.hh,v 1.19 2009/11/13 17:34:26 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4PropagatorInField.icc,v 1.16 2009/11/13 17:34:26 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4RegularNavigation.hh,v 1.2 2007/10/18 14:18:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4RegularNavigation.hh,v 1.4 2010/09/03 16:29:43 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    8787 
    8888    G4double ComputeStepSkippingEqualMaterials(
    89                           const G4ThreeVector localPoint,
     89                                G4ThreeVector& localPoint,
    9090                          const G4ThreeVector& globalDirection,
    9191                          const G4double currentProposedStepLength,
    … …  
    116116    // Set and Get methods
    117117
    118     void SetVerboseLevel(G4int level) { fVerbose = level; }
    119     void CheckMode(G4bool mode) { fCheck = mode; }
     118    void SetVerboseLevel(G4int level) { fverbose = level; }
     119    void CheckMode(G4bool mode) { fcheck = mode; }
    120120    void SetNormalNavigation( G4NormalNavigation* fnormnav )
    121121      { fnormalNav = fnormnav; }
    … …  
    123123  private:
    124124
    125     G4int fVerbose;
    126     G4bool fCheck;
     125    G4int fverbose;
     126    G4bool fcheck;
    127127
    128128    G4NormalNavigation* fnormalNav;

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

    r1337 r1347  
    2626//
    2727// $Id: G4RegularNavigationHelper.hh,v 1.1 2009/01/27 09:31:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

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

    r1337 r1347  
    2626//
    2727// $Id: G4ReplicaNavigation.hh,v 1.6 2007/05/18 07:31:09 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4SafetyHelper.hh,v 1.7 2007/05/02 15:32:13 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4SimpleLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4TransportationManager.hh,v 1.12 2007/04/20 15:28:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4TransportationManager

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

    r1337 r1347  
    2626//
    2727// $Id: G4TransportationManager.icc,v 1.10 2007/04/20 15:28:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929// ------------------------------------------------------------
    3030//  GEANT 4  inlined function members implementation

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

    r1337 r1347  
    2626//
    2727// $Id: G4VIntersectionLocator.hh,v 1.6 2009/11/30 11:39:15 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2626//
    2727// $Id: G4VIntersectionLocator.icc,v 1.3 2008/11/14 18:26:35 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VoxelNavigation.hh,v 1.8 2010/11/04 12:13:30 japost Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4444#include "geomdefs.hh"
    4545#include "G4NavigationHistory.hh"
     46#include "G4NavigationLogger.hh"
    4647#include "G4AffineTransform.hh"
    4748#include "G4VPhysicalVolume.hh"
    … …  
    5152
    5253#include "G4BlockingList.hh"
     54
     55class G4VoxelSafety;
    5356
    5457// Required for inline implementation
    … …  
    98101
    99102    inline G4int GetVerboseLevel() const;
    100     inline void  SetVerboseLevel(G4int level);
     103    void  SetVerboseLevel(G4int level);
    101104      // Get/Set Verbose(ness) level.
    102105      // [if level>0 && G4VERBOSE, printout can occur]
    … …  
    107110      // Is effective only with G4VERBOSE set.
    108111
     112    inline void  EnableBestSafety( G4bool flag= false );
     113      // Enable best-possible evaluation of isotropic safety
     114
    109115  protected:
    110116
    … …  
    113119                            const G4ThreeVector& localDirection,
    114120                            const G4double currentStep );
     121
     122    G4SmartVoxelNode* VoxelLocateLight( G4SmartVoxelHeader* pHead,
     123                                        const G4ThreeVector& localPoint ) const;
     124
     125  private:  // Logging functions
     126
     127    void PreComputeStepLog  (const G4VPhysicalVolume* motherPhysical,
     128                                   G4double motherSafety,
     129                             const G4ThreeVector& localPoint);
     130    void AlongComputeStepLog(const G4VSolid* sampleSolid,
     131                             const G4ThreeVector& samplePoint,
     132                             const G4ThreeVector& sampleDirection,
     133                             const G4ThreeVector& localDirection,
     134                                   G4double sampleSafety,
     135                                   G4double sampleStep);
     136    void PostComputeStepLog (const G4VSolid* motherSolid,
     137                             const G4ThreeVector& localPoint,
     138                             const G4ThreeVector& localDirection,
     139                                   G4double motherStep,
     140                                   G4double motherSafety);
     141    void ComputeSafetyLog   (const G4VSolid* solid,
     142                             const G4ThreeVector& point,
     143                                   G4double safety,
     144                                   G4bool banner);
     145    inline void PrintDaughterLog (const G4VSolid* sampleSolid,
     146                                  const G4ThreeVector& samplePoint,
     147                                        G4double sampleSafety,
     148                                        G4double sampleStep);   
     149  protected:
    115150
    116151    G4BlockingList fBList;
    … …  
    147182    //
    148183
     184    G4VoxelSafety  *fpVoxelSafety;
     185    //  Helper object for Voxel Safety
     186
    149187    G4bool fCheck;
    150     G4int  fVerbose;
    151     G4double kCarTolerance;
     188    G4bool fBestSafety;
     189
     190    G4NavigationLogger* fLogger;
     191      // Verbosity logger
    152192};
    153193

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VoxelNavigation.icc,v 1.7 2010/11/04 17:38:17 japost Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    6767    }
    6868    else if ( targetNodeNo>=targetHeaderNoSlices )
    69          {
    70            targetNodeNo = targetHeaderNoSlices-1;
    71          }
     69    {
     70      targetNodeNo = targetHeaderNoSlices-1;
     71    }
    7272    // Stack info for stepping
    7373    //
    … …  
    169169G4int G4VoxelNavigation::GetVerboseLevel() const
    170170{
    171   return fVerbose;
    172 }
    173 
    174 // ********************************************************************
    175 // SetVerboseLevel
    176 // ********************************************************************
    177 //
    178 inline
    179 void  G4VoxelNavigation::SetVerboseLevel(G4int level)
    180 {
    181   fVerbose = level;
     171  return fLogger->GetVerboseLevel();
    182172}
    183173
    … …  
    191181  fCheck = mode;
    192182}
     183
     184// ********************************************************************
     185// EnableBestSafety
     186// ********************************************************************
     187//
     188inline
     189void  G4VoxelNavigation::EnableBestSafety(G4bool flag)
     190{
     191  fBestSafety = flag;
     192}
Note: See TracChangeset for help on using the changeset viewer.