Changeset 4398

Timestamp:

Jun 25, 2005, 9:23:18 AM (21 years ago)

Author:

eugene

Message:

further cleanup, adding output functions

Location:

trunk/psphot/src

Files:

• basic_classes.c (added)
• choose_psf_model.c (modified) (2 diffs)
• output.c (added)
• psphot-utils.c (modified) (1 diff)
• psphot.c (modified) (1 diff)
• source_moments.c (modified) (1 diff)

trunk/psphot/src/choose_psf_model.c

@@ -7 +7 @@
     bool        status;
     char       *modelName;
-    char        key[64];
+    char        key[64], filename[64];
     pmPSF_Test *test  = NULL;
     psArray    *stars = NULL;
@@ -35 +35 @@
         tests->data[i] = pmPSF_TestModel (stars, modelName, RADIUS);
 
-        // dump psf test data to file:
-        {
-          sprintf (key, "metric.%d.dat", i);
-          FILE *f = fopen (key, "w");
-          test = tests->data[i];
-
-
-          for (int j = 0; j < test->sources->n; j++) {
-            psSource *source = test->sources->data[j];
-            psModel  *model  = test->modelPSF->data[j];     
-            float sky = 0;
-
-            if (model != NULL) sky = model->params->data.F32[0];
-
-            fprintf (f, "%3d %6.1f %6.1f  %7.4f %7.4f  %8.4f\n", 
-                     j, source->moments->x, source->moments->y,
-                     test->metric->data.F64[j], test->fitMag->data.F64[j], sky);
-          }
-          fclose (f);
-        }
+        sprintf (filename, "metric.%d.dat", i);
+        DumpPSFTestData (tests->data[i], filename);
     }
 

trunk/psphot/src/psphot-utils.c

@@ -52 +52 @@
     fclose (f);
     return true;
+}
+
+bool DumpPSFTestData (pmPSF_Test *test, char *filename) 
+{
+
+  FILE *f = fopen (key, "w");
+
+  for (int j = 0; j < test->sources->n; j++) {
+
+    psSource *source = test->sources->data[j];
+    psModel  *model  = test->modelPSF->data[j];     
+
+    float sky = 0;
+    if (model != NULL) sky = model->params->data.F32[0];
+
+    fprintf (f, "%3d %6.1f %6.1f  %7.4f %7.4f  %8.4f\n", 
+             j, source->moments->x, source->moments->y,
+             test->metric->data.F64[j], test->fitMag->data.F64[j], sky);
+  }
+  fclose (f);
 }
 

trunk/psphot/src/psphot.c

@@ -24 +24 @@
     // construct sources and measure basic stats
     sources = source_moments (imdata, config, peaks);
+
+    basic_classes (sources, config);
 
     // source analysis is done in S/N order (brightest first)

trunk/psphot/src/source_moments.c

@@ -35 +35 @@
     }
 
-    // group into STAR, COSMIC, GALAXY, SATURATED
-    psfClump = pmSourcePSFClump (sources, config);
-    pmSourceRoughClass (sources, config, psfClump);
-
-    // make this optional
-    // DumpMoments (sources, "moments.dat");
-
     psLogMsg ("psphot", 3, "moments: %f sec\n", psTimerMark ("psphot"));
     psLogMsg ("psphot", 3, "%d sources\n", sources->n);