Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: G4 plugin material mixing #1805

Merged
merged 4 commits into from
Jan 31, 2023
Merged

feat: G4 plugin material mixing #1805

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd765a9
g4 plugin material mixing
andiwand Jan 27, 2023
d561e33
clang format
andiwand Jan 27, 2023
c205155
Merge branch 'main' into feature-g4-plugin-material-mixing
asalzburger Jan 31, 2023
13dec8b
Merge branch 'main' into feature-g4-plugin-material-mixing
asalzburger Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions Plugins/Geant4/src/Geant4Converters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#include "Acts/Surfaces/TrapezoidBounds.hpp"
#include "Acts/Utilities/Helpers.hpp"

#include <cassert>

#include "G4Box.hh"
#include "G4LogicalVolume.hh"
#include "G4Material.hh"
Expand Down Expand Up @@ -303,18 +301,31 @@ std::shared_ptr<Acts::HomogeneousSurfaceMaterial>
Acts::Geant4MaterialConverter::surfaceMaterial(const G4Material& g4Material,
ActsScalar original,
ActsScalar compressed) {
assert(g4Material.GetNumberOfElements() == 1);

ActsScalar compression = original / compressed;

auto g4X0 = g4Material.GetRadlen();
auto g4L0 = g4Material.GetNuclearInterLength();
auto g4Z = g4Material.GetZ();
auto g4A = (*g4Material.GetElementVector())[0]->GetN();
auto g4Rho = g4Material.GetDensity();
auto X0 = g4Material.GetRadlen();
auto L0 = g4Material.GetNuclearInterLength();
auto Rho = g4Material.GetDensity();

// Get{A,Z} is only meaningful for single-element materials (according to
// the Geant4 docs). Need to compute average manually.
auto g4Elements = g4Material.GetElementVector();
auto g4Fraction = g4Material.GetFractionVector();
auto g4NElements = g4Material.GetNumberOfElements();
double Ar = 0;
double Z = 0;
if (g4NElements == 1) {
Ar = g4Elements->at(0)->GetN();
Z = g4Material.GetZ();
} else {
for (size_t i = 0; i < g4NElements; i++) {
Ar += g4Elements->at(i)->GetN() * g4Fraction[i];
Z += g4Elements->at(i)->GetZ() * g4Fraction[i];
}
}

Material mat = Material::fromMassDensity(
g4X0 / compression, g4L0 / compression, g4A, g4Z, compression * g4Rho);
Material mat = Material::fromMassDensity(X0 / compression, L0 / compression,
Ar, Z, compression * Rho);

return std::make_shared<HomogeneousSurfaceMaterial>(
MaterialSlab(mat, compressed));
Expand Down