Changeset 14321

Timestamp:

Jul 19, 2007, 2:23:22 PM (19 years ago)

Author:

magnier

Message:

we were calculating sqrt(second moment), but everything else assumes the straight second moment; fixed

File:

• trunk/psModules/src/objects/pmSource.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-26 19:27:37 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-07-20 00:23:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -745 +745 @@
 
     // XXX EAM : these values can be negative, so we need to limit the range
-    source->moments->Sx = sqrt(PS_MAX(X2/Sum - PS_SQR(x), 0));
-    source->moments->Sy = sqrt(PS_MAX(Y2/Sum - PS_SQR(y), 0));
+    // XXX EAM : make the use of this consistent: should this be the second moment or sqrt?
+    // source->moments->Sx = sqrt(PS_MAX(X2/Sum - PS_SQR(x), 0));
+    // source->moments->Sy = sqrt(PS_MAX(Y2/Sum - PS_SQR(y), 0));
+    source->moments->Sx = PS_MAX(X2/Sum - PS_SQR(x), 0);
+    source->moments->Sy = PS_MAX(Y2/Sum - PS_SQR(y), 0);
 
     psTrace ("psModules.objects", 4,