Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
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 63002a7
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Thu Jun 2 21:35:57 2022 +0200

    code-format

commit 13fd702
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 95ed455
Author: Patrick Gartung <gartung@fnal.gov>
Date:   Wed Jun 1 21:26:22 2022 +0200

    Use edm::isFinite

commit 19b46ed
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 98dabea
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 a565f52.
  • Loading branch information
gartung committed Jun 2, 2022
1 parent a54d721 commit d3576b6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions RecoTracker/MkFitCore/BuildFile.xml
Expand Up @@ -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"/>
Expand Down
8 changes: 6 additions & 2 deletions RecoTracker/MkFitCore/src/MaterialEffects.h
Expand Up @@ -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]; }

Expand Down

0 comments on commit d3576b6

Please sign in to comment.