Changeset 19976

Timestamp:

Oct 7, 2008, 4:33:56 PM (18 years ago)

Author:

eugene

Message:

improve input / output consistency: should be able to read and write with identical results

File:

• trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c (modified) (7 diffs)

trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-07 20:06:25 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-08 02:33:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -71 +71 @@
     for (i = 0; i < sources->n; i++) {
         pmSource *source = (pmSource *) sources->data[i];
-        source->seq = i;
+        if (source->seq == -1) {
+            source->seq = i;
+        }
 
         // no difference between PSF and non-PSF model
@@ -83 +85 @@
             xErr = dPAR[PM_PAR_XPOS];
             yErr = dPAR[PM_PAR_YPOS];
-            axes = pmPSF_ModelToAxes (PAR, 20.0);
+            if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX])) {
+                axes = pmPSF_ModelToAxes (PAR, 20.0);
+            } else {
+                axes.major = NAN;
+                axes.minor = NAN;
+                axes.theta = NAN;
+            }
             chisq = model->chisq;
 
@@ -111 +119 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
         psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           peakMag);
         psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
@@ -220 +228 @@
         dPAR = model->dparams->data.F32;
 
+        source->seq       = psMetadataLookupU32 (&status, row, "IPP_IDET");
         PAR[PM_PAR_XPOS]  = psMetadataLookupF32 (&status, row, "X_PSF");
         PAR[PM_PAR_YPOS]  = psMetadataLookupF32 (&status, row, "Y_PSF");
@@ -236 +245 @@
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
+        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
 
         pmPSF_AxesToModel (PAR, axes);
@@ -247 +258 @@
 
         // note that some older versions used PSF_PROBABILITY: this was not well defined.
-        source->psfChisq  = psMetadataLookupF32 (&status, row, "PSF_CHISQ");
+        model->chisq      = psMetadataLookupF32 (&status, row, "PSF_CHISQ");
         source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
         source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");