Changeset 36154 for branches/eam_branches/ipp-20130904/psphot/src

Timestamp:

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

Author:

eugene

Message:

updates for psphotFullForce I/O

Location:

branches/eam_branches/ipp-20130904/psphot/src

Files:

• psphotGalaxyShape.c (modified) (3 diffs)
• psphotMergeSources.c (modified) (2 diffs)
• psphotPetroFlux.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

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

@@ -105 +105 @@
     {
         pmReadout *readoutCMF = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CMF");
-        if (!readoutCMF) goto loadTXT;
+        if (!readoutCMF) goto loadCFF;
 
         extCMF = psMetadataLookupPtr (NULL, readoutCMF->analysis, "PSPHOT.DETECTIONS");
@@ -111 +111 @@
             for (int i = 0; i < extCMF->allSources->n; i++) {
                 pmSource *source = extCMF->allSources->data[i];
+                source->mode |= PM_SOURCE_MODE_EXTERNAL;
+
+                // the supplied peak flux needs to be re-normalized
+                source->peak->rawFlux = 1.0;
+                source->peak->smoothFlux = 1.0;
+                source->peak->detValue = 1.0;
+
+                // drop the loaded source modelPSF
+                psFree (source->modelPSF);
+                source->modelPSF = NULL;
+                source->imageID = index;
+
+                psArrayAdd (detections->newSources, 100, source);
+            }
+        }
+    }
+
+loadCFF:
+    // load data from input CFF file:
+    {
+        pmReadout *readoutCFF = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CFF");
+        if (!readoutCFF) goto loadTXT;
+
+        extCFF = psMetadataLookupPtr (NULL, readoutCFF->analysis, "PSPHOT.DETECTIONS");
+        if (extCFF) {
+            for (int i = 0; i < extCFF->allSources->n; i++) {
+                pmSource *source = extCFF->allSources->data[i];
                 source->mode |= PM_SOURCE_MODE_EXTERNAL;
 

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

@@ -187 +187 @@
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
     PS_ASSERT_PTR_NON_NULL(source->pixels, false);
+    PS_ASSERT_PTR_NON_NULL(source->variance, false);
+    PS_ASSERT_PTR_NON_NULL(source->moments, false);
+    PS_ASSERT_PTR_NON_NULL(source->extpars, false);
 
     // the peak position is less accurate but less subject to extreme deviations
@@ -202 +205 @@
     // Calculate the Petro magnitude (make this block optional?)
     // XXX set the aperture here
-    float radPetro  = 2.0*source->moments->Mrf;
+    float radPetro  = PETROSIAN_RADII*source->extpars->petrosianRadius;
     float radPetro2 = radPetro*radPetro;
 
@@ -242 +245 @@
 
     // return the flux and error to parameters?
-    // source->moments->PetroFlux    = Sum;
-    // source->moments->PetroFluxErr = sqrt(Var);
+    source->extpars->petrosianFlux    = Sum;
+    source->extpars->petrosianFluxErr = sqrt(Var);
+    source->extpars->petrosianFill = nPetroPix / (M_PI * radPetro2);
 
     fprintf (stderr, "petro flux: %f +/- %f\n", Sum, sqrt(Var));