Changeset 4421

Timestamp:

Jun 28, 2005, 2:41:45 PM (21 years ago)

Author:

eugene

Message:

work on the galaxy models

Location:

trunk/psphot/src

Files:

• apply_psf_model.c (modified) (1 diff)
• onesource.c (modified) (1 diff)
• psphot-utils.c (modified) (3 diffs)
• psphot.c (modified) (4 diffs)
• setup.c (modified) (2 diffs)

trunk/psphot/src/apply_psf_model.c

@@ -76 +76 @@
         }
     }
+
+    // XXX this test compares dSx,dSy distribution with model.
+    // XXX it has some problems
+    // test_psf_scatter (sources);
+
     psLogMsg ("psphot", 3, "fit PSF models: %f sec for %d objects (%d total iterations)\n", psTimerMark ("psphot"), Nfit, Niter);
     psLogMsg ("psphot", 3, "subtracted %d PSF objects\n", Nsub);

trunk/psphot/src/onesource.c

@@ -39 +39 @@
     DumpImage (source->pixels, "resid.fits");
     DumpImage (source->mask, "mask.fits");
+    return true;
 }

trunk/psphot/src/psphot-utils.c

@@ -57 +57 @@
 {
 
-  FILE *f = fopen (key, "w");
+  FILE *f = fopen (filename, "w");
 
   for (int j = 0; j < test->sources->n; j++) {
@@ -72 +72 @@
   }
   fclose (f);
+  return true;
 }
 
@@ -154 +155 @@
 {
 
-    int i, j;
-    FILE *f;
-    psVector *params;
-    psVector *dparams;
-    psModel  *model;
+    int i;
+    FILE *f;
 
     f = fopen (filename, "w");

trunk/psphot/src/psphot.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-    psMetadata  *config  = NULL;                // user-provided configuration information
+    psMetadata  *config  = NULL;
     psImageData *imdata  = NULL;
     psArray     *sources = NULL;
-    psArray     *peaks   = NULL;                // a list of pmPeaks 
+    psArray     *peaks   = NULL;
     pmPSF       *psf     = NULL;
     psStats     *sky     = NULL;
@@ -25 +25 @@
     sources = source_moments (imdata, config, peaks);
 
+    // classify sources based on moments, brightness
     basic_classes (sources, config);
 
@@ -30 +31 @@
     sources = psArraySort (sources, by_SN);
 
-    // use stellar objects SN > PSF_SN_LIM
+    // use bright stellar objects to measure PSF
     psf = choose_psf_model (config, sources, sky);
 
@@ -39 +40 @@
     apply_psf_model (imdata, config, sources, psf, sky);
 
-    // XXX this test compares dSx,dSy distribution with model.
-    // XXX it has some problems
-    // test_psf_scatter (sources);
-
+    // fit extended objects with galaxy models
     // fit_galaxies (imdata, config, sources);
 

trunk/psphot/src/setup.c

@@ -43 +43 @@
       psFree (file);
     } else {
-      psScalar *value;
 
       noise = psImageAlloc (image->numCols, image->numRows, PS_TYPE_F32);
@@ -54 +53 @@
       // XXX EAM it looks like psBinaryOp is broken for (image op scalar)
       # if (0)
+      psScalar *value;
+
       value = psScalarAlloc (1.0 / GAIN, PS_TYPE_F64);
       noise = (psImage *) psBinaryOp (NULL, image, "/", value);