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

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/materials/src/G4Material.cc
+26 -4
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Material.cc 102843 2017-02-27 13:02:28Z gcosmo $
// $Id: G4Material.cc 106243 2017-09-26 01:56:43Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//
@@ -83,6 +83,10 @@
G4MaterialTable G4Material::theMaterialTable;
#ifdef G4MULTITHREADED
G4Mutex G4Material::materialMutex = G4MUTEX_INITIALIZER;
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
// Constructor to create a material from scratch
@@ -238,11 +242,11 @@ G4Material::~G4Material()
delete theElementVector;
delete fSandiaTable;
//delete fMaterialPropertiesTable;
if(fMassFractionVector) { delete [] fMassFractionVector; }
if(fAtomsVector) { delete [] fAtomsVector; }
delete [] fMassFractionVector;
delete [] fAtomsVector;
}
delete fIonisation;
if(VecNbOfAtomsPerVolume) { delete [] VecNbOfAtomsPerVolume; }
delete [] VecNbOfAtomsPerVolume;
// Remove this material from theMaterialTable.
//
@@ -331,6 +335,8 @@ void G4Material::CopyPointersOfBaseMaterial()
TotNbOfAtomsPerVolume = factor*fBaseMaterial->GetTotNbOfAtomsPerVolume();
TotNbOfElectPerVolume = factor*fBaseMaterial->GetTotNbOfElectPerVolume();
if(fState == kStateUndefined) { fState = fBaseMaterial->GetState(); }
theElementVector =
const_cast<G4ElementVector*>(fBaseMaterial->GetElementVector());
fMassFractionVector =
@@ -720,3 +726,19 @@ G4bool G4Material::IsExtended() const
{ return false; }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void G4Material::SetMaterialPropertiesTable(G4MaterialPropertiesTable* anMPT)
{
if(anMPT && fMaterialPropertiesTable != anMPT) {
#ifdef G4MULTITHREADED
G4MUTEXLOCK(&materialMutex);
#endif
delete fMaterialPropertiesTable;
fMaterialPropertiesTable = anMPT;
#ifdef G4MULTITHREADED
G4MUTEXUNLOCK(&materialMutex);
#endif
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......