Import Geant4 9.2.0 source tree
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ReplicaNavigation.cc,v 1.17 2007/11/16 09:39:14 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
// $Id: G4ReplicaNavigation.cc,v 1.19 2008/04/28 15:39:55 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
//
|
||||
//
|
||||
// class G4ReplicaNavigation Implementation
|
||||
@@ -1043,7 +1043,7 @@ G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
|
||||
motherSolid = pNRMother->GetLogicalVolume()->GetSolid();
|
||||
goodPoint = history.GetTransform(mdepth).TransformPoint(globalPoint);
|
||||
insideCode = motherSolid->Inside(goodPoint);
|
||||
if ( (insideCode==kOutside)||(insideCode==kSurface)&&exiting )
|
||||
if ( (insideCode==kOutside)||((insideCode==kSurface)&&exiting) )
|
||||
{
|
||||
// Outside mother -> back up to mother level
|
||||
// Locate.. in Navigator will back up one more level
|
||||
@@ -1065,7 +1065,7 @@ G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
|
||||
insideCode = Inside(history.GetVolume(depth),
|
||||
history.GetReplicaNo(depth),
|
||||
repPoint);
|
||||
if ( (insideCode==kOutside)||(insideCode==kSurface)&&exiting )
|
||||
if ( (insideCode==kOutside)||((insideCode==kSurface)&&exiting) )
|
||||
{
|
||||
localPoint = goodPoint;
|
||||
history.BackLevel(cdepth-depth);
|
||||
@@ -1084,7 +1084,7 @@ G4ReplicaNavigation::BackLocate(G4NavigationHistory &history,
|
||||
// of *previous* level - location code in navigator will back up one
|
||||
// level [And also manage blocking]
|
||||
//
|
||||
if ( (insideCode==kOutside)||(insideCode==kSurface)&&exiting )
|
||||
if ( (insideCode==kOutside)||((insideCode==kSurface)&&exiting) )
|
||||
{
|
||||
localPoint = goodPoint;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user