Changeset 36148 for branches/eam_branches/ipp-20130904/psphot/src/psphotKronFlux.c

Timestamp:

Sep 24, 2013, 12:09:27 PM (13 years ago)

Author:

eugene

Message:

first version of psphotFullForce which builds

Location:

branches/eam_branches/ipp-20130904/psphot/src

Files:

• . (modified) (1 prop)
• psphotKronFlux.c (modified) (11 diffs)

branches/eam_branches/ipp-20130904/psphot/src

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce

branches/eam_branches/ipp-20130904/psphot/src/psphotKronFlux.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotKronFlux (pmConfig *config, const pmFPAview *view, const char *filerule, int pass)
+bool psphotKronFlux (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -35 +35 @@
         psAssert (sources, "missing sources?");
 
-        pmPSF *psf = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF");
-        // psAssert (psf, "missing psf?");
-
-        if (!psphotKronFluxReadout (config, recipe, view, filerule, readout, sources, psf, i, pass)) {
+        if (!psphotKronFluxReadout (config, recipe, view, filerule, readout, sources)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to measure magnitudes for %s entry %d", filerule, i);
             return false;
@@ -46 +43 @@
 }
 
-bool psphotKronFluxReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, const char * filerule, pmReadout *readout, psArray *sources, pmPSF *psf, int index, int pass) {
+bool psphotKronFluxReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, const char *filerule, pmReadout *readout, psArray *sources) {
 
     bool status = false;
@@ -61 +58 @@
     if (!status) {
         nThreads = 0;
-    }
-
-    bool KRON_APPLY_WEIGHT = psMetadataLookupBool (&status, recipe, "KRON_APPLY_WEIGHT");
-    if (!status) {
-        KRON_APPLY_WEIGHT = true;
-    }
-
-    bool KRON_APPLY_WINDOW = psMetadataLookupBool (&status, recipe, "KRON_APPLY_WINDOW");
-    if (!status) {
-        KRON_APPLY_WINDOW = false;
     }
 
@@ -105 +92 @@
 
             // allocate a job -- if threads are not defined, this just runs the job
-            psThreadJob *job = psThreadJobAlloc ("PSPHOT_KRON_ITERATE");
+            psThreadJob *job = psThreadJobAlloc ("PSPHOT_KRON_FLUX");
 
             psArrayAdd(job->args, 1, readout);
@@ -111 +98 @@
             PS_ARRAY_ADD_SCALAR(job->args, markVal,            PS_TYPE_IMAGE_MASK);
             PS_ARRAY_ADD_SCALAR(job->args, maskVal,            PS_TYPE_IMAGE_MASK);
-            PS_ARRAY_ADD_SCALAR(job->args, pass,               PS_TYPE_S32);
 
 // set this to 0 to run without threading
@@ -153 +139 @@
 
     pmReadout *readout              = job->args->data[0];
-    psArray *sources                = job->args->data[2];
-    psImageMaskType markVal         = PS_SCALAR_VALUE(job->args->data[4],PS_TYPE_IMAGE_MASK_DATA);
-    psImageMaskType maskVal         = PS_SCALAR_VALUE(job->args->data[5],PS_TYPE_IMAGE_MASK_DATA);
+    psArray *sources                = job->args->data[1];
+    psImageMaskType markVal         = PS_SCALAR_VALUE(job->args->data[2],PS_TYPE_IMAGE_MASK_DATA);
+    psImageMaskType maskVal         = PS_SCALAR_VALUE(job->args->data[3],PS_TYPE_IMAGE_MASK_DATA);
 
     for (int i = 0; i < sources->n; i++) {
-
-        // XXX what do i need for the kron flux (given a supplied kron radius?)
 
         pmSource *source = sources->data[i];
@@ -180 +164 @@
         }
 
-        // is the right??
-        float windowRadius = 6.0*source->moments->Mrf ;
+        // is this right??
+        float windowRadius = 2.5*source->moments->Mrf ;
 
         // re-allocate image, weight, mask arrays for each peak with box big enough to fit BIG_RADIUS
-        bool extend = pmSourceRedefinePixels (source, readout, source->peak->x, source->peak->y, windowRadius + 2);
+        pmSourceRedefinePixels (source, readout, source->peak->x, source->peak->y, windowRadius + 2);
         psAssert (source->pixels, "WTF?");
 
@@ -205 +189 @@
 
     // the peak position is less accurate but less subject to extreme deviations
+    // XXX do this or just use the peak position?
     float dX = source->moments->Mx - source->peak->xf;
     float dY = source->moments->My - source->peak->yf;
@@ -211 +196 @@
     float Yo = (dR < 2.0) ? source->moments->My : source->peak->yf;
 
+    // center of mass in subimage.  Note: the calculation below uses pixel index, so we correct
+    // xCM, yCM from pixel coords to pixel index here.
+    psF32 xCM = Xo - 0.5 - source->pixels->col0; // coord of peak in subimage
+    psF32 yCM = Yo - 0.5 - source->pixels->row0; // coord of peak in subimage
+
     // Calculate the Kron magnitude (make this block optional?)
     // XXX set the aperture here
-    float radKron  = 2.5*Mrf;
+    float radKron  = 2.5*source->moments->Mrf;
     float radKron2 = radKron*radKron;
 
@@ -222 +212 @@
     // set vPix to the source pixels (it may have been set to the
     // smoothed image above)
-    vPix = source->pixels->data.F32;
-    vWgt = source->variance->data.F32;
-    vMsk = source->mask->data.F32;
+    psF32 **vPix = source->pixels->data.F32;
+    psF32 **vWgt = source->variance->data.F32;
+    psImageMaskType **vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA;
 
     for (psS32 row = 0; row < source->pixels->numRows ; row++) {

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce