Changeset 5986

Timestamp:

Jan 13, 2006, 9:03:34 PM (21 years ago)

Author:

eugene

Message:

file cleanups, function renames

Location:

trunk/psphot/src

Files:

• modelTestArguments.c (deleted)
• pmPeaksSigmaLimit.c (deleted)
• psphot.c (modified) (4 diffs)
• psphot.h (modified) (2 diffs)
• psphotArguments.c (modified) (1 diff)
• psphotBasicDeblend.c (modified) (1 diff)
• psphotChoosePSF.c (modified) (2 diffs)
• psphotFindPeaks.c (added)
• psphotGrowthCurve.c (added)
• psphotModelTest.c (modified) (2 diffs)
• psphotOutput.c (modified) (1 diff)
• psphotRoughClass.c (added)
• psphotSetup.c (modified) (1 diff)
• psphotSourceStats.c (modified) (1 diff)

trunk/psphot/src/psphot.c

@@ -1 +1 @@
 # include "psphot.h"
 
+// XXX need a better structure for handling optional sequence
 int main (int argc, char **argv) {
 
@@ -9 +10 @@
     pmPSF       *psf     = NULL;
     psStats     *sky     = NULL;
-    pmPSFClump   psfClump;
     bool         status;
 
     psTimerStart ("complete");
 
-    psphotModelGroupInit ();
-
+    // load command-line arguments and options
     config = psphotArguments (&argc, argv);
 
     // load input data (config and images (signal, noise, mask)
-    // XXX we have memory leaks here -- may be from psMetadata
     imdata = psphotSetup (config);
 
-    char *breakPt = psMetadataLookupPtr (&status, config, "BREAK_POINT");
-    if (!status) breakPt = psStringCopy ("NONE");
-
-    int FITMODE = psMetadataLookupS32 (&status, config, "FIT_MODE");
-    if (!status) FITMODE = 2;
-
-    // run model fitting tests on a single source
-    if (psMetadataLookupBool (&status, config, "TEST_FIT")) {
-        psphotModelTest (imdata, config);
-        exit (0);
-    }
+    // run a single-model test if desired
+    psphotModelTest (imdata, config);
 
     // measure image stats for initial guess 
@@ -42 +31 @@
 
     // find the peaks in the image
-    peaks = pmPeaksSigmaLimit (imdata, config, sky);
-    if (!strcasecmp (breakPt, "PEAKS")) exit (0);
+    peaks = psphotFindPeaks (imdata, config, sky);
 
     // construct sources and measure basic stats
     sources = psphotSourceStats (imdata, config, peaks);
-    if (!strcasecmp (breakPt, "STATS")) exit (0);
 
     // classify sources based on moments, brightness
-    // XXX - this has 1 leak
-    psfClump = pmSourcePSFClump (sources, config);
-
-    // group into STAR, COSMIC, GALAXY, SATURATED, etc.
-    pmSourceRoughClass (sources, config, psfClump);
+    psphotRoughClass (sources, config);
 
     // mark blended peaks PS_SOURCE_BLEND
     psphotBasicDeblend (sources, config, sky);
-    if (!strcasecmp (breakPt, "DEBLEND")) exit (0);
-
-    // source analysis is done in S/N order (brightest first)
-    sources = psArraySort (sources, psphotSortBySN);
-    psphotDumpMoments (config, sources);
-    if (!strcasecmp (breakPt, "CLASS")) exit (0);
 
     // use bright stellar objects to measure PSF
     psf = psphotChoosePSF (config, sources, sky);
-    if (!strcasecmp (breakPt, "PSFFIT")) exit (0);
 
+    // XXX change FITMODE to a string
+    int FITMODE = psMetadataLookupS32 (&status, config, "FIT_MODE");
     switch (FITMODE) {
       case 0:
@@ -101 +79 @@
 
     // write out data in appropriate format
-    psphotSamplePSFs (config, psf, imdata->image);
     psphotOutput (imdata, config, sources, psf, sky);
     psLogMsg ("psphot", 3, "wrote output: %f sec\n", psTimerMark ("psphot"));

trunk/psphot/src/psphot.h

@@ -25 +25 @@
 eamReadout     *psphotSetup (psMetadata *config);
 psStats        *psphotImageStats (eamReadout *imdata, psMetadata *config);
+psArray        *psphotFindPeaks (eamReadout *imdata, psMetadata *config, psStats *sky);
 psArray        *psphotSourceStats (eamReadout *imdata, psMetadata *config, psArray *allpeaks);
+bool            psphotRoughClass (psArray *sources, psMetadata *config);
 pmPSF          *psphotChoosePSF (psMetadata *config, psArray *sources, psStats *sky);
 bool            psphotApplyPSF (eamReadout *imdata, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky);
@@ -42 +44 @@
 
 bool            pmSourceFitFixed (pmSource *source, pmModel *model);
-psArray        *pmPeaksSigmaLimit (eamReadout *imdata, psMetadata *config, psStats *sky);
 pmModel        *pmSourceMagnitudes (pmSource *source, pmPSF *psf, float apRadius);
 pmModel        *pmSourceSelectModel (pmSource *source);

trunk/psphot/src/psphotArguments.c

@@ -117 +117 @@
     psMetadata *config = psMetadataAlloc ();
 
+    // add default values
+    psMetadataAddStr (config, PS_LIST_TAIL, "BREAK_POINT", 0, "", "NONE");
+    psMetadataAddS32 (config, PS_LIST_TAIL, "FIT_MODE", 0, "", 2);
+
     psMetadataAdd (config, PS_LIST_TAIL, "PSF_MODEL", PS_DATA_METADATA_MULTI, "folder for psf model entries", NULL);
+
     config = psMetadataConfigParse (config, &Nfail, argv[3], FALSE);
 

trunk/psphot/src/psphotBasicDeblend.c

@@ -132 +132 @@
     }
     psLogMsg ("psphot.deblend", 3, "identified %d blended objects (%f sec)\n", Nblend, psTimerMark ("psphot"));
+
+    char *breakPt = psMetadataLookupPtr (&status, config, "BREAK_POINT");
+    if (!strcasecmp (breakPt, "DEBLEND")) exit (0);
+
     return true;
 }

