Changeset 13139

Timestamp:

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

Author:

magnier

Message:

fixed inconsistencies between read and write

Location:

trunk/psModules/src/objects

Files:

• pmSourceIO_PS1_DEV_0.c (modified) (4 diffs)
• pmSourceIO_SMPDATA.c (modified) (5 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");
 

trunk/psModules/src/objects/pmSourceIO_SMPDATA.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-27 22:14:08 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-03 00:13:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -54 +54 @@
     // find config information for output header
     float ZERO_POINT = psMetadataLookupF32 (&status, imageHeader, "ZERO_PT");
+    if (!status)
+        ZERO_POINT = 25.0;
+
     float lsky = 0;
     int type = 0;
@@ -70 +73 @@
             yPos = PAR[PM_PAR_YPOS];
 
-            type = pmSourceDophotType (source);
+            type = pmSourceGetDophotType (source);
             lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
 
@@ -160 +163 @@
 
         lsky             = psMetadataLookupF32 (&status, row, "LOG_SKY");
-        PAR[PM_PAR_SKY]  = pow(lsky, 10.0);
+        PAR[PM_PAR_SKY]  = pow(10.0, lsky);
+        source->sky    = PAR[PM_PAR_SKY];
+
         PAR[PM_PAR_XPOS] = psMetadataLookupF32 (&status, row, "X_PIX");
         PAR[PM_PAR_YPOS] = psMetadataLookupF32 (&status, row, "Y_PIX");
@@ -169 +174 @@
         pmPSF_AxesToModel (PAR, axes);
 
+
         source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT;
         source->extMag = psMetadataLookupF32 (&status, row, "MAG_GAL") - ZERO_POINT;
-        source->errMag = psMetadataLookupF32 (&status, row, "MAG_ERR");
+        source->errMag = psMetadataLookupF32 (&status, row, "MAG_ERR") * 0.001;
         source->apMag  = psMetadataLookupF32 (&status, row, "MAG_AP")  - ZERO_POINT;
+
+        source->pixWeight = psMetadataLookupU8 (&status, row, "WEIGHT")/255.0;
+        int dophot = psMetadataLookupU8 (&status, row, "DOPHOT");
+        pmSourceSetDophotType (source, dophot);
 
         psF64 Area = 2.0 * M_PI * axes.major * axes.minor;