Changeset 21213 for branches/pap_branch_20090128/psphot/src/psphotOutput.c

Timestamp:

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

Author:

Paul Price

Message:

Convering 'weight' to 'variance' where appropriate. Mostly just propagating changes from psModules.

File:

• branches/pap_branch_20090128/psphot/src/psphotOutput.c (modified) (5 diffs)

branches/pap_branch_20090128/psphot/src/psphotOutput.c

@@ -18 +18 @@
 
 pmReadout *psphotSelectBackgroundStdev (pmConfig *config,
-                                        const pmFPAview *view) {
+                                        const pmFPAview *view) {
 
     bool status;
@@ -77 +77 @@
                 continue;
             }
-            // skip zero-weight points
-            if (source->weight->data.F32[i][j] == 0) {
+            // skip zero-variance points
+            if (source->variance->data.F32[i][j] == 0) {
                 continue;
             }
@@ -86 +86 @@
                      (i + source->pixels->row0),
                      source->pixels->data.F32[i][j],
-                     1.0 / source->weight->data.F32[i][j],
+                     1.0 / source->variance->data.F32[i][j],
                      source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j]);
         }
@@ -124 +124 @@
         if (model == NULL)
             continue;
-        if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
-            nEXT ++;
-        }
-        if (source->mode & PM_SOURCE_MODE_CR_LIMIT) {
-            nCR ++;
-        }
+        if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
+            nEXT ++;
+        }
+        if (source->mode & PM_SOURCE_MODE_CR_LIMIT) {
+            nCR ++;
+        }
         nSrc ++;
     }