trunk/psphot/src/psphotChoosePSF.c

@@ -12 +12 @@
 
     psTimerStart ("psphot");
+
+    // examine PSF sources in S/N order (brightest first)
+    sources = psArraySort (sources, psphotSortBySN);
 
     // array to store candidate PSF stars
@@ -88 +91 @@
     psLogMsg ("psphot.pspsf", 3, "selected psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
 
+    char *breakPt = psMetadataLookupPtr (&status, config, "BREAK_POINT");
+    if (!strcasecmp (breakPt, "PSFFIT")) exit (0);
+
     return (psf);
 }

trunk/psphot/src/psphotModelTest.c

@@ -11 +11 @@
 
     psMetadataItem *item  = NULL;
+
+    // run model fitting tests on a single source
+    if (!psMetadataLookupBool (&status, config, "TEST_FIT")) return false;
 
     // what fitting mode to use?
@@ -166 +169 @@
     psphotSaveImage (NULL, source->pixels, "resid.fits");
     psphotSaveImage (NULL, source->mask, "mask.fits");
-    return true;
+
+    exit (0);
 }

trunk/psphot/src/psphotOutput.c

@@ -15 +15 @@
     if (residImage != NULL) psphotSaveImage (imdata->header, imdata->image, residImage);
     if (psfFile != NULL) psphotWritePSF (psf, psfFile);
+    psphotSamplePSFs (config, psf, imdata->image);
 
     if (outputFile == NULL) {

trunk/psphot/src/psphotSetup.c

@@ -17 +17 @@
 
     psTimerStart ("psphot");
+
+    // load implementation-specific models
+    psphotModelGroupInit ();
 
     // setup header template, specify COMMENT and HISTORY as MULTI

trunk/psphot/src/psphotSourceStats.c

@@ -61 +61 @@
      
     psLogMsg ("psphot", 3, "%d moments: %f sec\n", sources->n, psTimerMark ("psphot"));
+
+    char *breakPt = psMetadataLookupPtr (&status, config, "BREAK_POINT");
+    if (!strcasecmp (breakPt, "STATS")) exit (0);
+
     return (sources);
 }