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

Import Geant4 11.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2023-12-08 10:43:34 +01:00
parent dd1f179cda
commit 860a2b92bf
3962 changed files with 139318 additions and 164259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/cuts/History
+9
View File
@@ -6,6 +6,15 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2023-10-24 Ivana Hrivnacova (proccuts-V11-01-01)
- G4ProductionCutsTable - Added method CreateCoupleTables()
separated from UpdateCoupleTable() needed to prepare
class data for usafe new SetEnergyCutVector(...)
## 2023-09-29 Vladimir Ivantchenko (proccuts-V11-01-00)
- G4ProductionCutsTable - added method SetEnergyCutVector(...)
requested by ALICE experiment
## 2022-11-16 Gabriele Cosmo (proccuts-V11-00-06)
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
source/processes/cuts/include/G4ProductionCutsTable.hh
+10
View File
@@ -66,6 +66,9 @@ class G4ProductionCutsTable
virtual ~G4ProductionCutsTable();
void CreateCoupleTables();
// Creates material cuts couples table and allocate the other tables
void UpdateCoupleTable(G4VPhysicalVolume* currentWorld);
// Triggers an update of the table of G4ProductionCuts objects
@@ -144,6 +147,10 @@ class G4ProductionCutsTable
G4double* GetEnergyCutsDoubleVector(std::size_t pcIdx) const;
// Methods for backward compatibility
void SetEnergyCutVector(const std::vector<G4double>& cutE, std::size_t idx);
// User defined cut vectors (idx < 4) range cut should be defined
// to avoid inconsistency in physics
void SetVerboseLevel(G4int value);
G4int GetVerboseLevel() const;
// Control flag for output message
@@ -191,6 +198,7 @@ class G4ProductionCutsTable
G4bool IsCoupleUsedInTheRegion(const G4MaterialCutsCouple* aCouple,
const G4Region* aRegion) const;
private:
static G4ProductionCutsTable* fProductionCutsTable;
@@ -199,6 +207,8 @@ class G4ProductionCutsTable
std::vector<std::vector<G4double>*> rangeCutTable;
std::vector<std::vector<G4double>*> energyCutTable;
std::vector<G4double>* userEnergyCuts[4] = {nullptr, nullptr, nullptr, nullptr};
G4RegionStore* fG4RegionStore = nullptr;
G4VRangeToEnergyConverter* converters[NumberOfG4CutIndex];
source/processes/cuts/src/G4ProductionCutsTable.cc
+73 -41
View File
@@ -107,6 +107,10 @@ G4ProductionCutsTable::~G4ProductionCutsTable()
converters[i] = nullptr;
rangeDoubleVector[i] = nullptr;
energyDoubleVector[i] = nullptr;
if(i < 4)
{
delete userEnergyCuts[i];
}
}
fProductionCutsTable = nullptr;
@@ -115,33 +119,22 @@ G4ProductionCutsTable::~G4ProductionCutsTable()
}
// --------------------------------------------------------------------
void G4ProductionCutsTable::UpdateCoupleTable(G4VPhysicalVolume* /*currWorld*/)
void G4ProductionCutsTable::SetEnergyCutVector(const std::vector<G4double>& cutE,
std::size_t idx)
{
if(firstUse)
{
if(G4ParticleTable::GetParticleTable()->FindParticle("gamma"))
{
converters[0] = new G4RToEConvForGamma();
converters[0]->SetVerboseLevel(GetVerboseLevel());
}
if(G4ParticleTable::GetParticleTable()->FindParticle("e-"))
{
converters[1] = new G4RToEConvForElectron();
converters[1]->SetVerboseLevel(GetVerboseLevel());
}
if(G4ParticleTable::GetParticleTable()->FindParticle("e+"))
{
converters[2] = new G4RToEConvForPositron();
converters[2]->SetVerboseLevel(GetVerboseLevel());
}
if(G4ParticleTable::GetParticleTable()->FindParticle("proton"))
{
converters[3] = new G4RToEConvForProton();
converters[3]->SetVerboseLevel(GetVerboseLevel());
}
firstUse = false;
if (idx >= 4) {
G4ExceptionDescription ed;
ed << "Wrong index= " << idx << "; it should be < 4";
G4Exception("G4ProductionCutsTable::SetEnergyCutVector()",
"CUTS0100", FatalException, ed);
return;
}
userEnergyCuts[idx] = new std::vector<G4double>(cutE);
}
// --------------------------------------------------------------------
void G4ProductionCutsTable::CreateCoupleTables()
{
// Reset "used" flags of all couples
for(auto CoupleItr=coupleTable.cbegin();
CoupleItr!=coupleTable.cend(); ++CoupleItr)
@@ -232,6 +225,51 @@ void G4ProductionCutsTable::UpdateCoupleTable(G4VPhysicalVolume* /*currWorld*/)
}
}
// resize Range/Energy cuts double vectors if new couple is made
if(newCoupleAppears)
{
for(std::size_t ix=0; ix<NumberOfG4CutIndex; ++ix)
{
G4double* rangeVOld = rangeDoubleVector[ix];
G4double* energyVOld = energyDoubleVector[ix];
if(rangeVOld) delete [] rangeVOld;
if(energyVOld) delete [] energyVOld;
rangeDoubleVector[ix] = new G4double[(*(rangeCutTable[ix])).size()];
energyDoubleVector[ix] = new G4double[(*(energyCutTable[ix])).size()];
}
}
}
// --------------------------------------------------------------------
void G4ProductionCutsTable::UpdateCoupleTable(G4VPhysicalVolume* /*currWorld*/)
{
CreateCoupleTables();
if(firstUse)
{
if(G4ParticleTable::GetParticleTable()->FindParticle("gamma"))
{
converters[0] = new G4RToEConvForGamma();
converters[0]->SetVerboseLevel(GetVerboseLevel());
}
if(G4ParticleTable::GetParticleTable()->FindParticle("e-"))
{
converters[1] = new G4RToEConvForElectron();
converters[1]->SetVerboseLevel(GetVerboseLevel());
}
if(G4ParticleTable::GetParticleTable()->FindParticle("e+"))
{
converters[2] = new G4RToEConvForPositron();
converters[2]->SetVerboseLevel(GetVerboseLevel());
}
if(G4ParticleTable::GetParticleTable()->FindParticle("proton"))
{
converters[3] = new G4RToEConvForProton();
converters[3]->SetVerboseLevel(GetVerboseLevel());
}
firstUse = false;
}
// Update RangeEnergy cuts tables
std::size_t idx = 0;
G4Timer timer;
@@ -249,10 +287,18 @@ void G4ProductionCutsTable::UpdateCoupleTable(G4VPhysicalVolume* /*currWorld*/)
{
G4double rCut = aCut->GetProductionCut((G4int)ptcl);
(*(rangeCutTable[ptcl]))[idx] = rCut;
// if(converters[ptcl] && (*cItr)->IsUsed())
if(converters[ptcl])
if(nullptr != converters[ptcl])
{
(*(energyCutTable[ptcl]))[idx] = converters[ptcl]->Convert(rCut,aMat);
// check user defined cut in energy
if(nullptr == userEnergyCuts[ptcl] || userEnergyCuts[ptcl]->size() <= idx)
{
(*(energyCutTable[ptcl]))[idx] = converters[ptcl]->Convert(rCut,aMat);
}
else
{
(*(energyCutTable[ptcl]))[idx] = (*(userEnergyCuts[ptcl]))[idx];
}
}
else
{
@@ -270,20 +316,6 @@ void G4ProductionCutsTable::UpdateCoupleTable(G4VPhysicalVolume* /*currWorld*/)
G4cout << timer << G4endl;
}
// resize Range/Energy cuts double vectors if new couple is made
if(newCoupleAppears)
{
for(std::size_t ix=0; ix<NumberOfG4CutIndex; ++ix)
{
G4double* rangeVOld = rangeDoubleVector[ix];
G4double* energyVOld = energyDoubleVector[ix];
if(rangeVOld) delete [] rangeVOld;
if(energyVOld) delete [] energyVOld;
rangeDoubleVector[ix] = new G4double[(*(rangeCutTable[ix])).size()];
energyDoubleVector[ix] = new G4double[(*(energyCutTable[ix])).size()];
}
}
// Update Range/Energy cuts double vectors
for(std::size_t ix=0; ix<NumberOfG4CutIndex; ++ix)
{