Changeset 4168

Timestamp:

Jun 8, 2005, 2:59:54 PM (21 years ago)

Author:

desonia

Message:

PS_SQRT_F32 was depreciated.

Location:

trunk/psModules/src

Files:

• pmImageSubtract.c (modified) (2 diffs)
• pmObjects.c (modified) (2 diffs)
• pmReadoutCombine.c (modified) (3 diffs)

trunk/psModules/src/pmImageSubtract.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-03 21:43:42 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 00:59:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1051 +1051 @@
         }
     }
-    psF32 rmsDev = PS_SQRT_F32(meanDev / (psF64)(numDev - 1));
+    psF32 rmsDev = sqrtf(meanDev / (psF64)(numDev - 1));
     psF32 limit = rmsDev * sigmaRej;
 

trunk/psModules/src/pmObjects.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-03 22:46:04 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 00:59:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1143 +1143 @@
         psF32 A  = M_PI * sigX * sigY;
         psF32 B  = tmpSrc->moments->Sky;
-        psF32 RT = PS_SQRT_F32(S + (A * B) + (A * PS_SQR(RDNOISE) / PS_SQRT_F32(GAIN)));
-        psF32 SN = (S * PS_SQRT_F32(GAIN) / RT);
+        psF32 RT = sqrtf(S + (A * B) + (A * PS_SQR(RDNOISE) / sqrtf(GAIN)));
+        psF32 SN = (S * sqrtf(GAIN) / RT);
 
         starsn->data.F32[starsn->n] = SN;

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 20:28:32 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 00:59:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -288 +288 @@
                             x+= tmpPixels->data.F32[r];
                         }
-                        sigma = PS_SQRT_F32((readnoise*readnoise) + gain * x) / gain;
+                        sigma = sqrtf((readnoise*readnoise) + gain * x) / gain;
 
                         tmpPixelErrors->data.F32[r] = sigma;
@@ -307 +307 @@
                             sigma+= tmpPixels->data.F32[r];
                         }
-                        sigma = PS_SQRT_F32((readnoise*readnoise) + (gain * sigma)) / gain;
+                        sigma = sqrtf((readnoise*readnoise) + (gain * sigma)) / gain;
 
                         tmpPixelErrors->data.F32[r] = sigma;