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

Import Geant4 11.0.2 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-05-25 15:50:57 +02:00
parent de4f28d823
commit b3bf75a2a1
341 changed files with 93127 additions and 39343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/gdml/src/G4GDMLReadMaterials.cc
+2 -2
View File
@@ -242,7 +242,7 @@ G4double G4GDMLReadMaterials::PRead(const xercesc::DOMElement* const PElement)
// --------------------------------------------------------------------
G4double G4GDMLReadMaterials::TRead(const xercesc::DOMElement* const TElement)
{
G4double value = STP_Temperature;
G4double value = NTP_Temperature;
G4double unit = kelvin;
const xercesc::DOMNamedNodeMap* const attributes = TElement->getAttributes();
@@ -552,7 +552,7 @@ void G4GDMLReadMaterials::MaterialRead(
G4double a = 0.0;
G4double D = 0.0;
G4State state = kStateUndefined;
G4double T = STP_Temperature;
G4double T = NTP_Temperature;
G4double P = STP_Pressure;
G4double MEE = -1.0;
source/persistency/gdml/src/G4GDMLReadSolids.cc
+2 -2
View File
@@ -3559,7 +3559,6 @@ void G4GDMLReadSolids::PropertyRead(
{
G4MaterialPropertyVector* propvect;
G4String temp = name + ref;
std::cout << temp << std::endl;
// first check if it was already built
if(mapOfMatPropVects.find(temp) == mapOfMatPropVects.end())
{
@@ -4057,7 +4056,8 @@ void G4GDMLReadSolids::SolidsRead(
// --------------------------------------------------------------------
G4VSolid* G4GDMLReadSolids::GetSolid(const G4String& ref) const
{
G4VSolid* solidPtr = G4SolidStore::GetInstance()->GetSolid(ref, false);
G4VSolid* solidPtr = G4SolidStore::GetInstance()
->GetSolid(ref,false,reverseSearch);
if(solidPtr == nullptr)
{
source/persistency/gdml/src/G4GDMLReadStructure.cc
+13 -5
View File
@@ -823,7 +823,15 @@ void G4GDMLReadStructure::AssemblyRead(
xercesc::XMLString::release(&name_attr);
G4AssemblyVolume* pAssembly = new G4AssemblyVolume();
assemblyMap.insert(std::make_pair(GenerateName(name), pAssembly));
auto aName = GenerateName(name);
if(reverseSearch)
{
assemblyMap.insert_or_assign(aName, pAssembly);
}
else
{
assemblyMap.insert(std::make_pair(aName, pAssembly));
}
for(xercesc::DOMNode* iter = assemblyElement->getFirstChild();
iter != nullptr; iter = iter->getNextSibling())
@@ -1067,8 +1075,8 @@ void G4GDMLReadStructure::StructureRead(
// --------------------------------------------------------------------
G4VPhysicalVolume* G4GDMLReadStructure::GetPhysvol(const G4String& ref) const
{
G4VPhysicalVolume* physvolPtr =
G4PhysicalVolumeStore::GetInstance()->GetVolume(ref, false);
G4VPhysicalVolume* physvolPtr
= G4PhysicalVolumeStore::GetInstance()->GetVolume(ref,false,reverseSearch);
if(physvolPtr == nullptr)
{
@@ -1083,8 +1091,8 @@ G4VPhysicalVolume* G4GDMLReadStructure::GetPhysvol(const G4String& ref) const
// --------------------------------------------------------------------
G4LogicalVolume* G4GDMLReadStructure::GetVolume(const G4String& ref) const
{
G4LogicalVolume* volumePtr =
G4LogicalVolumeStore::GetInstance()->GetVolume(ref, false);
G4LogicalVolume* volumePtr
= G4LogicalVolumeStore::GetInstance()->GetVolume(ref,false,reverseSearch);
if(volumePtr == nullptr)
{