Changeset 2145 in Sophya

Timestamp:

Jul 31, 2002, 12:34:12 PM (23 years ago)

Author:

ansari

Message:

Suppression des #define pour fonctions float ds fmath.h (fmat.h est devenu vide) + adaptations , Reza 31/7/2002

Location:

trunk/SophyaLib/NTools

Files:

• dynccd.cc (modified) (2 diffs)
• fmath.h (modified) (1 diff)

trunk/SophyaLib/NTools/dynccd.cc

@@ -113 +113 @@
 if ( (pixel > MaxADU) || (pixel < MinADU) )   return(0.);
 if ( TypNoise == kConstantNoise)  return(1.);
-if ( TypNoise == kSqrtADUNoise )  return(fsqrt(fabsf(pixel)));
+if ( TypNoise == kSqrtADUNoise )  return(sqrt(fabs(pixel)));
 
 if ( TypNoise == kSigFondNoise)
@@ -124 +124 @@
 h = (pixel>fond) ? (r_8)(pixel-fond) : 0.;
 s = ronsq+h/Gain;
-s = fsqrt(s);
+s = sqrt(s);
 return(s);
 }

trunk/SophyaLib/NTools/fmath.h

@@ -4 +4 @@
 #define  FMATH_H_SEEN
 
-#include <math.h>
+/* float math functions declarations using #define removed
+   to avoid compilation problems - Sophya code modified 
+   accordingly - 
+   C++ overloaded math functions should be used instead
+                                        R. Ansari
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+if defined(OSF1)
+define   fexp(x)       expf(x)
+define   fsqrt(x)      sqrtf(x)
+define   flog10(x)     log10f(x)
+define   flog(x)       logf(x)
+elif !defined(IRIX64)
+define   fexp(x)     ((float)(exp((double)(x))))
+define   expf(x)     ((float)(exp((double)(x))))
+define   fabsf(x)    ((float)(fabs((double)(x))))
+define   fsqrt(x)    ((float)(sqrt((double)(x))))
+define   sqrtf(x)    ((float)(sqrt((double)(x))))
+define   flog10(x)   ((float)(log10((double)(x))))
+define   log10f(x)   ((float)(log10((double)(x))))
+define   flog(x)     ((float)(log((double)(x))))
+define   logf(x)     ((float)(log((double)(x))))
+define   floorf(x)   ((float) floor((double)(x)))
+define   ceilf(x)    ((float) ceil((double)(x)))
+define   powf(x,y)    ((float) pow((double)(x), (double)(y)))
+endif
 
+*/
 
-#if defined(OSF1)
-#define   fexp(x)       expf(x)
-#define   fsqrt(x)      sqrtf(x)
-#define   flog10(x)     log10f(x)
-#define   flog(x)       logf(x)
-#elif !defined(IRIX64)
-#define   fexp(x)     ((float)(exp((double)(x))))
-#define   expf(x)     ((float)(exp((double)(x))))
-#define   fabsf(x)    ((float)(fabs((double)(x))))
-#define   fsqrt(x)    ((float)(sqrt((double)(x))))
-#define   sqrtf(x)    ((float)(sqrt((double)(x))))
-#define   flog10(x)   ((float)(log10((double)(x))))
-#define   log10f(x)   ((float)(log10((double)(x))))
-#define   flog(x)     ((float)(log((double)(x))))
-#define   logf(x)     ((float)(log((double)(x))))
-#define   floorf(x)   ((float) floor((double)(x)))
-#define   ceilf(x)    ((float) ceil((double)(x)))
-#define   powf(x,y)    ((float) pow((double)(x), (double)(y)))
-#endif
-
-#ifdef __cplusplus
-}
-#endif
 
 #endif