Changeset 1154 in Sophya for trunk/SigPredictor/abscalctool.h

Timestamp:

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

Author:

ansari

Message:

portage Cxx
D.Y.

File:

• trunk/SigPredictor/abscalctool.h (modified) (2 diffs)

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;
 
 };