Changeset 36718 for trunk/psModules

Timestamp:

May 1, 2014, 4:36:26 PM (12 years ago)

Author:

bills

Message:

Modify psphotFullForce and psphotFullForceSummary to support forcing
multiple extended model fits per source.

Location:

trunk/psModules/src/objects

Files:

• pmSource.h (modified) (1 diff)
• pmSourceExtendedPars.h (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (7 diffs)

trunk/psModules/src/objects/pmSource.h

@@ -119 +119 @@
     pmSourceExtendedPars *extpars;      ///< extended source parameters
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
-    pmSourceGalaxyFits *galaxyFits;     ///< fits to galaxy models (psphotFullForce only)
+    psArray *galaxyFits;                ///< fits to galaxy models (psphotFullForce only)
     pmSourceLensing *lensingOBJ;        ///< lensing moments parameters (per object)
     pmSourceLensing *lensingPSF;        ///< lensing moments parameters (psf, interpolated)

trunk/psModules/src/objects/pmSourceExtendedPars.h

@@ -83 +83 @@
 
 typedef struct {
+  int       modelType;
   psVector *Flux;
   psVector *dFlux;

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -482 +482 @@
     }
 
+#ifdef SORT_EXTENSIONS_BY_FLUX
     // let's write these out in S/N order
     sources = psArraySort (sources, pmSourceSortByFlux);
+#endif
 
     table = psArrayAllocEmpty (sources->n);
@@ -821 +823 @@
     psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "xsrc table extension", extname);
 
+#ifdef SORT_EXTENSIONS_BY_FLUX
     // let's write these out in S/N order
     sources = psArraySort (sources, pmSourceSortByFlux);
+#endif
 
     float magOffset; 
@@ -1225 +1229 @@
     psVector *fwhmValues = psMetadataLookupVector(&status, readout->analysis, "STACK.PSF.FWHM.VALUES");
 
+#ifdef SORT_EXTENSIONS_BY_FLUX
     // let's write these out in S/N order
     sources = psArraySort (sources, pmSourceSortByFlux);
+#endif
 
     table = psArrayAllocEmpty (sources->n);
@@ -1441 +1447 @@
     psMetadataAddStr (outhead, PS_LIST_TAIL, "HI", PS_META_REPLACE, "does this get through?", "THERE");
 
-    // let's write these out in S/N order
-    sources = psArraySort (sources, pmSourceSortByFlux);
+    // They are probably already in this order but ...
+    sources = psArraySort (sources, pmSourceSortBySeq);
 
     psArray *table = psArrayAllocEmpty (sources->n);
@@ -1459 +1465 @@
         if (source->galaxyFits == NULL) continue;
 
