Changeset 13139 for trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

Timestamp:

May 2, 2007, 2:13:42 PM (19 years ago)

Author:

magnier

Message:

fixed inconsistencies between read and write

File:

• trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c (modified) (4 diffs)

trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-27 22:14:08 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-03 00:13:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -85 +85 @@
         }
 
-        float peakMag = (source->peak->flux > 0) ? -2.5*log(source->peak->flux) : NAN;
+        float peakMag = (source->peak->flux > 0) ? -2.5*log10(source->peak->flux) : NAN;
         psS16 nImageOverlap = 1;
         psS32 ID = 0; // XXX need to figure out how to generate this
@@ -187 +187 @@
         PAR[PM_PAR_SKY]   = psMetadataLookupF32 (&status, row, "SKY");
         dPAR[PM_PAR_SKY]  = psMetadataLookupF32 (&status, row, "SKY_SIGMA");
+        source->sky = PAR[PM_PAR_SKY];
+        source->skyErr = dPAR[PM_PAR_SKY];
 
         // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_ERR");
+        source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
 
         pmPSF_AxesToModel (PAR, axes);
@@ -197 +199 @@
         float flux = (isfinite(lflux)) ? pow(10.0, -0.4*lflux) : NAN;
         source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], flux, PM_PEAK_LONE);
+        source->peak->flux = flux;
+
         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");