Changeset 31653

Timestamp:

Jun 21, 2011, 5:46:29 PM (15 years ago)

Author:

eugene

Message:

some fields were not being read from the input CMF file, so they were dropped between chip and camera: PSF_INST_FLUX, PSF_INST_FLUX_SIG, AP_MAG_RAW

File:

• branches/eam_branches/ipp-20110505/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c (modified) (1 diff)

branches/eam_branches/ipp-20110505/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c

@@ -270 +270 @@
         source->skyErr    = dPAR[PM_PAR_SKY];
 
-        // XXX use these to determine PAR[PM_PAR_I0]?
         source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
-        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
+        source->psfMagErr = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
+        source->apMagRaw  = psMetadataLookupF32 (&status, row, "AP_MAG_RAW");
+
+        // XXX use these to determine PAR[PM_PAR_I0] if they exist?
+        source->psfFlux   = psMetadataLookupF32 (&status, row, "PSF_INST_FLUX");
+        source->psFluxErr = psMetadataLookupF32 (&status, row, "PSF_INST_FLUX_SIG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor