Changeset 36154 for branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c

Timestamp:

Sep 27, 2013, 3:47:04 PM (13 years ago)

Author:

eugene

Message:

updates for psphotFullForce I/O

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c (modified) (3 diffs)

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

@@ -210 +210 @@
         if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) continue;
 
-        // XXX where are we storing the supplied kron radius?
+        // psphotSetRadiusMomentsExact sets the radius based on Mrf
         if (!isfinite(source->moments->Mrf)) continue;
 
+        // modelFits is allocated if a galaxy fit is requested
+        if (!source->modelFits) continue;
+
+        psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal); // NOTE : 6 allocs
+
         // skip saturated stars modeled with a radial profile 
+        // XXX worry about this at some point..
         if (source->mode2 & PM_SOURCE_MODE2_SATSTAR_PROFILE) continue;
 
@@ -221 +227 @@
         }
 
-        // XXX this is not right (use same concept as general source fit)
-        float windowRadius = 6.0*source->moments->Mrf ;
-
-        // re-allocate image, weight, mask arrays for each peak with box big enough to fit BIG_RADIUS
-        pmSourceRedefinePixels (source, readout, source->peak->x, source->peak->y, windowRadius + 2);
-        psAssert (source->pixels, "WTF?");
-
         // this function populates moments->Mrf,GalaxyShape,GalaxyShapeErr
         // do the following for a set of shapes (Ex,Ey)
@@ -245 +244 @@
     pmModelType modelType = pmModelClassGetType ("PS_MODEL_EXP");
 
-    pmModel *model = pmModelAlloc(modelType);
-    if (!model) {
-        return NULL;
-    }
-
+    pmModel *model = source->modelFits->data[0];
+    if (!model) return false;
+
+    // we are using fitOptions->mode : be sure this makes sense
     pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
 
+    // we are fitting only PM_PAR_I0; the shape elements are generated from a grid
     psF32 *PAR = pcm->modelConv->params->data.F32;
 
+    // double check that the guess is carried along...
+
     // I have some source guess (e0, e1, e2)
-    psEllipsePol guessPol;
+    psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, modelType);
+    psEllipsePol guessPol = psEllipseAxesToPol (guessAxes);
 
     // I am going to retain the value of e0, and grid search around e1,e2