Import Geant4 9.3.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4LogicalVolume.cc,v 1.33 2008/07/10 09:40:09 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4LogicalVolume.cc,v 1.34 2009/09/24 13:22:57 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// class G4LogicalVolume Implementation
|
||||
@@ -161,17 +161,13 @@ G4LogicalVolume::IsAncestor(const G4VPhysicalVolume* aVolume) const
|
||||
//
|
||||
G4int G4LogicalVolume::TotalVolumeEntities() const
|
||||
{
|
||||
static G4int vols = 0;
|
||||
|
||||
vols++;
|
||||
G4int vols = 1;
|
||||
for (G4PhysicalVolumeList::const_iterator itDau = fDaughters.begin();
|
||||
itDau != fDaughters.end(); itDau++)
|
||||
{
|
||||
G4VPhysicalVolume* physDaughter = (*itDau);
|
||||
for (G4int i=0; i<physDaughter->GetMultiplicity(); i++)
|
||||
{
|
||||
physDaughter->GetLogicalVolume()->TotalVolumeEntities();
|
||||
}
|
||||
vols += physDaughter->GetMultiplicity()
|
||||
*physDaughter->GetLogicalVolume()->TotalVolumeEntities();
|
||||
}
|
||||
return vols;
|
||||
}
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Region.cc,v 1.26 2008/07/15 10:27:36 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4Region.cc,v 1.27 2009/11/27 16:34:37 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// class G4Region Implementation
|
||||
@@ -47,7 +47,8 @@
|
||||
//
|
||||
G4Region::G4Region(const G4String& pName)
|
||||
: fName(pName), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
|
||||
fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
|
||||
fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
|
||||
fRegionalSteppingAction(0)
|
||||
{
|
||||
G4RegionStore* rStore = G4RegionStore::GetInstance();
|
||||
if (rStore->GetRegion(pName,false))
|
||||
@@ -71,7 +72,8 @@ G4Region::G4Region(const G4String& pName)
|
||||
//
|
||||
G4Region::G4Region( __void__& )
|
||||
: fName(""), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
|
||||
fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
|
||||
fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
|
||||
fRegionalSteppingAction(0)
|
||||
{
|
||||
// Register to store
|
||||
//
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmartVoxelHeader.cc,v 1.31 2008/01/24 15:46:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4SmartVoxelHeader.cc,v 1.34 2009/10/30 14:05:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// class G4SmartVoxelHeader
|
||||
@@ -365,12 +365,12 @@ void G4SmartVoxelHeader::BuildReplicaVoxels(G4LogicalVolume* pVolume)
|
||||
{
|
||||
// Sanity check on extent
|
||||
//
|
||||
G4double min, max;
|
||||
G4double emin = kInfinity, emax = -kInfinity;
|
||||
G4VoxelLimits limits;
|
||||
G4AffineTransform origin;
|
||||
pVolume->GetSolid()->CalculateExtent(axis, limits, origin, min, max);
|
||||
if ( (std::fabs((min-fminExtent)/fminExtent) +
|
||||
std::fabs((max-fmaxExtent)/fmaxExtent)) > 0.05)
|
||||
pVolume->GetSolid()->CalculateExtent(axis, limits, origin, emin, emax);
|
||||
if ( (std::fabs((emin-fminExtent)/fminExtent) +
|
||||
std::fabs((emax-fmaxExtent)/fmaxExtent)) > 0.05)
|
||||
{
|
||||
G4cerr << "ERROR - G4SmartVoxelHeader::BuildReplicaVoxels()"
|
||||
<< G4endl
|
||||
@@ -1037,6 +1037,9 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
|
||||
//
|
||||
for (nNode=0; nNode<noNodes; nNode++)
|
||||
{
|
||||
// Get rid of possible excess capacity in the internal node vector
|
||||
//
|
||||
((*nodeList)[nNode])->Shrink();
|
||||
G4SmartVoxelProxy* pProxyNode = new G4SmartVoxelProxy((*nodeList)[nNode]);
|
||||
if (!pProxyNode)
|
||||
{
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * 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: G4VTouchable.cc,v 1.1 2009/11/06 10:36:00 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
// class G4VTouchable implementation
|
||||
//
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
#include "G4VTouchable.hh"
|
||||
|
||||
G4VTouchable::G4VTouchable()
|
||||
{
|
||||
}
|
||||
|
||||
G4VTouchable::~G4VTouchable()
|
||||
{
|
||||
}
|
||||
|
||||
G4VPhysicalVolume* G4VTouchable::GetVolume(G4int) const
|
||||
{
|
||||
G4Exception("G4VTouchable::GetVolume()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
G4VSolid* G4VTouchable::GetSolid(G4int) const
|
||||
{
|
||||
G4Exception("G4VTouchable::GetSolid()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
G4int G4VTouchable::GetReplicaNumber(G4int) const
|
||||
{
|
||||
G4Exception("G4VTouchable::GetReplicaNumber()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
G4int G4VTouchable::MoveUpHistory(G4int)
|
||||
{
|
||||
G4Exception("G4VTouchable::MoveUpHistory()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
void G4VTouchable::UpdateYourself(G4VPhysicalVolume*,
|
||||
const G4NavigationHistory* )
|
||||
{
|
||||
G4Exception("G4VTouchable::UpdateYourself()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
}
|
||||
|
||||
G4int G4VTouchable::GetHistoryDepth() const
|
||||
{
|
||||
G4Exception("G4VTouchable::GetHistoryDepth()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
const G4NavigationHistory* G4VTouchable::GetHistory() const
|
||||
{
|
||||
G4Exception("G4VTouchable::GetHistory()", "NotApplicable",
|
||||
FatalException, "Undefined call to base class.");
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user