Changeset 21366 for trunk/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Feb 5, 2009, 5:03:33 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psphot/src/psphotFitSourcesLinear.c (modified) (7 diffs)

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -68 +68 @@
 
         // if (source->type == PM_SOURCE_TYPE_STAR &&
-        if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
+        if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
 
         if (final) {
@@ -76 +76 @@
         }
 
-        // generate model for sources without, or skip if we can't
-        if (!source->modelFlux) {
-            if (!pmSourceCacheModel (source, maskVal)) continue;
-        }
+        // generate model for sources without, or skip if we can't
+        if (!source->modelFlux) {
+            if (!pmSourceCacheModel (source, maskVal)) continue;
+        }
 
         // save the original coords
@@ -96 +96 @@
 
     // vectors to store stats for each object
-    // psVector *weight = psVectorAlloc (fitSources->n, PS_TYPE_F32);
+    // psVector *variance = psVectorAlloc (fitSources->n, PS_TYPE_F32);
     psVector *errors = psVectorAlloc (fitSources->n, PS_TYPE_F32);
 
@@ -128 +128 @@
         psSparseVectorElement (sparse, i, f);
 
-        // add the per-source weights (border region)
+        // add the per-source variances (border region)
         switch (SKY_FIT_ORDER) {
           case 1:
@@ -208 +208 @@
         pmSource *source = fitSources->data[i];
         pmModel *model = pmSourceGetModel (NULL, source);
-        pmSourceChisq (model, source->pixels, source->maskObj, source->weight, maskVal);
+        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal);
     }
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "get chisqs: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
@@ -253 +253 @@
     // accumulate the image statistics from the masked regions
     psF32 **image  = readout->image->data.F32;
-    psF32 **weight = readout->weight->data.F32;
+    psF32 **variance = readout->variance->data.F32;
     psImageMaskType  **mask   = readout->mask->data.PS_TYPE_IMAGE_MASK_DATA;
 
@@ -268 +268 @@
                 wt = 1.0;
             } else {
-                wt = weight[j][i];
+                wt = variance[j][i];
             }
             f = image[j][i];