Changeset 11161

Timestamp:

Jan 18, 2007, 6:39:02 PM (19 years ago)

Author:

magnier

Message:

changing to peak SN from moments SN, adding flux and SN to peak output

File:

• trunk/psModules/src/objects/pmSourceIO_RAW.c (modified) (6 diffs)

trunk/psModules/src/objects/pmSourceIO_RAW.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-03 18:48:10 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-19 04:39:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
                  source[0].apMag, source[0].type, source[0].mode,
                  logChi, logChiNorm,
-                 source[0].moments->SN,
+                 source[0].peak->SN,
                  model[0].radiusFit,
                  source[0].pixWeight,
@@ -164 +164 @@
                  log10(model[0].chisq/model[0].nDOF),
                  log10(model[0].chisqNorm/model[0].nDOF),
-                 source[0].moments->SN,
+                 source[0].peak->SN,
                  model[0].radiusFit,
                  source[0].pixWeight,
@@ -208 +208 @@
 
         fprintf (f, "%5d %5d  %7.1f  %7.1f %7.1f  %6.3f %6.3f  %8.1f %7.1f %7.1f %7.1f  %4d %2d\n",
-                 source->peak->x, source->peak->y, source->peak->counts,
+                 source->peak->x, source->peak->y, source->peak->value,
                  moment->x, moment->y,
                  moment->Sx, moment->Sy,
@@ -239 +239 @@
             continue;
         fprintf (f, "%5d %5d  %7.1f  %7.1f %7.1f  %6.3f %6.3f  %10.1f %7.1f %7.1f %7.1f  %4d %2d %#5x\n",
-                 source->peak->x, source->peak->y, source->peak->counts,
+                 source->peak->x, source->peak->y, source->peak->value,
                  source->moments->x, source->moments->y,
                  source->moments->Sx, source->moments->Sy,
@@ -267 +267 @@
         if (peak == NULL)
             continue;
-        fprintf (f, "%5d %5d  %7.1f %7.2f %7.2f\n",
-                 peak->x, peak->y, peak->counts, peak->xf, peak->yf);
-    }
-    fclose (f);
-    return true;
-}
-
+        fprintf (f, "%5d %5d  %7.1f %7.2f %7.2f %7.2f\n",
+                 peak->x, peak->y, peak->value, peak->SN, peak->xf, peak->yf);
+    }
+    fclose (f);
+    return true;
+}
+