Changeset 9527 for trunk/psphot/src/psphotEnsemblePSF.c

Timestamp:

Oct 12, 2006, 4:24:34 PM (20 years ago)

Author:

rhl

Message:

Use CONSTANT_PHOTOMETRIC_WEIGHTS to control weighting of pmSourceCrossProduct; provide symbolic names for model parameters

File:

• trunk/psphot/src/psphotEnsemblePSF.c (modified) (10 diffs)

trunk/psphot/src/psphotEnsemblePSF.c

@@ -37 +37 @@
     // psRegion AnalysisRegion = psRegionForImage (readout->image, psRegionFromString (region));
     if (psRegionIsNaN (AnalysisRegion)) psAbort ("psphot", "analysis region mis-defined");
+
+    const bool CONSTANT_PHOTOMETRIC_WEIGHTS =
+        psMetadataLookupBool(&status, recipe, "CONSTANT_PHOTOMETRIC_WEIGHTS");
+    if (!status) {
+        psAbort(PS_FILE_LINE, "You must provide a value for the BOOL recipe CONSTANT_PHOTOMETRIC_WEIGHTS");
+    }
 
     for (int i = 0; i < sources->n; i++) {
@@ -68 +74 @@
         pmModel *modelEXT = pmSourceModelGuess (inSource, psf->type); 
         if (inSource->mode &  PM_SOURCE_MODE_SATSTAR) {
-            modelEXT->params->data.F32[2] = inSource->moments->x;
-            modelEXT->params->data.F32[3] = inSource->moments->y;
+            modelEXT->params->data.F32[PM_PAR_XPOS] = inSource->moments->x;
+            modelEXT->params->data.F32[PM_PAR_YPOS] = inSource->moments->y;
         } else {
             // peak-up on peak (for non-sat objects)
@@ -81 +87 @@
 
             psTrace ("psphotEnsemblePSF", 5, "peak coord: %f %f -> %f %f\n", 
-                     modelEXT->params->data.F32[2], modelEXT->params->data.F32[3], min.x + ix, min.y + iy);
+                     modelEXT->params->data.F32[PM_PAR_XPOS], modelEXT->params->data.F32[PM_PAR_YPOS], min.x + ix, min.y + iy);
             
             // if min point is too deviant, keep the old value
             if ((fabs(min.x) < 1.5) && (fabs(min.y) < 1.5)) {
-                modelEXT->params->data.F32[2] = min.x + ix;
-                modelEXT->params->data.F32[3] = min.y + iy;
+                modelEXT->params->data.F32[PM_PAR_XPOS] = min.x + ix;
+                modelEXT->params->data.F32[PM_PAR_YPOS] = min.y + iy;
             }
             psFree (bicube);
@@ -96 +102 @@
 
         // save the original coords
-        x = model->params->data.F32[2];
-        y = model->params->data.F32[3];
+        x = model->params->data.F32[PM_PAR_XPOS];
+        y = model->params->data.F32[PM_PAR_YPOS];
 
         // set the fit radius based on the object flux limit and the model
@@ -112 +118 @@
 
         // set model to unit peak, zero sky (we assume sky is subtracted)
-        model->params->data.F32[0] = 0.0;
-        model->params->data.F32[1] = 1.0;
+        model->params->data.F32[PM_PAR_SKY] = 0.0;
+        model->params->data.F32[PM_PAR_FLUX] = 1.0;
 
         // fill in the model pixel values
@@ -143 +149 @@
 
         // scale by diagonal element (auto-cross-product)
-        r = pmSourceCrossProduct (Mi, Mi);
+        r = pmSourceCrossProduct (Mi, Mi, CONSTANT_PHOTOMETRIC_WEIGHTS);
         weight->data.F32[i] = r;
 
@@ -149 +155 @@
 
         // find the image x model value
-        f = pmSourceCrossProduct (Fi, Mi);
+        f = pmSourceCrossProduct (Fi, Mi, CONSTANT_PHOTOMETRIC_WEIGHTS);
         psSparseVectorElement (sparse, i, f / r);
 
@@ -163 +169 @@
             
             // got an overlap; calculate cross-product and add to output array
-            f = pmSourceCrossProduct (Mi, Mj);
+            f = pmSourceCrossProduct (Mi, Mj, CONSTANT_PHOTOMETRIC_WEIGHTS);
             psSparseMatrixElement (sparse, j, i, f / r); 
         }
@@ -194 +200 @@
             psAbort ("psphot", "ensemble source is nan");
         }
-        Fi->modelPSF->params->data.F32[1] = norm->data.F32[i];
-        Fi->modelPSF->dparams->data.F32[1] = sqrt(sqrt(2) * norm->data.F32[i] / (sparse->Bfj->data.F32[i] * weight->data.F32[i]));
+        Fi->modelPSF->params->data.F32[PM_PAR_FLUX] = norm->data.F32[i];
+        Fi->modelPSF->dparams->data.F32[PM_PAR_FLUX] = sqrt(sqrt(2) * norm->data.F32[i] / (sparse->Bfj->data.F32[i] * weight->data.F32[i]));
         // XXX EAM : this factor of sqrt(2) makes the errors consistent, but I don't understand it
 
@@ -210 +216 @@
         pmModel *model = Fi->modelPSF;
 
-        x = model->params->data.F32[2];
-        y = model->params->data.F32[3];
+        x = model->params->data.F32[PM_PAR_XPOS];
+        y = model->params->data.F32[PM_PAR_YPOS];
 
         psImageKeepCircle (Fi->mask, x, y, model->radiusTMP, "OR", PM_MASK_MARK);