Changeset 5617

Timestamp:

Nov 28, 2005, 10:35:43 AM (21 years ago)

Author:

eugene

Message:

adding optional output dumps

Location:

trunk/psphot/src

Files:

• pmPeaksSigmaLimit.c (modified) (1 diff)
• psphot.c (modified) (1 diff)
• psphotOutput.c (modified) (2 diffs)
• psphotSourceStats.c (modified) (1 diff)

trunk/psphot/src/pmPeaksSigmaLimit.c

@@ -31 +31 @@
     psFree (smooth);
 
-    // make this optional
-    // DumpPeaks (peaks, "peaks.dat");
-
+    // optional dump of all peak data
+    char *output = psMetadataLookupPtr (&status, config, "PEAKS_OUTPUT_FILE");
+    if (status && (output != NULL) && (output[0])) {
+        pmPeaksWriteText (peaks, output);
+        psFree (output);
+    }
+     
     psLogMsg ("psphot", 3, "%d peaks: %f sec\n", peaks->n, psTimerMark ("psphot"));
-
     return (peaks);
 }

trunk/psphot/src/psphot.c

@@ -30 +30 @@
     // XXX - this has 1 leak
     psfClump = pmSourcePSFClump (sources, config);
+    // psLogMsg ("psphot", 4, "clump  X,  Y: %f, %f\n", psfClump.X, psfClump.Y);
+    // psLogMsg ("psphot", 4, "clump DX, DY: %f, %f\n", psfClump.dX, psfClump.dY);
 
     // group into STAR, COSMIC, GALAXY, SATURATED
     pmSourceRoughClass (sources, config, psfClump);
+
+    // optional dump of all rough source data
+    { 
+      bool status;
+      char *output = psMetadataLookupPtr (&status, config, "MOMENTS_OUTPUT_FILE");
+      if (status && (output != NULL) && (output[0])) {
+        pmMomentsWriteText (sources, output);
+        psFree (output);
+      }
+    }
 
     // source analysis is done in S/N order (brightest first)

trunk/psphot/src/psphotOutput.c

@@ -348 +348 @@
 
 // write the peaks to an output file
-bool pmPeaksWriteText (psArray *sources, char *filename) {
+bool pmPeaksWriteText (psArray *peaks, char *filename) {
 
     int i;
     FILE *f;
-    pmPeak *peak;
         
     f = fopen (filename, "w");
@@ -360 +359 @@
     }
 
-    for (i = 0; i < sources->n; i++) {
-        peak = (pmPeak *) sources->data[i];
+    for (i = 0; i < peaks->n; i++) {
+        pmPeak *peak = peaks->data[i];
         if (peak == NULL) continue;
         fprintf (f, "%5d %5d  %7.1f\n", 

trunk/psphot/src/psphotSourceStats.c

@@ -46 +46 @@
         psFree (source);
     }
-
+     
     psLogMsg ("psphot", 3, "%d moments: %f sec\n", sources->n, psTimerMark ("psphot"));
     return (sources);