Import Geant4 9.3.0 source tree
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Navigator.hh,v 1.27 2008/10/24 14:00:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// class G4Navigator
|
||||
@@ -37,7 +37,7 @@
|
||||
// or to find the physical volume containing a given point in the world
|
||||
// reference system. The navigator maintains a transformation history and
|
||||
// other information to optimise the tracking time performance.
|
||||
//
|
||||
|
||||
// History:
|
||||
// - Created. Paul Kent, Jul 95/96
|
||||
// - Zero step protections J.A. / G.C., Nov 2004
|
||||
@@ -236,10 +236,11 @@ class G4Navigator
|
||||
inline G4bool ExitedMotherVolume() const;
|
||||
// Verify if the step has exited the mother volume.
|
||||
|
||||
inline void CheckMode(G4bool mode);
|
||||
inline void CheckMode(G4bool mode);
|
||||
// Run navigation in "check-mode", therefore using additional
|
||||
// verifications and more strict correctness conditions.
|
||||
// Is effective only with G4VERBOSE set.
|
||||
inline G4bool IsCheckModeActive() { return fCheck; }
|
||||
|
||||
void PrintState() const;
|
||||
// Print the internal state of the Navigator (for debugging).
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PhantomParameterisation.hh,v 1.4 2008/01/22 15:02:36 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4PhantomParameterisation.hh,v 1.5 2009/05/19 18:27:03 arce Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// class G4PhantomParameterisation
|
||||
@@ -112,6 +112,7 @@ class G4PhantomParameterisation : public G4VPVParameterisation
|
||||
const G4VPhysicalVolume*) const {}
|
||||
|
||||
void BuildContainerSolid( G4VPhysicalVolume *pPhysicalVol );
|
||||
void BuildContainerSolid( G4VSolid *pMotherSolid );
|
||||
// Save as container solid the parent of the voxels. Check that the
|
||||
// voxels fill it completely.
|
||||
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PropagatorInField.hh,v 1.17 2008/11/13 14:28:56 tnikitin Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4PropagatorInField.hh,v 1.19 2009/11/13 17:34:26 japost Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// Class G4PropagatorInField
|
||||
@@ -162,16 +162,13 @@ class G4PropagatorInField
|
||||
|
||||
inline G4VIntersectionLocator* GetIntersectionLocator();
|
||||
inline void SetIntersectionLocator(G4VIntersectionLocator *pLocator );
|
||||
// Change or get the object which calculates the exact
|
||||
// intersection point with the next boundary
|
||||
|
||||
public: // without description
|
||||
|
||||
inline G4double GetDeltaIntersection() const;
|
||||
inline G4double GetDeltaOneStep() const;
|
||||
inline void SetAccuraciesWithDeltaOneStep( G4double deltaOneStep );
|
||||
inline void SetDeltaIntersection( G4double deltaIntersection );
|
||||
inline void SetDeltaOneStep( G4double deltaOneStep );
|
||||
// The above 5 methods are obsolete and will not work, as they have been
|
||||
// replaced by the same methods in G4FieldManager since Geant4 4.0 ...
|
||||
|
||||
inline G4FieldManager* GetCurrentFieldManager();
|
||||
inline void SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator );
|
||||
@@ -182,6 +179,13 @@ class G4PropagatorInField
|
||||
G4int noAbandon );
|
||||
inline G4int GetThresholdNoZeroSteps( G4int i );
|
||||
|
||||
inline G4double GetZeroStepThreshold();
|
||||
inline void SetZeroStepThreshold( G4double newLength );
|
||||
|
||||
void RefreshIntersectionLocator();
|
||||
// Update the Locator with parameters from this class
|
||||
// and from current field manager
|
||||
|
||||
protected: // with description
|
||||
|
||||
void PrintStepLengthDiagnostic( G4double currentProposedStepLength,
|
||||
@@ -242,6 +246,8 @@ class G4PropagatorInField
|
||||
|
||||
G4double kCarTolerance;
|
||||
// Geometrical tolerance defining surface thickness
|
||||
G4double fZeroStepThreshold;
|
||||
// Threshold for counting of tiny or 'zero' steps
|
||||
|
||||
G4VIntersectionLocator *fIntersectionLocator;
|
||||
G4bool fAllocatedLocator;
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PropagatorInField.icc,v 1.13 2008/10/29 14:31:55 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4PropagatorInField.icc,v 1.16 2009/11/13 17:34:26 japost Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------------------
|
||||
@@ -109,6 +109,7 @@ void G4PropagatorInField::SetMaxLoopCount( G4int new_max )
|
||||
fMax_loop_count = new_max;
|
||||
}
|
||||
|
||||
// #if 0
|
||||
inline
|
||||
G4double G4PropagatorInField::GetDeltaIntersection() const
|
||||
{
|
||||
@@ -120,25 +121,7 @@ G4double G4PropagatorInField::GetDeltaOneStep() const
|
||||
{
|
||||
return fCurrentFieldMgr->GetDeltaOneStep();
|
||||
}
|
||||
|
||||
inline
|
||||
void
|
||||
G4PropagatorInField::SetAccuraciesWithDeltaOneStep( G4double valDeltaOneStep )
|
||||
{
|
||||
fDetectorFieldMgr->SetAccuraciesWithDeltaOneStep(valDeltaOneStep);
|
||||
}
|
||||
|
||||
inline
|
||||
void G4PropagatorInField::SetDeltaOneStep( G4double valDeltaOneStep )
|
||||
{
|
||||
fDetectorFieldMgr->SetDeltaOneStep(valDeltaOneStep);
|
||||
}
|
||||
|
||||
inline
|
||||
void G4PropagatorInField::SetDeltaIntersection( G4double valDeltaIntersection )
|
||||
{
|
||||
fDetectorFieldMgr->SetDeltaIntersection(valDeltaIntersection);
|
||||
}
|
||||
// #endif
|
||||
|
||||
inline
|
||||
G4int G4PropagatorInField::GetVerboseLevel() const
|
||||
@@ -235,6 +218,12 @@ G4int G4PropagatorInField::GetThresholdNoZeroSteps( G4int i )
|
||||
return t;
|
||||
}
|
||||
|
||||
inline G4double G4PropagatorInField::GetZeroStepThreshold(){ return fZeroStepThreshold; }
|
||||
inline void G4PropagatorInField::SetZeroStepThreshold( G4double newLength )
|
||||
{
|
||||
fZeroStepThreshold= newLength;
|
||||
}
|
||||
|
||||
inline
|
||||
void G4PropagatorInField::SetDetectorFieldManager(G4FieldManager* newDetectorFieldManager)
|
||||
{
|
||||
@@ -258,7 +247,12 @@ inline
|
||||
void G4PropagatorInField::
|
||||
SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator )
|
||||
{
|
||||
if(SimpleOrMultiNavigator) { fNavigator= SimpleOrMultiNavigator; }
|
||||
if(SimpleOrMultiNavigator) {
|
||||
fNavigator= SimpleOrMultiNavigator;
|
||||
if( fIntersectionLocator ) {
|
||||
fIntersectionLocator->SetNavigatorFor( SimpleOrMultiNavigator );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -294,3 +288,4 @@ G4bool G4PropagatorInField::IntersectChord( G4ThreeVector StartPointA,
|
||||
fPreviousSafety,fPreviousSftOrigin,
|
||||
LinearStepLength,IntersectionPoint);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * License and Disclaimer *
|
||||
// * *
|
||||
// * The Geant4 software is copyright of the Copyright Holders of *
|
||||
// * the Geant4 Collaboration. It is provided under the terms and *
|
||||
// * conditions of the Geant4 Software License, included in the file *
|
||||
// * LICENSE and available at http://cern.ch/geant4/license . These *
|
||||
// * include a list of copyright holders. *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. Please see the license in the file LICENSE and URL above *
|
||||
// * for the full disclaimer and the limitation of liability. *
|
||||
// * *
|
||||
// * This code implementation is the result of the scientific and *
|
||||
// * technical work of the GEANT4 collaboration. *
|
||||
// * By using, copying, modifying or distributing the software (or *
|
||||
// * any work based on the software) you agree to acknowledge its *
|
||||
// * use in resulting scientific publications, and indicate your *
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RegularNavigationHelper.hh,v 1.1 2009/01/27 09:31:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
// --------------------------------------------------------------------
|
||||
// GEANT 4 class header file
|
||||
//
|
||||
// G4RegularNavigationHelper
|
||||
//
|
||||
// Class description:
|
||||
//
|
||||
// Utility class for navigation on regular structures, providing step
|
||||
// lengths counting for each regular voxel of the structure.
|
||||
|
||||
// Author: Pedro Arce, November 2008
|
||||
// --------------------------------------------------------------------
|
||||
#ifndef G4RegularNavigationHelper_HH
|
||||
#define G4RegularNavigationHelper_HH
|
||||
|
||||
#include <vector>
|
||||
#include "globals.hh"
|
||||
|
||||
class G4RegularNavigationHelper
|
||||
{
|
||||
public:
|
||||
|
||||
G4RegularNavigationHelper();
|
||||
~G4RegularNavigationHelper();
|
||||
|
||||
static void ClearStepLengths();
|
||||
static void AddStepLength( G4int copyNo, G4double slen );
|
||||
|
||||
static std::vector< std::pair<G4int,G4double> > theStepLengths;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VIntersectionLocator.hh,v 1.4 2008/11/14 18:26:35 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4VIntersectionLocator.hh,v 1.6 2009/11/30 11:39:15 japost Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// Class G4VIntersectionLocator
|
||||
@@ -94,25 +94,36 @@ class G4VIntersectionLocator
|
||||
// Intersect the chord from StartPointA to EndPointB and return
|
||||
// whether an intersection occurred. NOTE: changes the Safety!
|
||||
|
||||
inline void SetEpsilonStepFor( G4double EpsilonStep );
|
||||
inline void SetDeltaIntersectionFor( G4double deltaIntersection );
|
||||
inline void SetNavigatorFor( G4Navigator *fNavigator );
|
||||
inline void SetChordFinderFor(G4ChordFinder *fCFinder );
|
||||
// These parameters must be set at each step, in case they were changed
|
||||
|
||||
// Note: This simple approach ensures that all scenarios are considered.
|
||||
// [ Future refinement may identify which are invariant during a
|
||||
// track, run or event ]
|
||||
|
||||
inline void SetVerboseFor(G4int fVerbose);
|
||||
inline G4int GetVerboseFor();
|
||||
// Controling verbosity enables checking of the locating of intersections
|
||||
|
||||
public: // without description
|
||||
// Additional inline Set/Get methods for parameters, dependent objects
|
||||
|
||||
// inline Set/Get methods used for IntersctionLocator
|
||||
inline G4double GetDeltaIntersectionFor();
|
||||
inline G4double GetEpsilonStepFor();
|
||||
inline G4Navigator* GetNavigatorFor();
|
||||
inline G4ChordFinder* GetChordFinderFor();
|
||||
|
||||
inline G4double GetDeltaIntersectionFor();
|
||||
inline G4double GetEpsilonStepFor();
|
||||
inline G4Navigator* GetNavigatorFor();
|
||||
inline G4ChordFinder* GetChordFinderFor();
|
||||
inline G4int GetVerboseFor();
|
||||
inline void SetSafetyParametersFor(G4bool UseSafety );
|
||||
|
||||
inline void SetEpsilonStepFor( G4double EpsilonStep );
|
||||
inline void SetDeltaIntersectionFor( G4double deltaIntersection );
|
||||
inline void SetNavigatorFor( G4Navigator *fNavigator );
|
||||
inline void SetChordFinderFor(G4ChordFinder *fCFinder );
|
||||
inline void SetSafetyParametersFor(G4bool UseSafety );
|
||||
inline void SetVerboseFor(G4int fVerbose);
|
||||
|
||||
inline void AddAdjustementOfFoundIntersection(G4bool UseCorrection);
|
||||
inline void AddAdjustementOfFoundIntersection(G4bool UseCorrection);
|
||||
inline G4bool GetAdjustementOfFoundIntersection();
|
||||
// Methods to be made Obsolete - replaced by methods below
|
||||
inline void AdjustIntersections(G4bool UseCorrection);
|
||||
inline G4bool AreIntersectionsAdjusted(){ return fUseNormalCorrection; }
|
||||
// Change adjustment flag ( New Interface )
|
||||
|
||||
protected: // with description
|
||||
|
||||
@@ -143,17 +154,19 @@ class G4VIntersectionLocator
|
||||
|
||||
protected:
|
||||
|
||||
G4double kCarTolerance;
|
||||
G4int fVerboseLevel;
|
||||
// For verbose purposes
|
||||
G4bool fUseNormalCorrection;
|
||||
G4double kCarTolerance; // Constant
|
||||
|
||||
G4int fVerboseLevel; // For debugging
|
||||
G4bool fUseNormalCorrection; // Configuration parameter
|
||||
|
||||
G4Navigator *fiNavigator;
|
||||
// Parameters set by G4PropagatorInField ( when ? )
|
||||
|
||||
G4ChordFinder *fiChordFinder;
|
||||
G4double fiEpsilonStep;
|
||||
G4double fiDeltaIntersection;
|
||||
G4Navigator *fiNavigator;
|
||||
G4ChordFinder *fiChordFinder;
|
||||
G4bool fiUseSafety;
|
||||
// For passing the parameters from G4PropagatorInField
|
||||
// Parameters set at each physical step by calling method - G4PropagatorInField
|
||||
|
||||
G4Navigator *fHelpingNavigator;
|
||||
// Helper for location
|
||||
|
||||
Reference in New Issue
Block a user