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

Generic material properties #260

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Generic material properties #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4a157e
Drop optical from material properties, since they are generic
paolafer Sep 13, 2024
e23d806
Add Fano factor and ionization energy to GXe properties
paolafer Sep 13, 2024
c6380e2
Add properties for LXe
paolafer Sep 13, 2024
a3c9be3
Add properties for argon
paolafer Sep 13, 2024
2ec0476
Add new properties to fake grids
paolafer Sep 13, 2024
9f493b0
Add exception if material property table is not present
paolafer Sep 13, 2024
1cf2d7e
Fix ionization energy in LXe
paolafer Sep 14, 2024
3cfa409
Cosmetics
paolafer Sep 14, 2024
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
2 changes: 1 addition & 1 deletion source/generators/ScintillationGenerator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "DetectorConstruction.h"
#include "GeometryBase.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "FactoryBase.h"

#include <G4GenericMessenger.hh>
Expand Down
8 changes: 4 additions & 4 deletions source/geometries/BlackBox.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "MaterialsList.h"
#include "IonizationSD.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "Visibilities.h"

#include <G4Box.hh>
Expand Down Expand Up @@ -120,7 +120,7 @@ namespace nexus {

G4Material* world_mat = G4NistManager::Instance()->FindOrBuildMaterial("G4_AIR");

world_mat->SetMaterialPropertiesTable(opticalprops::Vacuum());
world_mat->SetMaterialPropertiesTable(materialprops::Vacuum());

G4Box* world_solid_vol =
new G4Box(world_name, world_xy_/2., world_xy_/2., world_z_/2.);
Expand Down Expand Up @@ -170,7 +170,7 @@ namespace nexus {

G4Material* sapphire_mat = materials::Sapphire();

sapphire_mat->SetMaterialPropertiesTable(opticalprops::Sapphire());
sapphire_mat->SetMaterialPropertiesTable(materialprops::Sapphire());

G4double pedot_thickn = 150. *nm;
G4double window_thickn = 6. *mm;
Expand Down Expand Up @@ -198,7 +198,7 @@ namespace nexus {

G4Material* pedot_mat = materials::PEDOT();

pedot_mat->SetMaterialPropertiesTable(opticalprops::PEDOT());
pedot_mat->SetMaterialPropertiesTable(materialprops::PEDOT());

G4Tubs* pedot_solid_vol =
new G4Tubs(pedot_name, 0, sapphire_diam/2., pedot_thickn/2., 0, twopi);
Expand Down
4 changes: 2 additions & 2 deletions source/geometries/BlackBoxSiPMBoard.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "MaterialsList.h"
#include "SiPMSensl.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "BoxPointSamplerLegacy.h"
#include "Visibilities.h"

Expand Down Expand Up @@ -184,7 +184,7 @@ void BlackBoxSiPMBoard::Construct()
// Adding the optical surface
G4OpticalSurface* mask_opsurf =
new G4OpticalSurface(mask_name, unified, ground, dielectric_metal);
mask_opsurf->SetMaterialPropertiesTable(opticalprops::PTFE());
mask_opsurf->SetMaterialPropertiesTable(materialprops::PTFE());
new G4LogicalSkinSurface(mask_name + "_OPSURF", mask_logic, mask_opsurf);

new G4PVPlacement(nullptr, G4ThreeVector(0., 0., mask_posz), mask_logic,
Expand Down
4 changes: 2 additions & 2 deletions source/geometries/CylindricChamber.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "PmtR11410.h"
#include "NextNewKDB.h"
#include "MaterialsList.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "UniformElectricDriftField.h"
#include "IonizationSD.h"
#include "FactoryBase.h"
Expand Down Expand Up @@ -70,7 +70,7 @@ namespace nexus {
new G4Tubs("GAS", 0., chamber_diam/2., chamber_length/2., 0., twopi);

G4Material* gxe = materials::GXe(10.*bar);
gxe->SetMaterialPropertiesTable(opticalprops::GXe(10.*bar, 303));
gxe->SetMaterialPropertiesTable(materialprops::GXe(10.*bar, 303));

G4LogicalVolume* gas_logic = new G4LogicalVolume(gas_solid, gxe, "GAS");

Expand Down
6 changes: 3 additions & 3 deletions source/geometries/GenericPhotosensor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "MaterialsList.h"
#include "SensorSD.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "Visibilities.h"

#include <G4Box.hh>
Expand Down Expand Up @@ -104,7 +104,7 @@ void GenericPhotosensor::DefineMaterials()
"Window rindex set, but NOT USED. Using TPB rindex.");

window_optProp->AddProperty("RINDEX",
opticalprops::TPB()->GetProperty("RINDEX"));
materialprops::TPB()->GetProperty("RINDEX"));
window_mat_->SetMaterialPropertiesTable(window_optProp);
}

Expand All @@ -125,7 +125,7 @@ void GenericPhotosensor::DefineMaterials()

// WLS coating /////
wls_mat_ = materials::TPB();
wls_mat_->SetMaterialPropertiesTable(opticalprops::TPB());
wls_mat_->SetMaterialPropertiesTable(materialprops::TPB());
}


Expand Down
8 changes: 4 additions & 4 deletions source/geometries/GenericWLSFiber.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "GenericWLSFiber.h"

#include "MaterialsList.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "Visibilities.h"

#include <G4Tubs.hh>
Expand Down Expand Up @@ -91,12 +91,12 @@ void GenericWLSFiber::DefineMaterials()
// FPethylene: for outer in muticladding

iclad_mat_ = materials::PMMA();
iclad_mat_->SetMaterialPropertiesTable(opticalprops::PMMA());
iclad_mat_->SetMaterialPropertiesTable(materialprops::PMMA());

// If 2 claddings, defining the outer cladding material
if (doubleclad_) {
oclad_mat_ = materials::FPethylene();
oclad_mat_->SetMaterialPropertiesTable(opticalprops::FPethylene());
oclad_mat_->SetMaterialPropertiesTable(materialprops::FPethylene());
}

// If optical properties of coating are set explicitly, use them
Expand Down Expand Up @@ -255,7 +255,7 @@ void GenericWLSFiber::BuildSquareFiber()
new G4PVPlacement(nullptr, G4ThreeVector(0., 0., 0.), oclad_logic,
oclad_name, innermost_logic, false, 0, false);

innermost_logic = oclad_logic;
innermost_logic = oclad_logic;
}

