Skip to content
Snippets Groups Projects
Commit 6866b1c6 authored by Christos Anastopoulos's avatar Christos Anastopoulos
Browse files

MdtSegmentT0Fitter MuonLayerSegmentMakerTools MuonSegmentCleaner add ATLAS_CHECK_THREAD_SAFETY

parent 66d19a3b
No related branches found
No related tags found
5 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45321MdtSegmentT0Fitter MuonLayerSegmentMakerTools MuonSegmentCleaner add ATLAS_CHECK_THREAD_SAFETY
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools
......@@ -214,8 +214,8 @@ MuonLayerSegmentFinderTool::findMdtSegmentsFromHough(
findMdtSegments(intersection, mdts, clusters, segments);
// clean-up memory
for (auto hit : mdts) delete hit;
for (auto hit : clusters) delete hit;
for (const auto *hit : mdts) delete hit;
for (const auto *hit : clusters) delete hit;
ATH_MSG_DEBUG(" Done maximum: new segments " << segments.size() - nprevSegments);
}
ATH_MSG_DEBUG(" Done with layer: new segments " << segments.size() - nprevSegments);
......@@ -304,23 +304,23 @@ MuonLayerSegmentFinderTool::findClusterSegments(const MuonSystemExtension::Inter
const std::vector<const MuonClusterOnTrack*>& clustersMM = layerROTs.getClusters(MuonStationIndex::MM);
std::vector<const MuonClusterOnTrack*> clusters;
if (clustersSTGC.size() > 0) {
if (!clustersSTGC.empty()) {
ATH_MSG_DEBUG(" STGC clusters " << clustersSTGC.size());
for (auto cl : clustersSTGC) {
for (const auto *cl : clustersSTGC) {
clusters.push_back(cl);
}
}
if (clustersMM.size() > 0) {
if (!clustersMM.empty()) {
ATH_MSG_DEBUG(" MM clusters " << clustersMM.size());
for (auto cl : clustersMM) {
for (const auto *cl : clustersMM) {
clusters.push_back(cl);
}
}
std::vector<MuonSegment*> foundSegments;
m_clusterSegMakerNSW->find(clusters, foundSegments);
if (foundSegments.size() > 0) {
for (auto seg : foundSegments) {
if (!foundSegments.empty()) {
for (auto *seg : foundSegments) {
ATH_MSG_DEBUG(" NSW segment " << m_printer->print(*seg));
segments.push_back(std::shared_ptr<const MuonSegment>(seg));
ATH_MSG_DEBUG(" total segments " << segments.size());
......
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner
......@@ -84,7 +84,7 @@ const Muon::MuonSegment* MuonSegmentAmbiCleaner::resolve(const Muon::MuonSegment
if (rot)
{
rots.push_back(rot);
crots.push_back(0);
crots.push_back(nullptr);
}
else
......@@ -263,10 +263,10 @@ const Muon::MuonSegment* MuonSegmentAmbiCleaner::resolve(const Muon::MuonSegment
for(unsigned int j = 0; j < nphi ; j++ ) {
if (crots_phi[j] == crots_phi[i] && j!=i)
{
crots_phi[j]=0;
crots_phi[j]=nullptr;
}
}
crots_phi[i]=0;
crots_phi[i]=nullptr;
}
}
......@@ -314,7 +314,7 @@ const Muon::MuonSegment* MuonSegmentAmbiCleaner::resolve(const Muon::MuonSegment
const Trk::LocalDirection locSegmentDir(segment->localDirection());
Amg::Vector2D locSegmentPos(lSegmentPos.x(),lSegmentPos.y());
const Amg::MatrixX locSegmenterr(segment->localCovariance());
const Amg::MatrixX& locSegmenterr(segment->localCovariance());
Trk::FitQuality* fitQuality = segment->fitQuality()->clone();
Muon::MuonSegment* newSegment = new Muon::MuonSegment(locSegmentPos,locSegmentDir,locSegmenterr,psf,meas_keep,fitQuality);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment