From c9c5185b08772b27055a25a294eea80692cd595a Mon Sep 17 00:00:00 2001 From: Carsten Burgard Date: Thu, 16 Dec 2021 12:56:14 +0100 Subject: [PATCH 1/2] fixed types --- .../AnalysisEfficiency/AnalysisEfficiency.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp b/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp index 03a1c420..61733e2e 100644 --- a/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp +++ b/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp @@ -283,8 +283,8 @@ StatusCode AnalysisEfficiency::run(const std::shared_ptr& clipboard) // Get the telescope tracks from the clipboard auto tracks = clipboard->getData(); - auto pitch_x = m_detector->getPitch().X(); - auto pitch_y = m_detector->getPitch().Y(); + double pitch_x = m_detector->getPitch().X(); + double pitch_y = m_detector->getPitch().Y(); // Loop over all tracks for(auto& track : tracks) { @@ -368,13 +368,13 @@ StatusCode AnalysisEfficiency::run(const std::shared_ptr& clipboard) // Calculate in-pixel position of track in microns auto inpixel = m_detector->inPixel(localIntercept); - auto xmod = inpixel.X(); - auto ymod = inpixel.Y(); - auto xmod_um = xmod * 1000.; // mm->um (for plotting) - auto ymod_um = ymod * 1000.; // mm->um (for plotting) + double xmod = inpixel.X(); + double ymod = inpixel.Y(); + double xmod_um = xmod * 1000.; // mm->um (for plotting) + double ymod_um = ymod * 1000.; // mm->um (for plotting) bool isWithinInPixelROI = - (pitch_x - abs(xmod * 2) > m_inpixelEdgeCut.x()) && (pitch_y - abs(ymod * 2) > m_inpixelEdgeCut.y()); + (pitch_x - fabs(xmod * 2.) > m_inpixelEdgeCut.x()) && (pitch_y - fabs(ymod * 2.) > m_inpixelEdgeCut.y()); // Get the DUT clusters from the clipboard, that are assigned to the track auto associated_clusters = track->getAssociatedClusters(m_detector->getName()); -- GitLab From 843d76fa5b9cea40a5d832e9fdbef3e1409c4d19 Mon Sep 17 00:00:00 2001 From: Carsten Burgard Date: Thu, 16 Dec 2021 13:42:50 +0100 Subject: [PATCH 2/2] reverted back to auto --- .../AnalysisEfficiency/AnalysisEfficiency.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp b/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp index 61733e2e..18a4caeb 100644 --- a/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp +++ b/src/modules/AnalysisEfficiency/AnalysisEfficiency.cpp @@ -283,8 +283,8 @@ StatusCode AnalysisEfficiency::run(const std::shared_ptr& clipboard) // Get the telescope tracks from the clipboard auto tracks = clipboard->getData(); - double pitch_x = m_detector->getPitch().X(); - double pitch_y = m_detector->getPitch().Y(); + auto pitch_x = m_detector->getPitch().X(); + auto pitch_y = m_detector->getPitch().Y(); // Loop over all tracks for(auto& track : tracks) { @@ -368,10 +368,10 @@ StatusCode AnalysisEfficiency::run(const std::shared_ptr& clipboard) // Calculate in-pixel position of track in microns auto inpixel = m_detector->inPixel(localIntercept); - double xmod = inpixel.X(); - double ymod = inpixel.Y(); - double xmod_um = xmod * 1000.; // mm->um (for plotting) - double ymod_um = ymod * 1000.; // mm->um (for plotting) + auto xmod = inpixel.X(); + auto ymod = inpixel.Y(); + auto xmod_um = xmod * 1000.; // mm->um (for plotting) + auto ymod_um = ymod * 1000.; // mm->um (for plotting) bool isWithinInPixelROI = (pitch_x - fabs(xmod * 2.) > m_inpixelEdgeCut.x()) && (pitch_y - fabs(ymod * 2.) > m_inpixelEdgeCut.y()); -- GitLab