From 1f60d46e35f2262d7b44b03b8347cd51423cc81b Mon Sep 17 00:00:00 2001 From: Christopher Backhouse Date: Thu, 5 Nov 2020 13:23:43 -0600 Subject: [PATCH] Fix silly error in clang fix. Print out the names of the disagreeing calculators in testOsc. --- OscLib/PMNS.cxx | 2 +- OscLib/PMNSOpt.cxx | 2 +- OscLib/test/testOsc.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OscLib/PMNS.cxx b/OscLib/PMNS.cxx index 42548e1..f8853ad 100644 --- a/OscLib/PMNS.cxx +++ b/OscLib/PMNS.cxx @@ -624,7 +624,7 @@ template class osc::_PMNS; #ifdef __clang__ namespace stan::math{ inline bool isinf(const stan::math::var& x){return stan::math::is_inf(x);} - inline bool isnan(const stan::math::var& x){return !stan::math::is_nan(x);} + inline bool isnan(const stan::math::var& x){return stan::math::is_nan(x);} inline bool isfinite(const stan::math::var& x){return !stan::math::is_inf(x) && !stan::math::is_nan(x);} inline stan::math::var copysign(stan::math::var x, stan::math::var y){return y > 0 ? x : -x;} } diff --git a/OscLib/PMNSOpt.cxx b/OscLib/PMNSOpt.cxx index a03a080..10dd0e9 100644 --- a/OscLib/PMNSOpt.cxx +++ b/OscLib/PMNSOpt.cxx @@ -399,7 +399,7 @@ template class osc::_PMNSOpt; #ifdef __clang__ namespace stan::math{ inline bool isinf(const stan::math::var& x){return stan::math::is_inf(x);} - inline bool isnan(const stan::math::var& x){return !stan::math::is_nan(x);} + inline bool isnan(const stan::math::var& x){return stan::math::is_nan(x);} inline bool isfinite(const stan::math::var& x){return !stan::math::is_inf(x) && !stan::math::is_nan(x);} inline stan::math::var copysign(stan::math::var x, stan::math::var y){return y > 0 ? x : -x;} diff --git a/OscLib/test/testOsc.cc b/OscLib/test/testOsc.cc index c19cc8f..8ed464d 100644 --- a/OscLib/test/testOsc.cc +++ b/OscLib/test/testOsc.cc @@ -140,7 +140,7 @@ int main() std::cerr << "!!! Probabilities for " << title.Data() << " differ at " << E << " GeV. " << Ps[i] << " vs " << Ps[j] - << " between calculators " << i << " and " << j << std::endl; + << " between calculators " << names[i] << " and " << names[j] << std::endl; } } // end for j } // end for i