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.

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

Jump to bottom

[HGCal] Fix thread safety issue in layer clustering density map filling #26470

Merged
merged 4 commits into from Apr 17, 2019
Merged

[HGCal] Fix thread safety issue in layer clustering density map filling #26470

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
5c7c1b2
filling density map is not thread safe and is taken out of the parall…
felicepantaleo Apr 16, 2019
49a9607
filling density map is not thread safe and is taken out of the parall…
felicepantaleo Apr 16, 2019
a00d27f
Update RecoLocalCalo/HGCalRecProducers/plugins/HGCalCLUEAlgo.cc
Dr15Jones Apr 17, 2019
75b42c3
Update RecoLocalCalo/HGCalRecProducers/plugins/HGCalImagingAlgo.cc
Dr15Jones Apr 17, 2019
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
4 changes: 2 additions & 2 deletions RecoLocalCalo/HGCalRecProducers/plugins/HGCalCLUEAlgo.cc
View file
Open in desktop
Expand Up @@ -95,15 +95,15 @@ void HGCalCLUEAlgo::makeClusters() {
double maxdensity = calculateLocalDensity(points_[i], hit_kdtree,
actualLayer); // also stores rho (energy
// density) for each point (node)
//Now that we have the density per point we can store it
setDensity(points_[i]);
// calculate distance to nearest point with higher density storing
// distance (delta) and point's index
calculateDistanceToHigher(points_[i]);
findAndAssignClusters(points_[i], hit_kdtree, maxdensity, bounds, actualLayer,
layerClustersPerLayer_[i]);
});
});
//Now that we have the density per point we can store it
for(auto const& p: points_) { setDensity(p); }
}

std::vector<reco::BasicCluster> HGCalCLUEAlgo::getClusters(bool) {
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalCalo/HGCalRecProducers/plugins/HGCalImagingAlgo.cc
View file
Open in desktop
Expand Up @@ -100,15 +100,15 @@ void HGCalImagingAlgo::makeClusters() {
double maxdensity = calculateLocalDensity(
points_[i], hit_kdtree, actualLayer); // also stores rho (energy
// density) for each point (node)
//Now that we have the density per point we can store it
setDensity(points_[i]);
// calculate distance to nearest point with higher density storing
// distance (delta) and point's index
calculateDistanceToHigher(points_[i]);
findAndAssignClusters(points_[i], hit_kdtree, maxdensity, bounds,
actualLayer, layerClustersPerLayer_[i]);
});
});
//Now that we have the density per point we can store it
for(auto const& p: points_) { setDensity(p); }
}

std::vector<reco::BasicCluster> HGCalImagingAlgo::getClusters(bool doSharing) {
Expand Down