Changeset 29560 for trunk/ppTranslate/src/ppMopsRead.c

Timestamp:

Oct 25, 2010, 5:27:23 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Updates reflecting changes of eam_branches/ipp-20100823/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c rev 29230 / Partial support for -version option (to be improved)

File:

• trunk/ppTranslate/src/ppMopsRead.c (modified) (2 diffs)

trunk/ppTranslate/src/ppMopsRead.c

@@ -109 +109 @@
             det->naxis1->data.S32[numGood] = naxis1;
             det->naxis2->data.S32[numGood] = naxis2;
-
             det->nPos->data.S32[numGood] = psMetadataLookupS32(NULL, row, "DIFF_NPOS");
             det->fPos->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_FRATIO");
@@ -117 +116 @@
 
             //Additions of 2010-10-25
-            det->psfInstFlux->data.F32[numGood] = psMetadataLookupS32(NULL, row, "PSF_INST_FLUX");
-            det->psfInstFluxSig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "PSF_INST_FLUX_SIG");
-            det->apMag->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_MAG");
-            det->apMagRaw->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_MAG_RAW");
-            det->apMagRadius->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_MAG_RADIUS");
-            det->apFlux->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_FLUX");
-            det->apFluxSig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_FLUX_SIG");
-            det->peakFluxAsMag->data.F32[numGood] = psMetadataLookupS32(NULL, row, "PEAK_FLUX_AS_MAG");
-            det->calPsfMag->data.F32[numGood] = psMetadataLookupS32(NULL, row, "CAL_PSF_MAG");
-            det->calPsfMagSig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "CAL_PSF_MAG_SIG");
-            det->sky->data.F32[numGood] = psMetadataLookupS32(NULL, row, "SKY");
-            det->skySig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "SKY_SIGMA");
-            det->qualityPerfect->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_QF_PERFECT");
-            det->momentsR1->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_R1");
-            det->momentsRH->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_RH");
-            det->kronFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX");
-            det->kronFluxErr->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_ERR");
-            det->kronFluxInner->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_INNER");
-            det->kronFluxOuter->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_OUTER");
-            det->diffRP->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_R_P");
-            det->diffSnP->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_SN_P");
-            det->diffRM->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_R_M");
-            det->diffSnM->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_SN_M");
-            det->flags2->data.U32[numGood] = psMetadataLookupU32(NULL, row, "FLAGS2");
-            det->ippIdet->data.U32[numGood] = psMetadataLookupU32(NULL, row, "IPP_IDET");
-            det->nFrames->data.U16[numGood] = psMetadataLookupU16(NULL, row, "N_FRAMES");
-            det->padding->data.S16[numGood] = psMetadataLookupS16(NULL, row, "PADDING");
+            if (args->version == 2) {
+              det->psfInstFlux->data.F32[numGood] = psMetadataLookupS32(NULL, row, "PSF_INST_FLUX");
+              det->psfInstFluxSig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "PSF_INST_FLUX_SIG");
+              det->apMag->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_MAG");
+              det->apMagRaw->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_MAG_RAW");
+              det->apMagRadius->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_MAG_RADIUS");
+              det->apFlux->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_FLUX");
+              det->apFluxSig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "AP_FLUX_SIG");
+              det->peakFluxAsMag->data.F32[numGood] = psMetadataLookupS32(NULL, row, "PEAK_FLUX_AS_MAG");
+              det->calPsfMag->data.F32[numGood] = psMetadataLookupS32(NULL, row, "CAL_PSF_MAG");
+              det->calPsfMagSig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "CAL_PSF_MAG_SIG");
+              det->sky->data.F32[numGood] = psMetadataLookupS32(NULL, row, "SKY");
+              det->skySig->data.F32[numGood] = psMetadataLookupS32(NULL, row, "SKY_SIGMA");
+              det->qualityPerfect->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_QF_PERFECT");
+              det->momentsR1->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_R1");
+              det->momentsRH->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_RH");
+              det->kronFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX");
+              det->kronFluxErr->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_ERR");
+              det->kronFluxInner->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_INNER");
+              det->kronFluxOuter->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_OUTER");
+              det->diffRP->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_R_P");
+              det->diffSnP->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_SN_P");
+              det->diffRM->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_R_M");
+              det->diffSnM->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_SN_M");
+              det->flags2->data.U32[numGood] = psMetadataLookupU32(NULL, row, "FLAGS2");
+              det->ippIdet->data.U32[numGood] = psMetadataLookupU32(NULL, row, "IPP_IDET");
+              det->nFrames->data.U16[numGood] = psMetadataLookupU16(NULL, row, "N_FRAMES");
+              det->padding->data.S16[numGood] = psMetadataLookupS16(NULL, row, "PADDING");
+            } else {
+              det->psfInstFlux->data.F32[numGood] = NAN;
+              det->psfInstFluxSig->data.F32[numGood] = NAN;
+              det->apMag->data.F32[numGood] = NAN;
+              det->apMagRaw->data.F32[numGood] = NAN;
+              det->apMagRadius->data.F32[numGood] = NAN;
+              det->apFlux->data.F32[numGood] = NAN;
+              det->apFluxSig->data.F32[numGood] = NAN;
+              det->peakFluxAsMag->data.F32[numGood] = NAN;
+              det->calPsfMag->data.F32[numGood] = NAN;
+              det->calPsfMagSig->data.F32[numGood] = NAN;
+              det->sky->data.F32[numGood] = NAN;
+              det->skySig->data.F32[numGood] = NAN;
+              det->qualityPerfect->data.F32[numGood] = NAN;
+              det->momentsR1->data.F32[numGood] = NAN;
+              det->momentsRH->data.F32[numGood] = NAN;
+              det->kronFlux->data.F32[numGood] = NAN;
+              det->kronFluxErr->data.F32[numGood] = NAN;
+              det->kronFluxInner->data.F32[numGood] = NAN;
+              det->kronFluxOuter->data.F32[numGood] = NAN;
+              det->diffRP->data.F32[numGood] = NAN;
+              det->diffSnP->data.F32[numGood] = NAN;
+              det->diffRM->data.F32[numGood] = NAN;
+              det->diffSnM->data.F32[numGood] = NAN;
+              det->flags2->data.U32[numGood] = 0;
+              det->ippIdet->data.U32[numGood] = 0;
+              det->nFrames->data.U16[numGood] = 0;
+              det->padding->data.S16[numGood] = 0;
+            }
 
             // Calculate error in RA, Dec