From d3576b6f019b0c64ce1dff0aced22330b511720b Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Thu, 2 Jun 2022 21:39:48 +0200
Subject: [PATCH] Squashed commit of the following:

commit c1b4e398181ab209ef97c8234cfe0d3724951c51
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Thu Jun 2 21:38:05 2022 +0200

    Remove RecoTracker/MkFitCore/standalone/Makefile.config changes

commit 63002a7da7ebda66ce2d7c4b3955c390efd26f7d
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Thu Jun 2 21:35:57 2022 +0200

    code-format

commit 13fd702530e1bafc08f7f60aad8784df41cd82d6
Author: Patrick Gartung <gartung@cms-oc-gpu-01.cern.ch>
Date:   Thu Jun 2 21:16:43 2022 +0200

    Change math-errno to no-inline where needed and remove where it is not needed

commit 95ed455d11b87a75721ac1ea110be4a23fe311b9
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Wed Jun 1 21:26:22 2022 +0200

    Use edm::isFinite

commit 19b46edb5de5bacd540044ac38c71d3b841a2148
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Tue May 31 19:24:58 2022 +0200

    Add check for isnan input to getRbin and getZbin. Move __attribute__((optimize("math-errno"))) to getRlVal and getXiVal where the segfaults occur.

commit 98dabeaa2d7514233790dcda1fe10a97e5e03816
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Tue May 31 17:34:12 2022 +0200

    Revert "Remove fast-math flag and attribute needed to prevent segfault when fast-math is used"

    This reverts commit a565f528861deb96fb549f12c8ec619dc60fde1d.
---
 RecoTracker/MkFitCore/BuildFile.xml         | 1 +
 RecoTracker/MkFitCore/src/MaterialEffects.h | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/RecoTracker/MkFitCore/BuildFile.xml b/RecoTracker/MkFitCore/BuildFile.xml
index 7ccecdb78f361..4caccf93b36f7 100644
--- a/RecoTracker/MkFitCore/BuildFile.xml
+++ b/RecoTracker/MkFitCore/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="json"/>
 <use name="tbb"/>
 <flags CXXFLAGS="-fopenmp-simd"/>
+<flags CXXFLAGS="-ffast-math"/>
 <flags ADD_SUBDIR="1"/>
 <export>
   <lib name="RecoTrackerMkFitCore"/>
diff --git a/RecoTracker/MkFitCore/src/MaterialEffects.h b/RecoTracker/MkFitCore/src/MaterialEffects.h
index 4d6f199f3cb11..52fc9021a1a4c 100644
--- a/RecoTracker/MkFitCore/src/MaterialEffects.h
+++ b/RecoTracker/MkFitCore/src/MaterialEffects.h
@@ -19,8 +19,12 @@ namespace mkfit {
   public:
     MaterialEffects();
 
-    int getZbin(const float z) const { return (std::abs(z) * Config::nBinsZME) / (Config::rangeZME); }
-    int getRbin(const float r) const { return (r * Config::nBinsRME) / (Config::rangeRME); }
+    int __attribute__((optimize("no-inline"))) getZbin(const float z) const {
+      return (std::abs(z) * Config::nBinsZME) / (Config::rangeZME);
+    }
+    int __attribute__((optimize("no-inline"))) getRbin(const float r) const {
+      return (r * Config::nBinsRME) / (Config::rangeRME);
+    }
     float getRlVal(const int zb, const int rb) const { return mRlgridME[zb][rb]; }
     float getXiVal(const int zb, const int rb) const { return mXigridME[zb][rb]; }