Changeset 30659

Timestamp:

Feb 16, 2011, 4:15:44 PM (15 years ago)

Author:

Serge CHASTEL

Message:

Merging type conversion fixes into production branch

Location:

tags/ipp-20101215/ppTranslate

Files:

• . (modified) (1 prop)
• src/ppMonet.c (modified) (1 diff)
• src/ppMopsMerge.c (modified) (2 diffs, 1 prop)
• src/ppMopsRead.c (modified) (4 diffs)

tags/ipp-20101215/ppTranslate/src/ppMonet.c

@@ -146 +146 @@
             psU32 flags = psMetadataLookupU32(NULL, row, "FLAGS");
 
-            float width = 0.5 * (major + minor);
+            float width = (float) (0.5 * (major + minor));
 
             gzprintf(gz, "%s , %.2f , %.2f , %.8lf , %.8lf , %.3f , %.3f , %.2f , %#08x\n",

tags/ipp-20101215/ppTranslate/src/ppMopsMerge.c

@@ -22 +22 @@
     )
 {
-    float dx = detections->x->data.F32[index] - detections->naxis1->data.S32[index] / 2.0;
-    float dy = detections->y->data.F32[index] - detections->naxis2->data.S32[index] / 2.0;
-    return PS_SQR(dx) + PS_SQR(dy);
+  float dx = (float) (detections->x->data.F32[index] - detections->naxis1->data.S32[index] / 2.0);
+  float dy = (float) (detections->y->data.F32[index] - detections->naxis2->data.S32[index] / 2.0);
+  return PS_SQR(dx) + PS_SQR(dy);
 }
 
@@ -170 +170 @@
     psTrace("ppMops.merge", 2, "%ld sources in merged detections list\n", merged->num);
 
-    merged->seeing /= num;
+    merged->seeing /= (float) num;
 
     return merged;

tags/ipp-20101215/ppTranslate/src/ppMopsRead.c

@@ -45 +45 @@
         if (args->version == 0) {
           psTrace("ppMops.read", 1, "Changing args->version to %d\n", skyChipPsfVersion);
-          args->version = skyChipPsfVersion;
+          args->version = (unsigned short) skyChipPsfVersion;
         }
         if (skyChipPsfVersion == 0) {
@@ -87 +87 @@
         det->mjd = psMetadataLookupF64(NULL, header, "MJD-OBS") + det->exptime / 2.0 / 3600 / 24;
 
-        det->seeing = 0.5 * (psMetadataLookupF32(NULL, header, "FWHM_MAJ") +
-                             psMetadataLookupF32(NULL, header, "FWHM_MIN"));
+        det->seeing = (float) 0.5 * (psMetadataLookupF32(NULL, header, "FWHM_MAJ") +
+                                     psMetadataLookupF32(NULL, header, "FWHM_MIN"));
 
         int naxis1 = psMetadataLookupS32(NULL, header, "IMNAXIS1"); // Number of columns
@@ -145 +145 @@
               //Values are set only if the version is 2
               if (skyChipPsfVersion == 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->psfInstFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_INST_FLUX");
+                det->psfInstFluxSig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_INST_FLUX_SIG");
+                det->apMag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_MAG");
+                det->apMagRaw->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_MAG_RAW");
+                det->apMagRadius->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_MAG_RADIUS");
+                det->apFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_FLUX");
+                det->apFluxSig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_FLUX_SIG");
+                det->peakFluxAsMag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PEAK_FLUX_AS_MAG");
+                det->calPsfMag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "CAL_PSF_MAG");
+                det->calPsfMagSig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "CAL_PSF_MAG_SIG");
+                det->sky->data.F32[numGood] = psMetadataLookupF32(NULL, row, "SKY");
+                det->skySig->data.F32[numGood] = psMetadataLookupF32(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");
@@ -236 +236 @@
             numGood++;
         }
-        det->seeing *= plateScale / numGood;
+        det->seeing *= ((float) plateScale) / ((float) numGood);
 
         det->x->n = numGood;