Changeset 244 in svn

Timestamp:

Feb 5, 2009, 11:56:10 AM (16 years ago)

Author:

Xavier Rouby

Message:

from PI to pi

Location:

trunk

Files:

• Utilities/Fastjet/plugins/CDFCones/interface/CalTower.hh (modified) (2 diffs)
• interface/SmearUtil.h (modified) (2 diffs)
• src/SmearUtil.cc (modified) (2 diffs)

trunk/Utilities/Fastjet/plugins/CDFCones/interface/CalTower.hh

@@ -8 +8 @@
 #include <cmath>
 #include <iostream>
-
-#ifndef M_PI
-#define M_PI  3.141592653589793238462643383279502884197 
-#endif
-
-const double pi = acos(-1);
-
 
 /* // CDF data : 22 towers. step=2.7° at the beginning, and after, it changes
@@ -48 +41 @@
     10,10,10,10,10, 10,10,10,10,10, 10,10,10,10,10, 10,10,10,20, 20 }; 
 
+
+#ifndef __PI__
+#define __PI__
+const float pi = 3.14159265358979312;
+#endif 
 
 class CalTower

trunk/interface/SmearUtil.h

@@ -47 +47 @@
 };
 
+#ifndef __PI__
+#define __PI__
 extern const float pi = 3.14159265358979312;
+#endif 
 
 class RESOLution
@@ -194 +197 @@
   void BinEtaPhi(const float phi, const float eta, float& iPhi, float& iEta);
 
-  static const float pi = 3.14159265358979312;
 };
 

trunk/src/SmearUtil.cc

@@ -979 +979 @@
    if(index==-100) return; 
    iPhi = -100;
-   float dphi = TOWER_dphi[index]*PI/180.; 
+   float dphi = TOWER_dphi[index]*pi/180.; 
    for (unsigned int i=1; i < 360/TOWER_dphi[index]; i++ ) {
-        float low = -PI+(i-1)*dphi;
+        float low = -pi+(i-1)*dphi;
         float high= low+dphi;
         if(phi > low && phi < high ){
@@ -988 +988 @@
         } 
    }
-   if (phi > PI-dphi) iPhi = PI-dphi;
+   if (phi > pi-dphi) iPhi = pi-dphi;
 }
 
 //**************************** Returns the delta Phi ****************************
 float DeltaPhi(const float phi1, const float phi2) {
-  float deltaphi=phi1-phi2; // in here, -PI < phi < PI
-  if(fabs(deltaphi) > PI) {
-        deltaphi=2.*PI -fabs(deltaphi);// put deltaphi between 0 and PI
+  float deltaphi=phi1-phi2; // in here, -pi < phi < pi
+  if(fabs(deltaphi) > pi) {
+        deltaphi=2.*pi -fabs(deltaphi);// put deltaphi between 0 and pi
         }
   else deltaphi=fabs(deltaphi);