Changeset 21211 for branches/pap_branch_20090128/psModules/src/objects/pmSourceMoments.c

Timestamp:

Jan 28, 2009, 2:33:51 PM (17 years ago)

Author:

Paul Price

Message:

Changing pmReadout.weight to variance. Adding pmReadout.covariance which will carry around a covariance pseudo-matrix, allowing us to calculate the pixel-to-pixel variance. pmReadout.covariance now exists and is set, but no mechanism yet to read/write, or use it.

File:

• branches/pap_branch_20090128/psModules/src/objects/pmSourceMoments.c (modified) (12 diffs)

branches/pap_branch_20090128/psModules/src/objects/pmSourceMoments.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-27 06:39:38 $
+ *  @version $Revision: 1.7.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-29 00:33:51 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
     pmSource->peak
     pmSource->pixels
-    pmSource->weight (optional)
+    pmSource->variance (optional)
     pmSource->mask (optional)
 
@@ -99 +99 @@
 
         psF32 *vPix = source->pixels->data.F32[row];
-        psF32 *vWgt = source->weight->data.F32[row];
+        psF32 *vWgt = source->variance->data.F32[row];
         psImageMaskType *vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[row];
 
@@ -110 +110 @@
                 vMsk++;
             }
-            if (isnan(*vPix)) continue;
+            if (isnan(*vPix)) continue;
 
             psF32 xDiff = col - xPeak;
@@ -189 +189 @@
 
         psF32 *vPix = source->pixels->data.F32[row];
-        psF32 *vWgt = source->weight->data.F32[row];
+        psF32 *vWgt = source->variance->data.F32[row];
         psImageMaskType  *vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[row];
 
@@ -200 +200 @@
                 vMsk++;
             }
-            if (isnan(*vPix)) continue;
+            if (isnan(*vPix)) continue;
 
             psF32 xDiff = col - xCM;
@@ -206 +206 @@
 
             // radius is just a function of (xDiff, yDiff)
-            psF32 r2  = PS_SQR(xDiff) + PS_SQR(yDiff);
-            psF32 r  = sqrt(r2);
+            psF32 r2  = PS_SQR(xDiff) + PS_SQR(yDiff);
+            psF32 r  = sqrt(r2);
             if (r > radius) continue;
 
@@ -278 +278 @@
 
     psTrace ("psModules.objects", 4, "Mxx: %f  Mxy: %f  Myy: %f  Mxxx: %f  Mxxy: %f  Mxyy: %f  Myyy: %f  Mxxxx: %f  Mxxxy: %f  Mxxyy: %f  Mxyyy: %f  Mxyyy: %f\n",
-             source->moments->Mxx,   source->moments->Mxy,   source->moments->Myy, 
+             source->moments->Mxx,   source->moments->Mxy,   source->moments->Myy,
              source->moments->Mxxx,  source->moments->Mxxy,  source->moments->Mxyy,  source->moments->Myyy,
              source->moments->Mxxxx, source->moments->Mxxxy, source->moments->Mxxyy, source->moments->Mxyyy, source->moments->Myyyy);
@@ -286 +286 @@
 
     if (source->moments->Mxx < 0) {
-        fprintf (stderr, "error: neg second moment??\n");
+        fprintf (stderr, "error: neg second moment??\n");
     }
     if (source->moments->Myy < 0) {
-        fprintf (stderr, "error: neg second moment??\n");
+        fprintf (stderr, "error: neg second moment??\n");
     }
 
@@ -341 +341 @@
 
         psF32 *vPix = source->pixels->data.F32[row];
-        psF32 *vWgt = source->weight->data.F32[row];
+        psF32 *vWgt = source->variance->data.F32[row];
         psImageMaskType  *vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[row];
 
@@ -352 +352 @@
                 vMsk++;
             }
-            if (isnan(*vPix)) continue;
+            if (isnan(*vPix)) continue;
 
             psF32 xDiff = col - xPeak;
@@ -407 +407 @@
     }
 
-# if (PS_TRACE_ON) 
+# if (PS_TRACE_ON)
     float Sxx = PS_MAX(X2/Sum - PS_SQR(x), 0);
     float Sxy = XY / Sum;