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

Timestamp:

Oct 25, 2010, 4:29:35 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Changes reflecting eam_branches/ipp-20100823/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c rev 29230

File:

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

trunk/ppTranslate/src/ppMopsRead.c

@@ -116 +116 @@
             det->nRatioAll->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_NRATIO_ALL");
 
+            //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");
+
             // Calculate error in RA, Dec
-            double xErr = psMetadataLookupF64(NULL, row, "X_PSF_SIG");
-            double yErr = psMetadataLookupF64(NULL, row, "Y_PSF_SIG");
-            double scale = psMetadataLookupF64(NULL, row, "PLTSCALE");
-            double angle = psMetadataLookupF64(NULL, row, "POSANGLE");
+            double xErr = psMetadataLookupF64(NULL, row, "X_PSF_SIG"); //SC: Warning! Promotion of F32
+            double yErr = psMetadataLookupF64(NULL, row, "Y_PSF_SIG"); //SC: Warning! Promotion of F32
+            double scale = psMetadataLookupF64(NULL, row, "PLTSCALE"); //SC: Warning! Promotion of F32
+            double angle = psMetadataLookupF64(NULL, row, "POSANGLE"); //SC: Warning! Promotion of F32
 
             if (!isfinite(det->x->data.F32[numGood]) || !isfinite(det->y->data.F32[numGood]) ||
@@ -181 +210 @@
         det->nRatioMask->n = numGood;
         det->nRatioAll->n = numGood;
+        det->psfInstFlux->n = numGood;
+        det->psfInstFluxSig->n = numGood;
+        det->apMag->n = numGood;
+        det->apMagRaw->n = numGood;
+        det->apMagRadius->n = numGood;
+        det->apFlux->n = numGood;
+        det->apFluxSig->n = numGood;
+        det->peakFluxAsMag->n = numGood;
+        det->calPsfMag->n = numGood;
+        det->calPsfMagSig->n = numGood;
+        det->sky->n = numGood;
+        det->skySig->n = numGood;
+        det->qualityPerfect->n = numGood;
+        det->momentsR1->n = numGood;
+        det->momentsRH->n = numGood;
+        det->kronFlux->n = numGood;
+        det->kronFluxErr->n = numGood;
+        det->kronFluxInner->n = numGood;
+        det->kronFluxOuter->n = numGood;
+        det->diffRP->n = numGood;
+        det->diffSnP->n = numGood;
+        det->diffRM->n = numGood;
+        det->diffSnM->n = numGood;
+        det->flags2->n = numGood;
+        det->ippIdet->n = numGood;
+        det->nFrames->n = numGood;
+        det->padding->n = numGood;
 
         det->num = numGood;