@@ -242 +242 @@
 
     for (int i = 0; i < try->sources->n; i++) {
-        // masked for: bad model fit, outlier in parameters
-        if (try->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PSFTRY_MASK_ALL)
-            continue;
-
-        pmSource *source = try->sources->data[i];
-        float x = source->modelPSF->params->data.F32[PM_PAR_XPOS];
-        float y = source->modelPSF->params->data.F32[PM_PAR_YPOS];
-
-        // set the mask and subtract the PSF model
-        // XXX should we be using maskObj? should we be unsetting the mask?
-        // use pmModelSub because modelFlux has not been generated
-        assert (source->maskObj);
-        psImageKeepCircle (source->maskObj, x, y, radius, "OR", markVal);
-        pmModelSub (source->pixels, source->maskObj, source->modelPSF, PM_MODEL_OP_FULL, maskVal);
-        psImageKeepCircle (source->maskObj, x, y, radius, "AND", PS_NOT_IMAGE_MASK(markVal));
+        // masked for: bad model fit, outlier in parameters
+        if (try->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PSFTRY_MASK_ALL)
+            continue;
+
+        pmSource *source = try->sources->data[i];
+        float x = source->modelPSF->params->data.F32[PM_PAR_XPOS];
+        float y = source->modelPSF->params->data.F32[PM_PAR_YPOS];
+
+        // set the mask and subtract the PSF model
+        // XXX should we be using maskObj? should we be unsetting the mask?
+        // use pmModelSub because modelFlux has not been generated
+        assert (source->maskObj);
+        psImageKeepCircle (source->maskObj, x, y, radius, "OR", markVal);
+        pmModelSub (source->pixels, source->maskObj, source->modelPSF, PM_MODEL_OP_FULL, maskVal);
+        psImageKeepCircle (source->maskObj, x, y, radius, "AND", PS_NOT_IMAGE_MASK(markVal));
     }
 
     FILE *f = fopen ("shapes.dat", "w");
     for (int i = 0; i < try->sources->n; i++) {
-        psF32 inPar[10];  // must be psF32 to pmPSF_FitToModel
-
-        // masked for: bad model fit, outlier in parameters
-        if (try->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PSFTRY_MASK_ALL) continue;
-
-        pmSource *source = try->sources->data[i];
-        psF32 *outPar = source->modelEXT->params->data.F32;
-
-        psEllipseShape shape;
-
-        shape.sx  = outPar[PM_PAR_SXX] / M_SQRT2;
-        shape.sy  = outPar[PM_PAR_SYY] / M_SQRT2;
-        shape.sxy = outPar[PM_PAR_SXY];
-
-        psEllipsePol pol = pmPSF_ModelToFit (outPar);
-        inPar[PM_PAR_E0] = pol.e0;
-        inPar[PM_PAR_E1] = pol.e1;
-        inPar[PM_PAR_E2] = pol.e2;
-        pmPSF_FitToModel (inPar, 0.1);
-
-        psEllipseAxes axes1 = psEllipseShapeToAxes (shape, 20.0);
-        psEllipseAxes axes2 = psEllipsePolToAxes(pol, 0.1);
-
-        psEllipsePol pol2 = psEllipseAxesToPol (axes1);
-
-        fprintf (f, "%3d  %7.2f %7.2f  %7.4f %7.4f %7.4f  --  %7.4f %7.4f %7.4f  :  %7.4f %7.4f %7.4f  --  %7.4f %7.4f %7.4f : %7.4f %7.4f %6.1f : %7.4f %7.4f %6.1f\n",
-                 i, outPar[PM_PAR_XPOS], outPar[PM_PAR_YPOS],
-                 outPar[PM_PAR_SXX], outPar[PM_PAR_SXY], outPar[PM_PAR_SYY],
-                 pol.e0, pol.e1, pol.e2,
-                 pol2.e0, pol2.e1, pol2.e2,
-                 inPar[PM_PAR_SXX], inPar[PM_PAR_SXY], inPar[PM_PAR_SYY],
-                 axes1.major, axes1.minor, axes1.theta*PM_DEG_RAD,
-                 axes2.major, axes2.minor, axes2.theta*PM_DEG_RAD
-            );
+        psF32 inPar[10];  // must be psF32 to pmPSF_FitToModel
+
+        // masked for: bad model fit, outlier in parameters
+        if (try->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PSFTRY_MASK_ALL) continue;
+
+        pmSource *source = try->sources->data[i];
+        psF32 *outPar = source->modelEXT->params->data.F32;
+
+        psEllipseShape shape;
+
+        shape.sx  = outPar[PM_PAR_SXX] / M_SQRT2;
+        shape.sy  = outPar[PM_PAR_SYY] / M_SQRT2;
+        shape.sxy = outPar[PM_PAR_SXY];
+
+        psEllipsePol pol = pmPSF_ModelToFit (outPar);
+        inPar[PM_PAR_E0] = pol.e0;
+        inPar[PM_PAR_E1] = pol.e1;
+        inPar[PM_PAR_E2] = pol.e2;
+        pmPSF_FitToModel (inPar, 0.1);
+
+        psEllipseAxes axes1 = psEllipseShapeToAxes (shape, 20.0);
+        psEllipseAxes axes2 = psEllipsePolToAxes(pol, 0.1);
+
+        psEllipsePol pol2 = psEllipseAxesToPol (axes1);
+
+        fprintf (f, "%3d  %7.2f %7.2f  %7.4f %7.4f %7.4f  --  %7.4f %7.4f %7.4f  :  %7.4f %7.4f %7.4f  --  %7.4f %7.4f %7.4f : %7.4f %7.4f %6.1f : %7.4f %7.4f %6.1f\n",
+                 i, outPar[PM_PAR_XPOS], outPar[PM_PAR_YPOS],
+                 outPar[PM_PAR_SXX], outPar[PM_PAR_SXY], outPar[PM_PAR_SYY],
+                 pol.e0, pol.e1, pol.e2,
+                 pol2.e0, pol2.e1, pol2.e2,
+                 inPar[PM_PAR_SXX], inPar[PM_PAR_SXY], inPar[PM_PAR_SYY],
+                 axes1.major, axes1.minor, axes1.theta*PM_DEG_RAD,
+                 axes2.major, axes2.minor, axes2.theta*PM_DEG_RAD
+            );
     }
     fclose (f);