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.

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

[DD4hep] Set material temperature and pressure to NTP instead of default STP #33344

Merged
merged 1 commit into from Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -556,6 +556,8 @@ void Converter<DDLElementaryMaterial>::operator()(xml_h element) const {
}

mix->AddElement(elt, 1.0);
mix->SetTemperature(ns.context()->description.stdConditions().temperature);
mix->SetPressure(ns.context()->description.stdConditions().pressure);

/// Create medium from the material
TGeoMedium* medium = mgr.GetMedium(matname);
Expand Down Expand Up @@ -621,6 +623,8 @@ void Converter<DDLCompositeMaterial>::operator()(xml_h element) const {
ns.context()->unresolvedMaterials[nam].emplace_back(
cms::DDParsingContext::CompositeMaterial(ns.prepend(fracname), fraction));
}
mix->SetTemperature(ns.context()->description.stdConditions().temperature);
mix->SetPressure(ns.context()->description.stdConditions().pressure);
mix->SetRadLen(0e0);
/// Create medium from the material
TGeoMedium* medium = mgr.GetMedium(matname);
Expand Down
2 changes: 2 additions & 0 deletions DetectorDescription/DDCMS/src/DDDetector.cc
Expand Up @@ -21,6 +21,8 @@ namespace cms {
m_description->addExtension<cms::DDVectorsMap>(&m_vectors);
m_description->addExtension<dd4hep::PartSelectionMap>(&m_partsels);
m_description->addExtension<dd4hep::SpecParRegistry>(&m_specpars);
m_description->setStdConditions("NTP");
edm::LogVerbatim("Geometry") << "DDDetector::ctor Setting DD4hep STD conditions to NTP";
if (bigXML)
processXML(fileName);
else
Expand Down