Changeset 15040

Timestamp:

Sep 26, 2007, 5:35:47 PM (19 years ago)

Author:

eugene

Message:

various cleanups of I/O operations

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (2 diffs)
• psphotReadout.c (modified) (2 diffs)
• psphotSortBySN.c (modified) (1 diff)
• psphotSourceSize.c (modified) (3 diffs)

trunk/psphot/src/Makefile.am

@@ -42 +42 @@
         psphotSourceFits.c       \
         psphotRadiusChecks.c     \
-        psphotSortBySN.c         \
         psphotOutput.c           \
         psphotGrowthCurve.c      \

trunk/psphot/src/psphot.h

@@ -54 +54 @@
 // basic support functions
 void            psphotModelClassInit (void);
-int             pmPeakSortBySN (const void **a, const void **b);
-int             pmPeakSortByY (const void **a, const void **b);
-int             pmSourceSortBySN (const void **a, const void **b);
-int             pmSourceSortByY (const void **a, const void **b);
 bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore, psMaskType maskVal);
 bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe, psMaskType maskVal);
@@ -116 +112 @@
 bool            psphotMakeResiduals (psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal);
 
-bool psphotExtendedSources (pmReadout *readout, psArray *sources, psMetadata *recipe, psMaskType maskVal);
-bool psphotPSFConvModel (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-psKernel *psphotKernelFromPSF (pmSource *source, int nPix);
+bool            psphotExtendedSources (pmReadout *readout, psArray *sources, psMetadata *recipe, psMaskType maskVal);
+bool            psphotPSFConvModel (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+psKernel       *psphotKernelFromPSF (pmSource *source, int nPix);
 
-bool psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool psphotIsophotal (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool psphotAnnuli (pmSource *source, psMetadata *recipe, psMaskType maskVal);
-bool psphotKron (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotIsophotal (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotAnnuli (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool            psphotKron (pmSource *source, psMetadata *recipe, psMaskType maskVal);
 
 // structures & functions to support psf-convolved model fitting

trunk/psphot/src/psphotReadout.c

@@ -171 +171 @@
 
     // XXX test the CR/EXT measurement
-    // psphotSourceSize (readout, sources, recipe);
+    // XXX we need to call this here and after the second pass: option for starting number?
+    psphotSourceSize (readout, sources, recipe);
 
     if (!strcasecmp (breakPt, "ENSEMBLE")) {
@@ -259 +260 @@
     // plot positive sources
     if (!havePSF) {
-        psphotSourcePlots (readout, sources, recipe, maskVal);
+        // psphotSourcePlots (readout, sources, recipe, maskVal);
     }
 

trunk/psphot/src/psphotSortBySN.c

@@ -1 @@
-# include "psphotInternal.h"
 
-
-// sort by SN (descending)
-int pmPeakSortBySN (const void **a, const void **b)
-{
-    pmPeak *A = *(pmPeak **)a;
-    pmPeak *B = *(pmPeak **)b;
-
-    psF32 fA = A->SN;
-    psF32 fB = B->SN;
-    if (isnan (fA)) fA = 0;
-    if (isnan (fB)) fB = 0;
-
-    psF32 diff = fA - fB;
-    if (diff > FLT_EPSILON) return (-1);
-    if (diff < FLT_EPSILON) return (+1);
-    return (0);
-}
-
-// sort by Y (ascending)
-int pmPeakSortByY (const void **a, const void **b)
-{
-    pmPeak *A = *(pmPeak **)a;
-    pmPeak *B = *(pmPeak **)b;
-
-    psF32 fA = A->y;
-    psF32 fB = B->y;
-
-    psF32 diff = fA - fB;
-    if (diff > FLT_EPSILON) return (+1);
-    if (diff < FLT_EPSILON) return (-1);
-    return (0);
-}
-
-// sort by SN (descending)
-int pmSourceSortBySN (const void **a, const void **b)
-{
-    pmSource *A = *(pmSource **)a;
-    pmSource *B = *(pmSource **)b;
-
-    psF32 fA = (A->peak == NULL) ? 0 : A->peak->SN;
-    psF32 fB = (B->peak == NULL) ? 0 : B->peak->SN;
-    if (isnan (fA)) fA = 0;
-    if (isnan (fB)) fB = 0;
-
-    psF32 diff = fA - fB;
-    if (diff > FLT_EPSILON) return (-1);
-    if (diff < FLT_EPSILON) return (+1);
-    return (0);
-}
-
-// sort by Y (ascending)
-int pmSourceSortByY (const void **a, const void **b)
-{
-    pmSource *A = *(pmSource **)a;
-    pmSource *B = *(pmSource **)b;
-
-    psF32 fA = (A->peak == NULL) ? 0 : A->peak->y;
-    psF32 fB = (B->peak == NULL) ? 0 : B->peak->y;
-
-    psF32 diff = fA - fB;
-    if (diff > FLT_EPSILON) return (+1);
-    if (diff < FLT_EPSILON) return (-1);
-    return (0);
-}
-

trunk/psphot/src/psphotSourceSize.c

@@ -7 +7 @@
 
 bool psphotSourceSize (pmReadout *readout, psArray *sources, psMetadata *recipe) {
-
-    FILE *f = fopen ("srcsize.dat", "w");
 
     // loop over all source
@@ -53 +51 @@
         // P(chisq > chisq_obs; Ndof) = gamma_Q (Ndof/2, chisq/2)
         // Ndof = 4 ? (four measurements, no free parameters)
-        float Ppsf = gsl_sf_gamma_inc_Q (2, 0.5*chisq);
+        // XXX this value is going to be biased low because of systematic errors.
+        // we need to calibrate it somehow
+        source->psfProb = gsl_sf_gamma_inc_Q (2, 0.5*chisq);
 
         float fCR = 0.0;
@@ -87 +87 @@
             nEXT ++;
         }
-        fCR = (nCR > 0) ? fCR / nCR : 0.0;
-        fEXT = (nEXT > 0) ? fEXT / nEXT : 0.0;
-
-        // XXX plot this as a function of flux / magnitude?
-        // XXX overlay outliers on an image?
-        
-        fprintf (f, "%f %f %f   %f %f   %f %f\n", source->peak->xf, source->peak->yf, source->peak->flux,
-                 chisq, Ppsf, fCR, fEXT);
+        source->crNsigma  = (nCR > 0)  ? fCR / nCR : 0.0;
+        source->extNsigma = (nEXT > 0) ? fEXT / nEXT : 0.0;
     }
-    fclose (f);
     return true;
 }