Commit 95c818f4 authored by Paul Jean Schutze's avatar Paul Jean Schutze
Browse files

Merge branch '162-backports' into 'v1.6-stable'

Backport latest fixes to v1.6-stable

See merge request !444
parents dbe9b532 8c242538
Pipeline #2634465 failed with stages
in 2 minutes and 37 seconds
......@@ -142,6 +142,7 @@ G4VPhysicalVolume* GeometryConstructionG4::Construct() {
* - solder
* - paper
* - polystyrene
* - ppo foam
* - vacuum
*/
void GeometryConstructionG4::init_materials() {
......@@ -202,8 +203,8 @@ void GeometryConstructionG4::init_materials() {
// Create paper material (cellulose C6H10O5)
auto* Paper = new G4Material("Paper", 0.8 * CLHEP::g / CLHEP::cm3, 3);
Paper->AddElement(C, 6);
Paper->AddElement(O, 10);
Paper->AddElement(H, 5);
Paper->AddElement(O, 5);
Paper->AddElement(H, 10);
materials_["paper"] = Paper;
// Create polystyrene [(C6H5CHCH2)n]
......@@ -213,6 +214,16 @@ void GeometryConstructionG4::init_materials() {
Polystyrene->AddElement(H, 8);
materials_["polystyrene"] = Polystyrene;
// Create PPO foam [(C8H8O)n]
// https://en.wikipedia.org/wiki/Poly(p-phenylene_oxide)
// (approximate) material for Dortmund Cold Box (DOBOX) used in
// ATLAS ITk Pixels testbeams
auto* PPOFoam = new G4Material("PPOFoam", 0.05 * CLHEP::g / CLHEP::cm3, 3);
PPOFoam->AddElement(C, 8);
PPOFoam->AddElement(H, 8);
PPOFoam->AddElement(O, 1);
materials_["ppofoam"] = PPOFoam;
// Add vacuum
materials_["vacuum"] = new G4Material("Vacuum", 1, 1.008 * CLHEP::g / CLHEP::mole, CLHEP::universe_mean_density);
}
......
......@@ -63,6 +63,7 @@ This module can create support layers and passive volumes of the following mater
* PCB G-10
* solder
* polystyrene
* ppo foam
* vacuum
### Dependencies
......
......@@ -240,6 +240,10 @@ void ProjectionPropagationModule::run(unsigned int) {
// Calculate the drift time
auto calc_drift_time = [&]() {
if(position.z() == top_z_) {
return 0.;
}
double Ec = (type == CarrierType::ELECTRON ? electron_Ec_ : hole_Ec_);
double zero_mobility = (type == CarrierType::ELECTRON ? electron_Vm_ / electron_Ec_ : hole_Vm_ / hole_Ec_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment