lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/navigation/include/G4Navigator.icc
+3 -41
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4Navigator.icc 73164 2013-08-21 08:55:28Z gcosmo $
//
//
// class G4Navigator Inline implementation
@@ -138,21 +138,7 @@ void G4Navigator::ResetStackAndState()
inline
EVolume G4Navigator::VolumeType(const G4VPhysicalVolume *pVol) const
{
EVolume type;
EAxis axis;
G4int nReplicas;
G4double width,offset;
G4bool consuming;
if ( pVol->IsReplicated() )
{
pVol->GetReplicationData(axis,nReplicas,width,offset,consuming);
type = (consuming) ? kReplica : kParameterised;
}
else
{
type = kNormal;
}
return type;
return pVol->VolumeType();
}
// ********************************************************************
@@ -162,31 +148,7 @@ EVolume G4Navigator::VolumeType(const G4VPhysicalVolume *pVol) const
inline
EVolume G4Navigator::CharacteriseDaughters(const G4LogicalVolume *pLog) const
{
EVolume type;
EAxis axis;
G4int nReplicas;
G4double width,offset;
G4bool consuming;
G4VPhysicalVolume *pVol;
if ( pLog->GetNoDaughters()==1 )
{
pVol = pLog->GetDaughter(0);
if (pVol->IsReplicated())
{
pVol->GetReplicationData(axis,nReplicas,width,offset,consuming);
type = (consuming) ? kReplica : kParameterised;
}
else
{
type = kNormal;
}
}
else
{
type = kNormal;
}
return type;
return pLog->CharacteriseDaughters();
}
// ********************************************************************