-        pmModel *model = source->modelFits->data[0];
-        if (!model) return false;
-
-        // X,Y coordinates are stored with the model parameters
-        psF32 *PAR = model->params->data.F32;
-
-        psMetadata *row = psMetadataAlloc ();
-
-        // we write out the x,y positions so people can link to the psf either way (position or ID)
-        psMetadataAddU32 (row, PS_LIST_TAIL, "IPP_IDET",         0, "IPP detection identifier index", source->seq);
-        psMetadataAddF32 (row, PS_LIST_TAIL, "X_FIT",            0, "model x coordinate",             PAR[PM_PAR_XPOS]);
-        psMetadataAddF32 (row, PS_LIST_TAIL, "Y_FIT",            0, "model y coordinate",             PAR[PM_PAR_YPOS]);
-        psMetadataAddF32 (row, PS_LIST_TAIL, "NPIX",             0, "number of pixels for fits",      source->galaxyFits->nPix);
-
-        psVector *Flux = source->galaxyFits->Flux;
-        psVector *dFlux = source->galaxyFits->dFlux;
-        psVector *chisq = source->galaxyFits->chisq;
-
-        psMetadataAddVector (row, PS_LIST_TAIL, "GAL_FLUX",     PS_META_REPLACE, "normalization for galaxy flux", Flux);
-        psMetadataAddVector (row, PS_LIST_TAIL, "GAL_FLUX_ERR", PS_META_REPLACE, "error on normalization", dFlux);
-        psMetadataAddVector (row, PS_LIST_TAIL, "GAL_CHISQ",    PS_META_REPLACE, "galaxy fit chisq", chisq);
-
-        psArrayAdd (table, 100, row);
-        psFree (row);
+        for (int iModel = 0; iModel < source->modelFits->n; iModel++) {
+            pmModel *model = source->modelFits->data[iModel];
+            pmSourceGalaxyFits *galaxyFits = source->galaxyFits->data[iModel];
+
+            if (!model || !galaxyFits) return false;
+
+            // XXX: TODO: we should search for the model that has the same type as the fits
+            psAssert(model->type == galaxyFits->modelType, "galaxyFits model type does not match model type");
+
+            // X,Y coordinates are stored with the model parameters
+            psF32 *PAR = model->params->data.F32;
+
+            psMetadata *row = psMetadataAlloc ();
+
+            // we write out the x,y positions so people can link to the psf either way (position or ID)
+            psMetadataAddU32 (row, PS_LIST_TAIL, "IPP_IDET",         0, "IPP detection identifier index", source->seq);
+            psMetadataAddS32 (row, PS_LIST_TAIL, "MODEL_TYPE",       0, "model type",                     galaxyFits->modelType);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "X_FIT",            0, "model x coordinate",             PAR[PM_PAR_XPOS]);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "Y_FIT",            0, "model y coordinate",             PAR[PM_PAR_YPOS]);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "NPIX",             0, "number of pixels for fits",      galaxyFits->nPix);
+
+            psVector *Flux = galaxyFits->Flux;
+            psVector *dFlux = galaxyFits->dFlux;
+            psVector *chisq = galaxyFits->chisq;
+
+            psMetadataAddVector (row, PS_LIST_TAIL, "GAL_FLUX",     PS_META_REPLACE, "normalization for galaxy flux", Flux);
+            psMetadataAddVector (row, PS_LIST_TAIL, "GAL_FLUX_ERR", PS_META_REPLACE, "error on normalization", dFlux);
+            psMetadataAddVector (row, PS_LIST_TAIL, "GAL_CHISQ",    PS_META_REPLACE, "galaxy fit chisq", chisq);
+
+            psArrayAdd (table, 100, row);
+            psFree (row);
+        }
     }
 
@@ -1541 +1555 @@
         }
 
+        int modelType = psMetadataLookupS32 (&status,    row, "MODEL_TYPE");
         psVector *Flux  = psMetadataLookupVector(&status, row, "GAL_FLUX");
         psVector *dFlux = psMetadataLookupVector(&status, row, "GAL_FLUX_ERR");
@@ -1546 +1561 @@
 
         if (Flux && Flux->n > 0) {
-            psFree(source->galaxyFits);
-            source->galaxyFits = pmSourceGalaxyFitsAlloc();
-            source->galaxyFits->nPix = psMetadataLookupF32(&status, row, "NPIX");
-
-            psFree(source->galaxyFits->Flux);
-            source->galaxyFits->Flux  = psMemIncrRefCounter(Flux);
-            psFree(source->galaxyFits->dFlux);
-            source->galaxyFits->dFlux = psMemIncrRefCounter(dFlux);
-            psFree(source->galaxyFits->chisq);
-            source->galaxyFits->chisq = psMemIncrRefCounter(chisq);
+            if (!source->galaxyFits) {
+                source->galaxyFits = psArrayAllocEmpty(1);
+            }
+
+            pmSourceGalaxyFits *galaxyFits = pmSourceGalaxyFitsAlloc();
+
+            psArrayAdd(source->galaxyFits, 1, galaxyFits);
+
+            psFree(galaxyFits);
+            galaxyFits->modelType = modelType;
+            galaxyFits->nPix = psMetadataLookupF32(&status, row, "NPIX");
+
+            psFree(galaxyFits->Flux);
+            galaxyFits->Flux  = psMemIncrRefCounter(Flux);
+            psFree(galaxyFits->dFlux);
+            galaxyFits->dFlux = psMemIncrRefCounter(dFlux);
+            psFree(galaxyFits->chisq);
+            galaxyFits->chisq = psMemIncrRefCounter(chisq);
         }