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

Import Geant4 8.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 14:44:26 +02:00
parent 8a51e0bc40
commit 216a75eeb1
8717 changed files with 360418 additions and 141343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/volumes/src/G4AssemblyVolume.cc
+205 -167
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4AssemblyVolume.cc,v 1.4 2005/11/09 15:08:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4AssemblyVolume.cc,v 1.10 2006/06/29 18:57:50 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// Class G4AssemblyVolume - implementation
@@ -35,6 +38,7 @@
#include "G4AffineTransform.hh"
#include "G4LogicalVolume.hh"
#include "G4VPhysicalVolume.hh"
#include "G4ReflectionFactory.hh"
#include <sstream>
@@ -55,10 +59,13 @@ G4AssemblyVolume::G4AssemblyVolume()
G4AssemblyVolume::~G4AssemblyVolume()
{
unsigned int howmany = fTriplets.size();
if( howmany != 0 ) {
for( unsigned int i = 0; i < howmany; i++ ) {
if( howmany != 0 )
{
for( unsigned int i = 0; i < howmany; i++ )
{
G4RotationMatrix* pRotToClean = fTriplets[i].GetRotation();
if( pRotToClean != 0 ) {
if( pRotToClean != 0 )
{
delete pRotToClean;
}
}
@@ -66,16 +73,18 @@ G4AssemblyVolume::~G4AssemblyVolume()
fTriplets.clear();
howmany = fPVStore.size();
if( howmany != 0 ) {
for( unsigned int j = 0; j < howmany; j++ ) {
if( howmany != 0 )
{
for( unsigned int j = 0; j < howmany; j++ )
{
G4RotationMatrix* pRotToClean = fPVStore[j]->GetRotation();
if( pRotToClean != 0 ) {
if( pRotToClean != 0 )
{
delete pRotToClean;
}
delete fPVStore[j];
}
}
fPVStore.clear();
InstanceCountMinus();
}
@@ -83,23 +92,20 @@ G4AssemblyVolume::~G4AssemblyVolume()
// Add and place the given volume according to the specified
// translation and rotation.
//
// The rotation matrix passed in can be 0 = identity or an address even of an object
// on the upper stack frame. During assembly imprint, it creates anyway a new matrix
// and keeps track of it so it can delete it later at destruction time.
// This new policy has been adopted since user has no control on the way the rotations
// are combined it's safer doing it this way.
// The rotation matrix passed in can be 0 = identity or an address even of an
// object on the upper stack frame. During assembly imprint, it creates anyway
// a new matrix and keeps track of it so it can delete it later at destruction
// time.
// This policy has been adopted since user has no control on the way the
// rotations are combined.
//
// WARNING! This interface will likely change in the next major release of Geant4 from
// a pointer to a reference due to the reason above
void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume* pVolume,
G4ThreeVector& translation,
G4RotationMatrix* pRotation )
{
G4RotationMatrix* toStore = new G4RotationMatrix;
if( pRotation != 0 ) {
*toStore = *pRotation;
}
if( pRotation != 0 ) { *toStore = *pRotation; }
G4AssemblyTriplet toAdd( pVolume, translation, toStore );
fTriplets.push_back( toAdd );
@@ -110,15 +116,62 @@ void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume* pVolume,
void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume* pVolume,
G4Transform3D& transformation )
{
G4ThreeVector v = transformation.getTranslation();
// Decompose transformation
G4Scale3D scale;
G4Rotate3D rotation;
G4Translate3D translation;
transformation.getDecomposition(scale, rotation, translation);
G4ThreeVector v = translation.getTranslation();
G4RotationMatrix* r = new G4RotationMatrix;
*r = transformation.getRotation();
*r = rotation.getRotation();
G4AssemblyTriplet toAdd( pVolume, v, r );
G4bool isReflection = false;
if (scale(0,0)*scale(1,1)*scale(2,2) < 0.) { isReflection = true; }
G4AssemblyTriplet toAdd( pVolume, v, r, isReflection );
fTriplets.push_back( toAdd );
}
// Add and place the given assembly volume according to the specified
// translation and rotation.
//
void G4AssemblyVolume::AddPlacedAssembly( G4AssemblyVolume* pAssembly,
G4ThreeVector& translation,
G4RotationMatrix* pRotation )
{
G4RotationMatrix* toStore = new G4RotationMatrix;
if( pRotation != 0 ) { *toStore = *pRotation; }
G4AssemblyTriplet toAdd( pAssembly, translation, toStore );
fTriplets.push_back( toAdd );
}
// Add and place the given assembly volume according to the specified
// transformation
//
void G4AssemblyVolume::AddPlacedAssembly( G4AssemblyVolume* pAssembly,
G4Transform3D& transformation )
{
// Decompose transformation
//
G4Scale3D scale;
G4Rotate3D rotation;
G4Translate3D translation;
transformation.getDecomposition(scale, rotation, translation);
G4ThreeVector v = translation.getTranslation();
G4RotationMatrix* r = new G4RotationMatrix;
*r = rotation.getRotation();
G4bool isReflection = false;
if (scale(0,0)*scale(1,1)*scale(2,2) < 0.) { isReflection = true; }
G4AssemblyTriplet toAdd( pAssembly, v, r, isReflection );
fTriplets.push_back( toAdd );
}
// Create an instance of an assembly volume inside of the specified
// mother volume. This works analogically to making stamp imprints.
// This method makes use of the Geant4 affine transformation class.
@@ -145,162 +198,147 @@ void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume* pVolume,
// The order of multiplication is reversed when comparing to CLHEP 3D
// transformation matrix(G4Transform3D class).
//
// The rotation matrix passed in can be 0 = identity or an address even of an object
// on the upper stack frame. During assembly imprint, it creates anyway a new matrix
// and keeps track of it so it can delete it later at destruction time.
// This new policy has been adopted since user has no control on the way the rotations
// are combined it's safer doing it this way.
// The rotation matrix passed in can be 0 = identity or an address even of an
// object on the upper stack frame. During assembly imprint, it creates anyway
// a new matrix and keeps track of it so it can delete it later at destruction
// time.
// This policy has been adopted since user has no control on the way the
// rotations are combined.
//
// If the assembly volume contains assembly (a'), the function is called
// recursively with composed transformation:
//
// WARNING! This interface will likely change in the next major release of Geant4 from
// a pointer to a reference due to the reason above
// Tanew = Ta * Ta'
//
void G4AssemblyVolume::MakeImprint( G4LogicalVolume* pMotherLV,
G4ThreeVector& translationInMother,
G4RotationMatrix* pRotationInMother,
G4int copyNumBase )
void G4AssemblyVolume::MakeImprint( G4AssemblyVolume* pAssembly,
G4LogicalVolume* pMotherLV,
G4Transform3D& transformation,
G4int copyNumBase,
G4bool surfCheck )
{
// If needed user can specify explicitly the base count from which to start off for the generation
// of phys. vol. copy numbers
// The old behaviour is preserved when copyNumBase == 0, e.g. the generated copy numbers start
// from the count equal to current number of daughter volumes before a imprint is made
unsigned int numberOfDaughters;
unsigned int numberOfDaughters;
if( copyNumBase == 0 ) {
if( copyNumBase == 0 )
{
numberOfDaughters = pMotherLV->GetNoDaughters();
} else {
}
else
{
numberOfDaughters = copyNumBase;
}
// We start from the first available index
//
numberOfDaughters++;
ImprintsCountPlus();
if( pRotationInMother == 0 ) {
// Make it by default an indentity matrix;
pRotationInMother = const_cast<G4RotationMatrix*>( &G4RotationMatrix::IDENTITY );
}
std::vector<G4AssemblyTriplet> triplets = pAssembly->fTriplets;
for( unsigned int i = 0; i < fTriplets.size(); i++ )
for( unsigned int i = 0; i < triplets.size(); i++ )
{
// Generate the unique name for the next PV instance
// The name has format:
G4Transform3D Ta( *(triplets[i].GetRotation()),
triplets[i].GetTranslation() );
if ( triplets[i].IsReflection() ) { Ta = Ta * G4ReflectZ3D(); }
G4Transform3D Tfinal = transformation * Ta;
if ( triplets[i].GetVolume() )
{
// Generate the unique name for the next PV instance
// The name has format:
//
// av_WWW_impr_XXX_YYY_ZZZ
// where the fields mean:
// WWW - assembly volume instance number
// XXX - assembly volume imprint number
// YYY - the name of a log. volume we want to make a placement of
// ZZZ - the log. volume index inside the assembly volume
//
std::stringstream pvName;
pvName << "av_"
<< GetAssemblyID()
<< "_impr_"
<< GetImprintsCount()
<< "_"
<< triplets[i].GetVolume()->GetName().c_str()
<< "_pv_"
<< i
<< std::ends;
// Generate a new physical volume instance inside a mother
// (as we allow 3D transformation use G4ReflectionFactory to
// take into account eventual reflection)
//
G4PhysicalVolumesPair pvPlaced
= G4ReflectionFactory::Instance()->Place( Tfinal,
pvName.str().c_str(),
triplets[i].GetVolume(),
pMotherLV,
false,
numberOfDaughters + i,
surfCheck );
// Register the physical volume created by us so we can delete it later
//
fPVStore.push_back( pvPlaced.first );
if ( pvPlaced.second ) { fPVStore.push_back( pvPlaced.second ); }
}
else if ( triplets[i].GetAssembly() )
{
// Place volumes in this assembly with composed transformation
//
MakeImprint( triplets[i].GetAssembly(), pMotherLV,
Tfinal, i*100+copyNumBase, surfCheck );
}
else
{
G4Exception("G4AssemblyVolume::MakeImprint(..)",
"NotApplicable", FatalException,
"Triplet has no volume and no assembly");
}
}
}
void G4AssemblyVolume::MakeImprint( G4LogicalVolume* pMotherLV,
G4ThreeVector& translationInMother,
G4RotationMatrix* pRotationInMother,
G4int copyNumBase,
G4bool surfCheck )
{
// If needed user can specify explicitely the base count from which to start
// off for the generation of phys. vol. copy numbers.
// The old behaviour is preserved when copyNumBase == 0, e.g. the generated
// copy numbers start from the count equal to current number of daughter
// volumes before an imprint is made
// Compose transformation
//
if( pRotationInMother == 0 )
{
// Make it by default an indentity matrix
//
// av_WWW_impr_XXX_YYY_ZZZ
// where the fields mean:
// WWW - assembly volume instance number
// XXX - assembly volume imprint number
// YYY - the name of a log. volume we want to make a placement of
// ZZZ - the log. volume index inside the assembly volume
std::stringstream pvName;
pvName << "av_"
<< GetAssemblyID()
<< "_impr_"
<< GetImprintsCount()
<< "_"
<< fTriplets[i].GetVolume()->GetName().c_str()
<< "_pv_"
<< i
<< std::ends;
// Create the transformation in this assembly volume
G4AffineTransform Ta( fTriplets[i].GetRotation()->inverse(),
fTriplets[i].GetTranslation() );
// Create the transformation in a mother volume
G4AffineTransform Tm( pRotationInMother->inverse(),
translationInMother );
// Combine them together
G4AffineTransform Tfinal = Ta * Tm;
// Extract the final absolute transformation inside a mother
G4RotationMatrix* pFinalRotation = new G4RotationMatrix(
Tfinal.NetRotation()
);
G4ThreeVector finalTranslation = Tfinal.NetTranslation();
// Generate a new physical volume instance inside a mother
G4VPhysicalVolume* pPlaced = new G4PVPlacement(
pFinalRotation
,finalTranslation
,fTriplets[i].GetVolume()
,pvName.str()
,pMotherLV
,false
,numberOfDaughters + i
);
// Register the physical volume created by us so we can delete it later
fPVStore.push_back( pPlaced );
pRotationInMother =
const_cast<G4RotationMatrix*>( &G4RotationMatrix::IDENTITY );
}
G4Transform3D transform( *pRotationInMother,
translationInMother );
MakeImprint(this, pMotherLV, transform, copyNumBase, surfCheck);
}
void G4AssemblyVolume::MakeImprint( G4LogicalVolume* pMotherLV,
G4Transform3D& transformation,
G4int copyNumBase )
G4int copyNumBase,
G4bool surfCheck )
{
// If needed user can specify explicitly the base count from which to start off for the generation
// of phys. vol. copy numbers
// The old behaviour is preserved when copyNumBase == 0, e.g. the generated copy numbers start
// from the count equal to current number of daughter volumes before a imprint is made
// If needed user can specify explicitely the base count from which to start
// off for the generation of phys. vol. copy numbers.
// The old behaviour is preserved when copyNumBase == 0, e.g. the generated
// copy numbers start from the count equal to current number of daughter
// volumes before a imprint is made
unsigned int numberOfDaughters;
if( copyNumBase == 0 ) {
numberOfDaughters = pMotherLV->GetNoDaughters();
} else {
numberOfDaughters = copyNumBase;
}
// We start from the first available index
numberOfDaughters++;
ImprintsCountPlus();
for( unsigned int i = 0; i < fTriplets.size(); i++ )
{
// Generate the unique name for the next PV instance
// The name has format:
//
// av_WWW_impr_XXX_YYY_ZZZ
// where the fields mean:
// WWW - assembly volume instance number
// XXX - assembly volume imprint number
// YYY - the name of a log. volume we want to make a placement of
// ZZZ - the log. volume index inside the assembly volume
std::stringstream pvName;
pvName << "av_"
<< GetAssemblyID()
<< "_impr_"
<< GetImprintsCount()
<< "_"
<< fTriplets[i].GetVolume()->GetName().c_str()
<< "_pv_"
<< i
<< std::ends;
G4Transform3D Ta( *(fTriplets[i].GetRotation()),
fTriplets[i].GetTranslation()
);
G4Transform3D Tfinal = transformation * Ta;
// G4RotationMatrix* pFinalRotation =
// new G4RotationMatrix( Tfinal.getRotation().inverse() );
// G4ThreeVector finalTranslation = Tfinal.getTranslation();
// Generate a new physical volume instance inside a mother
G4VPhysicalVolume* pPlaced = new G4PVPlacement( Tfinal,
fTriplets[i].GetVolume(),
pvName.str(),
pMotherLV,
false,
numberOfDaughters + i );
// Register the physical volume created by us so we can delete it later
fPVStore.push_back( pPlaced );
}
MakeImprint(this, pMotherLV, transformation, copyNumBase, surfCheck);
}
unsigned int G4AssemblyVolume::GetInstanceCount() const
source/geometry/volumes/src/G4GRSSolid.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4GRSSolid.cc,v 1.7 2003/11/02 16:06:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4GRSSolid.cc,v 1.8 2006/06/29 18:57:53 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// class G4GRSSolid Implementation
source/geometry/volumes/src/G4GRSVolume.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4GRSVolume.cc,v 1.7 2003/11/02 16:06:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4GRSVolume.cc,v 1.8 2006/06/29 18:57:55 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// class G4GRSVolume Implementation
source/geometry/volumes/src/G4LogicalBorderSurface.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4LogicalBorderSurface.cc,v 1.13 2004/05/19 08:14:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4LogicalBorderSurface.cc,v 1.14 2006/06/29 18:57:57 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
// --------------------------------------------------------------------
// G4LogicalBorderSurface Implementation
source/geometry/volumes/src/G4LogicalSkinSurface.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4LogicalSkinSurface.cc,v 1.12 2004/05/19 08:14:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4LogicalSkinSurface.cc,v 1.13 2006/06/29 18:57:59 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
// --------------------------------------------------------------------
// G4LogicalSkinSurface Implementation
source/geometry/volumes/src/G4NavigationHistory.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4NavigationHistory.cc,v 1.9 2003/12/04 15:59:05 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4NavigationHistory.cc,v 1.10 2006/06/29 18:58:02 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// G4NavigationHistory Implementation
source/geometry/volumes/src/G4NavigationLevel.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4NavigationLevel.cc,v 1.3 2005/06/06 13:41:26 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4NavigationLevel.cc,v 1.4 2006/06/29 18:58:04 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
// 30.09.97 J.Apostolakis Initial version.
//
source/geometry/volumes/src/G4NavigationLevelRep.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4NavigationLevelRep.cc,v 1.1 2005/06/06 13:41:26 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4NavigationLevelRep.cc,v 1.2 2006/06/29 18:58:06 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
// 1 October 1997 J.Apostolakis Initial version.
//
source/geometry/volumes/src/G4PVParameterised.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4PVParameterised.cc,v 1.5 2005/11/11 22:39:00 japost Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4PVParameterised.cc,v 1.6 2006/06/29 18:58:09 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// class G4PVParameterised
source/geometry/volumes/src/G4PVPlacement.cc
+19 -15
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4PVPlacement.cc,v 1.7 2005/11/16 19:08:00 japost Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4PVPlacement.cc,v 1.11 2006/06/29 18:58:11 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// class G4PVPlacement Implementation
@@ -112,7 +115,7 @@ G4PVPlacement::G4PVPlacement( G4RotationMatrix *pRot,
}
SetMotherLogical(pMotherLogical);
if (pMotherLogical) { pMotherLogical->AddDaughter(this); }
if (pSurfChk) { CheckOverlaps(); }
if ((pSurfChk) && (pMotherLogical)) { CheckOverlaps(); }
}
@@ -138,7 +141,7 @@ G4PVPlacement::G4PVPlacement( const G4Transform3D &Transform3D,
fallocatedRotM = (GetRotation() != 0);
SetMotherLogical(pMotherLogical);
if (pMotherLogical) { pMotherLogical->AddDaughter(this); }
if (pSurfChk) { CheckOverlaps(); }
if ((pSurfChk) && (pMotherLogical)) { CheckOverlaps(); }
}
// ----------------------------------------------------------------------
@@ -243,6 +246,7 @@ G4bool G4PVPlacement::CheckOverlaps(G4int res)
G4VSolid* solid = GetLogicalVolume()->GetSolid();
G4LogicalVolume* motherLog = GetMotherLogical();
if (!motherLog) { return false; }
G4cout << "Checking overlaps for volume " << GetName() << " ... ";
source/geometry/volumes/src/G4PVReplica.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4PVReplica.cc,v 1.6 2005/11/11 22:39:00 japost Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4PVReplica.cc,v 1.7 2006/06/29 18:58:14 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// class G4PVReplica Implementation
source/geometry/volumes/src/G4ReflectionFactory.cc
+39 -30
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4ReflectionFactory.cc,v 1.3 2004/12/02 09:31:35 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4ReflectionFactory.cc,v 1.5 2006/06/29 18:58:17 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// Class G4ReflectionFactory Implementation
@@ -106,7 +109,8 @@ G4ReflectionFactory::Place( const G4Transform3D& transform3D,
G4LogicalVolume* LV,
G4LogicalVolume* motherLV,
G4bool isMany,
G4int copyNo)
G4int copyNo,
G4bool surfCheck)
{
// Evaluates the passed transformation; if it contains reflection
// it performs its decomposition, creates new reflected solid and
@@ -149,7 +153,8 @@ G4ReflectionFactory::Place( const G4Transform3D& transform3D,
G4cout << "Scale positive" << G4endl;
G4VPhysicalVolume* pv1
= new G4PVPlacement(pureTransform3D, LV, name, motherLV, isMany, copyNo);
= new G4PVPlacement(pureTransform3D, LV, name,
motherLV, isMany, copyNo, surfCheck);
G4VPhysicalVolume* pv2 = 0;
if (G4LogicalVolume* reflMotherLV = GetReflectedLV(motherLV))
@@ -158,7 +163,8 @@ G4ReflectionFactory::Place( const G4Transform3D& transform3D,
// reflect this LV and place it in reflected mother
pv2 = new G4PVPlacement(fScale * (pureTransform3D * fScale.inverse()),
ReflectLV(LV),name,reflMotherLV,isMany,copyNo);
ReflectLV(LV, surfCheck), name, reflMotherLV,
isMany, copyNo, surfCheck);
}
return G4PhysicalVolumesPair(pv1, pv2);
@@ -172,8 +178,8 @@ G4ReflectionFactory::Place( const G4Transform3D& transform3D,
G4cout << "scale negative" << G4endl;
G4VPhysicalVolume* pv1
= new G4PVPlacement(pureTransform3D,
ReflectLV(LV), name, motherLV, isMany, copyNo);
= new G4PVPlacement(pureTransform3D, ReflectLV(LV, surfCheck), name,
motherLV, isMany, copyNo, surfCheck);
G4VPhysicalVolume* pv2 = 0;
if (G4LogicalVolume* reflMotherLV = GetReflectedLV(motherLV))
@@ -183,8 +189,8 @@ G4ReflectionFactory::Place( const G4Transform3D& transform3D,
// place the refLV consituent in reflected mother
pv2 = new G4PVPlacement(fScale * (pureTransform3D * fScale.inverse()),
LV, name, reflMotherLV, isMany, copyNo);
}
LV, name, reflMotherLV, isMany, copyNo, surfCheck);
}
return G4PhysicalVolumesPair(pv1, pv2);
}
@@ -359,7 +365,8 @@ G4ReflectionFactory::Divide(const G4String& name,
//_____________________________________________________________________________
G4LogicalVolume* G4ReflectionFactory::ReflectLV(G4LogicalVolume* LV)
G4LogicalVolume* G4ReflectionFactory::ReflectLV(G4LogicalVolume* LV,
G4bool surfCheck)
{
// Gets/creates the reflected solid and logical volume
// and copies + transforms LV daughters.
@@ -376,7 +383,7 @@ G4LogicalVolume* G4ReflectionFactory::ReflectLV(G4LogicalVolume* LV)
// process daughters
//
ReflectDaughters(LV, refLV);
ReflectDaughters(LV, refLV, surfCheck);
// check if to be set as root region
//
@@ -437,7 +444,8 @@ G4LogicalVolume* G4ReflectionFactory::CreateReflectedLV(G4LogicalVolume* LV)
//_____________________________________________________________________________
void G4ReflectionFactory::ReflectDaughters(G4LogicalVolume* LV,
G4LogicalVolume* refLV)
G4LogicalVolume* refLV,
G4bool surfCheck)
{
// Reflects daughters recursively.
// ---
@@ -454,7 +462,7 @@ void G4ReflectionFactory::ReflectDaughters(G4LogicalVolume* LV,
if (! dPV->IsReplicated())
{
ReflectPVPlacement(dPV, refLV);
ReflectPVPlacement(dPV, refLV, surfCheck);
}
else if (! dPV->GetParameterisation())
{
@@ -467,7 +475,7 @@ void G4ReflectionFactory::ReflectDaughters(G4LogicalVolume* LV,
}
else
{
ReflectPVParameterised(dPV, refLV);
ReflectPVParameterised(dPV, refLV, surfCheck);
}
}
}
@@ -475,7 +483,8 @@ void G4ReflectionFactory::ReflectDaughters(G4LogicalVolume* LV,
//_____________________________________________________________________________
void G4ReflectionFactory::ReflectPVPlacement(G4VPhysicalVolume* dPV,
G4LogicalVolume* refLV)
G4LogicalVolume* refLV,
G4bool surfCheck)
{
// Copies and transforms daughter of PVPlacement type of
// a constituent volume into a reflected volume.
@@ -510,14 +519,14 @@ void G4ReflectionFactory::ReflectPVPlacement(G4VPhysicalVolume* dPV,
// recursive call
//
ReflectDaughters(dLV, refDLV);
ReflectDaughters(dLV, refDLV, surfCheck);
}
// create new daughter physical volume
// with updated transformation
new G4PVPlacement(dt, refDLV, dPV->GetName(), refLV,
dPV->IsMany(), dPV->GetCopyNo());
dPV->IsMany(), dPV->GetCopyNo(), surfCheck);
}
else
@@ -528,7 +537,7 @@ void G4ReflectionFactory::ReflectPVPlacement(G4VPhysicalVolume* dPV,
refDLV = GetConstituentLV(dLV);
new G4PVPlacement(dt, refDLV, dPV->GetName(), refLV,
dPV->IsMany(), dPV->GetCopyNo());
dPV->IsMany(), dPV->GetCopyNo(), surfCheck);
}
}
@@ -655,7 +664,7 @@ void G4ReflectionFactory::ReflectPVDivision(G4VPhysicalVolume* dPV,
//_____________________________________________________________________________
void G4ReflectionFactory::ReflectPVParameterised(G4VPhysicalVolume* dPV,
G4LogicalVolume*)
G4LogicalVolume*, G4bool)
{
// Not implemented.
// Should copy and transform daughter of PVReplica type of
source/geometry/volumes/src/G4TouchableHistory.cc
+16 -13
View File
@@ -1,28 +1,31 @@
//
// ********************************************************************
// * DISCLAIMER *
// * License and Disclaimer *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * 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. *
// * 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 intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// * 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: G4TouchableHistory.cc,v 1.11 2005/06/06 15:19:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-08-00 $
// $Id: G4TouchableHistory.cc,v 1.12 2006/06/29 18:58:20 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
//
//
// class G4TouchableHistory Implementation
source/geometry/volumes/src/G4VNestedParameterisation.cc
-66
View File
@@ -1,66 +0,0 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * 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. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4VNestedParameterisation.cc,v 1.6 2005/11/24 18:19:53 japost Exp $
// GEANT4 tag $Name: geant4-08-00 $
//
// class G4VNestedParameterisation implementation
//
// --------------------------------------------------------------------
#include "G4VPhysicalVolume.hh"
#include "G4LogicalVolume.hh"
#include "G4VTouchable.hh"
#include "G4VNestedParameterisation.hh"
G4VNestedParameterisation::G4VNestedParameterisation() :
G4VPVParameterisation(), G4VVolumeMaterialScanner()
{
}
G4VNestedParameterisation::~G4VNestedParameterisation() {}
G4VSolid* G4VNestedParameterisation::ComputeSolid(const G4int,
G4VPhysicalVolume *pvol)
{
return pvol->GetLogicalVolume()->GetSolid();
}
G4bool G4VNestedParameterisation::IsNested() const
{
return true;
}
G4VVolumeMaterialScanner* G4VNestedParameterisation::GetMaterialScanner()
{
return this;
}
G4Material*
G4VNestedParameterisation::ComputeMaterial(const G4int repNo,
G4VPhysicalVolume *currentVol,
const G4VTouchable *parentTouch)
{
return ComputeMaterial( currentVol, repNo, parentTouch );
}