Changeset 1154 in Sophya

Timestamp:

Aug 29, 2000, 4:14:25 PM (25 years ago)

Author:

ansari

Message:

portage Cxx
D.Y.

Location:

trunk/SigPredictor

Files:

• abscalctool.cc (modified) (2 diffs)
• abscalctool.h (modified) (2 diffs)

trunk/SigPredictor/abscalctool.cc

@@ -59 +59 @@
 }
 
+/*      // Pour compilation sur cxx boeuf!
 double AbsCalcTool::max(double a, double b) const{
   if(a>b) return a;
@@ -68 +69 @@
   else return b;
 }
-
+*/
 int kmg_eulerRad(double ai, double bi, int select, double *ao, double *bo) {
   // All coordinates are in Radian.

trunk/SigPredictor/abscalctool.h

@@ -2 +2 @@
 #define AbsCalTool_H
 
-#include <ostream>
+#include <fstream>
 #include "unitvector.h"
 #include "pixelmap.h" 
@@ -57 +57 @@
          // Computation tools       
     // Math tools !!!!!!!-------------------------------------------------------
-        inline double max(double a, double b)const;
-        inline double min(double a, double b)const;
+        inline double max(double a, double b)const
+        {       if(a>b) return a;
+                else return b;
+        }
+        inline double min(double a, double b)const
+        {       if(a<b) return a;
+                else return b;
+        }
             //compute solid angle between cones of aperture angles ang1 and ang2
  
-        virtual inline double diffSolidAng(double ang1,double ang2) const;
+        virtual double diffSolidAng(double ang1,double ang2) const;
 
 };