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] Revise order of materials to prevent delayed resolution of references #34974

Merged
merged 5 commits into from Aug 24, 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
6 changes: 4 additions & 2 deletions DetectorDescription/DDCMS/interface/DDParsingContext.h
Expand Up @@ -27,7 +27,8 @@ namespace cms {
namespaces.emplace_back("");
if (makePayload) {
rotRevMap.reserve(3000);
allCompMaterials.reserve(400);
compMaterialsVec.reserve(400);
compMaterialsRefs.reserve(400);
}
}

Expand Down Expand Up @@ -84,7 +85,8 @@ namespace cms {
std::vector<std::string> namespaces;

std::unordered_map<std::string, std::vector<CompositeMaterial>> unresolvedMaterials;
std::unordered_map<std::string, std::pair<double, std::vector<CompositeMaterial>>> allCompMaterials;
std::vector<std::pair<std::string, double>> compMaterialsVec;
std::unordered_map<std::string, std::vector<CompositeMaterial>> compMaterialsRefs;
std::unordered_map<std::string, std::vector<std::string>> unresolvedVectors;
std::unordered_map<std::string,
std::variant<BooleanShape<dd4hep::UnionSolid>,
Expand Down
Expand Up @@ -603,15 +603,17 @@ void Converter<DDLCompositeMaterial>::operator()(xml_h element) const {

#endif

if (ns.context()->makePayload) {
ns.context()->compMaterialsVec.emplace_back(std::make_pair(nam, density));
}
for (composites.reset(); composites; ++composites) {
xml_dim_t xfrac(composites);
xml_dim_t xfrac_mat(xfrac.child(DD_CMU(rMaterial)));
double fraction = xfrac.fraction();
string fracname = ns.realName(xfrac_mat.nameStr());

if (ns.context()->makePayload) {
ns.context()->allCompMaterials[nam].first = density;
ns.context()->allCompMaterials[nam].second.emplace_back(
ns.context()->compMaterialsRefs[nam].emplace_back(
cms::DDParsingContext::CompositeMaterial(ns.prepend(fracname), fraction));
}
TGeoMaterial* frac_mat = mgr.GetMaterial(fracname.c_str());
Expand Down
Expand Up @@ -43,9 +43,10 @@ struct DDCoreToDDXMLOutput {

void element(const TGeoMaterial* element, std::ostream& xos);
void material(const DDMaterial& material, std::ostream& xos);
void material(
const std::pair<std::string, std::pair<double, std::vector<cms::DDParsingContext::CompositeMaterial>>>& material,
std::ostream& xos);
void material(const std::string& matName,
double density,
const std::vector<cms::DDParsingContext::CompositeMaterial>& matRefs,
std::ostream& xos);

void rotation(const DDRotation& rotation, std::ostream& xos, const std::string& rotn = "");
void rotation(const dd4hep::Rotation3D& rotation,
Expand Down
Expand Up @@ -123,8 +123,9 @@ void OutputDD4hepToDDL::beginRun(const edm::Run &, edm::EventSetup const &es) {
out.element(dynamic_cast<const TGeoMaterial *>(iter), *m_xos);
}
// Output composite materials
for (const auto &it : parsingContext->allCompMaterials) {
out.material(it, *m_xos);
for (const auto &it : parsingContext->compMaterialsVec) {
const std::string &matName = it.first;
out.material(matName, it.second, parsingContext->compMaterialsRefs[matName], *m_xos);
}
(*m_xos) << "</MaterialSection>" << std::endl;
(*m_xos) << "<RotationSection label=\"" << ns_ << "\">" << std::endl;
Expand Down
15 changes: 7 additions & 8 deletions DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc
Expand Up @@ -610,16 +610,15 @@ void DDCoreToDDXMLOutput::material(const DDMaterial& material, std::ostream& xos
}
}

void DDCoreToDDXMLOutput::material(
const std::pair<std::string, std::pair<double, std::vector<cms::DDParsingContext::CompositeMaterial>>>& material,
std::ostream& xos) {
xos << "<CompositeMaterial name=\"" << material.first << "\""
<< " density=\"" << std::scientific << std::setprecision(5) << convertGPerCcToMgPerCc(material.second.first)
<< "*mg/cm3\""
void DDCoreToDDXMLOutput::material(const std::string& matName,
double density,
const std::vector<cms::DDParsingContext::CompositeMaterial>& matRefs,
std::ostream& xos) {
xos << "<CompositeMaterial name=\"" << matName << "\""
<< " density=\"" << std::scientific << std::setprecision(5) << convertGPerCcToMgPerCc(density) << "*mg/cm3\""
<< " method=\"mixture by weight\">" << std::endl;

auto compIter = material.second.second.begin();
for (; compIter != material.second.second.end(); ++compIter) {
for (auto compIter = matRefs.begin(); compIter != matRefs.end(); ++compIter) {
xos << "<MaterialFraction fraction=\"" << std::fixed << std::setprecision(9) << compIter->fraction << "\">"
<< std::endl;
xos << "<rMaterial name=\"" << compIter->name << "\"/>" << std::endl;
Expand Down