[Rivet-svn] r4202 - branches/2012-06-aidarivet/src/Analyses trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Wed Mar  6 17:42:10 2013
New Revision: 4202

Log:
isnan -> std::isnan (and same for isinf)

Modified:
   branches/2012-06-aidarivet/src/Analyses/LHCB_2011_I917009.cc
   branches/2012-06-aidarivet/src/Analyses/OPAL_2004_S6132243.cc
   trunk/src/Analyses/LHCB_2011_I917009.cc
   trunk/src/Analyses/OPAL_2004_S6132243.cc

Modified: branches/2012-06-aidarivet/src/Analyses/LHCB_2011_I917009.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/LHCB_2011_I917009.cc	Wed Mar  6 17:37:44 2013	(r4201)
+++ branches/2012-06-aidarivet/src/Analyses/LHCB_2011_I917009.cc	Wed Mar  6 17:42:10 2013	(r4202)
@@ -97,7 +97,7 @@
         const FourMomentum& qmom = p.momentum();
         y = log((qmom.E() + qmom.pz())/(qmom.E() - qmom.pz()))/2.;
         // skip this particle if it has too high or too low rapidity (extremely rare cases when E = +- pz)
-        if ( isnan(y) || isinf(y) ) continue;
+        if ( std::isnan(y) || std::isinf(y) ) continue;
         y = fabs(y);
         if ( (y < rap_min) || (y > rap_max) ) continue;
         pT = sqrt((qmom.px() * qmom.px()) + (qmom.py() * qmom.py()));

Modified: branches/2012-06-aidarivet/src/Analyses/OPAL_2004_S6132243.cc
==============================================================================
--- branches/2012-06-aidarivet/src/Analyses/OPAL_2004_S6132243.cc	Wed Mar  6 17:37:44 2013	(r4201)
+++ branches/2012-06-aidarivet/src/Analyses/OPAL_2004_S6132243.cc	Wed Mar  6 17:42:10 2013	(r4202)
@@ -161,7 +161,7 @@
       const double hemi_mh = hemi.scaledMhigh();
       const double hemi_ml = hemi.scaledMlow();
       /// @todo This shouldn't be necessary... what's going on? Memory corruption suspected :(
-      // if (isnan(hemi_ml)) {
+      // if (std::isnan(hemi_ml)) {
       //   MSG_ERROR("NaN in HemiL! Event = " << numEvents());
       //   MSG_ERROR(hemi.M2low() << ", " << hemi.E2vis());
       // }
@@ -175,7 +175,7 @@
         _histHemiBroadN[_isqrts]->fill(hemi_bmin, weight);
         _histHemiBroadT[_isqrts]->fill(hemi_bsum, weight);
         for (int n = 1; n <= 5; ++n) {
-          // if (isnan(pow(hemi_ml, n))) MSG_ERROR("NaN in HemiL moment! Event = " << numEvents());
+          // if (std::isnan(pow(hemi_ml, n))) MSG_ERROR("NaN in HemiL moment! Event = " << numEvents());
           _histHemiMassHMom[_isqrts]->fill(n, pow(hemi_mh, n)*weight);
           _histHemiMassLMom[_isqrts]->fill(n, pow(hemi_ml, n)*weight);
           _histHemiBroadWMom[_isqrts]->fill(n, pow(hemi_bmax, n)*weight);

Modified: trunk/src/Analyses/LHCB_2011_I917009.cc
==============================================================================
--- trunk/src/Analyses/LHCB_2011_I917009.cc	Wed Mar  6 17:37:44 2013	(r4201)
+++ trunk/src/Analyses/LHCB_2011_I917009.cc	Wed Mar  6 17:42:10 2013	(r4202)
@@ -96,7 +96,7 @@
         const FourMomentum& qmom = p.momentum();
         y = log((qmom.E() + qmom.pz())/(qmom.E() - qmom.pz()))/2.;
         // skip this particle if it has too high or too low rapidity (extremely rare cases when E = +- pz)
-        if ( isnan(y) || isinf(y) ) continue;
+        if ( std::isnan(y) || std::isinf(y) ) continue;
         y = fabs(y);
         if (!inRange(y, rap_min, rap_max)) continue;
         pT = sqrt((qmom.px() * qmom.px()) + (qmom.py() * qmom.py()));

Modified: trunk/src/Analyses/OPAL_2004_S6132243.cc
==============================================================================
--- trunk/src/Analyses/OPAL_2004_S6132243.cc	Wed Mar  6 17:37:44 2013	(r4201)
+++ trunk/src/Analyses/OPAL_2004_S6132243.cc	Wed Mar  6 17:42:10 2013	(r4202)
@@ -161,7 +161,7 @@
       const double hemi_mh = hemi.scaledMhigh();
       const double hemi_ml = hemi.scaledMlow();
       /// @todo This shouldn't be necessary... what's going on? Memory corruption suspected :(
-      // if (isnan(hemi_ml)) {
+      // if (std::isnan(hemi_ml)) {
       //   MSG_ERROR("NaN in HemiL! Event = " << numEvents());
       //   MSG_ERROR(hemi.M2low() << ", " << hemi.E2vis());
       // }
@@ -175,7 +175,7 @@
         _histHemiBroadN[_isqrts]->fill(hemi_bmin, weight);
         _histHemiBroadT[_isqrts]->fill(hemi_bsum, weight);
         for (int n = 1; n <= 5; ++n) {
-          // if (isnan(pow(hemi_ml, n))) MSG_ERROR("NaN in HemiL moment! Event = " << numEvents());
+          // if (std::isnan(pow(hemi_ml, n))) MSG_ERROR("NaN in HemiL moment! Event = " << numEvents());
           _histHemiMassHMom[_isqrts]->fill(n, pow(hemi_mh, n)*weight);
           _histHemiMassLMom[_isqrts]->fill(n, pow(hemi_ml, n)*weight);
           _histHemiBroadWMom[_isqrts]->fill(n, pow(hemi_bmax, n)*weight);