Changeset 36217

Timestamp:

Oct 15, 2013, 11:39:41 AM (13 years ago)

Author:

eugene

Message:

save the galaxy flux for the model tests, not the Io; write as a set of vectors

Location:

branches/eam_branches/ipp-20130904/psModules/src/objects

Files:

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

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceExtendedPars.c

@@ -290 +290 @@
 static void pmSourceGalaxyFitsFree (pmSourceGalaxyFits *tmp) {
   
-    psFree (tmp->Io);
-    psFree (tmp->dIo);
+    psFree (tmp->Flux);
+    psFree (tmp->dFlux);
     psFree (tmp->chisq);
 
@@ -302 +302 @@
     psMemSetDeallocator(tmp, (psFreeFunc) pmSourceGalaxyFitsFree);
 
-    tmp->Io = psVectorAllocEmpty (25, PS_TYPE_F32);
-    tmp->dIo = psVectorAllocEmpty (25, PS_TYPE_F32);
+    tmp->Flux  = psVectorAllocEmpty (25, PS_TYPE_F32);
+    tmp->dFlux = psVectorAllocEmpty (25, PS_TYPE_F32);
     tmp->chisq = psVectorAllocEmpty (25, PS_TYPE_F32);
     tmp->nPix = 0;

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceExtendedPars.h

@@ -83 +83 @@
 
 typedef struct {
-  psVector *Io;
-  psVector *dIo;
+  psVector *Flux;
+  psVector *dFlux;
   psVector *chisq;
   int nPix;

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -1209 +1209 @@
 
         write_annuli:
-            psMetadataAdd (row, PS_LIST_TAIL, "APER_FLUX",       PS_DATA_VECTOR, "flux within annuli",       radFlux);
-            psMetadataAdd (row, PS_LIST_TAIL, "APER_FLUX_ERR",   PS_DATA_VECTOR, "flux error in annuli",     radFluxErr);
-            psMetadataAdd (row, PS_LIST_TAIL, "APER_FLUX_STDEV", PS_DATA_VECTOR, "flux standard deviation",  radFluxStdev);
-            psMetadataAdd (row, PS_LIST_TAIL, "APER_FILL",       PS_DATA_VECTOR, "fill factor of annuli",    radFill);
+            psMetadataAddVector (row, PS_LIST_TAIL, "APER_FLUX",       PS_META_REPLACE, "flux within annuli",       radFlux);
+            psMetadataAddVector (row, PS_LIST_TAIL, "APER_FLUX_ERR",   PS_META_REPLACE, "flux error in annuli",     radFluxErr);
+            psMetadataAddVector (row, PS_LIST_TAIL, "APER_FLUX_STDEV", PS_META_REPLACE, "flux standard deviation",  radFluxStdev);
+            psMetadataAddVector (row, PS_LIST_TAIL, "APER_FILL",       PS_META_REPLACE, "fill factor of annuli",    radFill);
             psFree (radFlux);
             psFree (radFluxErr);
@@ -1393 +1393 @@
         psMetadataAddF32 (row, PS_LIST_TAIL, "NPIX",             0, "number of pixels for fits",      source->galaxyFits->nPix);
 
-        psVector *Io = source->galaxyFits->Io;
-        psVector *dIo = source->galaxyFits->dIo;
+        psVector *Flux = source->galaxyFits->Flux;
+        psVector *dFlux = source->galaxyFits->dFlux;
         psVector *chisq = source->galaxyFits->chisq;
 
-        // we write a series of columns for each of the elements (maybe I should save them as vectors instead?)
-        for (int j = 0; j < Io->n; j++) {
-
-            char field[16];
-
-            snprintf (field, 16, "CHI_%02d", j);
-            psMetadataAddF32 (row, PS_LIST_TAIL, field, 0, "chisq of model fit", chisq->data.F32[j]);
-
-            snprintf (field, 16, "I0_%02d", j);
-            psMetadataAddF32 (row, PS_LIST_TAIL, field, 0, "chisq of model fit", Io->data.F32[j]);
-
-            snprintf (field, 16, "D_I0_%02d", j);
-            psMetadataAddF32 (row, PS_LIST_TAIL, field, 0, "chisq of model fit", dIo->data.F32[j]);
-
-            psArrayAdd (table, 100, row);
-            psFree (row);
-        }
+        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);
     }