Changeset 34252 for branches/eam_branches/ipp-20120627/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Jul 31, 2012, 3:44:32 PM (14 years ago)

Author:

eugene

Message:

read PSF_INST_FLUX,SIG and AP_MAG_RAW from PS1_SV1,PS1_DV2

File:

• branches/eam_branches/ipp-20120627/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (1 diff)

branches/eam_branches/ipp-20120627/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -315 +315 @@
         @ALL@     source->psfMagErr = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
         @ALL@     source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
-        @>PS1_V2@ source->apMagRaw  = psMetadataLookupF32 (&status, row, "AP_MAG_RAW");
+        @>PS1_V2,PS1_SV1,PS1_DV2@ source->apMagRaw  = psMetadataLookupF32 (&status, row, "AP_MAG_RAW");
 
         // XXX use these to determine PAR[PM_PAR_I0] if they exist?
         // XXX add these to PS1_SV1?
-        @>PS1_V2,PS1_DV?@ source->psfFlux   = psMetadataLookupF32 (&status, row, "PSF_INST_FLUX");
-        @>PS1_V2,PS1_DV?@ source->psfFluxErr= psMetadataLookupF32 (&status, row, "PSF_INST_FLUX_SIG");
+        @>PS1_V2,PS1_SV1,PS1_DV?@ source->psfFlux   = psMetadataLookupF32 (&status, row, "PSF_INST_FLUX");
+        @>PS1_V2,PS1_SV1,PS1_DV?@ source->psfFluxErr= psMetadataLookupF32 (&status, row, "PSF_INST_FLUX_SIG");
 
         // XXX this scaling is incorrect: does not include the 2 \pi AREA factor