Changeset 27931

Timestamp:

May 12, 2010, 12:04:13 PM (16 years ago)

Author:

eugene

Message:

add radial aperture errors

Location:

branches/eam_branches/psModules.20100506/src/objects

Files:

• pmSourceExtendedPars.c (modified) (2 diffs)
• pmSourceExtendedPars.h (modified) (1 diff)
• pmSourceIO_CMF_PS1_DV1.c (modified) (1 diff)
• pmSourceIO_CMF_PS1_SV1.c (modified) (4 diffs)

branches/eam_branches/psModules.20100506/src/objects/pmSourceExtendedPars.c

@@ -70 +70 @@
     if (!radial) return;
     psFree(radial->flux);
+    psFree(radial->fluxErr);
     psFree(radial->fill);
 }
@@ -79 +80 @@
 
     radial->flux = NULL;
+    radial->fluxErr = NULL;
     radial->fill = NULL;
     return radial;

branches/eam_branches/psModules.20100506/src/objects/pmSourceExtendedPars.h

@@ -23 +23 @@
 typedef struct {
     psVector *flux;                     // fluxes measured at above radii
+    psVector *fluxErr;                  // formal error on the fluxes (sqrt\sum(variance))
     psVector *fill;                     // angles corresponding to above radial profiles
 } pmSourceRadialApertures;

branches/eam_branches/psModules.20100506/src/objects/pmSourceIO_CMF_PS1_DV1.c

@@ -175 +175 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",     PS_DATA_F32, "PSF fit instrumental magnitude",            source->psfFlux);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",       source->psfFluxErr);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfFlux);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfFluxErr);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              apRadius);

branches/eam_branches/psModules.20100506/src/objects/pmSourceIO_CMF_PS1_SV1.c

@@ -95 +95 @@
     // we use this just to define the output vectors (which must be present for all objects)
     bool status = false;
-    psVector *radMin = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.LOWER");
+    psVector *radMax = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.UPPER");
+    psAssert (radMax, "this must have been defined and tested earlier!");
+    psAssert (radMax->n, "this must have been defined and tested earlier!");
 
     // we write out PSF-fits for all sources, regardless of quality.  the source flags tell us the state
@@ -172 +174 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental flux (counts)",         source->psfFlux);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental flux",             source->psfFluxErr);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              apRadius);
@@ -203 +207 @@
         psMetadataAdd (row, PS_LIST_TAIL, "FLAGS",            PS_DATA_U32, "psphot analysis flags",                      source->mode);
 
-        psVector *radFlux = psVectorAlloc(radMin->n, PS_TYPE_F32);
-        psVector *radFill = psVectorAlloc(radMin->n, PS_TYPE_F32);
-        psVectorInit (radFlux, NAN);
-        psVectorInit (radFill, NAN);
+        psVector *radFlux    = psVectorAlloc(radMax->n, PS_TYPE_F32);
+        psVector *radFluxErr = psVectorAlloc(radMax->n, PS_TYPE_F32);
+        psVector *radFill    = psVectorAlloc(radMax->n, PS_TYPE_F32);
+        psVectorInit (radFlux,    NAN);
+        psVectorInit (radFluxErr, NAN);
+        psVectorInit (radFill,    NAN);
         if (!source->radial) goto empty_annuli;
         if (!source->radial->flux) goto empty_annuli;
@@ -215 +221 @@
         // copy the data from fluxVal (which is not guaranteed to be the full length) to radFlux
         for (int j = 0; j < source->radial->flux->n; j++) {
-            radFlux->data.F32[j] = source->radial->flux->data.F32[j];
-            radFill->data.F32[j] = source->radial->fill->data.F32[j];
+            radFlux->data.F32[j]    = source->radial->flux->data.F32[j];
+            radFluxErr->data.F32[j] = source->radial->fluxErr->data.F32[j];
+            radFill->data.F32[j]    = source->radial->fill->data.F32[j];
         }
 
     empty_annuli:
-        psMetadataAdd (row, PS_LIST_TAIL, "APER_FLUX", PS_DATA_VECTOR, "flux within annuli",    radFlux);
-        psMetadataAdd (row, PS_LIST_TAIL, "APER_FILL", PS_DATA_VECTOR, "fill factor of annuli", radFill);
+        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_FILL",     PS_DATA_VECTOR, "fill factor of annuli", radFill);
         psFree (radFlux);
+        psFree (radFluxErr);
         psFree (radFill);