Commit 23a644d4 authored by Stephan Lachnit's avatar Stephan Lachnit
Browse files

Merge branch 'b-fix-material' into 'v3.0-stable' 

[v3.0-stable] Do not lower-case material names, G4 is case sensitive here!

See merge request allpix-squared/allpix-squared!1032
parents 3281511e f7d855ab

src/core/geometry/DetectorModel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ DetectorModel::DetectorModel(std::string type, std::shared_ptr<DetectorAssembly> 
        }



        auto material = support_config.get<std::string>("material", "g10");

        std::transform(material.begin(), material.end(), material.begin(), ::tolower);

        auto hole_type = support_config.get<std::string>("hole_type", "rectangular");

        std::transform(hole_type.begin(), hole_type.end(), hole_type.begin(), ::tolower);

        auto hole_size = support_config.get<XYVector>("hole_size", {0, 0});

src/modules/GeometryBuilderGeant4/tests/06-same_materials.conf

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ random_seed = 0 


[GeometryBuilderGeant4]

log_level = "TRACE"

world_volume = "air"

world_material = "air"



#PASS (WARNING) [I:GeometryBuilderGeant4] Material of passive material box1 is the same as the material of its mother volume!

src/modules/GeometryBuilderGeant4/tests/13-material_sensor.conf

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2023 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT



#DESC ensures that the sensor material can be chosen from the supported list of materials.

[Allpix]

detectors_file = "detector_support_material.conf"

number_of_events = 0

random_seed = 0



[GeometryBuilderGeant4]

log_level = "TRACE"

world_material = "air"



#PASS (TRACE) [I:GeometryBuilderGeant4] Found material "gallium_arsenide" in internal database

src/modules/GeometryBuilderGeant4/tests/14-material_support.conf

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2023 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT



#DESC ensures that support layers can load materials from the G4 NistManager database.

[Allpix]

detectors_file = "detector_support_material.conf"

number_of_events = 0

random_seed = 0



[GeometryBuilderGeant4]

log_level = "TRACE"

world_material = "air"



#PASS (TRACE) [I:GeometryBuilderGeant4] Found material "G4_SILICON_DIOXIDE" in Geant4 NIST Database

src/modules/GeometryBuilderGeant4/tests/15-material_passive.conf

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2023 CERN and the Allpix Squared authors

# SPDX-License-Identifier: MIT



#DESC ensures that passive models can load materials from the G4 NistManager database.

[Allpix]

detectors_file = "detector_passive_materials.conf"

number_of_events = 0

random_seed = 0



[GeometryBuilderGeant4]

log_level = "TRACE"



#PASS (TRACE) [I:GeometryBuilderGeant4] Found material "G4_Pb" in Geant4 NIST Database