Changeset 34488

Timestamp:

Sep 28, 2012, 2:34:58 PM (14 years ago)

Author:

Serge CHASTEL

Message:

SEEING is now the mean of fwhm_maj

Location:

trunk/ppTranslate/src

Files:

• ppMopsRead.c (modified) (3 diffs)
• ppMopsWrite.c (modified) (1 diff)

trunk/ppTranslate/src/ppMopsRead.c

@@ -95 +95 @@
     det->az = psMetadataLookupF64(NULL, header, "FPA.AZ");
     det->mjd = psMetadataLookupF64(NULL, header, "MJD-OBS") + det->exptime / 2.0 / 3600 / 24;
-
-    det->seeing = (float) 0.5 * (psMetadataLookupF32(NULL, header, "FWHM_MAJ") +
-                                 psMetadataLookupF32(NULL, header, "FWHM_MIN"));
-
+    //The global SEEING is the mean of all defined FWHM_MAJ
+    det->seeing = psMetadataLookupF32(NULL, header, "FWHM_MAJ");
     det->naxis1 = psMetadataLookupS32(NULL, header, "IMNAXIS1"); // Number of columns
     det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2"); // Number of rows
-
     psFree(header);
 
@@ -163 +160 @@
       }
     }
-
     psFitsClose(fits);
 
@@ -247 +243 @@
       numGood++;
     }
-    det->seeing *= ((float) plateScale) / ((float) numGood);
     det->numGood = numGood;
 

trunk/ppTranslate/src/ppMopsWrite.c

@@ -53 +53 @@
   for (int d = 0; d < detections->n; d++) {
     if ( (detections->data[d] != NULL) && (isfinite(((ppMopsDetections*) detections->data[d])->seeing)) ) {
-      seeing += (((ppMopsDetections*) detections->data[d])->seeing)*((float) (((ppMopsDetections*) detections->data[d])->numGood));
-      totalGood += (((ppMopsDetections*) detections->data[d])->numGood);
+      seeing += ((ppMopsDetections*) detections->data[d])->seeing;
+      totalGood += 1;
     }
   }