Skip to content

MTD geometry: DD4hep specPar update, additional fix #31921

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

Merged
cmsbuild merged 1 commit into from
Oct 24, 2020
Merged

MTD geometry: DD4hep specPar update, additional fix #31921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions Geometry/MTDNumberingBuilder/plugins/DDCmsMTDConstruction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ std::unique_ptr<GeometricTimingDet> DDCmsMTDConstruction::construct(const DDComp
if (fullNode == GeometricTimingDet::BTLLayer || fullNode == GeometricTimingDet::ETLDisc) {
layer.emplace_back(theCmsMTDConstruction.buildLayer(fv));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("DD4hep_MTDNumbering") << "Number of layers: " << layer.size();
edm::LogVerbatim("MTDNumbering") << "Number of layers: " << layer.size();
#endif
}
//
Expand Down Expand Up @@ -185,7 +185,7 @@ std::unique_ptr<GeometricTimingDet> DDCmsMTDConstruction::construct(const DDComp
subdet[2]->addComponent(layer[3]);
subdet[2]->addComponent(layer[4]);
} else {
throw cms::Exception("DD4hep_MTDNumbering") << "Wrong number of layers: " << layer.size();
throw cms::Exception("MTDNumbering") << "Wrong number of layers: " << layer.size();
}

// Add subdetectors to MTD
Expand All @@ -209,7 +209,7 @@ std::unique_ptr<GeometricTimingDet> DDCmsMTDConstruction::construct(const cms::D
cms::DDFilteredView fv(cpv.detector(), cpv.detector()->worldVolume());

fv.next(0);
edm::LogVerbatim("MTDNumbering") << fv.path();
edm::LogVerbatim("DD4hep_MTDNumbering") << fv.path();
auto mtd = std::make_unique<GeometricTimingDet>(&fv, GeometricTimingDet::MTD);

cms::DDSpecParRefs ref;
Expand All @@ -220,16 +220,16 @@ std::unique_ptr<GeometricTimingDet> DDCmsMTDConstruction::construct(const cms::D
fv.mergedSpecifics(ref);

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("MTDNumbering") << "Active filters using " << attribute << ":";
edm::LogVerbatim("DD4hep_MTDNumbering") << "Active filters using " << attribute << ":";
fv.printFilter();
edm::LogVerbatim("Geometry").log([&ref](auto& log) {
log << "Filtered DD SpecPar Registry size: " << ref.size() << "\n";
for (const auto& t : ref) {
log << "\nRegExps { ";
for (const auto& ki : t->paths)
log << "\nSpecPar " << t.first << ":\nRegExps { ";
for (const auto& ki : t.second->paths)
log << ki << " ";
log << "};\n ";
for (const auto& kl : t->spars) {
for (const auto& kl : t.second->spars) {
log << kl.first << " = ";
for (const auto& kil : kl.second) {
log << kil << " ";
Expand All @@ -241,7 +241,7 @@ std::unique_ptr<GeometricTimingDet> DDCmsMTDConstruction::construct(const cms::D
#endif

bool doSubdet = fv.firstChild();
edm::LogVerbatim("MTDNumbering") << fv.path();
edm::LogVerbatim("DD4hep_MTDNumbering") << fv.path();

CmsMTDStringToEnum theCmsMTDStringToEnum;

Expand All @@ -257,9 +257,9 @@ std::unique_ptr<GeometricTimingDet> DDCmsMTDConstruction::construct(const cms::D
theCmsMTDStringToEnum.type(nodeName.substr(0, CmsMTDStringToEnum::kModStrLen));

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("MTDNumbering") << fv.path();
edm::LogVerbatim("MTDNumbering") << "Module = " << fv.name() << " fullNode = " << fullNode
<< " thisNode = " << thisNode;
edm::LogVerbatim("DD4hep_MTDNumbering") << fv.path();
edm::LogVerbatim("DD4hep_MTDNumbering")
<< "Module = " << fv.name() << " fullNode = " << fullNode << " thisNode = " << thisNode;
#endif

if (fullNode == GeometricTimingDet::BTL || fullNode == GeometricTimingDet::ETL) {
Expand Down