Skip to content

[DD4hep] Final Changes to Replace tbb with std - requires a DD4hep update #31770

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

Closed
ianna wants to merge 4 commits into from
Closed

[DD4hep] Final Changes to Replace tbb with std - requires a DD4hep update #31770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dfda88
replace tbb containers with std ones
Oct 10, 2020
4d13472
final changes to replace tbb with std - requires updated dd4hep
ianna Oct 13, 2020
12b4530
update to a new API
ianna Oct 13, 2020
c09ccdb
update to the new dd4hep version
ianna Oct 14, 2020
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
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/interface/DDFilteredView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ namespace cms {

std::string path = this->path();
for (const auto& specPar : refs) {
for (const auto& part : specPar->paths) {
for (const auto& part : specPar.second->paths) {
bool flag(true);
std::size_t from = 0;
for (auto name : dd4hep::dd::split(part, "/")) {
Expand All @@ -185,7 +185,7 @@ namespace cms {
}
}
if (flag) {
return specPar->value<std::vector<T>>(key);
return specPar.second->value<std::vector<T>>(key);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions DetectorDescription/DDCMS/interface/DDParsingContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ namespace cms {
bool debug_specpars = false;

dd4hep::Detector& description;

std::unordered_map<std::string, dd4hep::Assembly> assemblies;
std::unordered_map<std::string, dd4hep::Rotation3D> rotations;
std::unordered_map<std::string, dd4hep::Solid> shapes;
Expand Down
Loading