// Inner Cladding (always built)
Expand Down
12 changes: 6 additions & 6 deletions source/geometries/Next100EnergyPlane.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "Next100EnergyPlane.h"
#include "MaterialsList.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "Visibilities.h"
#include "CylinderPointSampler.h"

Expand Down Expand Up @@ -225,7 +225,7 @@ namespace nexus {
gas_copperplate_opsur->SetModel(unified);
gas_copperplate_opsur->SetFinish(ground);
gas_copperplate_opsur->SetSigmaAlpha(0.0);
gas_copperplate_opsur->SetMaterialPropertiesTable(opticalprops::Copper());
gas_copperplate_opsur->SetMaterialPropertiesTable(materialprops::Copper());
new G4LogicalSkinSurface("GAS_COPPER_PLATE_OPSURF",
copper_plate_logic, gas_copperplate_opsur);

Expand All @@ -234,14 +234,14 @@ namespace nexus {

/// Assign optical properties to materials ///
G4Material* sapphire = materials::Sapphire();
sapphire->SetMaterialPropertiesTable(opticalprops::Sapphire());
sapphire->SetMaterialPropertiesTable(materialprops::Sapphire());
G4Material* tpb = materials::TPB();
tpb->SetMaterialPropertiesTable(opticalprops::TPB());
tpb->SetMaterialPropertiesTable(materialprops::TPB());
G4Material* vacuum =
G4NistManager::Instance()->FindOrBuildMaterial("G4_Galactic");
vacuum->SetMaterialPropertiesTable(opticalprops::Vacuum());
vacuum->SetMaterialPropertiesTable(materialprops::Vacuum());
G4Material* optical_coupler = materials::OpticalSilicone();
optical_coupler->SetMaterialPropertiesTable(opticalprops::OptCoupler());
optical_coupler->SetMaterialPropertiesTable(materialprops::OptCoupler());


/// Vacuum volume that encapsulates all elements related to PMTs. ///
Expand Down
14 changes: 7 additions & 7 deletions source/geometries/Next100FieldCage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "MaterialsList.h"
#include "Visibilities.h"
#include "IonizationSD.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "UniformElectricDriftField.h"
#include "XenonProperties.h"
#include "CylinderPointSampler.h"
Expand Down Expand Up @@ -273,7 +273,7 @@ void Next100FieldCage::DefineMaterials()

/// TPB coating
tpb_ = materials::TPB();
tpb_->SetMaterialPropertiesTable(opticalprops::TPB());
tpb_->SetMaterialPropertiesTable(materialprops::TPB());

/// Steel
steel_ = materials::Steel316Ti();
Expand Down Expand Up @@ -369,7 +369,7 @@ void Next100FieldCage::BuildCathode()
G4LogicalVolume* cathode_logic;

G4Material* fgrid_mat = materials::FakeDielectric(gas_, "cath_grid_mat");
fgrid_mat->SetMaterialPropertiesTable(opticalprops::FakeGrid(pressure_,
fgrid_mat->SetMaterialPropertiesTable(materialprops::FakeGrid(pressure_,
temperature_,
cath_grid_transparency_,
grid_thickn_));
Expand Down Expand Up @@ -448,7 +448,7 @@ void Next100FieldCage::BuildCathode()
gas_mesh_opsur->SetModel(unified);
gas_mesh_opsur->SetFinish(ground);
gas_mesh_opsur->SetSigmaAlpha(0.0);
gas_mesh_opsur->SetMaterialPropertiesTable(opticalprops::Steel());
gas_mesh_opsur->SetMaterialPropertiesTable(materialprops::Steel());
new G4LogicalSkinSurface("GAS_CATHODE_MESH_OPSURF",
cathode_grid_logic, gas_mesh_opsur);

Expand Down Expand Up @@ -613,7 +613,7 @@ void Next100FieldCage::BuildELRegion()

/// EL grids
G4Material* fgrid_mat = materials::FakeDielectric(gas_, "el_grid_mat");
fgrid_mat->SetMaterialPropertiesTable(opticalprops::FakeGrid(pressure_,
fgrid_mat->SetMaterialPropertiesTable(materialprops::FakeGrid(pressure_,
temperature_,
el_grid_transparency_,
grid_thickn_,
Expand Down Expand Up @@ -688,7 +688,7 @@ void Next100FieldCage::BuildELRegion()
gas_mesh_opsur->SetModel(unified);
gas_mesh_opsur->SetFinish(ground);
gas_mesh_opsur->SetSigmaAlpha(0.0);
gas_mesh_opsur->SetMaterialPropertiesTable(opticalprops::Steel());
gas_mesh_opsur->SetMaterialPropertiesTable(materialprops::Steel());
new G4LogicalSkinSurface("GAS_EL_MESH_OPSURF",
el_grid_logic, gas_mesh_opsur);

Expand Down Expand Up @@ -873,7 +873,7 @@ void Next100FieldCage::BuildLightTube()
/// Optical surface on teflon ///
G4OpticalSurface* refl_Surf =
new G4OpticalSurface("refl_Surf", unified, ground, dielectric_metal, .01);
refl_Surf->SetMaterialPropertiesTable(opticalprops::PTFE());
refl_Surf->SetMaterialPropertiesTable(materialprops::PTFE());
new G4LogicalSkinSurface("refl_teflon_surf", teflon_drift_logic, refl_Surf);
new G4LogicalSkinSurface("refl_teflon_surf", teflon_buffer_logic, refl_Surf);

Expand Down
8 changes: 4 additions & 4 deletions source/geometries/Next100OpticalGeometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "Next100OpticalGeometry.h"
#include "Next100InnerElements.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "MaterialsList.h"
#include "FactoryBase.h"

Expand Down Expand Up @@ -105,19 +105,19 @@ namespace nexus {

if (gas_ == "naturalXe") {
gas_mat = materials::GXe(pressure_, temperature_);
gas_mat->SetMaterialPropertiesTable(opticalprops::GXe(pressure_,
gas_mat->SetMaterialPropertiesTable(materialprops::GXe(pressure_,
temperature_,
sc_yield_,
e_lifetime_));
} else if (gas_ == "enrichedXe") {
gas_mat = materials::GXeEnriched(pressure_, temperature_);
gas_mat->SetMaterialPropertiesTable(opticalprops::GXe(pressure_,
gas_mat->SetMaterialPropertiesTable(materialprops::GXe(pressure_,
temperature_,
sc_yield_,
e_lifetime_));
} else if (gas_ == "depletedXe") {
gas_mat = materials::GXeDepleted(pressure_, temperature_);
gas_mat->SetMaterialPropertiesTable(opticalprops::GXe(pressure_,
gas_mat->SetMaterialPropertiesTable(materialprops::GXe(pressure_,
temperature_,
sc_yield_,
e_lifetime_));
Expand Down
6 changes: 3 additions & 3 deletions source/geometries/Next100SiPM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "Next100SiPM.h"

#include "MaterialsList.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "Visibilities.h"
#include "SensorSD.h"

Expand Down Expand Up @@ -82,7 +82,7 @@ void Next100SiPM::Construct()
new G4Box(coating_name, sipm_width/2., sipm_length/2., coating_thickn_/2.);

G4Material* coating_mt = materials::TPB();
coating_mt->SetMaterialPropertiesTable(opticalprops::TPB());
coating_mt->SetMaterialPropertiesTable(materialprops::TPB());

G4LogicalVolume* coating_logic_vol =
new G4LogicalVolume(coating_solid_vol, coating_mt, coating_name);
Expand Down Expand Up @@ -112,7 +112,7 @@ void Next100SiPM::Construct()
G4double window_zpos = sipm_thickn/2. - coating_thickn_ - window_thickn/2.;

G4Material* optical_silicone = materials::OpticalSilicone();
optical_silicone->SetMaterialPropertiesTable(opticalprops::Epoxy());
optical_silicone->SetMaterialPropertiesTable(materialprops::Epoxy());

G4Box* window_solid_vol =
new G4Box(window_name, window_width/2., window_length/2., window_thickn/2.);
Expand Down
6 changes: 3 additions & 3 deletions source/geometries/Next100SiPMBoard.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Next100SiPMBoard.h"

#include "MaterialsList.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "BoxPointSampler.h"
#include "Visibilities.h"
#include "Next100SiPM.h"
Expand Down Expand Up @@ -124,7 +124,7 @@ void Next100SiPMBoard::Construct()

G4OpticalSurface* mask_opsurf =
new G4OpticalSurface(mask_name+"_OPSURF", unified, ground, dielectric_metal);
mask_opsurf->SetMaterialPropertiesTable(opticalprops::PTFE());
mask_opsurf->SetMaterialPropertiesTable(materialprops::PTFE());
new G4LogicalSkinSurface(mask_name+"_OPSURF", mask_logic_vol, mask_opsurf);


Expand All @@ -138,7 +138,7 @@ void Next100SiPMBoard::Construct()
new G4Box(mask_wls_name, size_/2., size_/2., wls_thickness/2.);

G4Material* tpb = materials::TPB();
tpb->SetMaterialPropertiesTable(opticalprops::TPB());
tpb->SetMaterialPropertiesTable(materialprops::TPB());

G4LogicalVolume* mask_wls_logic_vol =
new G4LogicalVolume(mask_wls_solid_vol, tpb, mask_wls_name);
Expand Down
4 changes: 2 additions & 2 deletions source/geometries/Next100Vessel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "Next100Vessel.h"
#include "MaterialsList.h"
#include "Visibilities.h"
#include "OpticalMaterialProperties.h"
#include "MaterialProperties.h"
#include "CylinderPointSampler.h"
#include "SpherePointSampler.h"
#include "Next100Th228Source.h"
Expand Down Expand Up @@ -348,7 +348,7 @@ namespace nexus {
"natural, enriched, depleted, or XeHe.");
}

vessel_gas_mat->SetMaterialPropertiesTable(opticalprops::GXe(pressure_,
vessel_gas_mat->SetMaterialPropertiesTable(materialprops::GXe(pressure_,
temperature_,
sc_yield_,
e_lifetime_));
Expand Down
Loading
Loading